commit 71bb7d4cb7e391c619595630a99beb283078ee70
author Alexander Dudaev <Aleksandr.Dudayev@xored.com> Mon Jan 13 11:10:33 2020 -0500
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Mon Jan 13 11:10:33 2020 -0500
tree 6dab7c31215311641bb11e8ed4a69bf0829b4f3f
parent e039a01318668efffaf6eddf143d5c72fbbc9a94
parent a4e389cd842badb7ec97e897c046f9ec1c10898c

Merge "Bump to 2.5.1"

releng/Jenkinsfile.groovy

diff --git a/releng/Jenkinsfile.groovy b/releng/Jenkinsfile.groovy
index edd4379..d23e501 100644
--- a/releng/Jenkinsfile.groovy
+++ b/releng/Jenkinsfile.groovy
@@ -197,7 +197,7 @@
 
 def post_build_actions() {
   junit "**/target/*-reports/*.xml"
-  archiveArtifacts allowEmptyArchive: true, artifacts: "rcpttTests/target/results/**/*, rcpttTests/target/**/*err*log, rcpttTests/target/runner/configuration/*.log, rcpttTests/target/runner-workspace/**/*, rcpttTests/target/**/.log, mockups/tests/target/results/**/*, mockups/tests/target/**/*err*log, mockups/tests/target/runner/configuration/*.log, mockups/tests/target/runner-workspace/**/*, mockups/tests/target/**/.log"
+  archiveArtifacts allowEmptyArchive: true, artifacts: "rcpttTests/target/results/**/*, rcpttTests/target/**/*err*log, rcpttTests/target/runner/configuration/*.log, rcpttTests/target/runner-workspace/**/*, rcpttTests/target/**/.log, mockups/rcpttTests/target/results/**/*, mockups/rcpttTests/target/**/*err*log, mockups/rcpttTests/target/runner/configuration/*.log, mockups/rcpttTests/target/runner-workspace/**/*, mockups/rcpttTests/target/**/.log"
 
   sh "dd if=/dev/zero of=file.txt count=100 bs=1048576" // 1048576 bytes = 1Mb
   sh "rm file.txt"

releng/buildenv/ubuntu/Dockerfile

diff --git a/releng/buildenv/ubuntu/Dockerfile b/releng/buildenv/ubuntu/Dockerfile
index ecabd3b..488e720 100644
--- a/releng/buildenv/ubuntu/Dockerfile
+++ b/releng/buildenv/ubuntu/Dockerfile
@@ -6,9 +6,10 @@
 ## Install a java 8, a webkit and a javafx
 RUN apt-get -y update \
  && apt-get install -y \
-    openjdk-8-jdk \
-    libwebkit2gtk-4.0 \
-    openjfx
+      openjdk-8-jdk \
+      libwebkit2gtk-4.0 \
+      openjfx \
+    && apt-get clean
 
 ## Install a maven
 ARG MAVEN_VERSION=3.5.4
@@ -19,8 +20,7 @@
   && mkdir ${MAVEN_HOME} \
   && tar -xzf /tmp/apache-maven.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
   && rm -f /tmp/apache-maven.tar.gz \
-  && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn \
-  && apt-get clean
+  && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 
 ENV MAVEN_HOME ${MAVEN_HOME}