diff --git a/Jenkinsfile b/Jenkinsfile index b6b228a5778..23b0dfe1cae 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -541,34 +541,15 @@ stage('Deploy') { runBuildOnNode { helper.withMavenWorkspace(mavenSettingsConfig: params.RELEASE_DRY_RUN ? null : helper.configuration.file.deployment.maven.settingsId) { configFileProvider([configFile(fileId: 'release.config.ssh', targetLocation: env.HOME + '/.ssh/config')]) { - sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) { - sh 'cat $HOME/.ssh/config' - sh "git clone https://github.com/hibernate/hibernate-noorm-release-scripts.git" - sh "bash -xe hibernate-noorm-release-scripts/prepare-release.sh search ${releaseVersion.toString()}" - - String deployCommand = "bash -xe hibernate-noorm-release-scripts/deploy.sh search" - if (!params.RELEASE_DRY_RUN) { - sh deployCommand - } else { - echo "WARNING: Not deploying. Would have executed:" - echo deployCommand - } - - String uploadDistributionCommand = "bash -xe hibernate-noorm-release-scripts/upload-distribution.sh search ${releaseVersion.toString()}" - String uploadDocumentationCommand = "bash -xe hibernate-noorm-release-scripts/upload-documentation.sh search ${releaseVersion.toString()} ${releaseVersion.family}" - if (!params.RELEASE_DRY_RUN) { - sh uploadDistributionCommand - sh uploadDocumentationCommand - } - else { - echo "WARNING: Not uploading anything. Would have executed:" - echo uploadDistributionCommand - echo uploadDocumentationCommand - } - - sh "bash -xe hibernate-noorm-release-scripts/update-version.sh search ${afterReleaseDevelopmentVersion.toString()}" - sh "bash -xe hibernate-noorm-release-scripts/push-upstream.sh search ${releaseVersion.toString()} ${helper.scmSource.branch.name} ${!params.RELEASE_DRY_RUN}" - } + withCredentials([file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'), + string(credentialsId: 'release.gpg.passphrase', variable: 'RELEASE_GPG_PASSPHRASE')]) { + sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) { + sh 'cat $HOME/.ssh/config' + sh "git clone https://github.com/hibernate/hibernate-noorm-release-scripts.git" + env.RELEASE_GPG_HOMEDIR = env.WORKSPACE_TMP + '/.gpg' + sh "bash -xe hibernate-noorm-release-scripts/release.sh search ${releaseVersion.toString()} ${afterReleaseDevelopmentVersion.toString()}" + } + } } } } diff --git a/build-config/pom.xml b/build-config/pom.xml index 2e9bf951752..ae3606c5d1b 100644 --- a/build-config/pom.xml +++ b/build-config/pom.xml @@ -34,6 +34,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/distribution/pom.xml b/distribution/pom.xml index 8cc354a36d0..cc2a59d69a8 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,6 +24,7 @@ true + true diff --git a/documentation/pom.xml b/documentation/pom.xml index fcb7a78b23c..f6190a76205 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -36,6 +36,7 @@ true + true true diff --git a/integrationtest/elasticsearch/pom.xml b/integrationtest/elasticsearch/pom.xml index fd94414014b..52fa90575a7 100755 --- a/integrationtest/elasticsearch/pom.xml +++ b/integrationtest/elasticsearch/pom.xml @@ -210,6 +210,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/integrationtest/jdk9-modules/pom.xml b/integrationtest/jdk9-modules/pom.xml index c385fc64d16..c7c3d39a156 100644 --- a/integrationtest/jdk9-modules/pom.xml +++ b/integrationtest/jdk9-modules/pom.xml @@ -100,6 +100,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/integrationtest/jms/pom.xml b/integrationtest/jms/pom.xml index 1660fed2f3d..9b692609c80 100644 --- a/integrationtest/jms/pom.xml +++ b/integrationtest/jms/pom.xml @@ -109,6 +109,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/integrationtest/jsr352/pom.xml b/integrationtest/jsr352/pom.xml index b0b6a60a439..376695334b1 100755 --- a/integrationtest/jsr352/pom.xml +++ b/integrationtest/jsr352/pom.xml @@ -153,6 +153,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/integrationtest/narayana/pom.xml b/integrationtest/narayana/pom.xml index a232a277307..9d60b75e196 100755 --- a/integrationtest/narayana/pom.xml +++ b/integrationtest/narayana/pom.xml @@ -71,6 +71,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/integrationtest/osgi/karaf-features/pom.xml b/integrationtest/osgi/karaf-features/pom.xml index 8e19dbd3ace..8a644e7db13 100644 --- a/integrationtest/osgi/karaf-features/pom.xml +++ b/integrationtest/osgi/karaf-features/pom.xml @@ -82,6 +82,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/integrationtest/osgi/karaf-it/pom.xml b/integrationtest/osgi/karaf-it/pom.xml index ff9e4f0a60c..f3b8af41811 100644 --- a/integrationtest/osgi/karaf-it/pom.xml +++ b/integrationtest/osgi/karaf-it/pom.xml @@ -211,6 +211,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/integrationtest/performance/engine-elasticsearch/pom.xml b/integrationtest/performance/engine-elasticsearch/pom.xml index 9b5dfe1a7fa..4dcb0c4d3bf 100644 --- a/integrationtest/performance/engine-elasticsearch/pom.xml +++ b/integrationtest/performance/engine-elasticsearch/pom.xml @@ -90,6 +90,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/integrationtest/performance/engine-lucene/pom.xml b/integrationtest/performance/engine-lucene/pom.xml index ba916b2e190..29b2ba29b03 100644 --- a/integrationtest/performance/engine-lucene/pom.xml +++ b/integrationtest/performance/engine-lucene/pom.xml @@ -82,6 +82,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/integrationtest/performance/orm/pom.xml b/integrationtest/performance/orm/pom.xml index f029d2c7095..63c8f1e0163 100755 --- a/integrationtest/performance/orm/pom.xml +++ b/integrationtest/performance/orm/pom.xml @@ -224,6 +224,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/integrationtest/performance/sandbox/pom.xml b/integrationtest/performance/sandbox/pom.xml index 47cdd7a081f..3b7f2db0f7a 100755 --- a/integrationtest/performance/sandbox/pom.xml +++ b/integrationtest/performance/sandbox/pom.xml @@ -69,6 +69,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/integrationtest/spring/pom.xml b/integrationtest/spring/pom.xml index 3af64326c04..b8d67e33e9a 100755 --- a/integrationtest/spring/pom.xml +++ b/integrationtest/spring/pom.xml @@ -146,6 +146,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/integrationtest/wildfly/pom.xml b/integrationtest/wildfly/pom.xml index d88f8d0d13b..a1140bfc246 100755 --- a/integrationtest/wildfly/pom.xml +++ b/integrationtest/wildfly/pom.xml @@ -255,6 +255,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-javadoc-plugin diff --git a/jbossmodules/testing/pom.xml b/jbossmodules/testing/pom.xml index 994c899cf2d..15ad53362e7 100644 --- a/jbossmodules/testing/pom.xml +++ b/jbossmodules/testing/pom.xml @@ -66,6 +66,13 @@ true + + org.apache.maven.plugins + maven-gpg-plugin + + true + + maven-resources-plugin diff --git a/pom.xml b/pom.xml index 4af7b275697..544815e4f3e 100644 --- a/pom.xml +++ b/pom.xml @@ -335,6 +335,7 @@ 0.8.3 4.3.0 1.5.Final + 3.0.1