From acd7740846b80b858f7ff926d6c810b036361772 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Thu, 7 Aug 2025 11:11:33 +0200 Subject: [PATCH 01/34] Using https URL --- src/test/resources/examples/resolving/withRemote.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/examples/resolving/withRemote.xsd b/src/test/resources/examples/resolving/withRemote.xsd index 1811f74..26a85da 100644 --- a/src/test/resources/examples/resolving/withRemote.xsd +++ b/src/test/resources/examples/resolving/withRemote.xsd @@ -20,7 +20,7 @@ elementFormDefault="qualified"> + schemaLocation="https://www.springframework.org/schema/context/spring-context.xsd" /> From 910320a5f1a8a4af32a1b21a1d8e87e1804e08b7 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Fri, 8 Aug 2025 12:08:29 +0200 Subject: [PATCH 02/34] Resolve #137 --- .gitlab-ci.yml | 43 ++++++------------- .mvn/createBuildImages.sh | 2 +- .settings/org.eclipse.jdt.ui.prefs | 4 +- .../examples/resolving/withRemote.xsd | 1 - 4 files changed, 16 insertions(+), 34 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e767682..5673d45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,9 +35,18 @@ cache: rules: - 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: extends: .java - image: $CI_REGISTRY_IMAGE/maven:3-jdk-11 + image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-11-alpine needs: [ ] script: - mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP install @@ -52,37 +61,13 @@ java-11: - target/surefire-reports/*.xml - target/failsafe-reports/*.xml -java8: - extends: .java - image: $CI_REGISTRY_IMAGE/maven:3-jdk-8 - java-11-openj9: extends: .java_extended 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: extends: .java - image: $CI_REGISTRY_IMAGE/maven:3-openjdk-17 - -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 + image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-17-alpine java-21: extends: .java @@ -94,7 +79,7 @@ java-24: deploy: stage: deploy - image: $CI_REGISTRY_IMAGE/maven:3-jdk-11 + image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-11-alpine needs: - job: java-11 script: @@ -124,7 +109,7 @@ create-build-image: owasp-check: extends: .java - image: $CI_REGISTRY_IMAGE/maven:3-jdk-11 + image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-11-alpine needs: [ ] script: - mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP validate -Powasp-check @@ -134,5 +119,3 @@ owasp-check: changes: - pom.xml - owasp-suppressions.xml - - diff --git a/.mvn/createBuildImages.sh b/.mvn/createBuildImages.sh index 1cd5ec7..e29998b 100644 --- a/.mvn/createBuildImages.sh +++ b/.mvn/createBuildImages.sh @@ -16,7 +16,7 @@ # 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" for i in "${TAGS[@]}" diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index 16bf637..4b3eff9 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -59,8 +59,8 @@ cleanup_profile=_initCleanUpProfile cleanup_settings_version=2 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_initFormatterProfile -formatter_settings_version=12 +formatter_profile=_init +formatter_settings_version=23 org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=java;javax;org;com;lombok;de; org.eclipse.jdt.ui.javadoc=true diff --git a/src/test/resources/examples/resolving/withRemote.xsd b/src/test/resources/examples/resolving/withRemote.xsd index 26a85da..1d458d8 100644 --- a/src/test/resources/examples/resolving/withRemote.xsd +++ b/src/test/resources/examples/resolving/withRemote.xsd @@ -18,7 +18,6 @@ - From 7bfd3309d17f89b88871f0c411d18eae9b37cd98 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 13 Aug 2025 17:00:30 +0200 Subject: [PATCH 03/34] Resolve "Remove IDE project folders from git" --- .gitignore | 7 +- .idea/checkstyle-idea.xml | 16 ---- .idea/compiler.xml | 18 ---- .idea/copyright/KoSIT_Validator.xml | 6 -- .idea/copyright/profiles_settings.xml | 7 -- .idea/eclipseCodeFormatter.xml | 17 ---- .idea/encodings.xml | 11 --- .idea/misc.xml | 89 ------------------ .idea/saveactions_settings.xml | 22 ----- .idea/vcs.xml | 6 -- .settings/org.eclipse.jdt.ui.prefs | 127 -------------------------- .settings/settings.xml | 47 ---------- 12 files changed, 5 insertions(+), 368 deletions(-) delete mode 100644 .idea/checkstyle-idea.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/KoSIT_Validator.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/eclipseCodeFormatter.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/saveactions_settings.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .settings/org.eclipse.jdt.ui.prefs delete mode 100644 .settings/settings.xml diff --git a/.gitignore b/.gitignore index 8d2ff7e..28b0fe5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ # Log file *.log -.idea #*.iml # Package Files # @@ -35,9 +34,13 @@ src/generated .project .classpath .factorypath -.settings +.idea/ +.settings/ .vscode *.code-workspace *.xpr # Testing stuff xrechnung + +# Mac stuff +.DS_Store diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml deleted file mode 100644 index ef7efd6..0000000 --- a/.idea/checkstyle-idea.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index c09264f..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/KoSIT_Validator.xml b/.idea/copyright/KoSIT_Validator.xml deleted file mode 100644 index 16895e8..0000000 --- a/.idea/copyright/KoSIT_Validator.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index bc6a0ba..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/eclipseCodeFormatter.xml b/.idea/eclipseCodeFormatter.xml deleted file mode 100644 index a63598c..0000000 --- a/.idea/eclipseCodeFormatter.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 893896a..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 4d7210a..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/saveactions_settings.xml b/.idea/saveactions_settings.xml deleted file mode 100644 index 3b2acd8..0000000 --- a/.idea/saveactions_settings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 4b3eff9..0000000 --- a/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,127 +0,0 @@ -cleanup.add_default_serial_version_id=false -cleanup.add_generated_serial_version_id=true -cleanup.add_missing_annotations=true -cleanup.add_missing_deprecated_annotations=true -cleanup.add_missing_methods=false -cleanup.add_missing_nls_tags=false -cleanup.add_missing_override_annotations=true -cleanup.add_missing_override_annotations_interface_methods=true -cleanup.add_serial_version_id=false -cleanup.always_use_blocks=true -cleanup.always_use_parentheses_in_expressions=false -cleanup.always_use_this_for_non_static_field_access=true -cleanup.always_use_this_for_non_static_method_access=false -cleanup.convert_functional_interfaces=false -cleanup.convert_to_enhanced_for_loop=true -cleanup.correct_indentation=false -cleanup.format_source_code=true -cleanup.format_source_code_changes_only=false -cleanup.insert_inferred_type_arguments=false -cleanup.make_local_variable_final=true -cleanup.make_parameters_final=true -cleanup.make_private_fields_final=true -cleanup.make_type_abstract_if_missing_method=false -cleanup.make_variable_declarations_final=true -cleanup.never_use_blocks=false -cleanup.never_use_parentheses_in_expressions=true -cleanup.organize_imports=true -cleanup.qualify_static_field_accesses_with_declaring_class=false -cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -cleanup.qualify_static_member_accesses_with_declaring_class=true -cleanup.qualify_static_method_accesses_with_declaring_class=false -cleanup.remove_private_constructors=true -cleanup.remove_redundant_type_arguments=true -cleanup.remove_trailing_whitespaces=true -cleanup.remove_trailing_whitespaces_all=true -cleanup.remove_trailing_whitespaces_ignore_empty=false -cleanup.remove_unnecessary_casts=true -cleanup.remove_unnecessary_nls_tags=true -cleanup.remove_unused_imports=true -cleanup.remove_unused_local_variables=false -cleanup.remove_unused_private_fields=true -cleanup.remove_unused_private_members=false -cleanup.remove_unused_private_methods=true -cleanup.remove_unused_private_types=true -cleanup.sort_members=false -cleanup.sort_members_all=false -cleanup.use_anonymous_class_creation=false -cleanup.use_blocks=true -cleanup.use_blocks_only_for_return_and_throw=false -cleanup.use_lambda=true -cleanup.use_parentheses_in_expressions=true -cleanup.use_this_for_non_static_field_access=true -cleanup.use_this_for_non_static_field_access_only_if_necessary=false -cleanup.use_this_for_non_static_method_access=true -cleanup.use_this_for_non_static_method_access_only_if_necessary=true -cleanup.use_type_arguments=false -cleanup_profile=_initCleanUpProfile -cleanup_settings_version=2 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_init -formatter_settings_version=23 -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com;lombok;de; -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates=