diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 1550b26..a525631 100755 --- a/.github/workflows/ci_cd.yml +++ b/.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 diff --git a/build.gradle.kts b/build.gradle.kts index c9c674b..10b8e93 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ java { tasks { wrapper { - gradleVersion = "8.10.2" + gradleVersion = "8.14" distributionType = Wrapper.DistributionType.BIN } } diff --git a/buildSrc/src/main/kotlin/com.frogdevelopment.jreleaser.publish-convention.gradle.kts b/buildSrc/src/main/kotlin/com.frogdevelopment.jreleaser.publish-convention.gradle.kts index 3d4c779..c6f6902 100644 --- a/buildSrc/src/main/kotlin/com.frogdevelopment.jreleaser.publish-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/com.frogdevelopment.jreleaser.publish-convention.gradle.kts @@ -11,8 +11,6 @@ java { publishing { publications { create("mavenJava") { - from(components["java"]) - versionMapping { usage("java-api") { fromResolutionOf("runtimeClasspath") diff --git a/consul-populate-cli/build.gradle.kts b/consul-populate-cli/build.gradle.kts index e202b59..42174cc 100644 --- a/consul-populate-cli/build.gradle.kts +++ b/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("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 { diff --git a/consul-populate-core/build.gradle.kts b/consul-populate-core/build.gradle.kts index c348756..83b87dc 100644 --- a/consul-populate-core/build.gradle.kts +++ b/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("mavenJava") { + from(components["java"]) + pom { name = "Consul Populate - Core" description = "Core library for Consul Populate" diff --git a/gradle.properties b/gradle.properties index a58d05d..fba0b71 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -micronautVersion=4.6.3 +micronautVersion=4.8.2 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8d12aed..9303299 100644 --- a/gradle/libs.versions.toml +++ b/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" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..1b33c55 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 66cd5a0..ca025c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/gradlew b/gradlew index f5feea6..23d15a9 100755 --- a/gradlew +++ b/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,7 +205,7 @@ 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. @@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' 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. diff --git a/gradlew.bat b/gradlew.bat index 9d21a21..db3a6ac 100644 --- a/gradlew.bat +++ b/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 diff --git a/settings.gradle.kts b/settings.gradle.kts index 6270372..699a50e 100644 --- a/settings.gradle.kts +++ b/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") }