Merge branch 'release/v12'

europeana · Apr 12, 2024 · 96197c4 · 96197c4
2 parents 0fa2f21 + cb62ebd
commit 96197c4
Show file tree

Hide file tree

Showing 402 changed files with 11,270 additions and 189,027 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on: push
 jobs:
 
   ci:
-    uses: europeana/metis-actions/.github/workflows/ci.yml@main
+    uses: europeana/metis-actions/.github/workflows/ci.yml@jdk21
     with:
       sonar_organization: europeana
       sonar_project_key: europeana_metis-framework
@@ -14,14 +14,14 @@ jobs:
 
   deploy-artifacts:
     needs: ci
-    uses: europeana/metis-actions/.github/workflows/deploy-artifacts.yml@main
+    uses: europeana/metis-actions/.github/workflows/deploy-artifacts.yml@jdk21
     secrets:
       ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
       ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
 
   docker-build_metis-authentication:
     needs: ci
-    uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@main
+    uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk21
     with:
       docker-organization: europeana
       docker-image-name: metis-authentication
@@ -31,7 +31,7 @@ jobs:
       DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
   docker-build_metis-core:
     needs: ci
-    uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@main
+    uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk21
     with:
       docker-organization: europeana
       docker-image-name: metis-core
@@ -41,7 +41,7 @@ jobs:
       DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
   docker-build_metis-dereference:
     needs: ci
-    uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@main
+    uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk21
     with:
       docker-organization: europeana
       docker-image-name: metis-dereference
@@ -51,7 +51,7 @@ jobs:
       DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
   docker-build_metis-repository:
     needs: ci
-    uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@main
+    uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk21
     with:
       docker-organization: europeana
       docker-image-name: metis-repository

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   ci-release:
-    uses: europeana/metis-actions/.github/workflows/release.yml@main
+    uses: europeana/metis-actions/.github/workflows/release.yml@jdk21
     with:
       release-version: ${{ github.event.inputs.release-version }}
       commit-hash-branch: ${{ github.event.inputs.commit-hash-branch }}

