From cdef55a02e6378b4b1b06f50623df82a17493e7b Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Thu, 20 Apr 2023 19:55:42 +0200
Subject: [PATCH] Remove unnecessary build arguments and fix deprecated ones

---
 full-build.sh                        | 3 +--
 full-deploy.sh                       | 1 -
 jenkins/milestone-deploy/Jenkinsfile | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/full-build.sh b/full-build.sh
index 8abfbe4e5ec..8bd3da405a9 100755
--- a/full-build.sh
+++ b/full-build.sh
@@ -2,7 +2,6 @@
 
 MVN_ARGS=(\
   -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-  -Dit-archetype-tests-skip=true \
 )
 
 # args parsing inspired by https://gist.github.com/jehiah/855086
@@ -50,6 +49,6 @@ echo mvn -B -f org.eclipse.xtext.full.releng ${MVN_ARGS[@]} $@
 mvn -B \
   -f org.eclipse.xtext.full.releng \
   clean deploy \
-  -DaltDeploymentRepository=local::default::file:./build/maven-repository \
+  -DaltDeploymentRepository=local::file:./build/maven-repository \
   ${MVN_ARGS[@]} \
   $@
diff --git a/full-deploy.sh b/full-deploy.sh
index ad193175649..20db6a28efa 100755
--- a/full-deploy.sh
+++ b/full-deploy.sh
@@ -2,7 +2,6 @@
 
 MVN_ARGS=(\
   -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-  -Dit-archetype-tests-skip=true \
 )
 
 # args parsing inspired by https://gist.github.com/jehiah/855086
diff --git a/jenkins/milestone-deploy/Jenkinsfile b/jenkins/milestone-deploy/Jenkinsfile
index 7d7ac3c1851..7177076b896 100644
--- a/jenkins/milestone-deploy/Jenkinsfile
+++ b/jenkins/milestone-deploy/Jenkinsfile
@@ -49,7 +49,7 @@ pipeline {
       steps {
         withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) {
           sh 'gpg --batch --import "${KEYRING}"'
-          sh 'for fpr in $(gpg --list-keys --with-colons  | awk -F: \'/fpr:/ {print $10}\' | sort -u); do echo -e "5\ny\n" |  gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust; done'
+          sh 'for fpr in $(gpg --list-keys --with-colons | awk -F: \'/fpr:/ {print $10}\' | sort -u); do echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust; done'
         }
         sshagent(['projects-storage.eclipse.org-bot-ssh']) {
           sh """