From 5a1ca79ed8ecfdcd2feffbdbf6ffb7e507d34664 Mon Sep 17 00:00:00 2001 From: Renzo Kottmann Date: Wed, 9 Apr 2025 18:41:31 +0200 Subject: [PATCH 001/106] WIP: bump apache.common.io to v2.18.0 --- pom.xml | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index cd1efac..6e5fbf9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,13 +15,14 @@ ~ limitations under the License. --> - + 4.0.0 KoSIT XML Prüftool Implementierung de.kosit - 1.5.0 + 1.5.1 validationtool KoSIT XML Validator against XSD and Schematron based on defined scenarios. @@ -37,7 +38,7 @@ renzo.kottmann Renzo Kottmann KoSIT - http://www.xoev.de + http://www.xeinkauf.de Product Owner @@ -55,7 +56,7 @@ UTF-8 3.23.1 - 2.11.0 + 2.18.0 3.12.0 0.8.8 2.3.7 @@ -400,11 +401,11 @@ dump - -
localhost
- ${jacoco.tcp.port} - true - + +
localhost
+ ${jacoco.tcp.port} + true + generateJacocoReport @@ -453,15 +454,15 @@ exec-maven-plugin 3.1.0 - + run - pre-integration-test - + pre-integration-test + exec - + - + java false true @@ -518,8 +519,8 @@ verify - - -Dfile.encoding=UTF-8 -Ddaemon.port=${validator.server.port} + + -Dfile.encoding=UTF-8 -Ddaemon.port=${validator.server.port} @@ -623,7 +624,9 @@ format - false + + false + From 4ce8f4de58d4611bada6c0391f3cb07e1c8e2c90 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 9 Apr 2025 19:25:35 +0200 Subject: [PATCH 002/106] Updated versions --- pom.xml | 56 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 6e5fbf9..877d788 100644 --- a/pom.xml +++ b/pom.xml @@ -55,13 +55,13 @@ UTF-8 - 3.23.1 + 3.27.3 2.18.0 - 3.12.0 - 0.8.8 - 2.3.7 - 1.18.24 - 4.9.0 + 3.17.0 + 0.8.13 + 2.3.9 + 1.18.38 + 4.11.0 7.2.0 5.2.0 11.4 @@ -96,13 +96,13 @@ info.picocli picocli - 4.7.0 + 4.7.6 true org.fusesource.jansi jansi - 2.4.0 + 2.4.1 true @@ -174,10 +174,20 @@ + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + ISO-8859-1 + + + org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.6.0 reserve-network-port @@ -197,7 +207,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.5.0 enforce-versions @@ -217,7 +227,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.14.0 1.8 1.8 @@ -228,7 +238,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.4.1 + 3.6.0 jdk11+ @@ -301,7 +311,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.4.2 + 3.7.1 full_dist @@ -326,7 +336,7 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin - 0.15.1 + 0.15.3 @@ -346,7 +356,7 @@ org.jvnet.jaxb2_commons jaxb2-basics - 0.11.1 + 0.13.1 @@ -419,7 +429,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M7 + 3.5.3 -Dfile.encoding=UTF-8 ${jacocoSurefire} @@ -429,7 +439,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.1 attach-sources @@ -443,7 +453,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.1.1 v@{project.version} @@ -452,7 +462,7 @@ org.codehaus.mojo exec-maven-plugin - 3.1.0 + 3.5.0 run @@ -510,7 +520,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M7 + 3.5.3 test-it @@ -529,7 +539,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.11.2 8 none @@ -579,7 +589,7 @@ maven-gpg-plugin - 1.6 + 3.2.7 sign-artifacts @@ -632,7 +642,7 @@ net.revelc.code.formatter formatter-maven-plugin - 2.12.2 + 2.13.0 maven-formatting From 98c2e1c18ce727e945e8b3ef77558459952e56d6 Mon Sep 17 00:00:00 2001 From: andreb Date: Wed, 23 Jul 2025 13:29:34 +0200 Subject: [PATCH 003/106] upgrade dependencies and plugins --- README.md | 3 ++- pom.xml | 27 ++++++++++--------- .../cmd/CommandLineOptions.java | 4 +-- .../validationtool/config/XPathBuilder.java | 2 +- .../cmd/CommandlineApplicationTest.java | 8 ++++++ .../impl/tasks/CreateReportActionTest.java | 2 +- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 0fd508e..50e3354 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,8 @@ The validator can be used in three different ways: The general way using the CLI is: ```shell -java -jar validationtool--standalone.jar -s [OPTIONS] [FILE] [FILE] [FILE] ... +java -jar validationtool--standalone.jar -s -r +[OPTIONS] [FILE] [FILE] [FILE] ... ``` The help option displays further CLI options to customize the process: diff --git a/pom.xml b/pom.xml index 877d788..2690237 100644 --- a/pom.xml +++ b/pom.xml @@ -56,16 +56,16 @@ UTF-8 3.27.3 - 2.18.0 - 3.17.0 + 2.20.0 + 3.18.0 0.8.13 2.3.9 1.18.38 4.11.0 - 7.2.0 - 5.2.0 - 11.4 - 1.7.36 + 10.0.4 + 5.5.5 + 12.8 + 2.0.17 @@ -96,13 +96,13 @@ info.picocli picocli - 4.7.6 + 4.7.7 true org.fusesource.jansi jansi - 2.4.1 + 2.4.2 true @@ -132,7 +132,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -143,7 +143,7 @@ io.rest-assured rest-assured - 5.3.0 + ${version.rest-assured} test @@ -187,7 +187,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.6.0 + 3.6.1 reserve-network-port @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.1 enforce-versions @@ -588,8 +588,9 @@ + org.apache.maven.plugins maven-gpg-plugin - 3.2.7 + 3.2.8 sign-artifacts diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java index 69e26d9..6381ecf 100644 --- a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java +++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java @@ -175,9 +175,9 @@ public class CommandLineOptions implements Callable { private static void configureLogging(final CommandLineOptions cmd) { if (cmd.isDebugLog()) { - System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG"); + System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG"); } else { - System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, cmd.getLogLevel().name()); + System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, cmd.getLogLevel().name()); } } diff --git a/src/main/java/de/kosit/validationtool/config/XPathBuilder.java b/src/main/java/de/kosit/validationtool/config/XPathBuilder.java index 90b5351..713f951 100644 --- a/src/main/java/de/kosit/validationtool/config/XPathBuilder.java +++ b/src/main/java/de/kosit/validationtool/config/XPathBuilder.java @@ -114,7 +114,7 @@ class XPathBuilder implements Builder { final Iterable iterable = () -> iterator; StreamSupport.stream(iterable.spliterator(), false).filter(e -> !ArrayUtils.contains(IGNORED_PREFIXES, e)) .filter(StringUtils::isNotBlank).forEach(e -> ns.put(e, this.executable.getUnderlyingExpression().getInternalExpression() - .getRetainedStaticContext().getURIForPrefix(e, false))); + .getRetainedStaticContext().getURIForPrefix(e, false).toString())); getNamespaces().putAll(ns); } diff --git a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java index 4231b9f..4515d9b 100644 --- a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java @@ -230,6 +230,14 @@ public class CommandlineApplicationTest { assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT); } + @Test + public void testAndre() throws IOException { + final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", + Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString(), "--report-prefix", "andre1" }; + CommandLineApplication.mainProgram(args); + assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT); + } + @Test public void testUnexpectedDaemonFlag() { final String[] args = new String[] { "-D", "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java b/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java index 17f6dfd..9bf99bc 100644 --- a/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java +++ b/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java @@ -77,7 +77,7 @@ public class CreateReportActionTest { this.action.check(bag); assertThat(bag.getReport()).isNotNull(); final String reportString = serialize(bag.getReport()); - assertThat(reportString).contains("SAXParseException"); + assertThat(reportString).contains("SXXP0003"); } @Test From 40f6f4a2961075fa7e49b8d690833a6cd15db66c Mon Sep 17 00:00:00 2001 From: Andre Babinsky Date: Fri, 25 Jul 2025 07:04:59 +0000 Subject: [PATCH 004/106] GitLab CI-Umgebung reaktivieren --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0365aa..e767682 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,6 +84,14 @@ java-19: extends: .java_extended image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-19-alpine +java-21: + extends: .java + image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-21-alpine + +java-24: + extends: .java_extended + image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-24-alpine + deploy: stage: deploy image: $CI_REGISTRY_IMAGE/maven:3-jdk-11 From 96c1d346ee9e30244b2f817563dfab862b11234f Mon Sep 17 00:00:00 2001 From: andreb Date: Mon, 28 Jul 2025 17:04:56 +0200 Subject: [PATCH 005/106] initalize 1.6.x migrate to jakarta --- .idea/misc.xml | 2 +- pom.xml | 75 +++++-------------- .../impl/CollectingErrorEventHandler.java | 4 +- .../impl/ConversionService.java | 16 ++-- .../impl/input/SourceInput.java | 4 +- .../impl/tasks/CreateReportAction.java | 6 +- .../impl/xml/StringTrimAdapter.java | 2 +- src/main/model/binding/global.xjb | 31 ++++---- 8 files changed, 51 insertions(+), 89 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 4d7210a..7970046 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -82,7 +82,7 @@ - + diff --git a/pom.xml b/pom.xml index 2690237..1d84c78 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ KoSIT XML Prüftool Implementierung de.kosit - 1.5.1 + 1.6.0 validationtool KoSIT XML Validator against XSD and Schematron based on defined scenarios. @@ -59,13 +59,14 @@ 2.20.0 3.18.0 0.8.13 - 2.3.9 + 4.0.2 1.18.38 4.11.0 10.0.4 5.5.5 12.8 2.0.17 + 4.0.9 @@ -123,6 +124,11 @@ ${version.jaxb} true + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jaxb} + org.assertj assertj-core @@ -158,7 +164,6 @@ 1.0.2 test - @@ -229,8 +234,8 @@ maven-compiler-plugin 3.14.0 - 1.8 - 1.8 + 11 + 11 UTF-8 @@ -267,44 +272,6 @@ - - jdk8 - package - - shade - - - true - java8-standalone - - - org.glassfish.jaxb:jaxb-runtime - com.sun.istack:istack-commons-runtime - com.sun.xml.fastinfoset:FastInfoset - jakarta.activation:jakarta.activation-api - jakarta.xml.bind:jakarta.xml.bind-api - org.jvnet.staxex:stax-ex - org.glassfish.jaxb:txw2 - - - - - de.kosit.validationtool.cmd.CommandLineApplication - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - **/module-info.class - - - - - @@ -334,9 +301,9 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.15.3 + org.jvnet.jaxb + jaxb-maven-plugin + ${version.jaxb-maven-plugin} @@ -354,20 +321,12 @@ - org.jvnet.jaxb2_commons - jaxb2-basics - 0.13.1 + org.jvnet.jaxb + jaxb-plugins + ${version.jaxb-maven-plugin} - - - org.glassfish.jaxb - jaxb-runtime - ${version.jaxb} - true - - @@ -541,7 +500,7 @@ maven-javadoc-plugin 3.11.2 - 8 + 11 none diff --git a/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java b/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java index 3897006..3f522a6 100644 --- a/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java +++ b/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.StringJoiner; -import javax.xml.bind.ValidationEvent; -import javax.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.ValidationEventHandler; import javax.xml.transform.ErrorListener; import javax.xml.transform.SourceLocator; import javax.xml.transform.TransformerException; diff --git a/src/main/java/de/kosit/validationtool/impl/ConversionService.java b/src/main/java/de/kosit/validationtool/impl/ConversionService.java index 31e4ff7..d2ca2d2 100644 --- a/src/main/java/de/kosit/validationtool/impl/ConversionService.java +++ b/src/main/java/de/kosit/validationtool/impl/ConversionService.java @@ -24,14 +24,14 @@ import java.util.Arrays; import java.util.Collection; import java.util.StringJoiner; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.JAXBIntrospector; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.ValidationEventHandler; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBIntrospector; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; diff --git a/src/main/java/de/kosit/validationtool/impl/input/SourceInput.java b/src/main/java/de/kosit/validationtool/impl/input/SourceInput.java index 65cb32d..7b0a9b8 100644 --- a/src/main/java/de/kosit/validationtool/impl/input/SourceInput.java +++ b/src/main/java/de/kosit/validationtool/impl/input/SourceInput.java @@ -21,7 +21,7 @@ import static org.apache.commons.lang3.StringUtils.defaultIfBlank; import java.io.IOException; import java.nio.charset.Charset; -import javax.xml.bind.util.JAXBSource; +import jakarta.xml.bind.util.JAXBSource; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; @@ -43,7 +43,7 @@ import net.sf.saxon.om.TreeInfo; *
    *
  • {@link StreamSource} - both {@link java.io.InputStream} based and {@link java.io.Reader} based
    • *
  • {@link javax.xml.transform.dom.DOMSource}
    • - *
  • {@link javax.xml.bind.util.JAXBSource}
    • + *
  • {@link jakarta.xml.bind.util.JAXBSource}
    • *
  • {@link TreeInfo}
    • *
