Upstream merge.
This commit is contained in:
@@ -37,11 +37,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ <relativePath>../pom.xml</relativePath>
|
+ <relativePath>../pom.xml</relativePath>
|
||||||
+ </parent>
|
+ </parent>
|
||||||
+
|
+
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>sonatype-nexus-snapshots</id>
|
|
||||||
@@ -0,0 +0,0 @@
|
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
- <groupId>org.bukkit</groupId>
|
- <groupId>org.bukkit</groupId>
|
||||||
@@ -71,7 +66,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
+ <id>ex-spigot</id>
|
+ <id>ex-spigot</id>
|
||||||
+ <configuration>
|
+ <configuration>
|
||||||
+ <outputPrefix>git-Spigot-</outputPrefix>
|
+ <outputPrefix>git-Spigot-</outputPrefix>
|
||||||
+ <outputPostfix></outputPostfix>
|
+ <outputPostfix></outputPostfix>
|
||||||
@@ -84,7 +79,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ </goals>
|
+ </goals>
|
||||||
+ </execution>
|
+ </execution>
|
||||||
+ <execution>
|
+ <execution>
|
||||||
+ <id>ex-craftbukkit</id>
|
+ <id>ex-craftbukkit</id>
|
||||||
+ <configuration>
|
+ <configuration>
|
||||||
+ <outputPrefix>-</outputPrefix>
|
+ <outputPrefix>-</outputPrefix>
|
||||||
+ <outputPostfix></outputPostfix>
|
+ <outputPostfix></outputPostfix>
|
||||||
|
|||||||
Reference in New Issue
Block a user