CatMC-Network/mSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The first patches

Browse Source
This commit is contained in:
virtualWinter 2023-07-21 05:14:41 +03:00
parent 3db356d228
commit e2e954b5a2
4 changed files with 327 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
patches/api/0001-Pom-changes.patch Normal file
View File

@ -0,0 +1,55 @@
From 5d076a3dc1f39f2503e6727c8950b7d7b32a3871 Mon Sep 17 00:00:00 2001
From: virtualWinter <winter@catmc.club>
Date: Fri, 21 Jul 2023 04:58:39 +0300
Subject: [PATCH] Pom changes
diff --git a/pom.xml b/pom.xml
index fe9d6d26..14c8fda0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,18 +4,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.github.paperspigot</groupId>
- <artifactId>paperspigot-parent</artifactId>
+ <groupId>net.hylist</groupId>
+ <artifactId>mspigot-parent</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <groupId>org.github.paperspigot</groupId>
- <artifactId>paperspigot-api</artifactId>
+ <artifactId>mspigot-api</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>PaperSpigot-API</name>
- <url>https://hub.spigotmc.org/stash/projects/PAPER/</url>
+ <name>mSpigot-API</name>
<description>An enhanced plugin API for Minecraft servers.</description>
<properties>
@@ -26,18 +24,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <!-- just until we get deployment to central approved -->
- <distributionManagement>
- <repository>
- <id>destroystokyo-releases</id>
- <url>https://repo.destroystokyo.com/content/repositories/releases/</url>
- </repository>
- <snapshotRepository>
- <id>destroystokyo-snapshots</id>
- <url>https://repo.destroystokyo.com/content/repositories/snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
-
<!-- required until fixed plexus-compiler-eclipse is deployed -->
<pluginRepositories>
<pluginRepository>
--
2.41.0.windows.1

50
patches/api/0002-More-pom.xml-ceanup-updates.patch Normal file
View File

@ -0,0 +1,50 @@
From 3e6822e8eacfd02ee03f4ecab347d32c60a92eca Mon Sep 17 00:00:00 2001
From: virtualWinter <winter@catmc.club>
Date: Fri, 21 Jul 2023 05:12:56 +0300
Subject: [PATCH] More pom.xml ceanup + updates
diff --git a/pom.xml b/pom.xml
index 14c8fda0..83f9f514 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,16 +106,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <!-- versions after this appear to be broken -->
- <version>3.1</version>
+ <version>3.11.0</version>
<configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId>
- <!-- source and target are ignored if this isn't true -->
<optimize>true</optimize>
</configuration>
<dependencies>
- <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-eclipse</artifactId>
@@ -126,7 +121,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
+ <version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
@@ -136,9 +131,7 @@
</execution>
</executions>
<configuration>
- <!-- utterly useless artifact from shade 2.x -->
<createDependencyReducedPom>false</createDependencyReducedPom>
- <!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
</plugin>
--
2.41.0.windows.1

220
patches/server/0001-pom.xml-ceanup-updates.patch Normal file
View File

