diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcbfef3014..7a6be9deca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,6 +144,9 @@ if(BUILD_JAVA)
option(UNIVERSAL_JAVA_PACKAGE "Build a Java multi OS Package" OFF)
message(STATUS "Java multiple os package: ${UNIVERSAL_JAVA_PACKAGE}")
+
+ set(GPG_ARGS "--pinentry-modeloopback" CACHE STRING "Extra options for GPG")
+ message(STATUS "GPG options: ${GPG_ARGS}")
endif()
# By default all dependencies are NOT built (i.e. BUILD_DEPS=OFF),
diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk
index c12dc303c2..cd1132e2c8 100644
--- a/makefiles/Makefile.java.mk
+++ b/makefiles/Makefile.java.mk
@@ -405,6 +405,8 @@ else
GPG_SIGN= -Dgpg.skip=true
endif
+GPG_ARGS ?= --pinentry-modeloopback
+
###################
## Maven package ##
###################
@@ -424,6 +426,8 @@ $(TEMP_JAVA_DIR)/$(JAVA_ORTOOLS_NATIVE_PROJECT)/pom.xml: \
$(SED) -i -e 's/@JAVA_PACKAGE@/$(JAVA_ORTOOLS_PACKAGE)/' \
$(TEMP_JAVA_DIR)$S$(JAVA_ORTOOLS_NATIVE_PROJECT)$Spom.xml
$(SED) -i -e 's/@JAVA_NATIVE_PROJECT@/$(JAVA_ORTOOLS_NATIVE_PROJECT)/' \
+ $(TEMP_JAVA_DIR)$S$(JAVA_ORTOOLS_NATIVE_PROJECT)$Spom.xml
+ $(SED) -i -e 's;@GPG_ARGS@;$(GPG_ARGS);' \
$(TEMP_JAVA_DIR)$S$(JAVA_ORTOOLS_NATIVE_PROJECT)$Spom.xml
.PHONY: java_runtime_pimpl
@@ -463,6 +467,8 @@ $(TEMP_JAVA_DIR)/$(JAVA_ORTOOLS_PROJECT)/pom.xml: \
$(SED) -i -e 's/@JAVA_NATIVE_PROJECT@/$(JAVA_ORTOOLS_NATIVE_PROJECT)/' \
$(TEMP_JAVA_DIR)$S$(JAVA_ORTOOLS_PROJECT)$Spom.xml
$(SED) -i -e 's/@JAVA_PROJECT@/$(JAVA_ORTOOLS_PROJECT)/' \
+ $(TEMP_JAVA_DIR)$S$(JAVA_ORTOOLS_PROJECT)$Spom.xml
+ $(SED) -i -e 's;@GPG_ARGS@;$(GPG_ARGS);' \
$(TEMP_JAVA_DIR)$S$(JAVA_ORTOOLS_PROJECT)$Spom.xml
.PHONY: java_pimpl
diff --git a/ortools/java/pom-full.xml.in b/ortools/java/pom-full.xml.in
index 384517cfee..6a2a3befbc 100644
--- a/ortools/java/pom-full.xml.in
+++ b/ortools/java/pom-full.xml.in
@@ -146,8 +146,7 @@
- --pinentry-mode
- loopback
+ @GPG_ARGS@
diff --git a/ortools/java/pom-local.xml.in b/ortools/java/pom-local.xml.in
index a9a75c7e54..7d0d5c5f5e 100644
--- a/ortools/java/pom-local.xml.in
+++ b/ortools/java/pom-local.xml.in
@@ -132,8 +132,7 @@
- --pinentry-mode
- loopback
+ @GPG_ARGS@
diff --git a/ortools/java/pom-native.xml.in b/ortools/java/pom-native.xml.in
index f54cd1dec7..a909c0f749 100644
--- a/ortools/java/pom-native.xml.in
+++ b/ortools/java/pom-native.xml.in
@@ -117,8 +117,7 @@
- --pinentry-mode
- loopback
+ @GPG_ARGS@
diff --git a/tools/release/Dockerfile b/tools/release/Dockerfile
index 2eebbc0418..ffa1354787 100644
--- a/tools/release/Dockerfile
+++ b/tools/release/Dockerfile
@@ -84,6 +84,8 @@ RUN git clone -b "${ORTOOLS_GIT_BRANCH}" --single-branch https://github.com/goog
FROM devel AS delivery
WORKDIR /root/or-tools
+ENV GPG_ARGS ""
+
ARG ORTOOLS_TOKEN
ENV ORTOOLS_TOKEN ${ORTOOLS_TOKEN}
ARG ORTOOLS_DELIVERY