From de13c90d7df1ed09535f6f0de81cd61e4fac27ec Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 26 May 2020 13:11:33 +0200 Subject: [PATCH] do not activate packaging with performRelease, it must be now activated manually --- Jenkinsfile | 10 +++++----- scm-packaging/pom.xml | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index db98d66445..10686c72f8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -62,14 +62,14 @@ node('docker') { } stage('Build') { - // we exclude scm-packaging and scm-it to speed-up build - mvn "clean install -DskipTests -pl '!:scm-packaging,!scm-it'" + // we exclude scm-it to speed-up build a little bit + mvn "clean install -DskipTests" } parallel( unitTest: { stage('Unit Test') { - mvn "test -DskipFrontendBuild -DskipTypecheck -Pcoverage -pl '!:scm-packaging,!scm-it' -Dmaven.test.failure.ignore=true" + mvn "test -DskipFrontendBuild -DskipTypecheck -Pcoverage -Dmaven.test.failure.ignore=true" junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml,**/target/jest-reports/TEST-*.xml' } }, @@ -114,7 +114,7 @@ node('docker') { releaseRepository: '/repository/releases/', type: 'Configurable' ]) - mvn.deployToNexusRepository("-pl '!:scm-packaging,!scm-it'") + mvn.deployToNexusRepository() // deploy frontend bits withCredentials([string(credentialsId: 'cesmarvin_npm_token', variable: 'NPM_TOKEN')]) { @@ -136,7 +136,7 @@ node('docker') { // deploy packages withGPGEnvironment { - mvn "-Dgpg.scm.keyring='${GPG_KEYRING}' -Dgpg.scm.key='${GPG_KEY_ID}' -Dgpg.scm.passphrase='${GPG_KEY_PASSPHRASE}' -rf :scm-packaging -pl '!scm-it' deploy" + mvn "-Dgpg.scm.keyring='${GPG_KEYRING}' -Dgpg.scm.key='${GPG_KEY_ID}' -Dgpg.scm.passphrase='${GPG_KEY_PASSPHRASE}' -P -rf :scm-packaging deploy" } } diff --git a/scm-packaging/pom.xml b/scm-packaging/pom.xml index 035e41a5f0..1a8ec5e9c5 100644 --- a/scm-packaging/pom.xml +++ b/scm-packaging/pom.xml @@ -47,11 +47,6 @@ packaging - - - performRelease - - unix