From 3c1f29715bc4ab1007d4f8b4dfebe46fb811765e Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Wed, 5 Jul 2023 19:31:17 -0400
Subject: [PATCH] Use default gpg executable. Install gpg key

---
 .github/workflows/eclipse-ls-extensions.yml | 8 ++++----
 eclipse-language-servers/pom.xml            | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/eclipse-ls-extensions.yml b/.github/workflows/eclipse-ls-extensions.yml
index 77c2332a8..eddc44a6e 100644
--- a/.github/workflows/eclipse-ls-extensions.yml
+++ b/.github/workflows/eclipse-ls-extensions.yml
@@ -28,10 +28,10 @@ jobs:
         run: |
           cd headless-services
           xvfb-run ./mvnw --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 }}
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index a420d5e6c..4770a9d1a 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -144,7 +144,7 @@
 				<gpg.passphrase>${env.gpg_passphrase}</gpg.passphrase>
 				<gpg.keyname>${env.gpg_keyname}</gpg.keyname>
 				<gpg.homedir>${env.gpg_homedir}</gpg.homedir>
-				<gpg.executable>gpg2</gpg.executable>
+				<!--<gpg.executable>gpg2</gpg.executable>-->
 			</properties>
 		</profile>
 
@@ -526,7 +526,7 @@
 						<passphrase>${gpg.passphrase}</passphrase>
 						<keyname>${gpg.keyname}</keyname>
 						<!--<homedir>${gpg.homedir}</homedir>-->
-						<executable>${gpg.executable}</executable>
+						<!--<executable>${gpg.executable}</executable>-->
 						<gpgArguments>
 							<arg>--pinentry-mode=loopback</arg>
 						</gpgArguments>