Merge branch 'main' into feat-chmod

adoptium · Aug 9, 2024 · 818b0d2 · 818b0d2
2 parents 6c36dc0 + 3af43b4
commit 818b0d2
Show file tree

Hide file tree

Showing 50 changed files with 17 additions and 240 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -45,7 +45,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+        uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+        uses: github/codeql-action/autobuild@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -68,6 +68,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+        uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -58,14 +58,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+        uses: github/codeql-action/upload-sarif@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
         with:
           sarif_file: results.sarif
diff --git a/11/jdk/alpine/entrypoint.sh b/11/jdk/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jdk/ubi/ubi9-minimal/entrypoint.sh b/11/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jdk/ubuntu/focal/entrypoint.sh b/11/jdk/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jdk/ubuntu/jammy/entrypoint.sh b/11/jdk/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jdk/ubuntu/noble/entrypoint.sh b/11/jdk/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jre/alpine/entrypoint.sh b/11/jre/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jre/ubi/ubi9-minimal/entrypoint.sh b/11/jre/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jre/ubuntu/focal/entrypoint.sh b/11/jre/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jre/ubuntu/jammy/entrypoint.sh b/11/jre/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jre/ubuntu/noble/entrypoint.sh b/11/jre/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jdk/alpine/entrypoint.sh b/17/jdk/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jdk/ubi/ubi9-minimal/entrypoint.sh b/17/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jdk/ubuntu/focal/entrypoint.sh b/17/jdk/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jdk/ubuntu/jammy/entrypoint.sh b/17/jdk/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jdk/ubuntu/noble/entrypoint.sh b/17/jdk/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jre/alpine/entrypoint.sh b/17/jre/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jre/ubi/ubi9-minimal/entrypoint.sh b/17/jre/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jre/ubuntu/focal/entrypoint.sh b/17/jre/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jre/ubuntu/jammy/entrypoint.sh b/17/jre/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jre/ubuntu/noble/entrypoint.sh b/17/jre/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jdk/alpine/entrypoint.sh b/21/jdk/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jdk/ubi/ubi9-minimal/entrypoint.sh b/21/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jdk/ubuntu/jammy/entrypoint.sh b/21/jdk/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jdk/ubuntu/noble/entrypoint.sh b/21/jdk/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jre/alpine/entrypoint.sh b/21/jre/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jre/ubi/ubi9-minimal/entrypoint.sh b/21/jre/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jre/ubuntu/jammy/entrypoint.sh b/21/jre/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jre/ubuntu/noble/entrypoint.sh b/21/jre/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/22/jdk/alpine/entrypoint.sh b/22/jdk/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then