diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3f227c27c9..2cd95f016a 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -34,11 +34,11 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- name: Generated Meta data
- run: mvn generate-sources -f m2e-maven-runtime -Pgenerate-osgi-metadata -Dtycho.mode=maven
+ run: mvn generate-sources -f m2e-maven-runtime -B -V -Pgenerate-osgi-metadata -Dtycho.mode=maven
- name: Build m2e-core
uses: GabrielBB/xvfb-action@v1
with:
- run: mvn clean verify -B -Pits -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Dtycho.surefire.timeout=7200
+ run: mvn clean verify -B -V -Pits -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true
- name: Upload Test Results
uses: actions/upload-artifact@v3
with:
diff --git a/Jenkinsfile b/Jenkinsfile
index e03e875c56..f9a6d7ebfb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,9 +20,11 @@ pipeline {
}
stage('Build') {
steps {
- sh 'mvn clean generate-sources -f m2e-maven-runtime/pom.xml -B -Dtycho.mode=maven -Pgenerate-osgi-metadata'
+ sh 'mvn clean generate-sources -f m2e-maven-runtime/pom.xml -B -V -Dtycho.mode=maven -Pgenerate-osgi-metadata'
wrap([$class: 'Xvnc', useXauthority: true]) {
- sh 'mvn clean verify -f pom.xml -B -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Peclipse-sign,its -Dtycho.surefire.timeout=7200'
+ sh 'mvn clean verify -B -V \
+ -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true \
+ -Peclipse-sign,its'
}
}
post {
@@ -48,7 +50,7 @@ pipeline {
{
echo Deploy m2e repo to ${1}
ssh genie.m2e@projects-storage.eclipse.org "\
- rm -rf ${1}/* && \
+ rm -rf ${1}/* && \
mkdir -p ${1}"
scp -r org.eclipse.m2e.repository/target/repository/* genie.m2e@projects-storage.eclipse.org:${1}
}
diff --git a/pom.xml b/pom.xml
index 4b62310000..fda80db6c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
3.0.0
-Xmx800m
- 7200
+ 900
true
true
../target/jacoco.exec
diff --git a/setup/m2e.setup b/setup/m2e.setup
index c73ac61327..6191a70783 100644
--- a/setup/m2e.setup
+++ b/setup/m2e.setup
@@ -47,7 +47,7 @@
xsi:type="jdt:JRETask"
version="JavaSE-17"
location="${jre.location-17}"
- name="JRE for JavaSE-11">
+ name="JRE for JavaSE-17">
Define the JRE needed to compile and run the Java projects of ${scope.project.label}