diff --git a/.release/.gitignore b/.release/.gitignore
new file mode 100644
index 00000000000..cdd9a17d6b0
--- /dev/null
+++ b/.release/.gitignore
@@ -0,0 +1,3 @@
+# The folder into which we checkout our release scripts into
+*
+!.gitignore
\ No newline at end of file
diff --git a/build/reports/pom.xml b/build/reports/pom.xml
index 593bfca93cc..52f36013fe4 100644
--- a/build/reports/pom.xml
+++ b/build/reports/pom.xml
@@ -186,38 +186,6 @@
-
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- false
-
-
-
-
- default-deploy
- none
-
-
-
- deferred-deploy
- deploy
-
- deploy-staged
-
-
-
-
diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
index f1348f25c42..b9cef215b8c 100644
--- a/ci/release/Jenkinsfile
+++ b/ci/release/Jenkinsfile
@@ -62,6 +62,7 @@ pipeline {
def releaseVersion = Version.parseReleaseVersion(params.RELEASE_VERSION)
def developmentVersion = Version.parseDevelopmentVersion(params.DEVELOPMENT_VERSION)
+ env.JRELEASER_DRY_RUN = params.RELEASE_DRY_RUN
echo "Performing full release for version ${releaseVersion.toString()}"
withMaven(mavenSettingsConfig: params.RELEASE_DRY_RUN ? null : 'ci-hibernate.deploy.settings.maven',
@@ -70,13 +71,16 @@ pipeline {
configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: env.HOME + '/.ssh/known_hosts')]) {
// using MAVEN_GPG_PASSPHRASE (the default env variable name for passphrase in maven gpg plugin)
withCredentials([file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'),
- string(credentialsId: 'release.gpg.passphrase', variable: 'MAVEN_GPG_PASSPHRASE')]) {
+ string(credentialsId: 'release.gpg.passphrase', variable: 'JRELEASER_GPG_PASSPHRASE'),
+ usernamePassword(credentialsId: 'central.sonatype.com', passwordVariable: 'JRELEASER_MAVENCENTRAL_TOKEN', usernameVariable: 'JRELEASER_MAVENCENTRAL_USERNAME'),
+ string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN')]) {
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-release-scripts.git'
- env.RELEASE_GPG_HOMEDIR = env.WORKSPACE_TMP + '/.gpg'
+ dir('.release/scripts') {
+ sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git .'
+ }
sh """
- bash -xe hibernate-release-scripts/release.sh ${params.RELEASE_DRY_RUN ? '-d' : ''} \
+ bash -xe .release/scripts/release.sh -j ${params.RELEASE_DRY_RUN ? '-d' : ''} \
search ${releaseVersion.toString()} ${developmentVersion.toString()}
"""
}
diff --git a/distribution/src/main/assembly/dist.xml b/distribution/src/main/assembly/dist.xml
index f0925c08d5b..0e7556bc27f 100644
--- a/distribution/src/main/assembly/dist.xml
+++ b/distribution/src/main/assembly/dist.xml
@@ -192,9 +192,8 @@
copyright.txt
lgpl.txt
-
- hibernate-noorm-release-scripts/**
- hibernate-release-scripts/**
+
+ .release/**
.git
diff --git a/pom.xml b/pom.xml
index 54db6552ecd..a96aaf6b912 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,9 +264,7 @@
3.4.0
3.5.0
0.18.3
- 1.6.13
3.1.1
- 3.1.0
1.5.0
3.6.0
3.5.0
@@ -308,11 +306,13 @@
- ossrh
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
- https://oss.sonatype.org/
- ossrh
- https://oss.sonatype.org/content/repositories/snapshots
+
+ staging-deploy
+ file:${maven.multiModuleProjectDirectory}/target/staging-deploy/maven
+ central-releases
+ https://central.sonatype.com/api/v1/publisher/
+ central-snapshots
+ https://central.sonatype.com/repository/maven-snapshots/
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- ${version.nexus-staging.plugin}
-
- ${deploy.skip}
-
-
-
org.apache.maven.plugins
maven-deploy-plugin
${version.deploy.plugin}
-
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
- ${version.gpg.plugin}
-
-
- sign-artifacts
- verify
-
- sign
-
-
- ${deploy.skip}
- ${env.RELEASE_GPG_HOMEDIR}
- true
-
-
-
+
+ ${deploy.skip}
+
@@ -1051,44 +1025,6 @@
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
-
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- false
-
- ${ossrh.releases.repo.id}
-
- ${ossrh.releases.repo.baseUrl}
-
- 60
-
-
-
- default-deploy
- deploy
-
-
- deploy
-
-
-
-
exec-maven-plugin
org.codehaus.mojo
@@ -1283,14 +1219,14 @@
- ${ossrh.releases.repo.id}
- OSSRH Releases Repository
- ${ossrh.releases.repo.url}
+ ${central.releases.repo.id}
+ Maven Central Releases Repository
+ ${central.releases.repo.url}
- ${ossrh.snapshots.repo.id}
- OSSRH Snapshots Repository
- ${ossrh.snapshots.repo.url}
+ ${central.snapshots.repo.id}
+ Maven Central Snapshots Repository
+ ${central.snapshots.repo.url}
@@ -1380,12 +1316,16 @@
prepare-package
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
-
-
+
+
+
+ maven-deploy-plugin
+
+ ${local.staging.releases.repo.id}::${local.staging.releases.repo.url}
+
+
+
+