From 432aa4b3f2c7b9bb6ebd18974a2dbf1d1acbb8c4 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/4] HSEARCH-4415 Define maven gpg plugin for public artifacts

---
 build-config/pom.xml                          |  7 ++++
 distribution/pom.xml                          |  1 +
 documentation/pom.xml                         |  1 +
 integrationtest/elasticsearch/pom.xml         |  7 ++++
 integrationtest/jdk9-modules/pom.xml          |  7 ++++
 integrationtest/jms/pom.xml                   |  7 ++++
 integrationtest/jsr352/pom.xml                |  7 ++++
 integrationtest/narayana/pom.xml              |  7 ++++
 integrationtest/osgi/karaf-features/pom.xml   |  7 ++++
 integrationtest/osgi/karaf-it/pom.xml         |  7 ++++
 .../performance/engine-elasticsearch/pom.xml  |  7 ++++
 .../performance/engine-lucene/pom.xml         |  7 ++++
 integrationtest/performance/orm/pom.xml       |  7 ++++
 integrationtest/performance/sandbox/pom.xml   |  7 ++++
 integrationtest/spring/pom.xml                |  7 ++++
 integrationtest/wildfly/pom.xml               |  7 ++++
 jbossmodules/testing/pom.xml                  |  7 ++++
 pom.xml                                       | 33 +++++++++++++++++++
 reports/pom.xml                               |  1 +
 sharedtestresources/pom.xml                   |  7 ++++
 20 files changed, 148 insertions(+)

diff --git a/build-config/pom.xml b/build-config/pom.xml
index 2e9bf951752..ae3606c5d1b 100644
--- a/build-config/pom.xml
+++ b/build-config/pom.xml
@@ -34,6 +34,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 8cc354a36d0..cc2a59d69a8 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -24,6 +24,7 @@
     <properties>
         <!-- Skip artifact deployment -->
         <maven.deploy.skip>true</maven.deploy.skip>
+        <gpg.skip>true</gpg.skip>
     </properties>
 
     <dependencies>
diff --git a/documentation/pom.xml b/documentation/pom.xml
index fcb7a78b23c..f6190a76205 100644
--- a/documentation/pom.xml
+++ b/documentation/pom.xml
@@ -36,6 +36,7 @@
 
         <!-- Skip artifact deployment -->
         <maven.deploy.skip>true</maven.deploy.skip>
+        <gpg.skip>true</gpg.skip>
         <!-- Skip javadoc generation -->
         <maven.javadoc.skip>true</maven.javadoc.skip>
     </properties>
