ci: Reflect build changes in CI pom.xml files

This commit applies the recent build changes to add a benchmarking module, remove Minecraft's log4j dependency, and update Guava and Junit4 to the CI configuration.
ProjectKig · Mar 25, 2022 · 29d1eab · 29d1eab
1 parent 49e9e16
commit 29d1eab
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 9 deletions.
diff --git a/api_ci_pom.xml b/api_ci_pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>17.0</version>
+            <version>31.1-jre</version>
             <scope>compile</scope>
         </dependency>
         <!-- bundled with Minecraft, should be kept in sync -->
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/ci_pom.xml b/ci_pom.xml
@@ -18,10 +18,26 @@
     <description>Parent project for all PaperSpigot modules.</description>
     <url>https://github.com/PaperSpigot/Spigot</url>
 
-    <modules>
-        <module>PaperSpigot-Server</module>
-        <module>PaperSpigot-API</module>
-    </modules>
+    <profiles>
+        <profile>
+            <id>server</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>PaperSpigot-Server</module>
+                <module>PaperSpigot-API</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>benchmarks</id>
+            <modules>
+                <module>PaperSpigot-Server</module>
+                <module>PaperSpigot-API</module>
+                <module>Benchmarks</module>
+            </modules>
+        </profile>
+    </profiles>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/server_ci_pom.xml b/server_ci_pom.xml
@@ -11,7 +11,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <api.version>unknown</api.version>
-        <junit.version>4.11</junit.version>
+        <junit.version>4.13.2</junit.version>
         <minecraft.version>1.8.8</minecraft.version>
         <minecraft_version>1_8_R3</minecraft_version>
         <buildtag.prefix>git-Bukkit-</buildtag.prefix>
@@ -47,6 +47,16 @@
             <version>${minecraft.version}-SNAPSHOT</version>
             <type>jar</type>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
@@ -100,6 +110,16 @@
             <artifactId>zstd-jni</artifactId>
             <version>1.5.0-4</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.17.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.17.1</version>
+        </dependency>
         <!-- // KigPaper end -->
     </dependencies>
 
@@ -190,7 +210,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -235,7 +255,7 @@
             <plugin>
                 <groupId>net.md-5</groupId>
                 <artifactId>specialsource-maven-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.2.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>