From adf12efc3eee9056e8e49d048c31f0cd6baf044d Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Tue, 17 Sep 2024 19:18:17 +0200
Subject: [PATCH] [Build] Move not always desired build parameters out of
 maven.config

---
 .github/workflows/ci.yml |  3 ++-
 .mvn/maven.config        |  3 ---
 Jenkinsfile              | 12 ++++++------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2dd03ba67c..cc9e34ab23 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,4 +16,5 @@ jobs:
       projectId: eclipse.pde
   build:
     uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/mavenBuild.yml@master
-
+    with:
+      maven-goals: clean verify -Ptck
diff --git a/.mvn/maven.config b/.mvn/maven.config
index e49acb33e8..100784d287 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -1,6 +1,3 @@
 -Pbuild-individual-bundles
--Ptck
--Dcompare-version-with-baselines.skip=false
 -DtrimStackTrace=false
---fail-at-end
 -Dtycho.localArtifacts=ignore
diff --git a/Jenkinsfile b/Jenkinsfile
index 74febc14e2..7dec810475 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,14 +15,14 @@ pipeline {
 	stages {
 		stage('Build') {
 			steps {
-				wrap([$class: 'Xvnc', useXauthority: true]) {
+				xvnc(useXauthority: true) {
 					sh """
-						mvn clean verify --batch-mode -Dmaven.repo.local=$WORKSPACE/.m2/repository \
-						-Pbree-libs \
-						-Papi-check \
-						-Pjavadoc \
+					mvn clean verify -Dmaven.repo.local=$WORKSPACE/.m2/repository \
+						--fail-at-end --update-snapshots --batch-mode --no-transfer-progress --show-version --errors \
+						-Pbree-libs -Papi-check -Pjavadoc -Ptck \
 						${env.BRANCH_NAME=='master' ? '-Peclipse-sign': ''} \
-						-Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true \
+						-Dcompare-version-with-baselines.skip=false \
+						-Dmaven.test.failure.ignore=true \
 						-Dtycho.debug.artifactcomparator \
 						-Dpde.docs.baselinemode=fail
 					"""