Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Java 17 in CI #26

Merged
merged 4 commits into from
Dec 3, 2023
Merged

Use Java 17 in CI #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1f98ef
Use Java 17 in CI
basilevs Dec 2, 2023
919dc0c
Trying to fix NPE
basilevs Dec 2, 2023
020f982
Fix invalid command line syntax (?) in tyho-surefire config
basilevs Dec 2, 2023
da23318
Tycho-surefire fails to propagate --add-opens
basilevs Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/org.eclipse.rcptt.reporting/src/org/eclipse/rcptt/reporting/core/ReportHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down
7 changes: 4 additions & 3 deletions ...rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion releng/Jenkinsfile.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions releng/buildenv/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 1 addition & 3 deletions runtime/tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion ...clipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/ReportBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
Expand Down