Update the order of release steps and simplify the ORM build script [HHH-19913]

build.gradle

@@ -47,14 +47,6 @@ tasks.register( 'releasePrepare' ) {
 	// See `:release:releasePrepare` which does a lot of heavy lifting here
 }
 
-tasks.register( 'releasePerform' ) {
-	group "release-perform"
-	description "Scripted release 'Release Perform' stage.  " +
-			"Generally this entails publishing artifacts to various servers.  " +
-			"Sub-projects register their own `releasePerform` to hook into this stage."
-	// See `:release:releasePerform` which does a lot of heavy lifting here
-}
-
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // CI Build Task
 

ci/release/Jenkinsfile

@@ -222,7 +222,15 @@ pipeline {
 								withEnv([
 										"DISABLE_REMOTE_GRADLE_CACHE=true"
 								]) {
-									sh ".release/scripts/publish.sh -j ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH}"
+                                    def notesFiles = findFiles(glob: 'release_notes.md')
+                                    if ( notesFiles.length < 1 ) {
+                                        throw new IllegalStateException( "Could not locate `release_notes.md`" )
+                                    }
+                                    if ( notesFiles.length > 1 ) {
+                                        throw new IllegalStateException( "Located more than 1 `release_notes.md`" )
+                                    }
+
+									sh ".release/scripts/publish.sh -j --notes=${notesFiles[0].path} ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH} "
 								}
 							}
 						}
@@ -271,25 +279,6 @@ pipeline {
 				}
 			}
 		}
-		stage('Create GitHub release') {
-			steps {
-				script {
-					checkoutReleaseScripts()
-
-                    def notesFiles = findFiles(glob: 'release_notes.md')
-                    if ( notesFiles.length < 1 ) {
-                        throw new IllegalStateException( "Could not locate `release_notes.md`" )
-                    }
-                    if ( notesFiles.length > 1 ) {
-                        throw new IllegalStateException( "Located more than 1 `release_notes.md`" )
-                    }
-
-					withCredentials([string(credentialsId: 'Hibernate-CI.github.com', variable: 'GITHUB_API_TOKEN')]) {
-						sh ".release/scripts/github-release.sh ${env.SCRIPT_OPTIONS} --notes=${notesFiles[0].path} ${env.PROJECT} ${env.RELEASE_VERSION}"
-					}
-				}
-			}
-		}
 	}
  	post {
  		always {

local-build-plugins/src/main/groovy/local.publishing-java-module.gradle

@@ -52,6 +52,9 @@ def releasePrepareTask = tasks.register("releasePrepare") {
     dependsOn tasks.check
     dependsOn tasks.generateMetadataFileForPublishedArtifactsPublication
     dependsOn tasks.generatePomFileForPublishedArtifactsPublication
+    // we depend on publishAllPublicationsToStagingRepository to make sure that the artifacts are "published" to a local staging directory
+    // used by JReleaser during the release process
+    dependsOn tasks.publishAllPublicationsToStagingRepository
 }
 
 // used from the h2 CI job

local-build-plugins/src/main/java/org/hibernate/build/OrmBuildDetails.java

@@ -16,7 +16,6 @@
  * @author Steve Ebersole
  */
 public abstract class OrmBuildDetails {
-	private final ReleaseDetails releaseDetails;
 	private final Provider<File> versionFileAccess;
 	private final HibernateVersion hibernateVersion;
 
@@ -26,12 +25,9 @@ public abstract class OrmBuildDetails {
 
 	@Inject
 	public OrmBuildDetails(Project project) {
-		releaseDetails = new ReleaseDetails( project );
 		versionFileAccess = project.provider( () -> new File( project.getRootDir(), HibernateVersion.RELATIVE_FILE ) );
 
-		hibernateVersion = releaseDetails.getReleaseVersion() != null
-				? releaseDetails.getReleaseVersion()
-				: fromVersionFile( versionFileAccess.get() );
+		hibernateVersion = fromVersionFile( versionFileAccess.get() );
 		project.setVersion( hibernateVersion.getFullName() );
 
 		jpaVersion = JpaVersion.from( project );
@@ -59,10 +55,6 @@ public String getHibernateVersionNameOsgi() {
 		return getHibernateVersion().getOsgiVersion();
 	}
 
-	public ReleaseDetails getReleaseDetails() {
-		return releaseDetails;
-	}
-
 	public JpaVersion getJpaVersion() {
 		return jpaVersion;
 	}