Rollback minimum supported versions to Java 11, Maven 3.8.8 and Spigo…

…t 1.16.5, fix datasourcecolumns runtime library
AuthMe · Apr 28, 2024 · e33a274 · e33a274
1 parent 3ca87cd
commit e33a274
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 46 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -10,7 +10,7 @@ jobs:
   build_and_test:
     strategy:
       matrix:
-        jdkversion: [17]
+        jdkversion: [11, 17, 21]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ language: java
 matrix:
   include:
   - env:
-    - JDK_VERSION=17
+    - JDK_VERSION=11
 
 before_install:
   - "[[ -d $HOME/.sdkman/ ]] && [[ -d $HOME/.sdkman/bin/ ]] || rm -rf $HOME/.sdkman/"

diff --git a/README.md b/README.md
@@ -115,17 +115,17 @@ You can also create your own translation file and, if you want, you can share it
 ## Requirements
 
 ##### Compiling requirements:
->- JDK 17
->- Maven (3.9+)
->- Git/Github (Optional)
+>- JDK 11+
+>- Maven (3.8.8+)
+>- Git/GitHub (Optional)
 
 ##### How to compile the project:
 >- Clone the project with Git/GitHub
 >- Execute command "mvn clean package"
 
 ##### Running requirements:
->- Java 17
->- Paper or Spigot (1.19.X and up)
+>- Java 11+
+>- Paper or Spigot (1.16.5 and up)
 >- ProtocolLib (optional, required by some features)
 
 ## Credits

diff --git a/pom.xml b/pom.xml
@@ -60,11 +60,11 @@
         <!-- Environment properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.source>17</java.source>
-        <java.target>17</java.target>
-        <java.apiVersion>17</java.apiVersion>
-        <java.compiler.minimumVersion>17</java.compiler.minimumVersion>
-        <maven.minimumVersion>3.9.0</maven.minimumVersion>
+        <java.source>11</java.source>
+        <java.target>11</java.target>
+        <java.apiVersion>11</java.apiVersion>
+        <java.compiler.minimumVersion>11</java.compiler.minimumVersion>
+        <maven.minimumVersion>3.8.8</maven.minimumVersion>
 
         <!-- Versioning properties -->
         <project.outputName>AuthMe</project.outputName>
@@ -94,12 +94,10 @@
         <dependencies.argon2-jvm-nolibs.version>2.11</dependencies.argon2-jvm-nolibs.version>
         <dependencies.bcrypt.version>0.9.0</dependencies.bcrypt.version>
         <dependencies.googleauth.version>1.5.0</dependencies.googleauth.version>
-        <dependencies.configme.version>1.4.1</dependencies.configme.version>
+        <dependencies.configme.version>1.3.1</dependencies.configme.version>
         <!-- Spigot -->
-        <dependencies.spigot.version>1.20.5-R0.1-SNAPSHOT</dependencies.spigot.version>
-        <dependencies.guava.version>31.1-jre</dependencies.guava.version> <!-- version bundled in 1.19.4 -->
-        <dependencies.gson.version>2.10</dependencies.gson.version> <!-- version bundled in 1.19.4 -->
-        <dependencies.log4j-core.version>2.19.0</dependencies.log4j-core.version> <!-- version bundled in 1.19.4 -->
+        <dependencies.spigot.version>1.16.5-R0.1-SNAPSHOT</dependencies.spigot.version>
+        <dependencies.log4j-core.version>2.8.1</dependencies.log4j-core.version> <!-- version bundled 1.16.5 -->
         <!-- Spigot libraries -->
         <dependencies.bstats.version>3.0.2</dependencies.bstats.version>
     </properties>
@@ -149,8 +147,10 @@
 
     <build>
         <defaultGoal>clean package</defaultGoal>
-        <!-- Little hack to make the shade plugin output a file with the right name -->
+        <!-- Little hack to make the shade plugin output a file with the right name
+        Disable, we aren't using shading atm
         <finalName>${project.finalNameBase}-noshade</finalName>
+        -->
 
         <resources>
             <resource>
@@ -320,13 +320,15 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.5.3</version>
                 <executions>
+                    <!-- Disable, we aren't using shading atm
                     <execution>
                         <id>shaded-jar</id>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
                     </execution>
+                    -->
                 </executions>
                 <configuration>
                     <!-- Don't create the reduced pom file, as we don't deploy the shaded jar -->
@@ -336,11 +338,11 @@
                     <!-- Use the base jar name, to help server owners download the right jar -->
                     <finalName>${project.finalNameBase}</finalName>
 
-                    <!--
+                    <!-- Disable, no relocations atm
                     <relocations>
                         <relocation>
-                            <pattern>ch.jalu.datasourcecolumns</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.ch.jalu.datasourcecolumns</shadedPattern>
+                            <pattern></pattern>
+                            <shadedPattern>fr.xephi.authme.libs.</shadedPattern>
                         </relocation>
                     </relocations>
                     -->
@@ -652,6 +654,12 @@
             <artifactId>configme</artifactId>
             <version>${dependencies.configme.version}</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Spigot API, https://www.spigotmc.org/ -->
@@ -661,14 +669,6 @@
             <version>${dependencies.spigot.version}</version>
             <scope>provided</scope>
             <exclusions>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.code.gson</groupId>
-                    <artifactId>gson</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.joml</groupId>
                     <artifactId>joml</artifactId>
@@ -677,24 +677,8 @@
                     <groupId>net.md-5</groupId>
                     <artifactId>bungeecord-chat</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.yaml</groupId>
-                    <artifactId>snakeyaml</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${dependencies.guava.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${dependencies.gson.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -7,7 +7,7 @@ description: ${project.description}
 # noinspection YAMLSchemaValidation
 main: ${pluginDescription.main}
 version: ${pluginDescription.version}
-api-version: 1.19
+api-version: 1.16
 softdepend:
     - Vault
     - LuckPerms
@@ -26,6 +26,7 @@ libraries:
   - org.apache.commons:commons-email:${dependencies.commons-email.version}
   - com.zaxxer:HikariCP:${dependencies.hikaricp.version}
   - org.slf4j:slf4j-simple:${dependencies.slf4j.version}
+  - ch.jalu:datasourcecolumns:${dependencies.datasourcecolumns.version}
   - com.mysql:mysql-connector-j:${dependencies.mysql-connector-j.version}
   - org.mariadb.jdbc:mariadb-java-client:${dependencies.mariadb-java-client.version}
   - org.postgresql:postgresql:${dependencies.postgresql.version}