diff --git a/.run/metis-authentication(.properties).run.xml b/.run/metis-authentication(.properties).run.xml
diff --git a/.run/metis-authentication-rest_Dockerfile.run.xml b/.run/metis-authentication-rest_Dockerfile.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="metis-authentication-rest/Dockerfile" type="docker-deploy"
+                   factoryName="dockerfile" folderName="docker-run-configuration" server-name="Docker">
+        <deployment type="dockerfile">
+            <settings>
+                <option name="imageTag" value="europeana/metis-authentication"/>
+                <option name="containerName" value="metis-authentication"/>
+                <option name="commandLineOptions"
+                        value="-p 8080:8080  -v /data/metis-configuration/k8s/common-components/custom-truststore-jks/custom-truststore.jks:/data/certificates/custom-truststore.jks -v /data/metis-configuration/metis-framework/metis-authentication/metis-authentication-rest/k8s/overlays/local/components/properties/application.properties:/application.properties -v /data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml:/data/logging/log4j2.xml"/>
+                <option name="sourceFilePath" value="metis-authentication/metis-authentication-rest/Dockerfile"/>
+            </settings>
+        </deployment>
+        <method v="2"/>
+    </configuration>
+</component>
diff --git a/.run/metis-authentication.run.xml b/.run/metis-authentication.run.xml
@@ -0,0 +1,36 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="metis-authentication" type="SpringBootApplicationConfigurationType"
+                   factoryName="Spring Boot" folderName="spring-run-configuration">
+        <option name="ALTERNATIVE_JRE_PATH" value="temurin-21"/>
+        <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true"/>
+        <envs>
+            <env name="logging.config"
+                 value="file:///data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml"/>
+            <env name="server.servlet.context-path" value="/metis-authentication"/>
+            <env name="spring.config.location"
+                 value="file:///data/metis-configuration/metis-framework/metis-authentication/metis-authentication-rest/k8s/overlays/local/components/properties/application.properties"/>
+            <env name="truststore.path"
+                 value="/data/metis-configuration/k8s/common-components/custom-truststore-jks/custom-truststore.jks"/>
+        </envs>
+        <module name="metis-authentication-rest"/>
+        <option name="SPRING_BOOT_MAIN_CLASS" value="eu.europeana.metis.authentication.rest.Application"/>
+        <extension name="net.ashald.envfile">
+            <option name="IS_ENABLED" value="false"/>
+            <option name="IS_SUBST" value="false"/>
+            <option name="IS_PATH_MACRO_SUPPORTED" value="false"/>
+            <option name="IS_IGNORE_MISSING_FILES" value="false"/>
+            <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false"/>
+            <ENTRIES>
+                <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false"/>
+            </ENTRIES>
+        </extension>
+        <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+            <option name="credential"/>
+            <option name="region"/>
+            <option name="useCurrentConnection" value="false"/>
+        </extension>
+        <method v="2">
+            <option name="Make" enabled="true"/>
+        </method>
+    </configuration>
+</component>
diff --git a/.run/metis-core (.properties).run.xml b/.run/metis-core (.properties).run.xml
diff --git a/.run/metis-core-rest_Dockerfile.run.xml b/.run/metis-core-rest_Dockerfile.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="metis-core-rest/Dockerfile" type="docker-deploy" factoryName="dockerfile"
+                   folderName="docker-run-configuration" server-name="Docker">
+        <deployment type="dockerfile">
+            <settings>
+                <option name="imageTag" value="europeana/metis-core"/>
+                <option name="containerName" value="metis-core"/>
+                <option name="commandLineOptions"
+                        value="-p 8080:8080  -v /data/metis-configuration/metis-framework/metis-core/metis-core-rest/k8s/overlays/local/components/properties/application.properties:/application.properties -v /data/metis-configuration/k8s/common-components/custom-truststore-jks/custom-truststore.jks:/data/certificates/custom-truststore.jks -v /data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml:/data/logging/log4j2.xml"/>
+                <option name="sourceFilePath" value="metis-core/metis-core-rest/Dockerfile"/>
+            </settings>
+        </deployment>
+        <method v="2"/>
+    </configuration>
+</component>
diff --git a/.run/metis-core.run.xml b/.run/metis-core.run.xml
@@ -0,0 +1,42 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="metis-core" type="SpringBootApplicationConfigurationType"
+                   factoryName="Spring Boot" folderName="spring-run-configuration">
+        <option name="ALTERNATIVE_JRE_PATH" value="temurin-21"/>
+        <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true"/>
+        <envs>
+            <env name="logging.config"
+                 value="file:///data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml"/>
+            <env name="server.servlet.context-path" value="/metis-core"/>
+            <env name="spring.config.location"
+                 value="file:///data/metis-configuration/metis-framework/metis-core/metis-core-rest/k8s/overlays/local/components/properties/application.properties"/>
+            <env name="truststore.path"
+                 value="/data/metis-configuration/k8s/common-components/custom-truststore-jks/custom-truststore.jks"/>
+        </envs>
+        <module name="metis-core-rest"/>
+        <option name="SPRING_BOOT_MAIN_CLASS" value="eu.europeana.metis.core.rest.Application"/>
+        <extension name="coverage">
+            <pattern>
+                <option name="PATTERN" value="eu.europeana.metis.core.rest.*"/>
+                <option name="ENABLED" value="true"/>
+            </pattern>
+        </extension>
+        <extension name="net.ashald.envfile">
+            <option name="IS_ENABLED" value="false"/>
+            <option name="IS_SUBST" value="false"/>
+            <option name="IS_PATH_MACRO_SUPPORTED" value="false"/>
+            <option name="IS_IGNORE_MISSING_FILES" value="false"/>
+            <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false"/>
+            <ENTRIES>
+                <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false"/>
+            </ENTRIES>
+        </extension>
+        <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+            <option name="credential"/>
+            <option name="region"/>
+            <option name="useCurrentConnection" value="false"/>
+        </extension>
+        <method v="2">
+            <option name="Make" enabled="true"/>
+        </method>
+    </configuration>
+</component>
diff --git a/.run/metis-dereference(.properties).run.xml b/.run/metis-dereference(.properties).run.xml
diff --git a/.run/metis-dereference-rest_Dockerfile.run.xml b/.run/metis-dereference-rest_Dockerfile.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="metis-dereference-rest/Dockerfile" type="docker-deploy"
+                   factoryName="dockerfile" folderName="docker-run-configuration" server-name="Docker">
+        <deployment type="dockerfile">
+            <settings>
+                <option name="imageTag" value="europeana/metis-dereference"/>
+                <option name="containerName" value="metis-dereference"/>
+                <option name="commandLineOptions"
+                        value="-p 8080:8080  -v /data/metis-configuration/metis-framework/metis-dereference/metis-dereference-rest/k8s/overlays/local/components/properties/application.properties:/application.properties -v /data/metis-configuration/k8s/common-components/custom-truststore-jks/custom-truststore.jks:/data/certificates/custom-truststore.jks -v /data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml:/data/logging/log4j2.xml"/>
+                <option name="sourceFilePath" value="metis-dereference/metis-dereference-rest/Dockerfile"/>
+            </settings>
+        </deployment>
+        <method v="2"/>
+    </configuration>
+</component>
diff --git a/.run/metis-dereference.run.xml b/.run/metis-dereference.run.xml
@@ -0,0 +1,42 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="metis-dereference" type="SpringBootApplicationConfigurationType"
+                   factoryName="Spring Boot" folderName="spring-run-configuration">
+        <option name="ALTERNATIVE_JRE_PATH" value="temurin-21"/>
+        <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true"/>
+        <envs>
+            <env name="logging.config"
+                 value="file:///data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml"/>
+            <env name="server.servlet.context-path" value="/metis-dereference"/>
+            <env name="spring.config.location"
+                 value="file:///data/metis-configuration/metis-framework/metis-dereference/metis-dereference-rest/k8s/overlays/local/components/properties/application.properties"/>
+            <env name="truststore.path"
+                 value="/data/metis-configuration/k8s/common-components/custom-truststore-jks/custom-truststore.jks"/>
+        </envs>
+        <module name="metis-dereference-rest"/>
+        <option name="SPRING_BOOT_MAIN_CLASS" value="eu.europeana.metis.dereference.rest.Application"/>
+        <extension name="coverage">
+            <pattern>
+                <option name="PATTERN" value="eu.europeana.metis.dereference.rest.*"/>
+                <option name="ENABLED" value="true"/>
+            </pattern>
+        </extension>
+        <extension name="net.ashald.envfile">
+            <option name="IS_ENABLED" value="false"/>
+            <option name="IS_SUBST" value="false"/>
+            <option name="IS_PATH_MACRO_SUPPORTED" value="false"/>
+            <option name="IS_IGNORE_MISSING_FILES" value="false"/>
+            <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false"/>
+            <ENTRIES>
+                <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false"/>
+            </ENTRIES>
+        </extension>
+        <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+            <option name="credential"/>
+            <option name="region"/>
+            <option name="useCurrentConnection" value="false"/>
+        </extension>
+        <method v="2">
+            <option name="Make" enabled="true"/>
+        </method>
+    </configuration>
+</component>