Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116)
This commit is contained in:
parent
6178609e1d
commit
ae6fec6d13
240 changed files with 435 additions and 456 deletions
|
@ -28,7 +28,7 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
|
|||
+/.factorypath
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..9c4382ef7373110b6e72163779316ff40234a992
|
||||
index 0000000000000000000000000000000000000000..dc8f0a7ac3387323428f71139ac07ec98cd33ed8
|
||||
--- /dev/null
|
||||
+++ b/build.gradle.kts
|
||||
@@ -0,0 +1,141 @@
|
||||
|
@ -54,11 +54,11 @@ index 0000000000000000000000000000000000000000..9c4382ef7373110b6e72163779316ff4
|
|||
+ runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
|
||||
+ runtimeOnly("mysql:mysql-connector-java:8.0.27")
|
||||
+
|
||||
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1")
|
||||
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
|
||||
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
|
||||
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.4")
|
||||
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2")
|
||||
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2")
|
||||
+
|
||||
+ testImplementation("junit:junit:4.13.1")
|
||||
+ testImplementation("junit:junit:4.13.2")
|
||||
+ testImplementation("org.hamcrest:hamcrest-library:1.3")
|
||||
+}
|
||||
+
|
||||
|
@ -175,7 +175,7 @@ index 0000000000000000000000000000000000000000..9c4382ef7373110b6e72163779316ff4
|
|||
+}
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
deleted file mode 100644
|
||||
index 56938962e9ba6b188c2f4bc1694b911f05994436..0000000000000000000000000000000000000000
|
||||
index 5d1e2c51c814281bf50c352f7fa9f99465100068..0000000000000000000000000000000000000000
|
||||
--- a/pom.xml
|
||||
+++ /dev/null
|
||||
@@ -1,540 +0,0 @@
|
||||
|
@ -347,26 +347,26 @@ index 56938962e9ba6b188c2f4bc1694b911f05994436..00000000000000000000000000000000
|
|||
- <dependency>
|
||||
- <groupId>org.apache.maven</groupId>
|
||||
- <artifactId>maven-resolver-provider</artifactId>
|
||||
- <version>3.8.1</version>
|
||||
- <version>3.8.4</version>
|
||||
- <scope>runtime</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.apache.maven.resolver</groupId>
|
||||
- <artifactId>maven-resolver-connector-basic</artifactId>
|
||||
- <version>1.7.0</version>
|
||||
- <version>1.7.2</version>
|
||||
- <scope>runtime</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.apache.maven.resolver</groupId>
|
||||
- <artifactId>maven-resolver-transport-http</artifactId>
|
||||
- <version>1.7.0</version>
|
||||
- <version>1.7.2</version>
|
||||
- <scope>runtime</scope>
|
||||
- </dependency>
|
||||
- <!-- testing -->
|
||||
- <dependency>
|
||||
- <groupId>junit</groupId>
|
||||
- <artifactId>junit</artifactId>
|
||||
- <version>4.13.1</version>
|
||||
- <version>4.13.2</version>
|
||||
- <scope>test</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
|
@ -474,12 +474,12 @@ index 56938962e9ba6b188c2f4bc1694b911f05994436..00000000000000000000000000000000
|
|||
- <dependency>
|
||||
- <groupId>org.ow2.asm</groupId>
|
||||
- <artifactId>asm</artifactId>
|
||||
- <version>9.1</version>
|
||||
- <version>9.2</version>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.ow2.asm</groupId>
|
||||
- <artifactId>asm-commons</artifactId>
|
||||
- <version>9.1</version>
|
||||
- <version>9.2</version>
|
||||
- </dependency>
|
||||
- </dependencies>
|
||||
- <executions>
|
||||
|
@ -598,7 +598,7 @@ index 56938962e9ba6b188c2f4bc1694b911f05994436..00000000000000000000000000000000
|
|||
- <dependency>
|
||||
- <groupId>org.eclipse.jdt</groupId>
|
||||
- <artifactId>ecj</artifactId>
|
||||
- <version>3.27.0</version>
|
||||
- <version>3.28.0</version>
|
||||
- </dependency>
|
||||
- </dependencies>
|
||||
- </plugin>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue