fix: remove old version of Java Servlet API (#2699)

* remove old version of Java Servlet API Signed-off-by: Pavel Jareš <[email protected]> Signed-off-by: achmelo <[email protected]> * openssl legacy key algorithm provider Signed-off-by: achmelo <[email protected]> * run redis only Signed-off-by: achmelo <[email protected]> * Revert "run redis only" This reverts commit 2b3fdc5. Signed-off-by: achmelo <[email protected]> Signed-off-by: Pavel Jareš <[email protected]> Signed-off-by: achmelo <[email protected]> Co-authored-by: Pavel Jareš <[email protected]>
zowe · Dec 5, 2022 · 190f4b8 · 190f4b8
1 parent ac0b3f0
commit 190f4b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -68,6 +68,10 @@ allprojects {
             downloadSources = true
         }
     }
+
+    configurations.all {
+        exclude group: "javax.servlet", module: "servlet-api"
+    }
 }
 
 subprojects {

diff --git a/docker/redis/run-redis.sh b/docker/redis/run-redis.sh
@@ -173,7 +173,7 @@ genKeyPairCert apimtst
 genKeyPairCert user
 genKeyPairCert unknownuser
 log "Extracting private key"
-openssl pkcs12 -in "${KEYSTORE}" -nocerts -out "${KEYSTORE_DIR}/all-services.keystore.key" -passin pass:password -passout pass:password
+openssl pkcs12 -in "${KEYSTORE}" -legacy -nocerts -out "${KEYSTORE_DIR}/all-services.keystore.key" -passin pass:password -passout pass:password
 
 log "Setting permissions for keystore files"
 chmod -R 775 "${KEYSTORE_DIR}"