[jena] branch master updated: JENA-1949: Add https crypto modules from the JDK

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/master by this push:
     new 2c1617c  JENA-1949: Add https crypto modules from the JDK
     new 7ee5d34  Merge pull request #821 from afs/jena1949-crypto
2c1617c is described below

commit 2c1617cef565bf5af2475c2e25849484a97d6423
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sun Nov 1 15:15:09 2020 +0000

    JENA-1949: Add https crypto modules from the JDK
---
 jena-fuseki2/jena-fuseki-docker/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jena-fuseki2/jena-fuseki-docker/Dockerfile b/jena-fuseki2/jena-fuseki-docker/Dockerfile
index abe6d9c..aa233b8 100644
--- a/jena-fuseki2/jena-fuseki-docker/Dockerfile
+++ b/jena-fuseki2/jena-fuseki-docker/Dockerfile
@@ -59,12 +59,14 @@ RUN ./download.sh --chksum sha1 "$JAR_URL"
 ## ADD "$JAR_URL"
 
 ## -- Make reduced Java JDK
+
+ARG JDEPS_EXTRA="jdk.crypto.cryptoki,jdk.crypto.ec"
 RUN \
-  JDEPS="$(jdeps --multi-release base --print-module-deps --ignore-missing-deps ${FUSEKI_JAR})" && \
+  JDEPS="$(jdeps --multi-release base --print-module-deps --ignore-missing-deps ${FUSEKI_JAR})"  && \
   jlink \
         --compress 2 --strip-debug --no-header-files --no-man-pages \
         --output "${JAVA_MINIMAL}" \
-        --add-modules "${JDEPS}"
+        --add-modules "${JDEPS},${JDEPS_EXTRA}"
 
 ADD entrypoint.sh .
 ADD log4j2.properties .