Merge "Replace extra classpath elements on extra requirements in pom.xml Workaround for bug 518354"
diff --git a/Jenkinsfile b/Jenkinsfile
index 26140b3..3247162 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,10 +12,10 @@
tty: true
resources:
limits:
- memory: "2Gi"
+ memory: "4Gi"
cpu: "1"
requests:
- memory: "2Gi"
+ memory: "4Gi"
cpu: "1"
volumeMounts:
- name: settings-xml
@@ -67,19 +67,42 @@
archiveArtifacts allowEmptyArchive: true, artifacts: 'repository/full/target/repository/**/*, repository/full/target/products/*, runner/product/target/*.zip'
}
}
- stage('Tests'){
+ stage('RCPTT Tests'){
steps {
container('ubuntu') {
- sh 'mvn clean verify -B -f $WORKSPACE/rcpttTests/pom.xml -Dci-maven-version=2.0.0-SNAPSHOT -DexplicitRunner=$WORKSPACE/runner/product/target/rcptt.runner-2.5.0-SNAPSHOT.zip -DrcpttPath=$WORKSPACE/repository/full/target/products/org.eclipse.rcptt.platform.product-linux.gtk.x86_64.zip || true'
+ sh '. repository/full/target/publisher.properties && \
+ mvn clean verify -B -f $WORKSPACE/rcpttTests/pom.xml \
+ -Dmaven.repo.local=$WORKSPACE/m2 -e \
+ -Dci-maven-version=2.0.0-SNAPSHOT \
+ -DexplicitRunner=`readlink -f $WORKSPACE/runner/product/target/rcptt.runner-${productVersion}-SNAPSHOT.zip` \
+ -DrcpttPath=$WORKSPACE/repository/full/target/products/org.eclipse.rcptt.platform.product-linux.gtk.x86_64.zip \
+ || true'
sh 'test -f $WORKSPACE/rcpttTests/target/results/tests.html'
}
}
}
+ stage('Mockup Tests'){
+ steps {
+ container('ubuntu') {
+ git 'https://github.com/DudaevAR/q7.quality.mockups.git'
+ sh '. repository/full/target/publisher.properties && \
+ mvn clean verify -B -f $WORKSPACE/tests/pom.xml \
+ -Dmaven.repo.local=$WORKSPACE/m2 -e \
+ -Dci-maven-version=2.0.0-SNAPSHOT \
+ -DexplicitRunner=`readlink -f $WORKSPACE/runner/product/target/rcptt.runner-${productVersion}-SNAPSHOT.zip` \
+ -DmockupsRepository=https://ci-staging.eclipse.org/rcptt/view/migration/job/mockups/lastSuccessfulBuild/artifact/repository/target/repository/ \
+ || true'
+ sh 'test -f $WORKSPACE/tests/target/results/tests.html'
+ }
+ }
+ }
}
post {
always {
junit '**/target/*-reports/*.xml'
- archiveArtifacts allowEmptyArchive: true, artifacts: 'rcpttTests/target/results/**/*, rcpttTests/target/**/*err*log, rcpttTests/target/runner-workspace/**/*, rcpttTests/target/**/.log'
+ archiveArtifacts allowEmptyArchive: true, artifacts: '*ests/target/results/**/*, *ests/target/**/*err*log, *ests/target/runner/configuration/*.log, *ests/target/runner-workspace/**/*, *ests/target/**/.log'
+ sh 'dd if=/dev/zero of=file.txt count=100 bs=1048576' // 1048576 bytes = 1Mb
+ sh 'ps x'
}
}
}
\ No newline at end of file
diff --git a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 1-line.test b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 1-line.test
index 52b5f07..dad23ef 100644
--- a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 1-line.test
+++ b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 1-line.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _bUx9oCbQEeSJvYFSUnsXEQ
-Runtime-Version: 2.2.0.201612300018
-Save-Time: 2/3/17 5:08 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 2:30 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -24,7 +24,7 @@
key-type Enter
}
get-editor "New Java Class Procs" | get-section Script | get-text-viewer | hover-text 36 9 -with Left
-get-window -from "Information Window" | get-editbox | get-property text -raw | invoke toLowerCase |
+get-window -from "Information Window" | get-control Browser | get-property text -raw | invoke toLowerCase |
invoke contains "description of create-java-class procedure" | verify-true
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 2-lines.test b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 2-lines.test
index 9fa8b84..fd5d874 100644
--- a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 2-lines.test
+++ b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 2-lines.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _pLJ3kCbQEeSJvYFSUnsXEQ
-Runtime-Version: 2.2.0.201612300018
-Save-Time: 2/3/17 9:08 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 2:32 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -26,7 +26,7 @@
key-type Enter
}
get-editor "New Java Class Procs" | get-section Script | get-text-viewer | hover-text 36 9 -with Left
-with [get-window -from "Information Window" | get-editbox | get-property text -raw | invoke toLowerCase ] {
+with [get-window -from "Information Window" | get-control Browser | get-property text -raw | invoke toLowerCase ] {
invoke contains "procedure <b>create-java-class</b>" | verify-true
invoke contains "description of create-java-class procedure second description line" | verify-true
}
@@ -37,7 +37,7 @@
key-type Enter
}
get-editor "New Java Class Procs" | get-section Script | get-text-viewer | hover-text 36 9 -with Left
-with [get-window -from "Information Window" | get-editbox | get-property text -raw | invoke toLowerCase ] {
+with [get-window -from "Information Window" | get-control Browser | get-property text -raw | invoke toLowerCase ] {
invoke contains "procedure <b>create-java-class</b>"
invoke contains "description of create-java-class procedure second description line" | verify-false
invoke contains "second description line" | verify-true
diff --git a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment javadoc.test b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment javadoc.test
index 4c43b66..a8dce89 100644
--- a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment javadoc.test
+++ b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment javadoc.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _GG-CECaOEeS4ZoAAFrP9Rg
-Runtime-Version: 2.2.0.201612300018
-Save-Time: 2/3/17 8:46 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 2:28 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -27,7 +27,7 @@
key-type Enter
}
get-editor "New Java Class Procs" | get-section Script | get-text-viewer | hover-text 36 9 -with Left
-with [get-window -from "Information Window" | get-editbox | get-property text -raw | invoke toLowerCase ] {
+with [get-window -from "Information Window" | get-control Browser | get-property text -raw | invoke toLowerCase ] {
invoke contains "procedure <b>open-new-class-dialog</b>" | verify-true
invoke contains "description of open-new-class-dialog"| verify-true
}
diff --git a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Context.test b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Context.test
index d2aeb34..495ebe1 100644
--- a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Context.test
+++ b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Context.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _d1NdkCbREeSJvYFSUnsXEQ
-Runtime-Version: 2.2.0.201612300018
-Save-Time: 2/3/17 8:47 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 2:29 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -26,7 +26,7 @@
-with [get-window -from "Information Window" | get-editbox | get-property text -raw | invoke toLowerCase ] {
+with [get-window -from "Information Window" | get-control Browser | get-property text -raw | invoke toLowerCase ] {
invoke contains "procedure <b>create-java-class</b>" | verify-true
invoke contains "description of create-java-class procedure" | verify-true
}
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/SetBreakpointInTestWithRestarting.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/SetBreakpointInTestWithRestarting.test
index f619950..4593209 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/SetBreakpointInTestWithRestarting.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/SetBreakpointInTestWithRestarting.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference: http://jira4.xored.com/browse/QS-1712
Id: _wFfUMDwFEeGWcueqnS9xrA
-Runtime-Version: 2.0.0.201505131625
-Save-Time: 5/14/15 4:51 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 4:00 PM
Tags: selfAUT, Debug
Testcase-Type: ecl
@@ -47,11 +47,11 @@
get-menu "Run/Debug As/.* Test Cases" | click
try -times 30 -delay 500 -command {
get-view Debug | get-tree
- | get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/get-view \\(CreateJavaProject: 1\\)"
- | get-property caption | equals "get-view (CreateJavaProject: 1)" | verify-true
- get-button "Resume (F8)" | click
+ | get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/get-view \\(CreateJavaProject: 1\\)"
+ | get-property caption | equals "get-view (CreateJavaProject: 1)" | verify-true
+ get-button "Resume (F8)" | click
}
- try -times 120 -delay 1000 -command {
+ try -times 25 -delay 5000 -command {
get-button "Resume (F8)" | click
}
}
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepIntoAtDebugging.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepIntoAtDebugging.test
index 43b9132..2eccb74 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepIntoAtDebugging.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepIntoAtDebugging.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _bssvoHM7EeGsLtfm1BUmHg
-Runtime-Version: 2.0.0.201505131625
-Save-Time: 5/14/15 5:00 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 3:46 PM
Tags: feature/debug, selfAUT
Testcase-Type: ecl
@@ -49,11 +49,11 @@
get-view Debug | get-tree
| get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/get-property \\(CreateJavaProject: 8\\)"
| get-property caption | equals "get-property (CreateJavaProject: 8)" | verify-true
-get-view Debug | get-tree | key-type F5
+get-button "Step Into (F5)" | click
get-view Debug | get-tree
| get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/equals \\(CreateJavaProject: 8\\)"
| get-property caption | equals "equals (CreateJavaProject: 8)" | verify-true
-get-view Debug | get-tree | key-type F5
+get-button "Step Into (F5)" | click
get-view Debug | get-tree
| get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/verify-true \\(CreateJavaProject: 8\\)"
| get-property caption | equals "verify-true (CreateJavaProject: 8)" | verify-true
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepOverAtDebugging.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepOverAtDebugging.test
index 905c892..6e271e4 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepOverAtDebugging.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepOverAtDebugging.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _xg40sHM7EeGsLtfm1BUmHg
-Runtime-Version: 2.0.0.201505131625
-Save-Time: 5/14/15 5:02 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 3:44 PM
Tags: feature/debug, selfAUT
Testcase-Type: ecl
@@ -52,7 +52,7 @@
get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/with \\(CreateJavaProject: 2\\)" | get-property caption
| equals "with (CreateJavaProject: 2)" | verify-true
}
-get-view Debug | get-tree | key-type F6
+get-button "Step Over (F6)" | click
with [get-view Debug | get-tree] {
get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread" | get-property childCount | equals 2
| verify-true
@@ -70,7 +70,7 @@
get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/with \\(CreateJavaProject: 2\\)" | get-property caption
| equals "with (CreateJavaProject: 2)" | verify-true
}
-get-view Debug | get-tree | key-type F6
+get-button "Step Over (F6)" | click
with [get-view Debug | get-tree] {
get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread" | get-property childCount | equals 3
| verify-true
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/TestSuiteDebug.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/TestSuiteDebug.test
index 56208b4..d2fecf8 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/TestSuiteDebug.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/TestSuiteDebug.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference: http://jira4.xored.com/browse/QS-1825
Id: _5OxMoY01EeGZA7v42Kh00Q
-Runtime-Version: 2.4.1.201903141547
-Save-Time: 3/18/19, 5:47 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 3:43 PM
Tags: selfAUT, Debug, TestSuite, QS-2256
Testcase-Type: ecl
@@ -59,20 +59,19 @@
key-type "M1+M2+w"
}
get-view "Test Explorer" | get-tree | select "MyProject/TestSuite" | get-menu "Debug As/1 Test Cases" | click
+set-q7-option uijobHangTimeout 5000
try -times 20 -delay 5000 -command {
get-view Debug | get-tree
- | get-item "TestSuite \\[RCPTT Test Suite\\]/TestSuite/ECL Thread/get-view \\(Check New Project Window: 1\\)"
- | get-property caption | equals "get-view (Check New Project Window: 1)" | verify-true
+ | select "TestSuite \\[RCPTT Test Suite\\]/TestSuite/ECL Thread/get-view \\(Check New Project Window: 1\\)"
}
get-editor "Check New Project Window"
-get-eclipse-window | key-type F8
+get-button "Resume (F8)" | click
try -times 20 -delay 5000 -command {
get-view Debug | get-tree
- | get-item "TestSuite \\[RCPTT Test Suite\\]/TestSuite/ECL Thread/get-button \\(CreateJavaProject: 6\\)"
- | get-property caption | equals "get-button (CreateJavaProject: 6)" | verify-true
+ | select "TestSuite \\[RCPTT Test Suite\\]/TestSuite/ECL Thread/get-button \\(CreateJavaProject: 6\\)"
}
get-editor CreateJavaProject
-get-eclipse-window | key-type F8
+get-button "Resume (F8)" | click
get-button "RCPTT perspective" | click
with [get-view "Execution View"] {
get-label "2/2" | get-property caption | equals "2/2" | verify-true
diff --git a/rcpttTests/platform_tests/Bug 474198 Read-File command.test b/rcpttTests/platform_tests/Bug 474198_Read-File command.test
similarity index 90%
rename from rcpttTests/platform_tests/Bug 474198 Read-File command.test
rename to rcpttTests/platform_tests/Bug 474198_Read-File command.test
index e146450..39b5719 100644
--- a/rcpttTests/platform_tests/Bug 474198 Read-File command.test
+++ b/rcpttTests/platform_tests/Bug 474198_Read-File command.test
@@ -1,13 +1,13 @@
--- RCPTT testcase ---
Format-Version: 1.0
Contexts: _SsJe4EGLEeWqEaLYgRXhIw
-Element-Name: Bug 474198_Read-File command\nBug 474198\n
+Element-Name: Bug 474198_Read-File command
Element-Type: testcase
Element-Version: 3.0
External-Reference: https://bugs.eclipse.org/bugs/show_bug.cgi?id=474198
Id: _DaCmwEGLEeWqEaLYgRXhIw
-Runtime-Version: 2.0.0.201508120641
-Save-Time: 8/13/15 2:24 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/16/19 4:59 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
diff --git a/rcpttTests/platform_tests/q7Explorer/ResourceRenameTest.test b/rcpttTests/platform_tests/q7Explorer/ResourceRenameTest.test
index ea2be01..fc97c36 100644
--- a/rcpttTests/platform_tests/q7Explorer/ResourceRenameTest.test
+++ b/rcpttTests/platform_tests/q7Explorer/ResourceRenameTest.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _da-SEauHEeCsAecib2O_8g
-Runtime-Version: 2.0.0.201505191136
-Save-Time: 5/20/15 9:11 AM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/16/19 4:41 PM
Tags: Q7Explorer, Rename
Testcase-Type: ecl
@@ -34,7 +34,7 @@
get-quick-access | key-type Enter
get-view "Project Explorer" | get-tree | select TestQ7Prj | get-menu "New/File" | click
-with [get-window "New File"] {
+with [get-window "Create New File"] {
get-editbox -after [get-label "File name:"] | set-text "test.txt"
get-button Finish | click
}
diff --git a/rcpttTests/platform_tests/selfAUTTests/RCPTT-478_HTML report looks different if it is copied as only html-file.test b/rcpttTests/platform_tests/selfAUTTests/RCPTT-478_HTML report looks different if it is copied as only html-file.test
index 3c5e567..1b1b5c5 100644
--- a/rcpttTests/platform_tests/selfAUTTests/RCPTT-478_HTML report looks different if it is copied as only html-file.test
+++ b/rcpttTests/platform_tests/selfAUTTests/RCPTT-478_HTML report looks different if it is copied as only html-file.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _V4RUAAK-EeWIbeVIcuukYQ
-Runtime-Version: 2.4.2.qualifier
-Save-Time: 4/3/19 6:00 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 3:51 PM
Tags: Browser
Testcase-Type: ecl
@@ -50,22 +50,20 @@
get-editbox -after [get-label "Folder name:"] | set-text F
get-button Finish | click
}
-get-view "Test Explorer" | get-tree | select "Q7Project/test1.*.html"
- | double-click
+get-view "Test Explorer" | get-tree | select "Q7Project/test1.*.html" | double-click
-let [val reportContent [get-editor ".*.html" | get-control Browser
- | get-property text -raw]]{
-
-get-editor ".*.html" | close
-
-with [get-view "Test Explorer" | get-tree] {
- select "Q7Project/test1.*.html" | get-menu Copy | click
- select "Q7Project/F" | select "Q7Project/F" | get-menu Paste | click
- select "Q7Project/F/test1.*.html" | double-click
-}
-
-get-editor ".*.html" | get-control Browser | get-property text -raw | eq $reportContent | verify-true
-
+let [val reportContent [get-editor ".*.html" | get-control Browser | get-property text -raw]]{
+
+ get-editor ".*.html" | close
+
+ with [get-view "Test Explorer" | get-tree] {
+ select "Q7Project/test1.*.html" | get-menu Copy | click
+ select "Q7Project/F" | select "Q7Project/F" | get-menu Paste | click
+ select "Q7Project/F/test1.*.html" | double-click
+ }
+
+ get-editor ".*.html" | get-control Browser | get-property text -raw | eq $reportContent | verify-true
+
}
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/pom.xml b/rcpttTests/pom.xml
index 87d7fe0..904dcea 100644
--- a/rcpttTests/pom.xml
+++ b/rcpttTests/pom.xml
@@ -84,7 +84,7 @@
</runner>
<skipTags>
<tag>skipExecution</tag>
- <tag>Browser</tag> // Needs a web browser installed in test environment
+ <!--tag>Browser</tag--> <!--// Needs a web browser installed in test environment -->
</skipTags>
<!--suites>
<suite>2019-03_regression</suite>
diff --git a/releng/buildenv/Dockerfile b/releng/buildenv/centos/Dockerfile
similarity index 77%
copy from releng/buildenv/Dockerfile
copy to releng/buildenv/centos/Dockerfile
index 289ee07..a4a7be8 100644
--- a/releng/buildenv/Dockerfile
+++ b/releng/buildenv/centos/Dockerfile
@@ -1,12 +1,13 @@
-FROM consol/ubuntu-xfce-vnc:latest
+FROM consol/centos-xfce-vnc:latest
# Switch to root user to install additional software
USER 0
-## Install a maven
-RUN apt-get -y update \
- && apt-get install openjdk-8-jdk -y
+## Install a java 8 and a javafx
+RUN yum install -y java-1.8.0-openjdk-devel \
+ && yum clean all
+## Install a maven
ENV MAVEN_VER="3.6.0"
RUN wget http://www-eu.apache.org/dist/maven/maven-3/${MAVEN_VER}/binaries/apache-maven-${MAVEN_VER}-bin.tar.gz \
&& tar xvf apache-maven-${MAVEN_VER}-bin.tar.gz \
diff --git a/releng/buildenv/Dockerfile b/releng/buildenv/ubuntu/Dockerfile
similarity index 80%
rename from releng/buildenv/Dockerfile
rename to releng/buildenv/ubuntu/Dockerfile
index 289ee07..3ffdc8e 100644
--- a/releng/buildenv/Dockerfile
+++ b/releng/buildenv/ubuntu/Dockerfile
@@ -3,10 +3,14 @@
# Switch to root user to install additional software
USER 0
-## Install a maven
+## Install a java 8, a webkit and a javafx
RUN apt-get -y update \
- && apt-get install openjdk-8-jdk -y
+ && apt-get install -y \
+ openjdk-8-jdk \
+ libwebkit2gtk-4.0 \
+ openjfx
+## Install a maven
ENV MAVEN_VER="3.6.0"
RUN wget http://www-eu.apache.org/dist/maven/maven-3/${MAVEN_VER}/binaries/apache-maven-${MAVEN_VER}-bin.tar.gz \
&& tar xvf apache-maven-${MAVEN_VER}-bin.tar.gz \
diff --git a/releng/pom.xml b/releng/pom.xml
index 32b3366..11e558d 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -301,7 +301,7 @@
</executions>
</plugin>
<plugin>
- <groupId>org.eclipse.tycho</groupId>
+ <groupId>${tycho-groupid}</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<executions>
<execution>
