Remove unnecessary build arguments and fix deprecated ones

eclipse · May 11, 2023 · cdef55a · cdef55a
1 parent 18216f4
commit cdef55a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 """