Update B/CB/S
This commit is contained in:
parent
f7e23ba7fa
commit
bec1253aa9
8 changed files with 92 additions and 97 deletions
|
@ -1,34 +1,32 @@
|
|||
From ed103e824a3c48330567e5b1a0a7bc112e94c4da Mon Sep 17 00:00:00 2001
|
||||
From 4bbb8c7aa24cea492d251eae531d0d88c1565b94 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 1 Mar 2016 00:16:08 +0100
|
||||
Subject: [PATCH] POM changes
|
||||
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 8c6d1aa1..07143b46 100644
|
||||
index f175b611..2fe7b78e 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -4,44 +4,38 @@
|
||||
@@ -3,39 +3,39 @@
|
||||
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>
|
||||
|
||||
<parent>
|
||||
- <groupId>org.sonatype.oss</groupId>
|
||||
- <artifactId>oss-parent</artifactId>
|
||||
- <version>9</version>
|
||||
+ <groupId>com.destroystokyo.paper</groupId>
|
||||
+ <artifactId>paper-parent</artifactId>
|
||||
+ <version>dev-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
- <groupId>org.spigotmc</groupId>
|
||||
- <artifactId>spigot-api</artifactId>
|
||||
+ <parent>
|
||||
+ <groupId>com.destroystokyo.paper</groupId>
|
||||
+ <artifactId>paper-parent</artifactId>
|
||||
+ <version>dev-SNAPSHOT</version>
|
||||
+ </parent>
|
||||
+
|
||||
+ <groupId>com.destroystokyo.paper</groupId>
|
||||
+ <artifactId>paper-api</artifactId>
|
||||
<version>1.12.1-R0.1-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Spigot-API</name>
|
||||
- <url>http://www.spigotmc.org/</url>
|
||||
- <url>https://www.spigotmc.org/</url>
|
||||
+ <name>Paper-API</name>
|
||||
+ <url>https://github.com/PaperMC/Paper</url>
|
||||
<description>An enhanced plugin API for Minecraft servers.</description>
|
||||
|
@ -67,7 +65,7 @@ index 8c6d1aa1..07143b46 100644
|
|||
<pluginRepositories>
|
||||
<pluginRepository>
|
||||
<id>spigotmc-public</id>
|
||||
@@ -49,6 +43,17 @@
|
||||
@@ -43,6 +43,17 @@
|
||||
</pluginRepository>
|
||||
</pluginRepositories>
|
||||
|
||||
|
@ -85,7 +83,7 @@ index 8c6d1aa1..07143b46 100644
|
|||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
@@ -63,6 +68,13 @@
|
||||
@@ -57,6 +68,13 @@
|
||||
<type>jar</type>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
@ -99,7 +97,7 @@ index 8c6d1aa1..07143b46 100644
|
|||
<!-- bundled with Minecraft, should be kept in sync -->
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
@@ -107,6 +119,7 @@
|
||||
@@ -101,6 +119,7 @@
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -107,7 +105,7 @@ index 8c6d1aa1..07143b46 100644
|
|||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@@ -126,26 +139,6 @@
|
||||
@@ -120,26 +139,6 @@
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
@ -134,16 +132,14 @@ index 8c6d1aa1..07143b46 100644
|
|||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
@@ -158,8 +151,7 @@
|
||||
@@ -152,6 +151,7 @@
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
- <!-- utterly useless artifact from shade 2.x -->
|
||||
- <createDependencyReducedPom>false</createDependencyReducedPom>
|
||||
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
|
||||
<!-- when downloading via Maven we can pull depends individually -->
|
||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
||||
</configuration>
|
||||
--
|
||||
2.13.3.windows.1
|
||||
2.13.4
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue