Revert java 21 to 17

Heliozoa · Heliozoa · commit ae4d38d48da3 · 2024-08-29T12:08:55.000+03:00
diff --git a/crates/bindings/tmc-langs-node/jest/maven-exercise/pom.xml b/crates/bindings/tmc-langs-node/jest/maven-exercise/pom.xml
@@ -21,8 +21,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>21</source>
-                    <target>21</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/crates/plugins/java/tests/data/ant-exercise/nbproject/build-impl.xml b/crates/plugins/java/tests/data/ant-exercise/nbproject/build-impl.xml
@@ -46,8 +46,8 @@ is divided into following sections:
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
+        <property name="default.javac.source" value="17"/>
+        <property name="default.javac.target" value="17"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
diff --git a/crates/plugins/java/tests/data/ant-exercise/nbproject/project.properties b/crates/plugins/java/tests/data/ant-exercise/nbproject/project.properties
@@ -38,8 +38,8 @@ javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=21
-javac.target=21
+javac.source=17
+javac.target=17
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
diff --git a/crates/plugins/java/tests/data/maven-exercise/pom.xml b/crates/plugins/java/tests/data/maven-exercise/pom.xml
@@ -21,8 +21,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>21</source>
-                    <target>21</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/crates/tmc-langs-plugins/tests/data/zip/exercise-name/pom.xml b/crates/tmc-langs-plugins/tests/data/zip/exercise-name/pom.xml
@@ -9,8 +9,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
     
     <dependencies>
diff --git a/crates/tmc-langs-plugins/tests/data/zip/module-trivial/nbproject/build-impl.xml b/crates/tmc-langs-plugins/tests/data/zip/module-trivial/nbproject/build-impl.xml
@@ -46,8 +46,8 @@ is divided into following sections:
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
+        <property name="default.javac.source" value="17"/>
+        <property name="default.javac.target" value="17"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
diff --git a/crates/tmc-langs-plugins/tests/data/zip/module-trivial/nbproject/project.properties b/crates/tmc-langs-plugins/tests/data/zip/module-trivial/nbproject/project.properties
@@ -38,8 +38,8 @@ javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
+javac.source=17
+javac.target=17
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
diff --git a/crates/tmc-langs/tests/data/MavenExercise.zip b/crates/tmc-langs/tests/data/MavenExercise.zip
diff --git a/crates/tmc-langs/tests/data/MavenStub.zip b/crates/tmc-langs/tests/data/MavenStub.zip
diff --git a/crates/tmc-langs/tests/data/MavenStub/.classpath b/crates/tmc-langs/tests/data/MavenStub/.classpath
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/crates/tmc-langs/tests/data/MavenStub/.project b/crates/tmc-langs/tests/data/MavenStub/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>MavenExercise</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/crates/tmc-langs/tests/data/MavenStub/.settings/org.eclipse.core.resources.prefs b/crates/tmc-langs/tests/data/MavenStub/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/crates/tmc-langs/tests/data/MavenStub/.settings/org.eclipse.jdt.apt.core.prefs b/crates/tmc-langs/tests/data/MavenStub/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/crates/tmc-langs/tests/data/MavenStub/.settings/org.eclipse.jdt.core.prefs b/crates/tmc-langs/tests/data/MavenStub/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/crates/tmc-langs/tests/data/MavenStub/.settings/org.eclipse.m2e.core.prefs b/crates/tmc-langs/tests/data/MavenStub/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/crates/tmc-langs/tests/data/MavenStub/__MACOSX/some mac file b/crates/tmc-langs/tests/data/MavenStub/__MACOSX/some mac file
diff --git a/crates/tmc-langs/tests/data/MavenStub/desktop.ini b/crates/tmc-langs/tests/data/MavenStub/desktop.ini
diff --git a/crates/tmc-langs/tests/data/MavenStub/pom.xml b/crates/tmc-langs/tests/data/MavenStub/pom.xml
@@ -0,0 +1,70 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>fi.helsinki.cs</groupId>
+    <artifactId>MavenExercise</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>MavenTest</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>fi.helsinki.cs.tmc</groupId>
+            <artifactId>edu-test-utils</artifactId>
+            <version>0.5.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+      <build>
+        <plugins>
+           <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-compiler-plugin</artifactId>
+               <version>3.13</version>
+               <configuration>
+                   <source>17</source>
+                   <target>17</target>
+               </configuration>
+           </plugin>
+        </plugins>
+    </build>
+    <repositories>
+        <repository>
+            <id>tmc</id>
+            <name>TMC repo</name>
+            <url>http://maven.testmycode.net/nexus/content/groups/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>tmc</id>
+            <name>TMC repo</name>
+            <url>http://maven.testmycode.net/nexus/content/groups/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+</project>
diff --git a/crates/tmc-langs/tests/data/MavenStub/src/main/java/SimpleStuff.java b/crates/tmc-langs/tests/data/MavenStub/src/main/java/SimpleStuff.java
@@ -0,0 +1,22 @@
+
+public class SimpleStuff {
+    // There are markers in the method bodies to make them easier to find in test code.
+    // Exercise "addsub"
+    public static int add(int a, int b) {
+        return 0; // METHOD BODY add
+    }
+    
+    // Exercise "addsub"
+    public static int subtract(int a, int b) {
+        return 0; // METHOD BODY subtract
+    }
+    
+    // Exercise "mul" (hidden test only)
+    public static int multiply(int a, int b) {
+        return 0; // METHOD BODY multiply
+    }
+    
+    public static void emptyMethod() throws Exception {
+        // METHOD BODY emptyMethod
+    }
+}
diff --git a/crates/tmc-langs/tests/data/MavenStub/src/test/java/SimpleTest.java b/crates/tmc-langs/tests/data/MavenStub/src/test/java/SimpleTest.java
@@ -0,0 +1,26 @@
+
+import fi.helsinki.cs.tmc.edutestutils.Points;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+@Points("simpletest-all both-test-files")
+public class SimpleTest {
+    @Test
+    @Points("addsub")
+    public void testAdd() {
+        assertEquals(9, SimpleStuff.add(3, 6));
+        assertEquals(-2, SimpleStuff.add(-9, 7));
+    }
+    
+    @Test
+    @Points("addsub justsub")
+    public void testSubtract() {
+        assertEquals(3, SimpleStuff.subtract(7, 4));
+        assertEquals(-333, SimpleStuff.subtract(123, 456));
+    }
+    
+    @Test
+    public void testEmptyMethod() throws Exception {
+        SimpleStuff.emptyMethod();
+    }
+}
diff --git a/crates/tmc-langs/tests/data/some_course/MavenExercise/pom.xml b/crates/tmc-langs/tests/data/some_course/MavenExercise/pom.xml
@@ -35,8 +35,8 @@
                <artifactId>maven-compiler-plugin</artifactId>
                <version>3.11.0</version>
                <configuration>
