Upstream merge
This commit is contained in:
Thinkofdeath
parent
d96ecbc04b
commit
3c15908aac
1 changed files with 81 additions and 96 deletions
|
|
@ -11,107 +11,92 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -0,0 +0,0 @@
|
@@ -0,0 +0,0 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
- <groupId>org.bukkit</groupId>
|
- <groupId>org.bukkit</groupId>
|
||||||
- <artifactId>craftbukkit</artifactId>
|
- <artifactId>craftbukkit</artifactId>
|
||||||
+ <groupId>org.spigotmc</groupId>
|
|
||||||
+ <artifactId>spigot</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
<version>1.8.3-R0.1-SNAPSHOT</version>
|
|
||||||
- <name>CraftBukkit</name>
|
|
||||||
- <url>http://www.bukkit.org</url>
|
|
||||||
+ <name>Spigot</name>
|
|
||||||
+ <url>http://www.spigotmc.org</url>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
@@ -0,0 +0,0 @@
|
|
||||||
<maven.compiler.target>1.6</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
+ <parent>
|
|
||||||
+ <groupId>org.spigotmc</groupId>
|
+ <groupId>org.spigotmc</groupId>
|
||||||
+ <artifactId>spigot-parent</artifactId>
|
+ <artifactId>spigot</artifactId>
|
||||||
+ <version>dev-SNAPSHOT</version>
|
<packaging>jar</packaging>
|
||||||
+ <relativePath>../pom.xml</relativePath>
|
<version>1.8.3-R0.1-SNAPSHOT</version>
|
||||||
+ </parent>
|
- <name>CraftBukkit</name>
|
||||||
|
- <url>http://www.bukkit.org</url>
|
||||||
|
+ <name>Spigot</name>
|
||||||
|
+ <url>http://www.spigotmc.org</url>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
@@ -0,0 +0,0 @@
|
||||||
|
<maven.compiler.target>1.6</maven.compiler.target>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
+ <parent>
|
||||||
|
+ <groupId>org.spigotmc</groupId>
|
||||||
|
+ <artifactId>spigot-parent</artifactId>
|
||||||
|
+ <version>dev-SNAPSHOT</version>
|
||||||
|
+ <relativePath>../pom.xml</relativePath>
|
||||||
|
+ </parent>
|
||||||
+
|
+
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
- <groupId>org.bukkit</groupId>
|
- <groupId>org.bukkit</groupId>
|
||||||
- <artifactId>bukkit</artifactId>
|
- <artifactId>bukkit</artifactId>
|
||||||
+ <groupId>net.sf.trove4j</groupId>
|
+ <groupId>net.sf.trove4j</groupId>
|
||||||
+ <artifactId>trove4j</artifactId>
|
+ <artifactId>trove4j</artifactId>
|
||||||
+ <version>3.0.3</version>
|
+ <version>3.0.3</version>
|
||||||
+ </dependency>
|
+ </dependency>
|
||||||
+ <dependency>
|
+ <dependency>
|
||||||
+ <groupId>org.spigotmc</groupId>
|
+ <groupId>org.spigotmc</groupId>
|
||||||
+ <artifactId>spigot-api</artifactId>
|
+ <artifactId>spigot-api</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
@@ -0,0 +0,0 @@
|
@@ -0,0 +0,0 @@
|
||||||
|
|
||||||
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
|
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
|
||||||
<build>
|
<build>
|
||||||
- <defaultGoal>clean install</defaultGoal>
|
- <defaultGoal>clean install</defaultGoal>
|
||||||
+ <defaultGoal>install</defaultGoal>
|
+ <defaultGoal>install</defaultGoal>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.lukegb.mojo</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>gitdescribe-maven-plugin</artifactId>
|
<artifactId>scriptus</artifactId>
|
||||||
<version>2.0</version>
|
<version>0.2</version>
|
||||||
<configuration>
|
- <configuration>
|
||||||
- <outputPrefix>${buildtag.prefix}</outputPrefix>
|
- <format>git-Bukkit-%s</format>
|
||||||
- <outputPostfix>${buildtag.suffix}</outputPostfix>
|
- </configuration>
|
||||||
<extraArguments>
|
<executions>
|
||||||
<extraArgument>--always</extraArgument>
|
<execution>
|
||||||
</extraArguments>
|
+ <id>ex-spigot</id>
|
||||||
</configuration>
|
+ <configuration>
|
||||||
<executions>
|
+ <format>git-Spigot-%s</format>
|
||||||
<execution>
|
+ <scmDirectory>../</scmDirectory>
|
||||||
+ <id>ex-spigot</id>
|
+ <descriptionProperty>spigot.desc</descriptionProperty>
|
||||||
+ <configuration>
|
+ </configuration>
|
||||||
+ <outputPrefix>git-Spigot-</outputPrefix>
|
+ <phase>initialize</phase>
|
||||||
+ <outputPostfix></outputPostfix>
|
+ <goals>
|
||||||
+ <scmDirectory>../</scmDirectory>
|
+ <goal>describe</goal>
|
||||||
+ <descriptionProperty>spigot.desc</descriptionProperty>
|
+ </goals>
|
||||||
+ </configuration>
|
+ </execution>
|
||||||
+ <phase>compile</phase>
|
+ <execution>
|
||||||
+ <goals>
|
+ <id>ex-craftbukkit</id>
|
||||||
+ <goal>gitdescribe</goal>
|
+ <configuration>
|
||||||
+ </goals>
|
+ <format>-%s</format>
|
||||||
+ </execution>
|
+ <scmDirectory>../../CraftBukkit</scmDirectory>
|
||||||
+ <execution>
|
+ <descriptionProperty>craftbukkit.desc</descriptionProperty>
|
||||||
+ <id>ex-craftbukkit</id>
|
+ </configuration>
|
||||||
+ <configuration>
|
<phase>initialize</phase>
|
||||||
+ <outputPrefix>-</outputPrefix>
|
<goals>
|
||||||
+ <outputPostfix></outputPostfix>
|
<goal>describe</goal>
|
||||||
+ <scmDirectory>../../CraftBukkit</scmDirectory>
|
|
||||||
+ <descriptionProperty>craftbukkit.desc</descriptionProperty>
|
|
||||||
+ </configuration>
|
|
||||||
<phase>compile</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>gitdescribe</goal>
|
|
||||||
@@ -0,0 +0,0 @@
|
@@ -0,0 +0,0 @@
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
|
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
|
||||||
<Implementation-Title>CraftBukkit</Implementation-Title>
|
<Implementation-Title>CraftBukkit</Implementation-Title>
|
||||||
- <Implementation-Version>${describe}</Implementation-Version>
|
- <Implementation-Version>${describe}</Implementation-Version>
|
||||||
+ <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
|
+ <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
|
||||||
<Implementation-Vendor>Bukkit Team</Implementation-Vendor>
|
<Implementation-Vendor>Bukkit Team</Implementation-Vendor>
|
||||||
<Specification-Title>Bukkit</Specification-Title>
|
<Specification-Title>Bukkit</Specification-Title>
|
||||||
<Specification-Version>${api.version}</Specification-Version>
|
<Specification-Version>${api.version}</Specification-Version>
|
||||||
@@ -0,0 +0,0 @@
|
|
||||||
<configuration>
|
|
||||||
<signature>
|
|
||||||
<groupId>org.codehaus.mojo.signature</groupId>
|
|
||||||
- <artifactId>java16</artifactId>
|
|
||||||
+ <artifactId>java16-sun</artifactId>
|
|
||||||
<version>1.1</version>
|
|
||||||
</signature>
|
|
||||||
</configuration>
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue