From e8072e77483fafad4e9577e37d10c0846f79bcec Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Thu, 6 Jul 2023 10:27:32 -0400
Subject: [PATCH] gpg.sign profile and cleanup

---
 .github/workflows/eclipse-ls-extensions.yml                  | 2 +-
 eclipse-distribution/pom.xml                                 | 5 ++---
 .../pom.xml                                                  | 2 +-
 .../org.springframework.tooling.ls.repository/pom.xml        | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/eclipse-ls-extensions.yml b/.github/workflows/eclipse-ls-extensions.yml
index a5928e81c..3d78fe3ab 100644
--- a/.github/workflows/eclipse-ls-extensions.yml
+++ b/.github/workflows/eclipse-ls-extensions.yml
@@ -40,7 +40,7 @@ jobs:
           gpg_keyname: ${{ secrets.GPG_KEYID }}
         run: |
           cd eclipse-language-servers
-          xvfb-run ./mvnw --batch-mode clean deploy -Pe428 -Psnapshot -Pgitactions -DbuildNumber=${{ steps.timestamp.outputs.timestamp }} -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
+          xvfb-run ./mvnw --batch-mode clean deploy -Pe428 -Psnapshot -Pgitactions -Pgpg.sign -DbuildNumber=${{ steps.timestamp.outputs.timestamp }} -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
       - name: Verify Eclipse LS Extensions on e429
         run: |
           cd eclipse-language-servers
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 4915c6b10..245fe7736 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -686,9 +686,8 @@
 					<version>${tycho-version}</version>
 					<configuration>
 						<skipIfJarsigned>true</skipIfJarsigned>
-						<passphrase>DyNaMo1927</passphrase>
-						<keyname>B19B2D81</keyname>
-						<!--<executable>${gpg.executable}</executable>-->
+						<passphrase>${gpg.passphrase}</passphrase>
+						<keyname>${gpg.keyname}</keyname>
 						<gpgArguments>
 							<arg>--pinentry-mode=loopback</arg>
 						</gpgArguments>
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml
index cbeaa5b99..211488f5c 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml
@@ -97,7 +97,7 @@
 
 	<profiles>
 		<profile>
-			<id>gitactions</id>
+			<id>gpg.sign</id>
 			<build>
 				<plugins>
 					<plugin>
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml
index 49616cdac..e1a323bc9 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml
@@ -84,7 +84,7 @@
 
 	<profiles>
 		<profile>
-			<id>gitactions</id>
+			<id>gpg.sign</id>
 			<build>
 				<plugins>
 					<plugin>