-                   <source>21</source>
-                   <target>21</target>
+                   <source>17</source>
+                   <target>17</target>
                </configuration>
            </plugin>
         </plugins>
diff --git a/docker.sh b/docker.sh
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:slim-bullseye AS base
+FROM rust:slim-bookworm AS base
 RUN rustup component add clippy
 # C# https://learn.microsoft.com/en-us/dotnet/core/install/linux-debian
 RUN apt update \
@@ -14,7 +14,7 @@ RUN apt update \
     # languages
     npm \
     python3 \
-    openjdk-21-jdk ant maven \
+    openjdk-17-jdk ant maven \
     dotnet-sdk-8.0 \
     check valgrind \
     r-base r-cran-devtools locales \
diff --git a/sample_exercises/java/ant-exercise/nbproject/build-impl.xml b/sample_exercises/java/ant-exercise/nbproject/build-impl.xml
@@ -46,8 +46,8 @@ is divided into following sections:
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
+        <property name="default.javac.source" value="17"/>
+        <property name="default.javac.target" value="17"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
diff --git a/sample_exercises/java/ant-exercise/nbproject/project.properties b/sample_exercises/java/ant-exercise/nbproject/project.properties
@@ -38,8 +38,8 @@ javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=21
-javac.target=21
+javac.source=17
+javac.target=17
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
diff --git a/sample_exercises/java/maven-exercise/pom.xml b/sample_exercises/java/maven-exercise/pom.xml
@@ -21,8 +21,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>21</source>
-                    <target>21</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
