Rollback minimum supported versions to Java 11, Maven 3.8.8 and Spigot 1.16.5, fix datasourcecolumns runtime library

This commit is contained in:
Gabriele C. 2024-04-28 21:04:48 +02:00
parent 3ca87cd127
commit e33a274405
5 changed files with 31 additions and 46 deletions

View File

@ -10,7 +10,7 @@ jobs:
build_and_test: build_and_test:
strategy: strategy:
matrix: matrix:
jdkversion: [17] jdkversion: [11, 17, 21]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

View File

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

View File

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

60
pom.xml
View File

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

View File

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