build: Upgraded gradle and boot plugin

redis-field-engineering · Jul 31, 2024 · 8cfcff4 · 8cfcff4
1 parent f1a6e1c
commit 8cfcff4
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 49 deletions.
diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
@@ -17,7 +17,8 @@ jobs:
       gpg-public-key: ${{ secrets.GPG_PUBLIC_KEY }}
       gpg-secret-key: ${{ secrets.GPG_SECRET_KEY }}
       sonatype-username: ${{ secrets.SONATYPE_USERNAME }}
-      sonatype-password: ${{ secrets.SONATYPE_PASSWORD }}      
+      sonatype-password: ${{ secrets.SONATYPE_PASSWORD }} 
+      codecov-token: ${{ secrets.CODECOV_TOKEN }}     
       docker-username: ${{ secrets.DOCKER_USERNAME }}
       docker-password: ${{ secrets.DOCKER_PASSWORD }}
       slack-webhook: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/build.gradle b/build.gradle
@@ -95,26 +95,16 @@ subprojects {
     }
 
     dependencies {
-        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api'
-        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params'
-        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine'
-        testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher'
-        testImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: testcontainersVersion
-        testImplementation(group: 'com.redis', name: 'testcontainers-redis', version: testcontainersRedisVersion) {
-            exclude group: 'com.redis', module: 'lettucemod'
-        }
+        testImplementation 'org.junit.jupiter:junit-jupiter-api'
+        testImplementation 'org.junit.jupiter:junit-jupiter-params'
+        testImplementation 'org.junit.jupiter:junit-jupiter-engine'
+        testImplementation 'org.junit.platform:junit-platform-launcher'
+        testImplementation 'org.testcontainers:junit-jupiter'
+        testImplementation group: 'com.redis', name: 'testcontainers-redis', version: testcontainersRedisVersion
     }
 
     test {
         useJUnitPlatform()
     }
 
-    configurations.all {
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            if (details.requested.name == 'lettuce-core' ) {
-                details.useVersion lettuceVersion
-            }
-        }
-    }
-
 }
