Merge pull request #26 from eclipse/java17

Use Java 17 in CI
eclipse · Dec 3, 2023 · 172b50e · 172b50e
2 parents f078e13 + da23318
commit 172b50e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/core/org.eclipse.rcptt.reporting/src/org/eclipse/rcptt/reporting/core/ReportHelper.java b/core/org.eclipse.rcptt.reporting/src/org/eclipse/rcptt/reporting/core/ReportHelper.java
@@ -11,6 +11,7 @@
 package org.eclipse.rcptt.reporting.core;
 
 import java.util.Map;
+import java.util.Objects;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.common.util.EMap;
@@ -160,7 +161,7 @@ public void apply(Node arg) {
 
 	public static void addSnapshotWithData(INodeBuilder node, EObject data) {
 		Snaphot snapshot = ReportFactory.eINSTANCE.createSnaphot();
-		snapshot.setData(data);
+		snapshot.setData(Objects.requireNonNull(data));
 		node.addSnapshot(snapshot);
 	}
 

diff --git a/...rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java b/...rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java
@@ -24,6 +24,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
@@ -91,9 +92,9 @@ public String apply(EObject input) {
 	 */
 	public FullSingleTestHtmlRenderer(PrintWriter writer, NumberFormat durationFormat, Function<Screenshot, String> imageStorage) {
 		super();
-		this.writer = writer;
-		this.durationFormat = durationFormat;
-		this.imageStorage = imageStorage;
+		this.writer = Objects.requireNonNull(writer);
+		this.durationFormat = Objects.requireNonNull(durationFormat);
+		this.imageStorage = Objects.requireNonNull(imageStorage);
 	}
 
 	private void renderHeader(int level, String title, String classes) {

diff --git a/releng/Jenkinsfile.groovy b/releng/Jenkinsfile.groovy
@@ -15,7 +15,7 @@ class Build implements Serializable {
   private final String BUILD_CONTAINER_NAME="ubuntu"
   private final String BUILD_CONTAINER="""
     - name: $BUILD_CONTAINER_NAME
-      image: basilevs/ubuntu-rcptt:3.6.1
+      image: basilevs/ubuntu-rcptt:3.6.2
       tty: true
       resources:
         limits:

diff --git a/releng/buildenv/ubuntu/Dockerfile b/releng/buildenv/ubuntu/Dockerfile
@@ -8,17 +8,17 @@ COPY openjdk-r_ubuntu_ppa.gpg /etc/apt/trusted.gpg.d/
 ## Install a java 11, a webkit and a javafx
 RUN apt-get -y update \
  && apt-get install -y \
-      openjdk-11-jdk \
+      openjdk-17-jdk \
       libwebkit2gtk-4.0 \
       openjfx \
     && apt-get clean
 
 ## Install a maven
 ARG MAVEN_VERSION=3.5.4
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ARG BASE_URL=https://archive.apache.org/dist/maven/maven-3/
 ARG MAVEN_HOME=/usr/share/maven
 
-RUN wget -O /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+RUN wget -O /tmp/apache-maven.tar.gz ${BASE_URL}/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
   && mkdir ${MAVEN_HOME} \
   && tar -xzf /tmp/apache-maven.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
   && rm -f /tmp/apache-maven.tar.gz \

diff --git a/runtime/tests/pom.xml b/runtime/tests/pom.xml
@@ -27,9 +27,7 @@
 				<configuration>
 					<useUIHarness>true</useUIHarness>
 					<useUIThread>true</useUIThread>
-					<argLine>-Daj.weaving.verbose=true
-						-Dorg.aspectj.weaver.showWeaveInfo=true
-						-Dorg.aspectj.osgi.verbose=true</argLine>
+					<argLine>-Daj.weaving.verbose=true -Dorg.aspectj.weaver.showWeaveInfo=true -Dorg.aspectj.osgi.verbose=true --add-opens java.base/java.lang=ALL-UNNAMED --add-modules=ALL-SYSTEM</argLine>
 					<frameworkExtensions>
 						<frameworkExtension>
 							<groupId>p2.osgi.bundle</groupId>

diff --git a/...clipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/ReportBuilder.java b/...clipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/ReportBuilder.java
@@ -11,6 +11,7 @@
 package org.eclipse.rcptt.sherlock.core.reporting;
 
 import java.util.Map;
+import java.util.Objects;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.EMap;
@@ -381,7 +382,7 @@ public static ReportBuilder load(ReportBuilderStore store) {
 	public static Snaphot createSnapshot(EObject data, Map<String, EObject> properties) {
 		Snaphot snapshot = ReportFactory.eINSTANCE.createSnaphot();
 		snapshot.setTime(getTime());
-		snapshot.setData(data);
+		snapshot.setData(Objects.requireNonNull(data));
 		if (properties != null) {
 			snapshot.getProperties().addAll(properties.entrySet());
 		}