From ff3dd7786abe602b582d778f9e458bbd1ce8b0f6 Mon Sep 17 00:00:00 2001
From: Rudi Schlatte <rudi@ifi.uio.no>
Date: Tue, 23 Apr 2024 17:04:58 +0200
Subject: [PATCH] Update dependencies

Change-Id: I5db28e66ce1a26b1d7600a0e09ae858c3173e914
---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 gradlew.bat                              | 20 ++++++++++----------
 optimiser-controller/build.gradle        | 16 +++++++++-------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a80b22c..b82aa23 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59..25da30d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,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 +57,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/optimiser-controller/build.gradle b/optimiser-controller/build.gradle
index 2b1e612..4c437cc 100644
--- a/optimiser-controller/build.gradle
+++ b/optimiser-controller/build.gradle
@@ -12,12 +12,12 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '8.1.1'
     // Use this to check for newer versions of dependency libraries via
     // ./gradlew dependencyUpdates
-    id "com.github.ben-manes.versions" version "0.50.0"
+    id "com.github.ben-manes.versions" version "0.51.0"
     // add jshell support (https://github.com/mrsarm/jshell-plugin):
     // rlwrap ./gradlew --console plain jshell
     id "com.github.mrsarm.jshell.plugin" version "1.2.1"
     // https://docs.freefair.io/gradle-plugins/8.4/reference/#_lombok
-    id "io.freefair.lombok" version "8.4"
+    id "io.freefair.lombok" version "8.6"
 }
 
 repositories {
@@ -38,9 +38,9 @@ repositories {
 dependencies {
     // JSON parsing, also used by the data classes defined in sal-common:
     // https://github.com/FasterXML/jackson
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.1'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0'
     // YAML parsing: https://github.com/FasterXML/jackson-dataformats-text
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.1'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.0'
 
     // Command-line parsing: https://picocli.info
     implementation 'info.picocli:picocli:4.7.5'
@@ -49,13 +49,15 @@ dependencies {
     implementation 'org.ow2.proactive:sal-common:13.1.0-SNAPSHOT'
 
     // Logging: SLF4J (implemented by Logback)
-    implementation 'ch.qos.logback:logback-classic:1.4.14'
+    implementation 'ch.qos.logback:logback-classic:1.5.6'
     // Include logstash-logback-encoder for JSON formatting
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     // the EXN Middleware:
     // https://openproject.nebulouscloud.eu/projects/nebulous-collaboration-hub/wiki/asynchronous-messaging-specification
-    implementation 'eu.nebulouscloud:exn-connector-java:1.0-SNAPSHOT'
+    implementation ('eu.nebulouscloud:exn-connector-java:1.0-SNAPSHOT') {
+        exclude group: 'org.slf4j', module: 'slf4j-simple'
+    }
 
     // Analysing KubeVela
     implementation project(':nebulous-requirements-extractor')
@@ -63,7 +65,7 @@ dependencies {
     // Use JUnit Jupiter for testing.
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.1'
-    testImplementation 'org.wiremock:wiremock:3.3.1'
+    testImplementation 'org.wiremock:wiremock:3.5.4'
 }
 
 // Apply a specific Java toolchain to ease working on different environments.