This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/isis.git
commit a9f3e9289ba8e1d890ed45bc68f7ace0bac36f19 Author: Andi Huber <[email protected]> AuthorDate: Sun Nov 13 09:12:39 2022 +0100 ISIS-3275: migrate schema (jaxb2 -> jaxb3 gen.) --- api/schema/pom.xml | 34 +++++++++++++++++++++- api/schema/src/main/java/module-info.java | 2 +- .../causeway/schema/{bindings.xml => bindings.xjb} | 26 ++++------------- 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/api/schema/pom.xml b/api/schema/pom.xml index 42f72db473..92fc278570 100644 --- a/api/schema/pom.xml +++ b/api/schema/pom.xml @@ -59,6 +59,35 @@ <build> <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>xjc</id> + <goals> + <goal>xjc</goal> + </goals> + </execution> + </executions> + <configuration> + <xjbSources> + <xjbSource>src/main/resources/org/apache/causeway/schema/bindings.xjb</xjbSource> + </xjbSources> + <sources> + <source>src/main/resources/org/apache/causeway/schema/common/common-2.0.xsd</source> + <source>src/main/resources/org/apache/causeway/schema/cmd/cmd-2.0.xsd</source> + <source>src/main/resources/org/apache/causeway/schema/ixn/ixn-2.0.xsd</source> + <source>src/main/resources/org/apache/causeway/schema/chg/chg-2.0.xsd</source> + <source>src/main/resources/org/apache/causeway/schema/metamodel/metamodel-2.0.xsd</source> + </sources> + <outputDirectory>${basedir}/target/generated-sources/xjc</outputDirectory> + <clearOutputDir>false</clearOutputDir> + </configuration> + </plugin> + + <!-- <plugin> <groupId>org.jvnet.jaxb2.maven2</groupId> <artifactId>maven-jaxb2-plugin</artifactId> @@ -97,7 +126,7 @@ <version>1.3</version> </dependency> <dependency> - <!-- fixes build on JDK 16+ see https://github.com/highsource/maven-jaxb2-plugin/issues/201 --> + <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> <version>2.3.3</version> @@ -123,6 +152,9 @@ </execution> </executions> </plugin> + --> + + </plugins> </build> </profile> diff --git a/api/schema/src/main/java/module-info.java b/api/schema/src/main/java/module-info.java index a7839c8e37..3eba943ddc 100644 --- a/api/schema/src/main/java/module-info.java +++ b/api/schema/src/main/java/module-info.java @@ -25,7 +25,7 @@ module org.apache.causeway.schema { exports org.apache.causeway.schema.chg.v2; requires java.xml; - requires java.xml.bind; + requires jakarta.xml.bind; requires spring.context; opens org.apache.causeway.schema.metamodel.v2; diff --git a/api/schema/src/main/resources/org/apache/causeway/schema/bindings.xml b/api/schema/src/main/resources/org/apache/causeway/schema/bindings.xjb similarity index 77% rename from api/schema/src/main/resources/org/apache/causeway/schema/bindings.xml rename to api/schema/src/main/resources/org/apache/causeway/schema/bindings.xjb index d139b28164..39d6c6ae6c 100644 --- a/api/schema/src/main/resources/org/apache/causeway/schema/bindings.xml +++ b/api/schema/src/main/resources/org/apache/causeway/schema/bindings.xjb @@ -17,12 +17,11 @@ specific language governing permissions and limitations under the License. --> -<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; - jaxb:version="2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:namespace="http://jaxb2-commons.dev.java.net/namespace-prefix"; - xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"; -> +<jaxb:bindings version="3.0" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"; + xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"; + xmlns:xs="http://www.w3.org/2001/XMLSchema"; + jaxb:extensionBindingPrefixes="xjc"> + <jaxb:bindings schemaLocation="chg/chg-2.0.xsd"> <jaxb:schemaBindings> <!-- @@ -31,9 +30,6 @@ --> <jaxb:package name="org.apache.causeway.schema.chg.v2"/> </jaxb:schemaBindings> - <jaxb:bindings> - <namespace:prefix name="chg" /> - </jaxb:bindings> </jaxb:bindings> <jaxb:bindings schemaLocation="ixn/ixn-2.0.xsd"> @@ -44,9 +40,6 @@ --> <jaxb:package name="org.apache.causeway.schema.ixn.v2"/> </jaxb:schemaBindings> - <jaxb:bindings> - <namespace:prefix name="ixn" /> - </jaxb:bindings> </jaxb:bindings> <!-- since ixn-1.3.xsd does an xs:import of common-1.2.xsd, we need to specify common's package bindings --> <jaxb:bindings schemaLocation="common/common-2.0.xsd"> @@ -57,9 +50,6 @@ --> <jaxb:package name="org.apache.causeway.schema.common.v2"/> </jaxb:schemaBindings> - <jaxb:bindings> - <namespace:prefix name="com" /> - </jaxb:bindings> </jaxb:bindings> <!-- since ixn-1.3.xsd does an xs:import of cmd-1.4.xsd, we need to specify common's package bindings --> <jaxb:bindings schemaLocation="cmd/cmd-2.0.xsd"> @@ -70,9 +60,6 @@ --> <jaxb:package name="org.apache.causeway.schema.cmd.v2"/> </jaxb:schemaBindings> - <jaxb:bindings> - <namespace:prefix name="cmd" /> - </jaxb:bindings> </jaxb:bindings> <jaxb:bindings schemaLocation="metamodel/metamodel-2.0.xsd"> @@ -83,8 +70,5 @@ --> <jaxb:package name="org.apache.causeway.schema.metamodel.v2"/> </jaxb:schemaBindings> - <jaxb:bindings> - <namespace:prefix name="mml" /> - </jaxb:bindings> </jaxb:bindings> </jaxb:bindings> \ No newline at end of file