diff --git a/integrationtest/elasticsearch/pom.xml b/integrationtest/elasticsearch/pom.xml
index fd94414014b..52fa90575a7 100755
--- a/integrationtest/elasticsearch/pom.xml
+++ b/integrationtest/elasticsearch/pom.xml
@@ -210,6 +210,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
diff --git a/integrationtest/jdk9-modules/pom.xml b/integrationtest/jdk9-modules/pom.xml
index c385fc64d16..c7c3d39a156 100644
--- a/integrationtest/jdk9-modules/pom.xml
+++ b/integrationtest/jdk9-modules/pom.xml
@@ -100,6 +100,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
 
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/integrationtest/jms/pom.xml b/integrationtest/jms/pom.xml
index 1660fed2f3d..9b692609c80 100644
--- a/integrationtest/jms/pom.xml
+++ b/integrationtest/jms/pom.xml
@@ -109,6 +109,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
diff --git a/integrationtest/jsr352/pom.xml b/integrationtest/jsr352/pom.xml
index b0b6a60a439..376695334b1 100755
--- a/integrationtest/jsr352/pom.xml
+++ b/integrationtest/jsr352/pom.xml
@@ -153,6 +153,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
diff --git a/integrationtest/narayana/pom.xml b/integrationtest/narayana/pom.xml
index a232a277307..9d60b75e196 100755
--- a/integrationtest/narayana/pom.xml
+++ b/integrationtest/narayana/pom.xml
@@ -71,6 +71,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
diff --git a/integrationtest/osgi/karaf-features/pom.xml b/integrationtest/osgi/karaf-features/pom.xml
index 8e19dbd3ace..8a644e7db13 100644
--- a/integrationtest/osgi/karaf-features/pom.xml
+++ b/integrationtest/osgi/karaf-features/pom.xml
@@ -82,6 +82,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
 
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/integrationtest/osgi/karaf-it/pom.xml b/integrationtest/osgi/karaf-it/pom.xml
index ff9e4f0a60c..f3b8af41811 100644
--- a/integrationtest/osgi/karaf-it/pom.xml
+++ b/integrationtest/osgi/karaf-it/pom.xml
@@ -211,6 +211,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
 
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/integrationtest/performance/engine-elasticsearch/pom.xml b/integrationtest/performance/engine-elasticsearch/pom.xml
index 9b5dfe1a7fa..4dcb0c4d3bf 100644
--- a/integrationtest/performance/engine-elasticsearch/pom.xml
+++ b/integrationtest/performance/engine-elasticsearch/pom.xml
@@ -90,6 +90,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
diff --git a/integrationtest/performance/engine-lucene/pom.xml b/integrationtest/performance/engine-lucene/pom.xml
index ba916b2e190..29b2ba29b03 100644
--- a/integrationtest/performance/engine-lucene/pom.xml
+++ b/integrationtest/performance/engine-lucene/pom.xml
@@ -82,6 +82,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
diff --git a/integrationtest/performance/orm/pom.xml b/integrationtest/performance/orm/pom.xml
index f029d2c7095..63c8f1e0163 100755
--- a/integrationtest/performance/orm/pom.xml
+++ b/integrationtest/performance/orm/pom.xml
@@ -224,6 +224,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
diff --git a/integrationtest/performance/sandbox/pom.xml b/integrationtest/performance/sandbox/pom.xml
index 47cdd7a081f..3b7f2db0f7a 100755
--- a/integrationtest/performance/sandbox/pom.xml
+++ b/integrationtest/performance/sandbox/pom.xml
@@ -69,6 +69,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
diff --git a/integrationtest/spring/pom.xml b/integrationtest/spring/pom.xml
index 3af64326c04..b8d67e33e9a 100755
--- a/integrationtest/spring/pom.xml
+++ b/integrationtest/spring/pom.xml
@@ -146,6 +146,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
diff --git a/integrationtest/wildfly/pom.xml b/integrationtest/wildfly/pom.xml
index d88f8d0d13b..a1140bfc246 100755
--- a/integrationtest/wildfly/pom.xml
+++ b/integrationtest/wildfly/pom.xml
@@ -255,6 +255,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
diff --git a/jbossmodules/testing/pom.xml b/jbossmodules/testing/pom.xml
index 994c899cf2d..15ad53362e7 100644
--- a/jbossmodules/testing/pom.xml
+++ b/jbossmodules/testing/pom.xml
@@ -66,6 +66,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
diff --git a/pom.xml b/pom.xml
index 4af7b275697..c4e7c4105ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -335,6 +335,7 @@
         <version.jacoco.plugin>0.8.3</version.jacoco.plugin>
         <version.coveralls.plugin>4.3.0</version.coveralls.plugin>
         <version.org.jboss.bridger.plugin>1.5.Final</version.org.jboss.bridger.plugin>
+        <version.gpg.plugin>3.0.1</version.gpg.plugin>
 
         <!--
             Please don't change the name of this property, it may be used and
@@ -1868,6 +1869,11 @@
                     <artifactId>bridger</artifactId>
                     <version>${version.org.jboss.bridger.plugin}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>${version.gpg.plugin}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
@@ -2009,6 +2015,33 @@
             </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>
+
         <profile>
             <id>jdk8</id>
             <activation>
diff --git a/reports/pom.xml b/reports/pom.xml
index df35101b697..34a0a5bc9af 100644
--- a/reports/pom.xml
+++ b/reports/pom.xml
@@ -23,6 +23,7 @@
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
+        <gpg.skip>true</gpg.skip>
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <!--
         Disable the dependency convergence rule, because the dependencies of various integration tests do not converge
diff --git a/sharedtestresources/pom.xml b/sharedtestresources/pom.xml
index 933e2797d81..2e0686a1a85 100644
--- a/sharedtestresources/pom.xml
+++ b/sharedtestresources/pom.xml
@@ -26,6 +26,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>

From 2753f1914437558dcf7f0f356d84396d1b8df7ed 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/4] HSEARCH-4415 Sign artifacts in Jenkinsfile releases

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

diff --git a/Jenkinsfile b/Jenkinsfile
index b6b228a5778..66a7d7dcd33 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -541,9 +541,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']) {
+				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"
@@ -569,6 +575,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/pom.xml b/pom.xml
index c4e7c4105ff..544815e4f3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1873,6 +1873,10 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
                     <version>${version.gpg.plugin}</version>
+                    <configuration>
+                        <homedir>${env.RELEASE_GPG_HOMEDIR}</homedir>
+                        <passphrase>${env.RELEASE_GPG_PASSPHRASE}</passphrase>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>

From fc6913afbcee6930f9d0d9a9638d36b471b972e7 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/4] 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 66a7d7dcd33..b889cb3ccfc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -544,45 +544,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()}"
 				}
 				}
 				}

From 408d10c861dbf7b2d84e72c9a3ab443a28e6f379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Tue, 25 Jan 2022 13:16:03 +0100
Subject: [PATCH 4/4] HSEARCH-4415 Correctly set RELEASE_GPG_HOMEDIR during
 releases

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index b889cb3ccfc..23b0dfe1cae 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -546,6 +546,7 @@ stage('Deploy') {
 				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()}"
 				}
 				}