diff --git a/core/redis-smart-cache-core/redis-smart-cache-core.gradle b/core/redis-smart-cache-core/redis-smart-cache-core.gradle
@@ -5,7 +5,7 @@ dependencies {
     implementation group: 'io.airlift', name: 'units', version: airliftVersion
     implementation 'io.micrometer:micrometer-registry-jmx'
     implementation group: 'com.redis', name: 'micrometer-registry-redis', version: micrometerRedisVersion
-    testImplementation group: 'org.awaitility', name: 'awaitility', version: awaitilityVersion
+    testImplementation 'org.awaitility:awaitility'
 }
 
 bootJar {

diff --git a/core/redis-smart-cache-jdbc/redis-smart-cache-jdbc.gradle b/core/redis-smart-cache-jdbc/redis-smart-cache-jdbc.gradle
@@ -5,18 +5,18 @@ dependencies {
     implementation group: 'io.trino', name: 'trino-parser', version: trinoVersion
     implementation group: 'io.airlift', name: 'units', version: airliftVersion
     testImplementation project(':redis-smart-cache-test')
-    testImplementation group: 'org.awaitility', name: 'awaitility', version: awaitilityVersion    
+    testImplementation 'org.awaitility:awaitility'    
     testImplementation 'org.slf4j:slf4j-jdk14'
     testImplementation 'org.postgresql:postgresql'
     testImplementation 'com.oracle.database.jdbc:ojdbc8'
     testImplementation 'com.mysql:mysql-connector-j'
-    testImplementation group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: mssqlVersion
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc'
     testImplementation group: 'com.ibm.db2', name: 'jcc', version: db2Version    
-    testImplementation group: 'org.testcontainers', name: 'postgresql', version: testcontainersVersion
-    testImplementation group: 'org.testcontainers', name: 'oracle-xe', version: testcontainersVersion
-    testImplementation group: 'org.testcontainers', name: 'mssqlserver', version: testcontainersVersion
-    testImplementation group: 'org.testcontainers', name: 'db2', version: testcontainersVersion
-    testImplementation group: 'org.testcontainers', name: 'mysql', version: testcontainersVersion
+    testImplementation 'org.testcontainers:postgresql'
+    testImplementation 'org.testcontainers:oracle-xe'
+    testImplementation 'org.testcontainers:mssqlserver'
+    testImplementation 'org.testcontainers:db2'
+    testImplementation 'org.testcontainers:mysql'
 }
 
 bootJar {

diff --git a/gradle.properties b/gradle.properties
@@ -1,27 +1,23 @@
 group                      = com.redis
 reproducibleBuild          = true
 
-bootPluginVersion          = 3.2.1
+bootPluginVersion          = 3.3.2
 kordampBuildVersion        = 3.4.0
 kordampPluginVersion       = 0.54.0
-shadowPluginVersion        = 8.1.1
+shadowPluginVersion        = 8.1.8
 jmhPluginVersion           = 0.7.0
 asciidoctorVersion         = 3.3.2
 
 airliftVersion             = 1.7
-awaitilityVersion          = 4.2.0
 checkerVersion             = 3.12.0
 db2Version                 = 11.5.8.0
 datafakerVersion           = 2.0.2
 errorproneVersion          = 2.21.1
 jacocoVersion              = 0.8.11
 lettucemodVersion          = 3.7.3
-lettuceVersion             = 6.2.6.RELEASE
 micrometerRedisVersion     = 0.5.1
-mssqlVersion               = 12.2.0.jre8
 progressbarVersion         = 0.10.0
-testcontainersRedisVersion = 2.0.1
-testcontainersVersion      = 1.19.1
+testcontainersRedisVersion = 2.2.2
 trinoVersion               = 422
 webjarsBootstrapVersion    = 5.3.2
 webjarsFontawesomeVersion  = 4.7.0

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,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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/.
@@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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

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/samples/redis-smart-cache-demo/redis-smart-cache-demo.gradle b/samples/redis-smart-cache-demo/redis-smart-cache-demo.gradle
@@ -9,7 +9,7 @@ dependencies {
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	runtimeOnly 'org.postgresql:postgresql'
 	runtimeOnly 'com.oracle.database.jdbc:ojdbc8'
-	runtimeOnly group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: mssqlVersion
+	runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
 	runtimeOnly group: 'com.ibm.db2', name: 'jcc', version: db2Version  
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'

diff --git a/settings.gradle b/settings.gradle
@@ -9,7 +9,7 @@ buildscript {
         classpath "org.kordamp.gradle:jacoco-gradle-plugin:$kordampPluginVersion"
         classpath "org.kordamp.gradle:kordamp-parentbuild:$kordampBuildVersion"
         classpath "org.springframework.boot:spring-boot-gradle-plugin:$bootPluginVersion"
-        classpath "com.github.johnrengelman:shadow:$shadowPluginVersion"
+        classpath "io.github.goooler.shadow:shadow-gradle-plugin:$shadowPluginVersion"
         classpath "me.champeau.jmh:jmh-gradle-plugin:$jmhPluginVersion"
         classpath "org.asciidoctor:asciidoctor-gradle-jvm:$asciidoctorVersion"
     }
@@ -36,7 +36,7 @@ projects {
             id 'org.asciidoctor.jvm.convert'
         }
         path(':redis-smart-cache-jdbc') {
-            id 'com.github.johnrengelman.shadow'
+            id 'io.github.goooler.shadow'
             id 'me.champeau.jmh'
         }
         path('redis-smart-cache-cli') {
@@ -53,7 +53,6 @@ enforce {
     }
     rule(enforcer.rules.ForceDependencies) { r ->
         r.dependencies.addAll "org.checkerframework:checker-qual:$checkerVersion",
-            "org.testcontainers:testcontainers:$testcontainersVersion",
             "com.redis:lettucemod:$lettucemodVersion",
             "com.google.errorprone:error_prone_annotations:$errorproneVersion"
     }