From a5c130dcdbaeec99e10ede8995601fca22a5e09e Mon Sep 17 00:00:00 2001 From: Matthias Villiger Date: Wed, 27 Mar 2024 15:25:57 +0100 Subject: [PATCH] Update dependencies --- .../org.eclipse.scout.sdk.core.java.test.iml | 6 +++--- .../org.eclipse.scout.sdk.core.s.test.iml | 13 ++++++------ .../org.eclipse.scout.sdk.core.test.iml | 6 +++--- ...eclipse.scout.sdk.core.typescript.test.iml | 6 +++--- .../org.eclipse.scout.sdk.doc.iml | 13 ++++++------ org.eclipse.scout.sdk.s2e.releng/pom.xml | 2 +- .../org.eclipse.scout.sdk.s2e.test.iml | 13 ++++++------ .../org.eclipse.scout.sdk.s2e.ui.iml | 14 ++++++------- org.eclipse.scout.sdk.s2i/build.gradle.kts | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- org.eclipse.scout.sdk.s2i/gradlew.bat | 20 +++++++++--------- .../org.eclipse.scout.sdk.s2i.iml | 8 +++---- org.eclipse.scout.sdk/pom.xml | 21 ++++++++++++------- 13 files changed, 68 insertions(+), 60 deletions(-) diff --git a/org.eclipse.scout.sdk.core.java.test/org.eclipse.scout.sdk.core.java.test.iml b/org.eclipse.scout.sdk.core.java.test/org.eclipse.scout.sdk.core.java.test.iml index afad6a707..7d626b341 100644 --- a/org.eclipse.scout.sdk.core.java.test/org.eclipse.scout.sdk.core.java.test.iml +++ b/org.eclipse.scout.sdk.core.java.test/org.eclipse.scout.sdk.core.java.test.iml @@ -25,9 +25,9 @@ - - - + + + \ No newline at end of file diff --git a/org.eclipse.scout.sdk.core.s.test/org.eclipse.scout.sdk.core.s.test.iml b/org.eclipse.scout.sdk.core.s.test/org.eclipse.scout.sdk.core.s.test.iml index 44d839bbd..6c0dc9e44 100644 --- a/org.eclipse.scout.sdk.core.s.test/org.eclipse.scout.sdk.core.s.test.iml +++ b/org.eclipse.scout.sdk.core.s.test/org.eclipse.scout.sdk.core.s.test.iml @@ -30,9 +30,9 @@ - - - + + + @@ -60,7 +60,7 @@ - + @@ -82,9 +82,10 @@ - + - + + diff --git a/org.eclipse.scout.sdk.core.test/org.eclipse.scout.sdk.core.test.iml b/org.eclipse.scout.sdk.core.test/org.eclipse.scout.sdk.core.test.iml index 482b1ae85..c306a3543 100644 --- a/org.eclipse.scout.sdk.core.test/org.eclipse.scout.sdk.core.test.iml +++ b/org.eclipse.scout.sdk.core.test/org.eclipse.scout.sdk.core.test.iml @@ -19,9 +19,9 @@ - - - + + + \ No newline at end of file diff --git a/org.eclipse.scout.sdk.core.typescript.test/org.eclipse.scout.sdk.core.typescript.test.iml b/org.eclipse.scout.sdk.core.typescript.test/org.eclipse.scout.sdk.core.typescript.test.iml index 17c17c699..f6311da66 100644 --- a/org.eclipse.scout.sdk.core.typescript.test/org.eclipse.scout.sdk.core.typescript.test.iml +++ b/org.eclipse.scout.sdk.core.typescript.test/org.eclipse.scout.sdk.core.typescript.test.iml @@ -22,9 +22,9 @@ - - - + + + diff --git a/org.eclipse.scout.sdk.doc/org.eclipse.scout.sdk.doc.iml b/org.eclipse.scout.sdk.doc/org.eclipse.scout.sdk.doc.iml index d82621e0a..6e5eec17d 100644 --- a/org.eclipse.scout.sdk.doc/org.eclipse.scout.sdk.doc.iml +++ b/org.eclipse.scout.sdk.doc/org.eclipse.scout.sdk.doc.iml @@ -27,9 +27,9 @@ - - - + + + @@ -57,7 +57,7 @@ - + @@ -79,9 +79,10 @@ - + - + + diff --git a/org.eclipse.scout.sdk.s2e.releng/pom.xml b/org.eclipse.scout.sdk.s2e.releng/pom.xml index f9f8385f1..a12eeb3ac 100644 --- a/org.eclipse.scout.sdk.s2e.releng/pom.xml +++ b/org.eclipse.scout.sdk.s2e.releng/pom.xml @@ -61,7 +61,7 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.8.0 + 1.8.1 org.apache.maven.plugins diff --git a/org.eclipse.scout.sdk.s2e.test/org.eclipse.scout.sdk.s2e.test.iml b/org.eclipse.scout.sdk.s2e.test/org.eclipse.scout.sdk.s2e.test.iml index 68a942776..9e94d8b0e 100644 --- a/org.eclipse.scout.sdk.s2e.test/org.eclipse.scout.sdk.s2e.test.iml +++ b/org.eclipse.scout.sdk.s2e.test/org.eclipse.scout.sdk.s2e.test.iml @@ -28,9 +28,9 @@ - - - + + + @@ -58,7 +58,7 @@ - + @@ -80,9 +80,10 @@ - + - + + diff --git a/org.eclipse.scout.sdk.s2e.ui/org.eclipse.scout.sdk.s2e.ui.iml b/org.eclipse.scout.sdk.s2e.ui/org.eclipse.scout.sdk.s2e.ui.iml index d427fe47d..87971f869 100644 --- a/org.eclipse.scout.sdk.s2e.ui/org.eclipse.scout.sdk.s2e.ui.iml +++ b/org.eclipse.scout.sdk.s2e.ui/org.eclipse.scout.sdk.s2e.ui.iml @@ -113,7 +113,6 @@ - @@ -147,9 +146,9 @@ - - - + + + @@ -175,7 +174,7 @@ - + @@ -197,9 +196,10 @@ - + - + + diff --git a/org.eclipse.scout.sdk.s2i/build.gradle.kts b/org.eclipse.scout.sdk.s2i/build.gradle.kts index 25704dcc3..bcd3a7e3c 100644 --- a/org.eclipse.scout.sdk.s2i/build.gradle.kts +++ b/org.eclipse.scout.sdk.s2i/build.gradle.kts @@ -43,7 +43,7 @@ dependencies { api("org.eclipse.scout.sdk", "org.eclipse.scout.sdk.core.s", scoutSdkVersion) api("org.eclipse.scout.sdk", "org.eclipse.scout.sdk.core.java.ecj", scoutSdkVersion) api("org.apache.poi", "poi-ooxml", "5.2.5") - testImplementation("org.mockito", "mockito-core", "5.10.0") + testImplementation("org.mockito", "mockito-core", "5.11.0") testImplementation("org.eclipse.scout.rt", "org.eclipse.scout.rt.client", scoutRtVersion) testImplementation("org.eclipse.scout.sdk", "org.eclipse.scout.sdk.core.java.test", scoutSdkVersion) testImplementation("org.eclipse.scout.sdk", "org.eclipse.scout.sdk.core.typescript.test", scoutSdkVersion) @@ -70,7 +70,7 @@ tasks { } runPluginVerifier { - ideVersions.set(listOf("IU-2022.3.3", "IU-2023.1.6", "IU-2023.2.6", "IU-2023.3.5", "IU-2024.1")) + ideVersions.set(listOf("IU-2022.3.3", "IU-2023.1.6", "IU-2023.2.6", "IU-2023.3.6", "IU-2024.1")) subsystemsToCheck.set("without-android") failureLevel.set(FailureLevel.ALL) } diff --git a/org.eclipse.scout.sdk.s2i/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.scout.sdk.s2i/gradle/wrapper/gradle-wrapper.properties index ceff7435e..788fb311a 100644 --- a/org.eclipse.scout.sdk.s2i/gradle/wrapper/gradle-wrapper.properties +++ b/org.eclipse.scout.sdk.s2i/gradle/wrapper/gradle-wrapper.properties @@ -9,7 +9,7 @@ # 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/org.eclipse.scout.sdk.s2i/gradlew.bat b/org.eclipse.scout.sdk.s2i/gradlew.bat index 93e3f59f1..25da30dbd 100644 --- a/org.eclipse.scout.sdk.s2i/gradlew.bat +++ b/org.eclipse.scout.sdk.s2i/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/org.eclipse.scout.sdk.s2i/org.eclipse.scout.sdk.s2i.iml b/org.eclipse.scout.sdk.s2i/org.eclipse.scout.sdk.s2i.iml index d6576a8cd..188b9d66c 100644 --- a/org.eclipse.scout.sdk.s2i/org.eclipse.scout.sdk.s2i.iml +++ b/org.eclipse.scout.sdk.s2i/org.eclipse.scout.sdk.s2i.iml @@ -139,13 +139,13 @@ - + - - + + - + diff --git a/org.eclipse.scout.sdk/pom.xml b/org.eclipse.scout.sdk/pom.xml index 730d47fdc..75e448baa 100644 --- a/org.eclipse.scout.sdk/pom.xml +++ b/org.eclipse.scout.sdk/pom.xml @@ -823,7 +823,7 @@ ch.qos.logback logback-classic - 1.4.14 + 1.5.3 org.apache.maven @@ -878,12 +878,12 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.1 commons-codec commons-codec - 1.16.0 + 1.16.1 com.google.guava @@ -894,7 +894,7 @@ org.mockito mockito-core - 5.10.0 + 5.11.0 xml-apis @@ -959,6 +959,11 @@ + + org.apache.commons + commons-lang3 + 3.14.0 + org.codehaus.plexus plexus-utils @@ -984,7 +989,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.1 + 3.13.0 ${jdk.source.version} ${jdk.source.version} @@ -995,19 +1000,19 @@ org.codehaus.plexus plexus-compiler-javac - 2.14.2 + 2.15.0 org.codehaus.plexus plexus-compiler-api - 2.14.2 + 2.15.0 org.asciidoctor asciidoctor-maven-plugin - 2.2.5 + 3.0.0