This commit is contained in:
Philip Helger 2025-08-08 12:08:29 +02:00
parent 6950a98f09
commit 910320a5f1
4 changed files with 16 additions and 34 deletions

View file

@ -35,9 +35,18 @@ cache:
rules: rules:
- if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_PIPELINE_SOURCE == "schedule"
# Note: image "maven:3-eclipse-temurin-8-alpine" does not work!
java-8:
extends: .java
image: $CI_REGISTRY_IMAGE/maven:3-jdk-8
java-8-openj9:
extends: .java_extended
image: $CI_REGISTRY_IMAGE/maven:3-jdk-8-openj9
java-11: java-11:
extends: .java extends: .java
image: $CI_REGISTRY_IMAGE/maven:3-jdk-11 image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-11-alpine
needs: [ ] needs: [ ]
script: script:
- mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP install - mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP install
@ -52,37 +61,13 @@ java-11:
- target/surefire-reports/*.xml - target/surefire-reports/*.xml
- target/failsafe-reports/*.xml - target/failsafe-reports/*.xml
java8:
extends: .java
image: $CI_REGISTRY_IMAGE/maven:3-jdk-8
java-11-openj9: java-11-openj9:
extends: .java_extended extends: .java_extended
image: $CI_REGISTRY_IMAGE/maven:3-jdk-11-openj9 image: $CI_REGISTRY_IMAGE/maven:3-jdk-11-openj9
java-8-openj9:
extends: .java_extended
image: $CI_REGISTRY_IMAGE/maven:3-jdk-8-openj9
java-15:
extends: .java_extended
image: $CI_REGISTRY_IMAGE/maven:3-openjdk-15
java-16:
extends: .java_extended
image: $CI_REGISTRY_IMAGE/maven:3-openjdk-16
java-17: java-17:
extends: .java extends: .java
image: $CI_REGISTRY_IMAGE/maven:3-openjdk-17 image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-17-alpine
java-18:
extends: .java_extended
image: $CI_REGISTRY_IMAGE/maven:3-openjdk-18
java-19:
extends: .java_extended
image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-19-alpine
java-21: java-21:
extends: .java extends: .java
@ -94,7 +79,7 @@ java-24:
deploy: deploy:
stage: deploy stage: deploy
image: $CI_REGISTRY_IMAGE/maven:3-jdk-11 image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-11-alpine
needs: needs:
- job: java-11 - job: java-11
script: script:
@ -124,7 +109,7 @@ create-build-image:
owasp-check: owasp-check:
extends: .java extends: .java
image: $CI_REGISTRY_IMAGE/maven:3-jdk-11 image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-11-alpine
needs: [ ] needs: [ ]
script: script:
- mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP validate -Powasp-check - mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP validate -Powasp-check
@ -134,5 +119,3 @@ owasp-check:
changes: changes:
- pom.xml - pom.xml
- owasp-suppressions.xml - owasp-suppressions.xml

View file

@ -16,7 +16,7 @@
# limitations under the License. # limitations under the License.
# #
TAGS=("3-openjdk-16" "3-jdk-11" "3-jdk-11-openj9" "3-jdk-8" "3-jdk-8-openj9" "3-openjdk-15" "3-openjdk-17" "3-openjdk-18" "3-eclipse-temurin-19-alpine") TAGS=("3-jdk-8" "3-jdk-8-openj9" "3-eclipse-temurin-11-alpine" "3-jdk-11-openj9" "3-eclipse-temurin-17-alpine" "3-eclipse-temurin-21-alpine" "3-eclipse-temurin-24-alpine")
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY" docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
for i in "${TAGS[@]}" for i in "${TAGS[@]}"

View file

@ -59,8 +59,8 @@ cleanup_profile=_initCleanUpProfile
cleanup_settings_version=2 cleanup_settings_version=2
eclipse.preferences.version=1 eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=_initFormatterProfile formatter_profile=_init
formatter_settings_version=12 formatter_settings_version=23
org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.ignorelowercasenames=true
org.eclipse.jdt.ui.importorder=java;javax;org;com;lombok;de; org.eclipse.jdt.ui.importorder=java;javax;org;com;lombok;de;
org.eclipse.jdt.ui.javadoc=true org.eclipse.jdt.ui.javadoc=true

View file

@ -18,7 +18,6 @@
<schema xmlns:context="http://www.springframework.org/schema/context" xmlns="http://www.w3.org/2001/XMLSchema" <schema xmlns:context="http://www.springframework.org/schema/context" xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://www.example.org/main" targetNamespace="http://www.example.org/main"
elementFormDefault="qualified"> elementFormDefault="qualified">
<import namespace="http://www.springframework.org/schema/context" <import namespace="http://www.springframework.org/schema/context"
schemaLocation="https://www.springframework.org/schema/context/spring-context.xsd" /> schemaLocation="https://www.springframework.org/schema/context/spring-context.xsd" />