dependency bumps

netlibs · May 27, 2023 · 94673f6 · 94673f6
1 parent ba48757
commit 94673f6
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 38 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,13 +9,13 @@ allprojects { project ->
   version = 'master-SNAPSHOT'
 
   repositories {
-      jcenter()
+      mavenCentral()
   }
 
   project.plugins.withId('java') {  
     java {
       toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(17)
       }
     }  
   }
@@ -32,7 +32,7 @@ eclipse.project.name = 'netlibs:ami'
 eclipse.synchronizationTasks configureBuildship
 
 wrapper {
-  gradleVersion = '6.7'
+  gradleVersion = '8.1.1'
   doLast {
     delete "${projectDir}/gradlew.bat"
   }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# 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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 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
         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
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# 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, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/pump/build.gradle b/pump/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'application'
     id 'eclipse'
     id 'com.diffplug.eclipse.apt'
-    id 'com.google.cloud.tools.jib' version '2.6.0'
+    id 'com.google.cloud.tools.jib' version '3.3.2'
 }
 
 mainClassName = 'io.netlibs.ami.pump.Main'
@@ -11,16 +11,16 @@ mainClassName = 'io.netlibs.ami.pump.Main'
 jib {
   from {
     // or open9...
-    image = 'adoptopenjdk:11-jre-hotspot' 
+    image = 'eclipse-temurin:17-jre' 
   }
   container {
     jvmFlags = [ '--illegal-access=permit', '--add-exports', 'java.base/jdk.internal.ref=ALL-UNNAMED' ]
     format = 'Docker'
   }
   to {
     auth {
-      username = System.getenv('GITHUB_ACTOR')
-      password = System.getenv('GITHUB_TOKEN')
+      username = System.getenv('GITHUB_ACTOR') ?: ""
+      password = System.getenv('GITHUB_TOKEN') ?: ""
     }
   }
 }
@@ -29,46 +29,39 @@ jib {
 apply from: "${rootDir}/gradle/eclipse.gradle"
 
 repositories {
-  jcenter()
-
+  mavenCentral()
 }
 
-eclipse.jdt.sourceCompatibility = 11
-eclipse.jdt.targetCompatibility = 11
+eclipse.jdt.sourceCompatibility = 17
+eclipse.jdt.targetCompatibility = 17
 
 application {
   applicationDefaultJvmArgs = ['--illegal-access=permit', '--add-exports', 'java.base/jdk.internal.ref=ALL-UNNAMED']
 }
 
 dependencies {
 
-  implementation platform('io.netty:netty-bom:4.1.79.Final')
-  implementation platform('software.amazon.awssdk:bom:2.17.257')
-  implementation platform('com.fasterxml.jackson:jackson-bom:2.13.3')
-  implementation platform('io.micrometer:micrometer-bom:1.9.3')
+  implementation platform('io.netty:netty-bom:4.1.93.Final')
+  implementation platform('software.amazon.awssdk:bom:2.20.73')
+  implementation platform('com.fasterxml.jackson:jackson-bom:2.15.1')
+  implementation platform('io.micrometer:micrometer-bom:1.11.0')
 
-  annotationProcessor 'org.immutables:value:2.9.0'
-  compileOnly 'org.immutables:value-annotations:2.9.0'
-
-  // implementation platform('io.github.resilience4j:resilience4j-bom:1.6.1')
-  // implementation 'io.github.resilience4j:resilience4j-retry'
-  // implementation 'io.github.resilience4j:resilience4j-ratelimiter'
+  annotationProcessor 'org.immutables:value:2.9.3'
+  compileOnly 'org.immutables:value-annotations:2.9.3'
 
   implementation 'software.amazon.awssdk:auth'
   implementation 'software.amazon.awssdk:sts'
   implementation 'software.amazon.awssdk:sns'
   implementation 'software.amazon.awssdk:kinesis'
   implementation 'software.amazon.awssdk:netty-nio-client'
-  implementation 'software.amazon.kinesis:amazon-kinesis-client:2.4.2'
+  implementation 'software.amazon.kinesis:amazon-kinesis-client:2.5.0'
 
-  implementation 'info.picocli:picocli:4.6.3'
+  implementation 'info.picocli:picocli:4.7.3'
 
-  implementation ('net.openhft:chronicle-queue:5.23ea30') {
+  implementation ('net.openhft:chronicle-queue:5.24ea16') {
     exclude group: 'net.openhft', module: 'affinity'
   }
 
-  //runtimeOnly 'net.openhft:affinity:3.20.0'
-
 }
 
 dependencies {
@@ -87,13 +80,13 @@ dependencies {
   implementation 'io.micrometer:micrometer-core'
   implementation 'io.micrometer:micrometer-registry-statsd'
 
-  implementation 'org.slf4j:slf4j-api:2.0.0'
-  runtimeOnly 'org.slf4j:slf4j-simple:2.0.0'
+  implementation 'org.slf4j:slf4j-api:2.0.7'
+  runtimeOnly 'org.slf4j:slf4j-simple:2.0.7'
 }
 
 dependencies {
-  testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
-  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
+  testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3'
+  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3'
 }