@ -0,0 +1,220 @@
From 3992f92e2797b07a20720fb12d4e5ade57c1dbde Mon Sep 17 00:00:00 2001
From: virtualWinter <winter@catmc.club>
Date: Fri, 21 Jul 2023 05:13:15 +0300
Subject: [PATCH] pom.xml ceanup + updates
diff --git a/pom.xml b/pom.xml
index 644305e6..e70c7c4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,17 @@
<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">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.github.paperspigot</groupId>
- <artifactId>paperspigot</artifactId>
+ <artifactId>mspigot-server</artifactId>
<packaging>jar</packaging>
<version>1.8.8-R0.1-SNAPSHOT</version>
- <name>PaperSpigot</name>
- <url>https://hub.spigotmc.org/stash/projects/PAPER/</url>
+ <name>mSpigot-Server</name>
+
+ <parent>
+ <groupId>net.hylist</groupId>
+ <artifactId>mspigot-parent</artifactId>
+ <version>dev-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,18 +21,10 @@
<minecraft_version>1_8_R3</minecraft_version>
<buildtag.prefix>git-Bukkit-</buildtag.prefix>
<buildtag.suffix></buildtag.suffix>
- <!--PaperSpigot - Bump to 1.8 - This will haunt me -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
- <parent>
- <groupId>org.github.paperspigot</groupId>
- <artifactId>paperspigot-parent</artifactId>
- <version>dev-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
<dependencies>
<dependency>
<groupId>net.sf.trove4j</groupId>
@@ -35,16 +32,16 @@
<version>3.0.3</version>
</dependency>
<dependency>
- <groupId>org.github.paperspigot</groupId>
- <artifactId>paperspigot-api</artifactId>
- <version>${project.version}</version>
+ <groupId>net.hylist</groupId>
+ <artifactId>mspigot-api</artifactId>
+ <version>1.8.8-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.17.0</version> <!-- Paper - Update Log4j -->
+ <version>2.17.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -64,7 +61,7 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>2.12.1</version> <!-- Paper - Update Log4j - use this specific version as it works on both aarch64 and windows -->
+ <version>2.12.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -82,7 +79,6 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
- <!-- testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -97,29 +93,26 @@
</dependency>
</dependencies>
- <!-- required until fixed plexus-compiler-eclipse is deployed -->
<pluginRepositories>
<pluginRepository>
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</pluginRepository>
- <!-- PaperSpigot - Repo for gitdescribe -->
<pluginRepository>
- <id>papermc</id> <!-- Paper - Update Log4j -->
- <url>https://papermc.io/repo/repository/maven-public/</url> <!-- Paper - Update Log4j -->
+ <id>papermc</id>
+ <url>https://papermc.io/repo/repository/maven-public/</url>
</pluginRepository>
</pluginRepositories>
- <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>com.lukegb.mojo</groupId>
<artifactId>gitdescribe-maven-plugin</artifactId>
- <version>1.3</version>
+ <version>3.0</version>
<configuration>
- <outputPrefix>git-PaperSpigot-</outputPrefix>
+ <outputPrefix>git-mSpigot-</outputPrefix>
<scmDirectory>..</scmDirectory>
</configuration>
<executions>
@@ -134,9 +127,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
+ <version>3.3.0</version>
<configuration>
- <forceCreation>true</forceCreation> <!-- Required to prevent shading the jar multiple times -->
+ <forceCreation>true</forceCreation>
<archive>
<manifestEntries>
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
@@ -146,7 +139,7 @@
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-Version>
<Specification-Vendor>Bukkit Team</Specification-Vendor>
- <Multi-Release>true</Multi-Release> <!-- Paper - update log4j -->
+ <Multi-Release>true</Multi-Release>
</manifestEntries>
<manifestSections>
<manifestSection>
@@ -174,7 +167,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version> <!-- Paper - Update Log4j -->
+ <version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
@@ -182,7 +175,6 @@
<goal>shade</goal>
</goals>
<configuration>
- <!-- Paper start - Update Log4j -->
<filters>
<filter>
<artifact>org.spigotmc:minecraft-server:**</artifact>
@@ -191,7 +183,6 @@
</excludes>
</filter>
</filters>
- <!-- Paper end - Update Log4j -->
<relocations>
<relocation>
<pattern>joptsimple</pattern>
@@ -225,37 +216,14 @@
</execution>
</executions>
</plugin>
- <!-- Gotta go after shade plugin -->
- <plugin>
- <groupId>net.md-5</groupId>
- <artifactId>specialsource-maven-plugin</artifactId>
- <version>1.2.3</version> <!-- paper - bump log4j -->
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>remap</goal>
- </goals>
- <configuration>
- <srgIn>${project.basedir}/deprecation-mappings.csrg</srgIn>
- <accessIn>${project.basedir}/deprecation-mappings.at</accessIn>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <!-- versions after this appear to be broken -->
- <version>3.1</version>
+ <version>3.11.0</version>
<configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId>
- <!-- source and target are ignored if this isn't true -->
<optimize>true</optimize>
</configuration>
<dependencies>
- <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-eclipse</artifactId>
@@ -266,7 +234,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.18</version>
+ <version>3.1.2</version>
<configuration>
<workingDirectory>${basedir}/target/test-server</workingDirectory>
<excludes>
--
2.41.0.windows.1

3
pom.xml
View File

@ -2,7 +2,8 @@
<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"> <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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.hylist</groupId> <groupId>net.hylist</groupId>
<artifactId>spigot-parent</artifactId> <artifactId>mspigot-parent</artifactId>
<name>mSpigot-Parent</name>
<version>dev-SNAPSHOT</version> <version>dev-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>Production version of Spigot for Hylist servers. Ported to 1.8.8</description> <description>Production version of Spigot for Hylist servers. Ported to 1.8.8</description>