diff --git a/Jenkinsfile b/Jenkinsfile index 6664e1f9d36..2dd368c50ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -522,34 +522,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 96b4a3c3370..8abdbef8688 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 df410129673..1ab9e1ae3db 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 66a90782c4e..40481d0ae9d 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 a251da196ca..322ec9d126c 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 bae47550c06..20ff0cc9333 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 f7fb5b17ea6..d90c8bfa0dd 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 4c72860910e..a76033443d2 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 5c08db6b5d6..e4d8117a6c9 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 af0fa460752..36f99ddd145 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 58a9e6d016d..ea1f3c08a26 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 030def9e0c4..f7451d09d0a 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 bbfac7aa70d..bb93bcfafe8 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 8fb2a1da0b3..4713ed284df 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 af36634563e..03f2a972abf 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 51506259c14..b77c8cb42b0 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 0d1d390caf2..e4cca8393df 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 84748af8987..d50444dc69e 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 046a06838e8..c580c4058df 100644 --- a/pom.xml +++ b/pom.xml @@ -335,6 +335,7 @@ 0.8.3 4.3.0 1.5.Final + 3.0.1