From d1f98ef281ef7282539dab8da26eed644cdc3176 Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Sat, 2 Dec 2023 19:12:11 +0400 Subject: [PATCH 1/4] Use Java 17 in CI --- releng/Jenkinsfile.groovy | 2 +- releng/buildenv/ubuntu/Dockerfile | 6 +++--- runtime/tests/pom.xml | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/releng/Jenkinsfile.groovy b/releng/Jenkinsfile.groovy index b1ad0ce40..7615d8381 100644 --- 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 index 2e06bd6a5..ab52f0f56 100644 --- 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 index c2f1aa590..423f4831e 100644 --- a/runtime/tests/pom.xml +++ b/runtime/tests/pom.xml @@ -29,7 +29,10 @@ true -Daj.weaving.verbose=true -Dorg.aspectj.weaver.showWeaveInfo=true - -Dorg.aspectj.osgi.verbose=true + -Dorg.aspectj.osgi.verbose=true + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-modules=ALL-SYSTEM + p2.osgi.bundle From 919dc0c97e4b05f9ddec82a51d8aaa5caa08d672 Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Sat, 2 Dec 2023 23:39:44 +0400 Subject: [PATCH 2/4] Trying to fix NPE java.lang.NullPointerException at org.eclipse.rcptt.reporting.html.FullSingleTestHtmlRenderer.renderEvent(FullSingleTestHtmlRenderer.java:230) at org.eclipse.rcptt.reporting.html.FullSingleTestHtmlRenderer.renderSnapshots(FullSingleTestHtmlRenderer.java:169) --- .../src/org/eclipse/rcptt/reporting/core/ReportHelper.java | 3 ++- .../rcptt/reporting/html/FullSingleTestHtmlRenderer.java | 7 ++++--- .../rcptt/sherlock/core/reporting/ReportBuilder.java | 3 ++- 3 files changed, 8 insertions(+), 5 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 index e951d3ec9..1582c8273 100644 --- 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/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java b/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java index 2889c4d4b..e6f917a44 100644 --- a/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java +++ b/launching/org.eclipse.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 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/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/ReportBuilder.java b/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/ReportBuilder.java index 49bc52ed6..ea3055b55 100644 --- a/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/ReportBuilder.java +++ b/watson/org.eclipse.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 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()); } From 020f982e721e4e77fc27bc00cffdb42f6df4a493 Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Sat, 2 Dec 2023 23:56:20 +0400 Subject: [PATCH 3/4] Fix invalid command line syntax (?) in tyho-surefire config --- runtime/tests/pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/runtime/tests/pom.xml b/runtime/tests/pom.xml index 423f4831e..9a55dc749 100644 --- a/runtime/tests/pom.xml +++ b/runtime/tests/pom.xml @@ -27,10 +27,12 @@ true true - -Daj.weaving.verbose=true + + -Daj.weaving.verbose=true -Dorg.aspectj.weaver.showWeaveInfo=true -Dorg.aspectj.osgi.verbose=true - --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens + java.base/java.lang=ALL-UNNAMED --add-modules=ALL-SYSTEM From da23318fcb986141808ef073dd50f675b8ea1b00 Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Sun, 3 Dec 2023 00:48:01 +0400 Subject: [PATCH 4/4] Tycho-surefire fails to propagate --add-opens --- runtime/tests/pom.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/runtime/tests/pom.xml b/runtime/tests/pom.xml index 9a55dc749..bbd23150c 100644 --- a/runtime/tests/pom.xml +++ b/runtime/tests/pom.xml @@ -27,14 +27,7 @@ true true - - -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 - + -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 p2.osgi.bundle