Feature/upgrades

.github/workflows/ci_cd.yml

@@ -27,7 +27,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3.1.0
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Compile & Test
         run: ./gradlew test

build.gradle.kts

@@ -17,7 +17,7 @@ java {
 
 tasks {
     wrapper {
-        gradleVersion = "8.10.2"
+        gradleVersion = "8.14"
         distributionType = Wrapper.DistributionType.BIN
     }
 }

buildSrc/src/main/kotlin/com.frogdevelopment.jreleaser.publish-convention.gradle.kts

@@ -11,8 +11,6 @@ java {
 publishing {
     publications {
         create<MavenPublication>("mavenJava") {
-            from(components["java"])
-
             versionMapping {
                 usage("java-api") {
                     fromResolutionOf("runtimeClasspath")

consul-populate-cli/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("io.micronaut.minimal.application") version "4.4.3"
+    id("io.micronaut.minimal.application") version "4.5.3"
     id("com.frogdevelopment.jreleaser.publish-convention")
     alias(libs.plugins.jib)
     alias(libs.plugins.shadow)
@@ -43,7 +43,7 @@ application {
 publishing {
     publications {
         named<MavenPublication>("mavenJava") {
-            shadow.component(this)
+            from(components["shadow"])
 
             pom {
                 name = "Consul Populate - CLI"
@@ -59,7 +59,7 @@ tasks {
     }
 
     shadowJar {
-//        minimize() waiting https://github.com/johnrengelman/shadow/pull/876
+        minimize()
     }
 
     test {

consul-populate-core/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("io.micronaut.minimal.library") version "4.4.3"
+    id("io.micronaut.minimal.library") version "4.5.3"
     id("com.frogdevelopment.jreleaser.publish-convention")
 }
 
@@ -38,6 +38,8 @@ dependencies {
 publishing {
     publications {
         named<MavenPublication>("mavenJava") {
+            from(components["java"])
+
             pom {
                 name = "Consul Populate - Core"
                 description = "Core library for Consul Populate"

gradle.properties

@@ -1 +1 @@
-micronautVersion=4.6.3
+micronautVersion=4.8.2

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-commons-io = "2.17.0"
-jetbrains = "26.0.1"
+commons-io = "2.19.0"
+jetbrains = "26.0.2"
 systemlambda = "1.2.1"
-testcontainers = "1.20.2"
-vertx = "4.5.10"
+testcontainers = "1.21.0"
+vertx = "4.5.14"
 
-plugin-jib = "3.4.3"
-plugin-shadow = "8.1.1"
+plugin-jib = "3.4.5"
+plugin-shadow = "8.3.6"
 
 [libraries]
 commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
@@ -19,4 +19,4 @@ vertx-consul = { module = "io.vertx:vertx-consul-client", version.ref = "vertx"
 
 [plugins]
 jib = { id = "com.google.cloud.tools.jib", version.ref = "plugin-jib" }
-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "plugin-shadow" }
+shadow = { id = "com.gradleup.shadow", version.ref = "plugin-shadow" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
 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,
+#   * DEFAULT_JVM_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" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("io.micronaut.platform.catalog") version "4.4.3"
+    id("io.micronaut.platform.catalog") version "4.5.3"
     id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
 }