Upgrading Gradle, some Gradle plugins and Spring Boot

RELEASE-NOTES.md

@@ -3,7 +3,7 @@
 ## 1.4.1
 
 1. codekvast-javaagent now uses aspectweaver 1.9.6
-2. Upgraded to Kotlin 1.4.10, Spring Boot 2.3.4
+2. Upgraded to Kotlin 1.4.10, Spring Boot 2.3.5
 3. Upgraded some dependencies
 4. Bug fixes
 

gradle.properties

@@ -14,13 +14,13 @@ codekvastDownloadPrefix      = http\://downloads.codekvast.io
 kotlin.incremental           = true
 
 # --- SDKMAN managed Java versions (used by <rootDir>/tools/install-compilers.sh, .gradlew and *.gradle)
-sdkmanJavaVersion_15         = 15.0.0-zulu
+sdkmanJavaVersion_15         = 15.0.1-zulu
 sdkmanJavaVersion_14         = 14.0.2-zulu
-sdkmanJavaVersion_13         = 13.0.4-zulu
+sdkmanJavaVersion_13         = 13.0.5-zulu
 sdkmanJavaVersion_12         = 12.0.2-zulu
-sdkmanJavaVersion_11         = 11.0.8-zulu
+sdkmanJavaVersion_11         = 11.0.9-zulu
 sdkmanJavaVersion_10         = 10.0.2-zulu
 sdkmanJavaVersion_9          = 9.0.7-zulu
-sdkmanJavaVersion_8          = 8.0.265-zulu
+sdkmanJavaVersion_8          = 8.0.272-zulu
 
-sdkmanJavaDefault            = 11.0.8-zulu # Used by .gradlew (and thus Jenkinsfile)
+sdkmanJavaDefault            = 11.0.9-zulu # Used by .gradlew (and thus Jenkinsfile)

gradle/buildscript.gradle

@@ -1,5 +1,5 @@
 def kotlinVersion = '1.4.10'
