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