diff --git a/docs/user/exercises/programming-sca-default-configuration.inc b/docs/user/exercises/programming-sca-default-configuration.inc index e4a551f502ec..7da8aa7092f9 100644 --- a/docs/user/exercises/programming-sca-default-configuration.inc +++ b/docs/user/exercises/programming-sca-default-configuration.inc @@ -151,8 +151,6 @@ For a description of the rules refer to the `PMD documentation 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/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index c8b9f20c465a..bcd251f1518a 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -63,13 +63,13 @@ artemis: images: java: # possible overrides: maven, gradle - default: "ls1tum/artemis-maven-template:java17-20" + default: "ls1tum/artemis-maven-template:java17-21" maven_blackbox: "ghcr.io/uni-passau-artemis/artemis-dejagnu:22" kotlin: # possible overrides: maven, gradle - default: "ls1tum/artemis-maven-template:java17-20" + default: "ls1tum/artemis-maven-template:java17-21" empty: - default: "ls1tum/artemis-maven-template:java17-20" + default: "ls1tum/artemis-maven-template:java17-21" python: default: "ls1tum/artemis-python-docker:latest" c: diff --git a/src/main/resources/templates/java/gradle_gradle/exercise/build.gradle b/src/main/resources/templates/java/gradle_gradle/exercise/build.gradle index 5deeeea2564a..0fe92568cc44 100644 --- a/src/main/resources/templates/java/gradle_gradle/exercise/build.gradle +++ b/src/main/resources/templates/java/gradle_gradle/exercise/build.gradle @@ -8,7 +8,7 @@ repositories { } dependencies { - implementation 'org.apache.commons:commons-lang3:3.13.0' + implementation 'org.apache.commons:commons-lang3:3.14.0' } sourceSets { diff --git a/src/main/resources/templates/java/gradle_gradle/exercise/gradle/wrapper/gradle-wrapper.jar b/src/main/resources/templates/java/gradle_gradle/exercise/gradle/wrapper/gradle-wrapper.jar index 7f93135c49b7..e6441136f3d4 100644 Binary files a/src/main/resources/templates/java/gradle_gradle/exercise/gradle/wrapper/gradle-wrapper.jar and b/src/main/resources/templates/java/gradle_gradle/exercise/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/main/resources/templates/java/gradle_gradle/exercise/gradle/wrapper/gradle-wrapper.properties b/src/main/resources/templates/java/gradle_gradle/exercise/gradle/wrapper/gradle-wrapper.properties index ac72c34e8acc..b82aa23a4f05 100644 --- a/src/main/resources/templates/java/gradle_gradle/exercise/gradle/wrapper/gradle-wrapper.properties +++ b/src/main/resources/templates/java/gradle_gradle/exercise/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/resources/templates/java/gradle_gradle/exercise/gradlew.bat b/src/main/resources/templates/java/gradle_gradle/exercise/gradlew.bat index 93e3f59f135d..25da30dbdeee 100644 --- a/src/main/resources/templates/java/gradle_gradle/exercise/gradlew.bat +++ b/src/main/resources/templates/java/gradle_gradle/exercise/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/src/main/resources/templates/java/gradle_gradle/exercise/gradlew.file b/src/main/resources/templates/java/gradle_gradle/exercise/gradlew.file index 0adc8e1a5321..1aa94a426907 100755 --- a/src/main/resources/templates/java/gradle_gradle/exercise/gradlew.file +++ b/src/main/resources/templates/java/gradle_gradle/exercise/gradlew.file @@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/src/main/resources/templates/java/gradle_gradle/solution/build.gradle b/src/main/resources/templates/java/gradle_gradle/solution/build.gradle index 5deeeea2564a..0fe92568cc44 100644 --- a/src/main/resources/templates/java/gradle_gradle/solution/build.gradle +++ b/src/main/resources/templates/java/gradle_gradle/solution/build.gradle @@ -8,7 +8,7 @@ repositories { } dependencies { - implementation 'org.apache.commons:commons-lang3:3.13.0' + implementation 'org.apache.commons:commons-lang3:3.14.0' } sourceSets { diff --git a/src/main/resources/templates/java/gradle_gradle/solution/gradle/wrapper/gradle-wrapper.jar b/src/main/resources/templates/java/gradle_gradle/solution/gradle/wrapper/gradle-wrapper.jar index 7f93135c49b7..e6441136f3d4 100644 Binary files a/src/main/resources/templates/java/gradle_gradle/solution/gradle/wrapper/gradle-wrapper.jar and b/src/main/resources/templates/java/gradle_gradle/solution/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/main/resources/templates/java/gradle_gradle/solution/gradle/wrapper/gradle-wrapper.properties b/src/main/resources/templates/java/gradle_gradle/solution/gradle/wrapper/gradle-wrapper.properties index ac72c34e8acc..b82aa23a4f05 100644 --- a/src/main/resources/templates/java/gradle_gradle/solution/gradle/wrapper/gradle-wrapper.properties +++ b/src/main/resources/templates/java/gradle_gradle/solution/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/resources/templates/java/gradle_gradle/solution/gradlew.bat b/src/main/resources/templates/java/gradle_gradle/solution/gradlew.bat index 93e3f59f135d..25da30dbdeee 100644 --- a/src/main/resources/templates/java/gradle_gradle/solution/gradlew.bat +++ b/src/main/resources/templates/java/gradle_gradle/solution/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/src/main/resources/templates/java/gradle_gradle/solution/gradlew.file b/src/main/resources/templates/java/gradle_gradle/solution/gradlew.file index 0adc8e1a5321..1aa94a426907 100755 --- a/src/main/resources/templates/java/gradle_gradle/solution/gradlew.file +++ b/src/main/resources/templates/java/gradle_gradle/solution/gradlew.file @@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/src/main/resources/templates/java/maven_blackbox/exercise/pom.xml b/src/main/resources/templates/java/maven_blackbox/exercise/pom.xml index 7cea6e7e51fe..4f7efbfce7c8 100644 --- a/src/main/resources/templates/java/maven_blackbox/exercise/pom.xml +++ b/src/main/resources/templates/java/maven_blackbox/exercise/pom.xml @@ -21,7 +21,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 22 diff --git a/src/main/resources/templates/java/maven_blackbox/solution/pom.xml b/src/main/resources/templates/java/maven_blackbox/solution/pom.xml index 19834daa96c7..21ad7af27dc5 100644 --- a/src/main/resources/templates/java/maven_blackbox/solution/pom.xml +++ b/src/main/resources/templates/java/maven_blackbox/solution/pom.xml @@ -21,7 +21,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 22 diff --git a/src/main/resources/templates/java/maven_maven/exercise/pom.xml b/src/main/resources/templates/java/maven_maven/exercise/pom.xml index 652d1345d24d..7feec495f8c7 100644 --- a/src/main/resources/templates/java/maven_maven/exercise/pom.xml +++ b/src/main/resources/templates/java/maven_maven/exercise/pom.xml @@ -14,7 +14,7 @@ org.apache.commons commons-lang3 - 3.13.0 + 3.14.0 @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 17 17 diff --git a/src/main/resources/templates/java/maven_maven/solution/pom.xml b/src/main/resources/templates/java/maven_maven/solution/pom.xml index 78a39349b0c8..c9bca2f43a27 100644 --- a/src/main/resources/templates/java/maven_maven/solution/pom.xml +++ b/src/main/resources/templates/java/maven_maven/solution/pom.xml @@ -14,7 +14,7 @@ org.apache.commons commons-lang3 - 3.13.0 + 3.14.0 @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 17 17 diff --git a/src/main/resources/templates/java/maven_maven/test/projectTemplate/pom.xml b/src/main/resources/templates/java/maven_maven/test/projectTemplate/pom.xml index 6d8f6239fdce..997728be058b 100644 --- a/src/main/resources/templates/java/maven_maven/test/projectTemplate/pom.xml +++ b/src/main/resources/templates/java/maven_maven/test/projectTemplate/pom.xml @@ -24,7 +24,7 @@ org.apache.commons commons-lang3 - 3.13.0 + 3.14.0 @@ -41,7 +41,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 17 17 @@ -50,12 +50,12 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.5 org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.1 enforce-no-student-code-in-trusted-packages @@ -105,7 +105,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.7.3.4 + 4.8.4.0 ${analyzeTests} @@ -125,12 +125,12 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.3.0 + 3.3.1 com.puppycrawl.tools checkstyle - 10.12.2 + 10.15.0 @@ -145,17 +145,17 @@ org.apache.maven.plugins maven-pmd-plugin - 3.21.0 + 3.22.0 net.sourceforge.pmd pmd-core - 6.55.0 + 7.2.0 net.sourceforge.pmd pmd-java - 6.55.0 + 7.2.0 @@ -188,7 +188,7 @@ com.teamscale impacted-test-engine - 30.1.1 + 33.1.2 @@ -196,7 +196,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.5 okhttp3,com.teamscale,retrofit2,shadow,com.squareup,okio @@ -206,7 +206,7 @@ com.teamscale teamscale-maven-plugin - 30.1.1 + 33.1.2 http://localhost dummy diff --git a/src/main/resources/templates/java/plain_gradle/exercise/gradle/wrapper/gradle-wrapper.jar b/src/main/resources/templates/java/plain_gradle/exercise/gradle/wrapper/gradle-wrapper.jar index 7f93135c49b7..e6441136f3d4 100644 Binary files a/src/main/resources/templates/java/plain_gradle/exercise/gradle/wrapper/gradle-wrapper.jar and b/src/main/resources/templates/java/plain_gradle/exercise/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/main/resources/templates/java/plain_gradle/exercise/gradle/wrapper/gradle-wrapper.properties b/src/main/resources/templates/java/plain_gradle/exercise/gradle/wrapper/gradle-wrapper.properties index ac72c34e8acc..b82aa23a4f05 100644 --- a/src/main/resources/templates/java/plain_gradle/exercise/gradle/wrapper/gradle-wrapper.properties +++ b/src/main/resources/templates/java/plain_gradle/exercise/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/resources/templates/java/plain_gradle/exercise/gradlew.bat b/src/main/resources/templates/java/plain_gradle/exercise/gradlew.bat index 93e3f59f135d..25da30dbdeee 100644 --- a/src/main/resources/templates/java/plain_gradle/exercise/gradlew.bat +++ b/src/main/resources/templates/java/plain_gradle/exercise/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/src/main/resources/templates/java/plain_gradle/exercise/gradlew.file b/src/main/resources/templates/java/plain_gradle/exercise/gradlew.file index 0adc8e1a5321..1aa94a426907 100755 --- a/src/main/resources/templates/java/plain_gradle/exercise/gradlew.file +++ b/src/main/resources/templates/java/plain_gradle/exercise/gradlew.file @@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/src/main/resources/templates/java/plain_gradle/solution/gradle/wrapper/gradle-wrapper.jar b/src/main/resources/templates/java/plain_gradle/solution/gradle/wrapper/gradle-wrapper.jar index 7f93135c49b7..e6441136f3d4 100644 Binary files a/src/main/resources/templates/java/plain_gradle/solution/gradle/wrapper/gradle-wrapper.jar and b/src/main/resources/templates/java/plain_gradle/solution/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/main/resources/templates/java/plain_gradle/solution/gradle/wrapper/gradle-wrapper.properties b/src/main/resources/templates/java/plain_gradle/solution/gradle/wrapper/gradle-wrapper.properties index ac72c34e8acc..b82aa23a4f05 100644 --- a/src/main/resources/templates/java/plain_gradle/solution/gradle/wrapper/gradle-wrapper.properties +++ b/src/main/resources/templates/java/plain_gradle/solution/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/resources/templates/java/plain_gradle/solution/gradlew.bat b/src/main/resources/templates/java/plain_gradle/solution/gradlew.bat index 93e3f59f135d..25da30dbdeee 100644 --- a/src/main/resources/templates/java/plain_gradle/solution/gradlew.bat +++ b/src/main/resources/templates/java/plain_gradle/solution/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/src/main/resources/templates/java/plain_gradle/solution/gradlew.file b/src/main/resources/templates/java/plain_gradle/solution/gradlew.file index 0adc8e1a5321..1aa94a426907 100755 --- a/src/main/resources/templates/java/plain_gradle/solution/gradlew.file +++ b/src/main/resources/templates/java/plain_gradle/solution/gradlew.file @@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/src/main/resources/templates/java/plain_maven/exercise/pom.xml b/src/main/resources/templates/java/plain_maven/exercise/pom.xml index 83c37d655a44..f0b84f6062af 100644 --- a/src/main/resources/templates/java/plain_maven/exercise/pom.xml +++ b/src/main/resources/templates/java/plain_maven/exercise/pom.xml @@ -21,7 +21,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 17 17 diff --git a/src/main/resources/templates/java/plain_maven/solution/pom.xml b/src/main/resources/templates/java/plain_maven/solution/pom.xml index a56e877bade7..bad1cc3decc9 100644 --- a/src/main/resources/templates/java/plain_maven/solution/pom.xml +++ b/src/main/resources/templates/java/plain_maven/solution/pom.xml @@ -21,7 +21,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 17 17 diff --git a/src/main/resources/templates/java/test/blackbox/projectTemplate/pom.xml b/src/main/resources/templates/java/test/blackbox/projectTemplate/pom.xml index ba64eaef5a18..38daabb206c3 100644 --- a/src/main/resources/templates/java/test/blackbox/projectTemplate/pom.xml +++ b/src/main/resources/templates/java/test/blackbox/projectTemplate/pom.xml @@ -20,7 +20,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 21 @@ -29,7 +29,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.7.3.6 + 4.8.4.0 ${analyzeTests} @@ -49,12 +49,12 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.3.0 + 3.3.1 com.puppycrawl.tools checkstyle - 10.12.4 + 10.15.0 @@ -71,17 +71,17 @@ org.apache.maven.plugins maven-pmd-plugin - 3.21.0 + 3.22.0 net.sourceforge.pmd pmd-core - 6.55.0 + 7.2.0 net.sourceforge.pmd pmd-java - 6.55.0 + 7.2.0 diff --git a/src/main/resources/templates/java/test/gradle/projectTemplate/build.gradle b/src/main/resources/templates/java/test/gradle/projectTemplate/build.gradle index 5d4e68c34ed7..c6d2e5f6689a 100644 --- a/src/main/resources/templates/java/test/gradle/projectTemplate/build.gradle +++ b/src/main/resources/templates/java/test/gradle/projectTemplate/build.gradle @@ -2,10 +2,10 @@ plugins { // %static-code-analysis-start% id 'checkstyle' id 'pmd' - id 'com.github.spotbugs' version '5.1.1' + id 'com.github.spotbugs' version '6.0.9' // %static-code-analysis-stop% // %record-testwise-coverage-start% - id 'com.teamscale' version '30.1.1' + id 'com.teamscale' version '33.1.2' // %record-testwise-coverage-stop% } @@ -22,7 +22,7 @@ repositories { dependencies { testImplementation 'de.tum.in.ase:artemis-java-test-sandbox:1.13.0' - implementation 'org.apache.commons:commons-lang3:3.13.0' + implementation 'org.apache.commons:commons-lang3:3.14.0' // testImplementation(':${exerciseNamePomXml}') // testImplementation(':${exerciseNamePomXml}-Solution') @@ -170,7 +170,7 @@ pmd { ruleSets = ["$scaConfigDirectory/pmd-configuration.xml"] rulesMinimumPriority = 5 ignoreFailures = true - toolVersion = '6.55.0' + toolVersion = '7.2.0' // exclude the test files pmdTest.enabled = false pmdMain.reports { diff --git a/src/main/resources/templates/java/test/gradle/projectTemplate/gradle/wrapper/gradle-wrapper.jar b/src/main/resources/templates/java/test/gradle/projectTemplate/gradle/wrapper/gradle-wrapper.jar index 7f93135c49b7..e6441136f3d4 100644 Binary files a/src/main/resources/templates/java/test/gradle/projectTemplate/gradle/wrapper/gradle-wrapper.jar and b/src/main/resources/templates/java/test/gradle/projectTemplate/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/main/resources/templates/java/test/gradle/projectTemplate/gradle/wrapper/gradle-wrapper.properties b/src/main/resources/templates/java/test/gradle/projectTemplate/gradle/wrapper/gradle-wrapper.properties index ac72c34e8acc..b82aa23a4f05 100644 --- a/src/main/resources/templates/java/test/gradle/projectTemplate/gradle/wrapper/gradle-wrapper.properties +++ b/src/main/resources/templates/java/test/gradle/projectTemplate/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/resources/templates/java/test/gradle/projectTemplate/gradlew.bat b/src/main/resources/templates/java/test/gradle/projectTemplate/gradlew.bat index 93e3f59f135d..25da30dbdeee 100644 --- a/src/main/resources/templates/java/test/gradle/projectTemplate/gradlew.bat +++ b/src/main/resources/templates/java/test/gradle/projectTemplate/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/src/main/resources/templates/java/test/gradle/projectTemplate/gradlew.file b/src/main/resources/templates/java/test/gradle/projectTemplate/gradlew.file index 0adc8e1a5321..1aa94a426907 100755 --- a/src/main/resources/templates/java/test/gradle/projectTemplate/gradlew.file +++ b/src/main/resources/templates/java/test/gradle/projectTemplate/gradlew.file @@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/src/main/resources/templates/java/test/maven/projectTemplate/pom.xml b/src/main/resources/templates/java/test/maven/projectTemplate/pom.xml index b9eef6f385db..c1a7d42fd3e8 100644 --- a/src/main/resources/templates/java/test/maven/projectTemplate/pom.xml +++ b/src/main/resources/templates/java/test/maven/projectTemplate/pom.xml @@ -36,7 +36,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 17 17 @@ -45,12 +45,12 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.5 org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.1 enforce-no-student-code-in-trusted-packages @@ -100,7 +100,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.7.3.4 + 4.8.4.0 ${analyzeTests} @@ -120,12 +120,12 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.3.0 + 3.3.1 com.puppycrawl.tools checkstyle - 10.12.2 + 10.15.0 @@ -140,17 +140,17 @@ org.apache.maven.plugins maven-pmd-plugin - 3.21.0 + 3.22.0 net.sourceforge.pmd pmd-core - 6.55.0 + 7.2.0 net.sourceforge.pmd pmd-java - 6.55.0 + 7.2.0 @@ -183,7 +183,7 @@ com.teamscale impacted-test-engine - 30.1.1 + 33.1.2 @@ -191,7 +191,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.5 okhttp3,com.teamscale,retrofit2,shadow,com.squareup,okio @@ -201,7 +201,7 @@ com.teamscale teamscale-maven-plugin - 30.1.1 + 33.1.2 http://localhost dummy diff --git a/src/main/resources/templates/java/test/stagePom.xml b/src/main/resources/templates/java/test/stagePom.xml index bd99936ac4e8..fea2492362ef 100644 --- a/src/main/resources/templates/java/test/stagePom.xml +++ b/src/main/resources/templates/java/test/stagePom.xml @@ -13,7 +13,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 17 17 @@ -22,12 +22,12 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.5 org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.1 enforce-no-student-code-in-trusted-packages diff --git a/src/main/resources/templates/kotlin/test/maven/projectTemplate/pom.xml b/src/main/resources/templates/kotlin/test/maven/projectTemplate/pom.xml index c6e318818999..e278d59eb3d2 100644 --- a/src/main/resources/templates/kotlin/test/maven/projectTemplate/pom.xml +++ b/src/main/resources/templates/kotlin/test/maven/projectTemplate/pom.xml @@ -14,7 +14,8 @@ UTF-8 -Dfile.encoding=UTF-8 - 1.7.10 + 1.9.23 + 33.1.2 @@ -49,7 +50,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.5 org.jetbrains.kotlin @@ -78,7 +79,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 compile @@ -103,7 +104,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.1 enforce-no-student-code-in-trusted-packages @@ -160,7 +161,7 @@ com.teamscale impacted-test-engine - 30.1.1 + ${teamscale.version} @@ -168,7 +169,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.5 okhttp3,com.teamscale,retrofit2,shadow,com.squareup,okio @@ -178,7 +179,7 @@ com.teamscale teamscale-maven-plugin - 30.1.1 + ${teamscale.version} http://localhost dummy