Merged up to main

Author: cody-constine-ttd

.github/workflows/build-and-test.yaml

@@ -4,4 +4,6 @@ on: [pull_request, push, workflow_dispatch]
 jobs:
   build:
     uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v2
+    with:
+      java_version: "21"
     secrets: inherit

.github/workflows/release-docker-image.yaml

@@ -45,25 +45,26 @@ on:
 
 jobs:
   Image:
-    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-java-to-docker-versioned.yaml@v2
+    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-java-to-docker-versioned.yaml@v3
     with: 
       release_type: ${{ inputs.release_type }}
       vulnerability_severity: ${{ inputs.vulnerability_severity }}
+      java_version: 21
     secrets: inherit
 
   e2e-test:
     name: E2E Test
-    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v2
+    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3
     needs: Image
     with:
       operator_type: public
       operator_image_version: ${{ inputs.operator_image_version }}
       core_image_version: ${{ needs.image.outputs.image_tag }}
       optout_image_version: ${{ inputs.optout_image_version }}
       e2e_image_version: ${{ inputs.e2e_image_version }}
-      core_branch: ${{ github.ref_name }}
-      optout_branch: ${{ inputs.optout_branch }}
-      admin_branch: ${{ inputs.admin_branch }}
+      branch_core: ${{ github.ref_name }}
+      branch_optout: ${{ inputs.optout_branch }}
+      branch_admin: ${{ inputs.admin_branch }}
       operator_branch: ${{ inputs.operator_branch }}
     secrets: inherit
 

.github/workflows/validate-image.yaml

@@ -23,4 +23,5 @@ jobs:
     with: 
       failure_severity: ${{ inputs.failure_severity || 'CRITICAL,HIGH' }}
       fail_on_error: ${{ inputs.fail_on_error || true }}
+      java_version: "21"
     secrets: inherit

.idea/runConfigurations/uid2-core_integrated.xml

@@ -1,20 +1,21 @@
-# sha from https://hub.docker.com/layers/amd64/eclipse-temurin/11.0.22_7-jre-alpine/images/sha256-d7a82981336958683f147f17396fe2219cb1072a5853e8a8ef16d07f0535343a?context=explore
-FROM eclipse-temurin@sha256:564eb67091b2cda82952299b4be52bf1b039289234b52f46057fe1286c173b71
+# sha from https://hub.docker.com/layers/amd64/eclipse-temurin/21.0.4_7-jre-alpine/images/sha256-8179ddc8a6c5ac9af935020628763b9a5a671e0914976715d2b61b21881cefca
+FROM eclipse-temurin@sha256:8179ddc8a6c5ac9af935020628763b9a5a671e0914976715d2b61b21881cefca
 
 WORKDIR /app
 EXPOSE 8088
 
 ARG JAR_NAME=uid2-core
 ARG JAR_VERSION=1.0.0-SNAPSHOT
 ARG IMAGE_VERSION=1.0.0.unknownhash
+ARG EXTRA_CONFIG
 ENV JAR_NAME=${JAR_NAME}
 ENV JAR_VERSION=${JAR_VERSION}
 ENV IMAGE_VERSION=${IMAGE_VERSION}
 ENV LOGBACK_CONF=${LOGBACK_CONF:-./conf/logback.xml}
 
 COPY ./target/${JAR_NAME}-${JAR_VERSION}-jar-with-dependencies.jar /app/${JAR_NAME}-${JAR_VERSION}.jar
 COPY ./target/${JAR_NAME}-${JAR_VERSION}-sources.jar /app
-COPY ./conf/default-config.json /app/conf/
+COPY ./conf/default-config.json ${EXTRA_CONFIG} /app/conf/
 COPY ./conf/*.xml /app/conf/
 
 RUN adduser -D uid2-core && mkdir -p /app && chmod 705 -R /app && mkdir -p /app/file-uploads && chmod 777 -R /app/file-uploads