From c2ac6ed426162b2584a66ea7fea2363236e3b9f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20M=C3=BChleisen?= <hannes@muehleisen.org>
Date: Wed, 30 Oct 2024 14:41:25 +0100
Subject: [PATCH] move back

---
 .github/workflows/Java.yml   | 3 ---
 scripts/jdbc_maven_deploy.py | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml
index 1ec84a44..5c724289 100644
--- a/.github/workflows/Java.yml
+++ b/.github/workflows/Java.yml
@@ -37,9 +37,6 @@ jobs:
       - name: Combine JARs
         shell: bash
         run: |
-          mkdir -p ~/.gnupg
-          echo -e "use-agent\npinentry-mode loopback\nno-tty\nbatch\n" > ~/.gnupg/gpg.conf
-          echo -e "allow-loopback-pinentry\n" > ~/.gnupg/gpg-agent.conf
           export XML='
             <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/scripts/jdbc_maven_deploy.py b/scripts/jdbc_maven_deploy.py
index 195f1d90..1673519e 100644
--- a/scripts/jdbc_maven_deploy.py
+++ b/scripts/jdbc_maven_deploy.py
@@ -182,7 +182,7 @@ def exec(cmd):
     shutil.copyfile(jar, os.path.join(results_dir, os.path.basename(jar)))
 
 print("JARs created, uploading (this can take a while!)")
-deploy_cmd_prefix = 'mvn gpg:sign-and-deploy-file -Durl=%s -DrepositoryId=ossrh' % deploy_url
+deploy_cmd_prefix = 'mvn gpg:sign-and-deploy-file -DgpgArguments=--batch -Dpassphrase= -Durl=%s -DrepositoryId=ossrh' % deploy_url
 exec("%s -DpomFile=%s -Dfile=%s" % (deploy_cmd_prefix, pom, binary_jar))
 exec("%s -Dclassifier=sources -DpomFile=%s -Dfile=%s" % (deploy_cmd_prefix, pom, sources_jar))
 exec("%s -Dclassifier=javadoc -DpomFile=%s -Dfile=%s" % (deploy_cmd_prefix, pom, javadoc_jar))