From aed9bbdb6623c7cc3944876c123d7728dacab1f9 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Wed, 5 Jul 2023 13:26:48 -0400
Subject: [PATCH] Attempt to GPG sign eclipse ls extensions

---
 .github/workflows/eclipse-ls-extensions.yml | 24 ++++++++++-----------
 eclipse-distribution/local-build.sh         |  2 +-
 eclipse-distribution/pom.xml                |  8 +++----
 eclipse-language-servers/pom.xml            | 21 +++++++++++++++---
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/eclipse-ls-extensions.yml b/.github/workflows/eclipse-ls-extensions.yml
index e3e7dbd7f..44d70c7c0 100644
--- a/.github/workflows/eclipse-ls-extensions.yml
+++ b/.github/workflows/eclipse-ls-extensions.yml
@@ -11,14 +11,14 @@ on:
 jobs:
 
   eclipse-distro-build:
-    runs-on: [self-hosted, sts4-gha-01]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-#      - name: Set up JDK 17
-#        uses: actions/setup-java@v3
-#        with:
-#          java-version: '17'
-#          distribution: 'temurin'
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
       - name: Enforce https instead of http
         run: ./nohttp.sh
       - name: Timestamp
@@ -28,17 +28,17 @@ jobs:
         run: |
           cd headless-services
           xvfb-run mvn --batch-mode clean install -DskipTests
-      - name: Install GPG key
-        run: |
-          echo "${{ secrets.GPG_PRIVATE_KEY }}" > gpg.asc
-          echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --passphrase-fd 0 --import gpg.asc
+#      - name: Install GPG key
+#        run: |
+#          echo "${{ secrets.GPG_PRIVATE_KEY }}" > gpg.asc
+#          echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --passphrase-fd 0 --import gpg.asc
       - name: Build Eclipse LS extensions
         env:
           tools_s3_access_key: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
           tools_s3_secret_key: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
           gpg_keyname: ${{ secrets.GPG_KEYID }}
-          gpg_homedir: ${{ github.workspace }}
+#          gpg_homedir: ${{ github.workspace }}
         run: |
           cd eclipse-language-servers
-          xvfb-run mvn --batch-mode clean deploy -Pe427 -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
\ No newline at end of file
+          xvfb-run mvn --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
\ No newline at end of file
diff --git a/eclipse-distribution/local-build.sh b/eclipse-distribution/local-build.sh
index b83c97154..4e2d66ee1 100755
--- a/eclipse-distribution/local-build.sh
+++ b/eclipse-distribution/local-build.sh
@@ -1,2 +1,2 @@
-mvn clean package -Pe427 -Psnapshot -Dsigning.skip=true -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.osx.signing=true -Dskip.win.signing=true -Dskip.osx.notarizing=true
+mvn clean package -Pe428 -Psnapshot -Dsigning.skip=true -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.osx.signing=true -Dskip.win.signing=true -Dskip.osx.notarizing=true
 
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 9331f9756..4915c6b10 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -91,7 +91,7 @@
 
 		<sts4-language-servers-p2-repo>https://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
 		
-		<tycho-version>3.0.4</tycho-version>
+		<tycho-version>4.0.0</tycho-version>
 		<encoding>UTF-8</encoding>
 
 		<misc.p2.repo.version>3.9.4.202211021051</misc.p2.repo.version>
@@ -686,9 +686,9 @@
 					<version>${tycho-version}</version>
 					<configuration>
 						<skipIfJarsigned>true</skipIfJarsigned>
-						<passphrase>${env.bamboo_vault_tools_signing_gpg_secret_passphrase}</passphrase>
-						<keyname>${gpg.keyname}</keyname>
-						<executable>${gpg.executable}</executable>
+						<passphrase>DyNaMo1927</passphrase>
+						<keyname>B19B2D81</keyname>
+						<!--<executable>${gpg.executable}</executable>-->
 						<gpgArguments>
 							<arg>--pinentry-mode=loopback</arg>
 						</gpgArguments>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 39170f1c5..9dd1e74db 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -87,7 +87,7 @@
 		<!-- OSX app signing -->
 		<skip.osx.signing>true</skip.osx.signing>
 
-		<tycho-version>3.0.4</tycho-version>
+		<tycho-version>4.0.0</tycho-version>
 		<encoding>UTF-8</encoding>
 
 		<dist.accessKey>${env.bamboo_vault_tools_s3_accesskey_password}</dist.accessKey>
@@ -145,6 +145,21 @@
 				<gpg.keyname>${env.gpg_keyname}</gpg.keyname>
 				<gpg.homedir>${env.gpg_homedir}</gpg.homedir>
 			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-gpg-plugin</artifactId>
+						<executions>
+							<execution>
+								<goals>
+									<goal>sign-p2-artifacts</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 
 		<profile>
@@ -524,8 +539,8 @@
 						<skipIfJarsigned>true</skipIfJarsigned>
 						<passphrase>${gpg.passphrase}</passphrase>
 						<keyname>${gpg.keyname}</keyname>
-						<homedir>${gpg.homedir}</homedir>
-						<executable>gpg2</executable>
+						<!--<homedir>${gpg.homedir}</homedir>-->
+						<!--<executable>gpg2</executable>-->
 						<gpgArguments>
 							<arg>--pinentry-mode=loopback</arg>
 						</gpgArguments>