Upgrade to gradle 9.1 with necessary fixes

build.gradle

@@ -21,7 +21,7 @@ allprojects {
 // When using encryption the the GFE_PASSWORD environment variable must be set or the build will fail
 // use ./gradlew encryptFiles to encrypt files
 
-//apply plugin: "com.cherryperry.gradle-file-encrypt"
+//apply plugin: 'io.openremote.com.cherryperry.gradle-file-encrypt'
 //gradleFileEncrypt {
 //    // files to encrypt
 //    plainFiles.from("deployment/manager/fcm.json")
@@ -36,7 +36,14 @@ allprojects {
 //        return password.toCharArray()
 //    }
 //}
+//interface InjectedExecOps {
+//    @Inject //@javax.inject.Inject
+//    ExecOperations getExecOps()
+//}
+//
 //tasks.register('checkFilesGitIgnoredNew') {
+//    def injected = project.objects.newInstance(InjectedExecOps)
+//
 //    doLast {
 //        // The provided checkFilesGitIgnored task doesn't work on Windows so here's one that does
 //        def plainFiles = project.getProperties().get("gradleFileEncrypt").plainFiles
@@ -51,7 +58,7 @@ allprojects {
 //            args.add("-q")
 //            args.add(plainFile) // Assuming plainFile is a single file path
 //
-//            def result = project.exec {
+//            def result = injected.execOps.exec {
 //                commandLine args
 //                ignoreExitValue = true // Allow the build to continue so we can check the exit value
 //            }

gradle.properties

@@ -5,9 +5,11 @@ version = 1.0-SNAPSHOT
 
 openremoteVersion = 1.8.1
 
-jacksonVersion = 2.16.0
+jacksonVersion = 2.18.3
 typescriptGeneratorVersion = 3.2.1263
 
 
 swaggerVersion=2.2.28
 swaggeruiVersion = 5.18.2
+
+testLoggerVersion = 4.0.0

gradle/wrapper/gradle-wrapper.properties

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

project.gradle

@@ -71,14 +71,16 @@ exit \$status
             // Add dependency on decrypt task for deployment installDist only if GFE_PASSWORD defined
             def password = System.env.GFE_PASSWORD
             if (password != null) {
-                Task decryptTask = getTasksByName("decryptFiles", false)[0]
-
-                try {
-                    def installDist = tasks.getByPath(":deployment:installDist")
-                    installDist.dependsOn decryptTask
-                    installDist.mustRunAfter(decryptTask)
-                } catch (Exception ex) {
-                    println("Failed to add decryptFiles task dependency: " + ex)
+                project(':deployment').afterEvaluate { deploymentProject ->
+                    try {
+                        def decryptTaskProvider = rootProject.tasks.named("decryptFiles")
+                        deploymentProject.tasks.named('installDist').configure { installDist ->
+                            installDist.dependsOn(decryptTaskProvider)
+                            installDist.mustRunAfter(decryptTaskProvider)
+                        }
+                    } catch (Exception ex) {
+                        println("Failed to add decryptFiles task dependency: " + ex)
+                    }
                 }
             }
         } else {

settings.gradle

@@ -1,8 +1,25 @@
+pluginManagement {
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.toString() == "io.openremote.com.cherryperry.gradle-file-encrypt") {
+                useModule("com.github.openremote:GradleFileEncrypt:$requested.version")
+            }
+        }
+    }
+
+    repositories {
+        gradlePluginPortal()
+        maven {
+            url = "https://jitpack.io"
+        }
+    }
+}
+
 plugins {
-    id "com.cherryperry.gradle-file-encrypt" version "2.0.3" apply false
-    id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.3" apply false
+    id 'io.openremote.com.cherryperry.gradle-file-encrypt' version '2.1.0' apply false
+    id "org.jetbrains.gradle.plugin.idea-ext" version "1.2" apply false
     id 'cz.habarta.typescript-generator' version "$typescriptGeneratorVersion" apply false
-    id 'pl.allegro.tech.build.axion-release' version '1.18.16' apply false
+    id 'pl.allegro.tech.build.axion-release' version '1.20.1' apply false
 }
 
 rootProject.name = "$projectName"

test/build.gradle

@@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    id 'com.adarshr.test-logger' version '3.1.0'
+    id 'com.adarshr.test-logger' version "$testLoggerVersion"
 }
 
 apply plugin: "java-library"