diff --git a/Jenkinsfile b/Jenkinsfile index d49e41ab511..d9f8514d7e5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -697,34 +697,15 @@ stage('Deploy') { runBuildOnNode { 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/parents/public/pom.xml b/parents/public/pom.xml index 9612b4e10f1..1607e5cbb46 100644 --- a/parents/public/pom.xml +++ b/parents/public/pom.xml @@ -245,5 +245,35 @@ + + release + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + ${env.RELEASE_GPG_HOMEDIR} + ${env.RELEASE_GPG_PASSPHRASE} + + + + + + + diff --git a/pom.xml b/pom.xml index 4a6a52c2036..5a1174942e4 100644 --- a/pom.xml +++ b/pom.xml @@ -332,6 +332,7 @@ 1.0.0.Beta2 3.7.0.1746 3.0.0 + 3.0.1 3.0.8