Merge pull request #77 from nordic-institute/gradle-8.12

chore: Upgrade Gradle version to 8.12
nordic-institute · Jan 28, 2025 · 461e6b7 · 461e6b7
2 parents cea8abb + f6799c0
commit 461e6b7
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 29 deletions.
diff --git a/buildSrc/src/main/groovy/catalogservice.java-checks.gradle b/buildSrc/src/main/groovy/catalogservice.java-checks.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 license {
-    header rootProject.file('LICENSE.txt')
+    header = rootProject.file('LICENSE.txt')
     include "**/*.java"
 }
 

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.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-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 ##########################################################################

diff --git a/xroad-catalog-collector/build.gradle b/xroad-catalog-collector/build.gradle
@@ -8,9 +8,12 @@ plugins {
     id 'catalogservice.java-checks'
 }
 
-group 'org.niis.xroad.catalog.collector'
-sourceCompatibility = 21
-targetCompatibility = 21
+group = 'org.niis.xroad.catalog.collector'
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
 
 repositories {
     mavenCentral()
@@ -46,7 +49,7 @@ springBoot {
     mainClass = 'org.niis.xroad.catalog.collector.CollectorApplication'
 }
 
-task wsImport {
+tasks.register('wsImport') {
     ext.sourcedestdir = layout.buildDirectory.dir("generated-sources/wsimport").get().asFile
     ext.destdir = layout.buildDirectory.dir("generated-classes/wsimport").get().asFile
     ext.wsdl = "${projectDir}/src/main/resources/schema/metaservices.wsdl"
@@ -55,21 +58,18 @@ task wsImport {
     outputs.dir sourcedestdir
 
     doLast() {
-        project.ant {
-            taskdef name: "wsimport", classname: "com.sun.tools.ws.ant.WsImport",
-                    classpath: configurations.wsimport.asPath
-            mkdir(dir: destdir)
-            mkdir(dir: sourcedestdir)
-
-            wsimport(sourcedestdir: sourcedestdir,
-                    destdir: destdir,
-                    wsdl: wsdl,
-                    wsdllocation: "/schema/metaservices.wsdl",
-                    package: "org.niis.xroad.catalog.collector.wsimport",
-                    keep: "true"
-            ) {
-                produces(dir: sourcedestdir, includes: "**/*.java")
-            }
+        ant.taskdef name: "wsimport", classname: "com.sun.tools.ws.ant.WsImport",
+                classpath: configurations.wsimport.asPath
+        ant.mkdir(dir: destdir)
+        ant.mkdir(dir: sourcedestdir)
+
+        ant.wsimport(sourcedestdir: sourcedestdir,
+                destdir: destdir,
+                wsdl: wsdl,
+                wsdllocation: "/schema/metaservices.wsdl",
+                package: "org.niis.xroad.catalog.collector.wsimport",
+                keep: "true") {
+            ant.produces(dir: sourcedestdir, includes: "**/*.java")
         }
     }
 }

diff --git a/xroad-catalog-lister/build.gradle b/xroad-catalog-lister/build.gradle
@@ -8,9 +8,12 @@ plugins {
     id 'catalogservice.java-checks'
 }
 
-group 'org.niis.xroad.catalog.lister'
-sourceCompatibility = 21
-targetCompatibility = 21
+group = 'org.niis.xroad.catalog.lister'
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
 
 repositories {
     mavenCentral()

diff --git a/xroad-catalog-persistence/build.gradle b/xroad-catalog-persistence/build.gradle
@@ -6,9 +6,12 @@ plugins {
     id 'catalogservice.java-checks'
 }
 
-group 'org.niis.xroad.catalog.persistence'
-sourceCompatibility = 21
-targetCompatibility = 21
+group = 'org.niis.xroad.catalog.persistence'
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
 
 repositories {
     mavenCentral()