* diff --git a/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java b/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java index 554a47f..4a5d265 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.util.Collection; import java.util.stream.Collectors; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.util.JAXBSource; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.util.JAXBSource; import org.xml.sax.ContentHandler; import org.xml.sax.DTDHandler; diff --git a/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java b/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java index f3c3c25..08ef4b1 100644 --- a/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java +++ b/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java @@ -16,7 +16,7 @@ package de.kosit.validationtool.impl.xml; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; public class StringTrimAdapter extends XmlAdapter { diff --git a/src/main/model/binding/global.xjb b/src/main/model/binding/global.xjb index 2c85926..cd2a512 100644 --- a/src/main/model/binding/global.xjb +++ b/src/main/model/binding/global.xjb @@ -16,22 +16,21 @@ --> + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + xmlns:inheritance="urn:jaxb.jvnet.org:plugin:inheritance" + jaxb:extensionBindingPrefixes="inheritance" + version="3.0"> + - + - + name="java.lang.String" + xmlType="xs:string" + adapter="de.kosit.validationtool.impl.xml.StringTrimAdapter"/> - @@ -40,24 +39,28 @@ de.kosit.validationtool.impl.model.BaseXMLSyntaxError + + - + + de.kosit.validationtool.impl.model.BaseOutput + - + From e3ac6cdb39d1944aa645f29a56276af0435e6ffd Mon Sep 17 00:00:00 2001 From: andreb Date: Tue, 29 Jul 2025 08:16:48 +0200 Subject: [PATCH 006/106] initalize 1.6.x migrate to jakarta --- .gitlab-ci.yml | 8 -------- CHANGELOG.md | 12 +++++++++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e767682..7c2e92a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,18 +52,10 @@ 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index fd7b759..ef2b14f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -# 1.5.0 (to be released) +## 1.6.0 + +### Changed + +- (CORE) Migration from javax to jakarta xml bind + +### Removed + +- (CORE) java 8 support. new default jdk 11 + +## 1.5.0 (to be released) ### Fixed From acd7740846b80b858f7ff926d6c810b036361772 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Thu, 7 Aug 2025 11:11:33 +0200 Subject: [PATCH 007/106] 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 008/106] 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 009/106] 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=