-def springBootVersion = '2.3.4.RELEASE'
+def springBootVersion = '2.3.5.RELEASE'
 
 repositories {
     jcenter()
@@ -8,20 +8,20 @@ repositories {
 }
 
 dependencies {
-    classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
-    classpath 'com.google.cloud.tools:jib-gradle-plugin:2.2.0'
-    classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+    classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
+    classpath 'gradle.plugin.com.google.cloud.tools:jib-gradle-plugin:2.6.0'
+    classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
     classpath 'com.ofg:uptodate-gradle-plugin:1.6.3'
     classpath 'gradle.plugin.com.energizedwork.webdriver-binaries:webdriver-binaries-gradle-plugin:1.4'
     classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
-    classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0'
-    classpath 'io.freefair.gradle:lombok-plugin:4.1.6'
-    classpath 'org.ajoberstar.grgit:grgit-gradle:3.1.1'
-    classpath 'org.asciidoctor:asciidoctor-gradle-jvm:2.4.0'
+    classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0'
+    classpath 'io.freefair.gradle:lombok-plugin:5.3.0'
+    classpath 'org.ajoberstar.grgit:grgit-gradle:4.1.0'
+    classpath 'org.asciidoctor:asciidoctor-gradle-jvm:3.3.0'
     classpath 'org.jetbrains.kotlin:kotlin-allopen:' + kotlinVersion
     classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:' + kotlinVersion
-    classpath 'org.kordamp:markdown-gradle-plugin:1.2.0'
+    classpath 'org.kordamp.gradle:markdown-gradle-plugin:2.2.0'
     classpath 'org.mariadb.jdbc:mariadb-java-client:2.5.4'
     classpath 'org.springframework.boot:spring-boot-gradle-plugin:' + springBootVersion
-    classpath 'org.unbroken-dome.gradle-plugins:gradle-testsets-plugin:2.2.1'
+    classpath 'org.unbroken-dome.gradle-plugins:gradle-testsets-plugin:3.0.1'
 }

gradle/libs.gradle

@@ -6,7 +6,7 @@ ext {
     mariadbVersion = '10.4'
     rabbitmqVersion = '3.8-management-alpine'
     seleniumVersion = '3.141.59'
-    springBootVersion = '2.3.4.RELEASE'
+    springBootVersion = '2.3.5.RELEASE'
     springfoxVersion = '2.9.2'
     testcontainersVersion = '1.14.3'
     wiremockVersion = '2.27.2'
@@ -17,10 +17,10 @@ ext {
     mariadbDriver = 'org.mariadb.jdbc:mariadb-java-client:2.7.0'
     slf4jApi = 'org.slf4j:slf4j-api:1.7.30'
     testFrameworks = [
-        'junit:junit:4.13',
+        'junit:junit:4.13.1',
         'org.hamcrest:hamcrest-core:2.2',
         'org.hamcrest:hamcrest-library:2.2',
-        'org.mockito:mockito-core:3.5.13',
+        'org.mockito:mockito-core:3.6.0',
         "org.springframework.boot:spring-boot-starter-test:$springBootVersion",
         'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
     ]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

product/agent/java-agent/build.gradle

@@ -35,10 +35,10 @@ dependencies {
 
     testImplementation testFrameworks
 
-    integrationTestCompile "com.github.tomakehurst:wiremock-standalone:$wiremockVersion"
-    integrationTestCompile "org.springframework.boot:spring-boot-starter-aop:$springBootVersion"
-    integrationTestRuntime aspectjWeaver
-    integrationTestRuntime logback
+    integrationTestImplementation "com.github.tomakehurst:wiremock-standalone:$wiremockVersion"
+    integrationTestImplementation "org.springframework.boot:spring-boot-starter-aop:$springBootVersion"
+    integrationTestRuntimeOnly aspectjWeaver
+    integrationTestRuntimeOnly logback
 
     jacocoagent "org.jacoco:org.jacoco.agent:$jacocoVersion:runtime@jar"
 }
@@ -150,7 +150,7 @@ integrationTest {
 
     systemProperty 'integrationTest.codekvastAgent', shadowJar.outputs.files.asPath
     systemProperty 'integrationTest.jacocoAgent', "${configurations.jacocoagent.asPath}=destfile=${buildDir}/jacoco/integrationTest2.exec,output=file,dumponexit=true"
-    systemProperty 'integrationTest.classpath', "build/classes/java/integrationTest:${configurations.integrationTestRuntime.asPath}"
+    systemProperty 'integrationTest.classpath', "build/classes/java/integrationTest:${configurations.integrationTestRuntimeClasspath.asPath}"
     systemProperty 'integrationTest.javaVersions', """
         ${sdkmanJavaVersion_8},
         ${sdkmanJavaVersion_9},
@@ -164,11 +164,13 @@ integrationTest {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
+    duplicatesStrategy = DuplicatesStrategy.FAIL
     archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
+    duplicatesStrategy = DuplicatesStrategy.FAIL
     archiveClassifier = 'javadoc'
     from javadoc.destinationDir
 }

product/dist/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'distribution'
-apply plugin: 'org.kordamp.markdown.convert'
+apply plugin: 'org.kordamp.gradle.markdown'
 
 description = 'Package codekvast-agent.zip and uploads it to http://download.codekvast.io'
 
 distributions {
 
     agent {
-        baseName = "codekvast-agent-$codekvastVersion"
+        distributionBaseName = "codekvast-agent-$codekvastVersion"
         contents {
             from(file('src/dist/codekvast.conf')) {
                 into "/"

product/server/backoffice/src/integrationTest/build.gradle

@@ -5,7 +5,7 @@ testSets {
 }
 
 dependencies {
-    integrationTestCompile 'org.springframework.amqp:spring-rabbit'
+    integrationTestImplementation 'org.springframework.amqp:spring-rabbit'
 }
 
 integrationTest {

product/server/common/build.gradle

@@ -43,5 +43,5 @@ dependencies {
     testImplementation testFrameworks
     testRuntimeOnly logback
 
-    integrationTestCompile sourceSets.test.output
+    integrationTestImplementation sourceSets.test.output
 }

product/server/dashboard/src/integrationTest/build.gradle

@@ -5,10 +5,10 @@ testSets {
 }
 
 dependencies {
-    integrationTestCompile 'org.springframework.amqp:spring-rabbit'
-    integrationTestCompile "org.testcontainers:mariadb:$testcontainersVersion"
-    integrationTestCompile "org.testcontainers:rabbitmq:$testcontainersVersion"
-    integrationTestCompile 'org.apache.commons:commons-lang3:3.11'
+    integrationTestImplementation 'org.springframework.amqp:spring-rabbit'
+    integrationTestImplementation "org.testcontainers:mariadb:$testcontainersVersion"
+    integrationTestImplementation "org.testcontainers:rabbitmq:$testcontainersVersion"
+    integrationTestImplementation 'org.apache.commons:commons-lang3:3.11'
 }
 
 integrationTest {

sample/sample-concrete-aspect/build.gradle

@@ -17,5 +17,5 @@ The aspect is written in @Aspect style"""
 
 dependencies {
     inpath project(":product:agent:java-agent")
-    compile aspectjRuntime
+    implementation aspectjRuntime
 }

sample/sample-spring-boot-executable-jar/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.3.4.RELEASE'
+        classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.3.5.RELEASE'
     }
 }
 

settings.gradle

@@ -24,7 +24,7 @@ include ':sample:swing-app'
 include ':sample:sample-concrete-aspect'
 
 buildCache {
-    local(DirectoryBuildCache) {
+    local {
         directory = new File(rootDir, '.build-cache')
     }
 }