diff --git a/pom.xml b/pom.xml index 0e168c0..0f40b57 100644 --- a/pom.xml +++ b/pom.xml @@ -23,8 +23,9 @@ UTF-8 UTF-8 11 - 2.3.1 - 2.4.0-b180830.0438 + 4.0.5 + 4.0.9 + 4.0.16 @@ -46,8 +47,8 @@ 1.6.0 - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api ${jaxb.version} @@ -56,9 +57,14 @@ ${jaxb.rt.version} - org.jvnet.jaxb2_commons - jaxb2-basics-runtime - ${jaxb2_commons.version} + jakarta.activation + jakarta.activation-api + 2.1.4 + + + org.jvnet.jaxb + jaxb-plugins-runtime + ${jaxb.plugins.version} junit diff --git a/xml/jaxb/generate-code-from-xsd/README.MD b/xml/jaxb/generate-code-from-xsd/README.MD index 9742259..6dede64 100644 --- a/xml/jaxb/generate-code-from-xsd/README.MD +++ b/xml/jaxb/generate-code-from-xsd/README.MD @@ -1,6 +1,6 @@ # Configure Maven to generate Java from an XSD schema -This project shows how to configure the [maven-jaxb2-plugin](https://github.com/highsource/maven-jaxb2-plugin) to generate JAXB code, enhanced with the [jaxb2-basics](https://github.com/highsource/jaxb2-basics) to get basic `Object` behavior (`hashCode`, `equals` and `toString`), and fluent builders. There is also a small JUnit test included, which verifies that the Object enhancements to plain JAXB code is present. +This project shows how to configure the [jaxb-maven-plugin](https://github.com/highsource/jaxb-tools) (the Jakarta-namespace continuation of the old `maven-jaxb2-plugin`) to generate JAXB code, enhanced with [jaxb-plugins](https://github.com/highsource/jaxb-tools) (formerly `jaxb2-basics`) to get basic `Object` behavior (`hashCode`, `equals` and `toString`), and fluent builders. There is also a small JUnit test included, which verifies that the Object enhancements to plain JAXB code is present. ## To generate, compiler and check the generated code ```sh diff --git a/xml/jaxb/generate-code-from-xsd/pom.xml b/xml/jaxb/generate-code-from-xsd/pom.xml index bbe320a..5bdb5c6 100644 --- a/xml/jaxb/generate-code-from-xsd/pom.xml +++ b/xml/jaxb/generate-code-from-xsd/pom.xml @@ -12,43 +12,29 @@ generate-code-from-xsd - - 1.11.1 - - - org.jvnet.jaxb2_commons - jaxb2-basics - 1.11.1 + org.jvnet.jaxb + jaxb-plugins + ${jaxb.plugins.version} net.codesup.util - jaxb2-rich-contract-plugin - 2.1.0 + jaxb-rich-contract-plugin + 4.2.1.2 - - - - org.codehaus.mojo - jaxb2-maven-plugin - 4.1.0 - - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.14.0 + org.jvnet.jaxb + jaxb-maven-plugin + ${jaxb.plugins.version} org.glassfish.jaxb @@ -63,20 +49,20 @@ -Xequals -XhashCode -Xfluent-builder - - -copyPartial=n + + -fluent-builder.copyPartial=n -Ximmutable - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb + jaxb-plugins net.codesup.util - jaxb2-rich-contract-plugin + jaxb-rich-contract-plugin @@ -97,16 +83,16 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api org.glassfish.jaxb jaxb-runtime - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb + jaxb-plugins-runtime junit