Programming exercises: Upgrade default java dependencies (#8310)

ls1intum · Jun 16, 2024 · a23da36 · a23da36
1 parent 837f88b
commit a23da36
Show file tree

Hide file tree

Showing 38 changed files with 165 additions and 186 deletions.
diff --git a/docs/user/exercises/programming-sca-default-configuration.inc b/docs/user/exercises/programming-sca-default-configuration.inc
@@ -151,19 +151,17 @@ For a description of the rules refer to the `PMD documentation <https://docs.pmd
 |                               +---------------------------------------------+
 |                               | CheckResultSet                              |
 |                               +---------------------------------------------+
-|                               | UnusedImports                               |
-|                               +---------------------------------------------+
 |                               | UnusedFormalParameter                       |
 |                               +---------------------------------------------+
 |                               | UnusedLocalVariable                         |
 |                               +---------------------------------------------+
 |                               | UnusedPrivateField                          |
 |                               +---------------------------------------------+
 |                               | UnusedPrivateMethod                         |
-+-------------------------------+---------------------------------------------+
-| Code Style/Code Style         | DontImportJavaLang                          |
 |                               +---------------------------------------------+
-|                               | DuplicateImports                            |
+|                               | PrimitiveWrapperInstantiation               |
++-------------------------------+---------------------------------------------+
+| Code Style/Code Style         | UnnecessaryImport                           |
 |                               +---------------------------------------------+
 |                               | ExtendsObject                               |
 |                               +---------------------------------------------+
@@ -180,6 +178,8 @@ For a description of the rules refer to the `PMD documentation <https://docs.pmd
 |                               | UselessParentheses                          |
 |                               +---------------------------------------------+
 |                               | UselessQualifiedThis                        |
+|                               +---------------------------------------------+
+|                               | EmptyControlStatement                       |
 +-------------------------------+---------------------------------------------+
 | Design/Design                 | CollapsibleIfStatements                     |
 |                               +---------------------------------------------+
@@ -203,26 +203,6 @@ For a description of the rules refer to the `PMD documentation <https://docs.pmd
 |                               +---------------------------------------------+
 |                               | DontUseFloatTypeForLoopIndices              |
 |                               +---------------------------------------------+
-|                               | EmptyCatchBlock                             |
-|                               +---------------------------------------------+
-|                               | EmptyFinallyBlock                           |
-|                               +---------------------------------------------+
-|                               | EmptyIfStmt                                 |
-|                               +---------------------------------------------+
-|                               | EmptyInitializer                            |
-|                               +---------------------------------------------+
-|                               | EmptyStatementBlock                         |
-|                               +---------------------------------------------+
-|                               | EmptyStatementNotInLoop                     |
-|                               +---------------------------------------------+
-|                               | EmptySwitchStatements                       |
-|                               +---------------------------------------------+
-|                               | EmptySynchronizedBlock                      |
-|                               +---------------------------------------------+
-|                               | EmptyTryBlock                               |
-|                               +---------------------------------------------+
-|                               | EmptyWhileStmt                              |
-|                               +---------------------------------------------+
 |                               | ImportFromSamePackage                       |
 |                               +---------------------------------------------+
 |                               | JumbledIncrementer                          |
@@ -248,8 +228,6 @@ For a description of the rules refer to the `PMD documentation <https://docs.pmd
 |                               | DoubleCheckedLocking                        |
 +-------------------------------+---------------------------------------------+
 | Performance/Performance       | BigIntegerInstantiation                     |
-|                               +---------------------------------------------+
-|                               | BooleanInstantiation                        |
 +-------------------------------+---------------------------------------------+
 | Security/Security             | All rules                                   |
 +-------------------------------+---------------------------------------------+

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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/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
@@ -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
diff --git a/.../resources/templates/java/gradle_gradle/exercise/gradle/wrapper/gradle-wrapper.properties b/.../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
@@ -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
@@ -145,15 +145,15 @@ 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
     case $MAX_FD in  #(
       '' | 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
@@ -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
diff --git a/.../resources/templates/java/gradle_gradle/solution/gradle/wrapper/gradle-wrapper.properties b/.../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
@@ -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
@@ -145,15 +145,15 @@ 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
     case $MAX_FD in  #(
       '' | 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
@@ -21,7 +21,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <release>22</release>
                 </configuration>

diff --git 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 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <release>22</release>
                 </configuration>

diff --git 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 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.13.0</version>
+            <version>3.14.0</version>
         </dependency>
     </dependencies>
     <build>
@@ -28,7 +28,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>17</source>
                     <target>17</target>

diff --git 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 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.13.0</version>
+            <version>3.14.0</version>
         </dependency>
     </dependencies>
     <build>
@@ -28,7 +28,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>17</source>
                     <target>17</target>