From fb327d9ae170ad157cbf30ba60b187c3da3e2434 Mon Sep 17 00:00:00 2001
From: Fabio Massimo Ercoli <fabiomassimo.ercoli@gmail.com>
Date: Wed, 19 Jan 2022 17:09:31 +0100
Subject: [PATCH 1/3] HSEARCH-4415 Define maven gpg plugin for public artifacts

---
 parents/public/pom.xml | 26 ++++++++++++++++++++++++++
 pom.xml                |  6 ++++++
 2 files changed, 32 insertions(+)

diff --git a/parents/public/pom.xml b/parents/public/pom.xml
index 6b6eb1ed742..bd5081a9e5e 100644
--- a/parents/public/pom.xml
+++ b/parents/public/pom.xml
@@ -252,5 +252,31 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>release</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index fb57b5b377c..d3e149807a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -382,6 +382,7 @@
         <version.moditect.plugin>1.0.0.RC2</version.moditect.plugin>
         <version.sonar.plugin>3.9.1.2184</version.sonar.plugin>
         <version.scripting.plugin>3.0.0</version.scripting.plugin>
+        <version.gpg.plugin>3.0.1</version.gpg.plugin>
         <version.org.codehaus.groovy-jsr223>3.0.9</version.org.codehaus.groovy-jsr223>
         <!--
             Please don't change the name of this property, it may be used and
@@ -2230,6 +2231,11 @@
                         </dependency>
                     </dependencies>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>${version.gpg.plugin}</version>
+                </plugin>
                 <plugin>
                     <artifactId>maven-antrun-plugin</artifactId>
                     <version>3.0.0</version>

From 3274b7cb0474e2e1d5848eb1fb6d25f60ba9124e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Thu, 20 Jan 2022 13:37:23 +0100
Subject: [PATCH 2/3] HSEARCH-4415 Sign artifacts in Jenkinsfile releases

---
 Jenkinsfile            | 18 +++++++++++++++++-
 parents/public/pom.xml |  4 ++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6692ac1a2f9..68d76505877 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -762,9 +762,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']) {
+				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']) {
+					try {
 						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/setup.sh"
 						sh "bash -xe hibernate-noorm-release-scripts/prepare-release.sh search ${releaseVersion.toString()}"
 
 						String deployCommand = "bash -xe hibernate-noorm-release-scripts/deploy.sh search"
@@ -790,6 +796,16 @@ stage('Deploy') {
 						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}"
 					}
+					finally {
+						try {
+							sh "bash -xe hibernate-noorm-release-scripts/cleanup.sh"
+						}
+						catch (Throwable t) {
+							echo 'Error cleaning up after release: ' + t.toString()
+						}
+					}
+				}
+				}
 				}
 			}
 		}
diff --git a/parents/public/pom.xml b/parents/public/pom.xml
index bd5081a9e5e..02bf325ffbb 100644
--- a/parents/public/pom.xml
+++ b/parents/public/pom.xml
@@ -272,6 +272,10 @@
                                 <goals>
                                     <goal>sign</goal>
                                 </goals>
+                                <configuration>
+                                    <homedir>${env.RELEASE_GPG_HOMEDIR}</homedir>
+                                    <passphrase>${env.RELEASE_GPG_PASSPHRASE}</passphrase>
+                                </configuration>
                             </execution>
                         </executions>
                     </plugin>

From 9d665670dcbde63b0158935c59303dee8d03e2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Thu, 20 Jan 2022 18:32:55 +0100
Subject: [PATCH 3/3] HSEARCH-4415 Switch to simpler release.sh for releases

---
 Jenkinsfile | 42 +++---------------------------------------
 1 file changed, 3 insertions(+), 39 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 68d76505877..f1d21cf0ad5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -765,45 +765,9 @@ stage('Deploy') {
 				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']) {
-					try {
-						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/setup.sh"
-						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}"
-					}
-					finally {
-						try {
-							sh "bash -xe hibernate-noorm-release-scripts/cleanup.sh"
-						}
-						catch (Throwable t) {
-							echo 'Error cleaning up after release: ' + t.toString()
-						}
-					}
+					sh 'cat $HOME/.ssh/config'
+					sh "git clone https://github.com/hibernate/hibernate-noorm-release-scripts.git"
+					sh "bash -xe hibernate-noorm-release-scripts/release.sh search ${releaseVersion.toString()} ${afterReleaseDevelopmentVersion.toString()}"
 				}
 				}
 				}