bump versions, added Hibernate ORM

atom7xyz · Dec 19, 2024 · 12d3099 · 12d3099
1 parent becf485
commit 12d3099
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 48 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,42 +21,44 @@ subprojects {
 
     repositories {
         mavenCentral()
+        maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+        maven("https://oss.sonatype.org/content/repositories/snapshots")
+        maven("https://oss.sonatype.org/content/repositories/central")
+
         maven {
-            name = "jitpack"
-            url = uri("https://www.jitpack.io")
+            name = "papermc"
+            url = uri("https://repo.papermc.io/repository/maven-public/")
         }
         maven {
             name = "mikigal-repo"
             url = uri("https://repo.mikigal.pl/releases")
         }
         maven {
-            name = "papermc"
-            url = uri("https://repo.papermc.io/repository/maven-public/")
+            name = "jitpack"
+            url = uri("https://www.jitpack.io")
         }
-        maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
-        maven("https://oss.sonatype.org/content/repositories/snapshots")
-        maven("https://oss.sonatype.org/content/repositories/central")
     }
 
     dependencies {
-        testImplementation(platform("org.junit:junit-bom:5.9.1"))
+        testImplementation(platform("org.junit:junit-bom:5.11.4"))
         testImplementation("org.junit.jupiter:junit-jupiter")
 
         /* Data structures related */
-        implementation("com.google.guava:guava:32.1.1-jre")
-        implementation("commons-codec:commons-codec:1.16.0")
+        implementation("com.google.guava:guava:33.4.0-jre")
+        implementation("commons-codec:commons-codec:1.17.1")
         implementation("org.apache.commons:commons-collections4:4.4")
         implementation("org.apache.commons:commons-math3:3.6.1")
         implementation("org.apache.commons:commons-lang3:3.13.0")
-        implementation("com.github.ben-manes.caffeine:caffeine:3.1.6")
+        implementation("com.github.ben-manes.caffeine:caffeine:3.1.8")
 
         /* DB related */
-        implementation("com.mysql:mysql-connector-j:8.1.0")
-        implementation("org.mariadb.jdbc:mariadb-java-client:3.1.4")
-        implementation("org.postgresql:postgresql:42.6.0")
-        implementation("com.rabbitmq:amqp-client:5.18.0")
-        implementation("com.zaxxer:HikariCP:5.0.1")
-        implementation("org.jooq:jooq:3.18.5")
+        implementation("com.mysql:mysql-connector-j:9.1.0")
+        implementation("org.mariadb.jdbc:mariadb-java-client:3.5.1")
+        implementation("org.postgresql:postgresql:42.7.4")
+        implementation("com.rabbitmq:amqp-client:5.24.0")
+        implementation("com.zaxxer:HikariCP:6.2.1")
+        implementation("org.jooq:jooq:3.19.16")
+        implementation("org.hibernate.orm:hibernate-core:6.6.3.Final")
 
         /* Config related */
         implementation("com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4")
@@ -65,12 +67,12 @@ subprojects {
         implementation("org.reflections:reflections:0.10.2")
 
         /* Others */
-        implementation("org.apache.logging.log4j:log4j-core:2.20.0")
+        implementation("org.apache.logging.log4j:log4j-core:2.24.3")
 
         /* Encoding/Decoding related. */
-        implementation("com.fasterxml.jackson.core:jackson-core:2.15.2")
-        implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
-        implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-ion:2.15.2")
+        implementation("com.fasterxml.jackson.core:jackson-core:2.18.2")
+        implementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
+        implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-ion:2.18.2")
     }
 
     tasks.test {

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +134,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/velib-spigot/build.gradle.kts b/velib-spigot/build.gradle.kts
@@ -1,7 +1,7 @@
 dependencies {
     /* Spigot related */
-    compileOnly("org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT")
 
     // https://mvnrepository.com/artifact/com.mojang/authlib
-    implementation("com.mojang:authlib:1.5.25")
+    implementation("com.mojang:authlib:3.11.50")
 }
diff --git a/velib-velocity/build.gradle.kts b/velib-velocity/build.gradle.kts
@@ -1,5 +1,5 @@
 dependencies {
     /* Velocity related */
-    compileOnly("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
-    annotationProcessor("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
+    compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
+    annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
 }