Skip to content

[#480] rename jaxb-bom to jaxb-tools-bom #626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2025
Merged

[#480] rename jaxb-bom to jaxb-tools-bom #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 7 additions & 36 deletions jaxb-bom-parent/jaxb-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,11 @@
<packaging>pom</packaging>
<name>JAXB Tools :: JAXB BOM</name>
<description>JAXB BOM file to align jaxb api and runtime dependencies.</description>
<dependencyManagement>
<!-- Start of jaxb-runtime dependencies -->
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<version>${istack.version}</version>
</dependency>
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
<version>${stax-ex.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>${fastinfoset.version}</version>
</dependency>
<!-- End of jaxb-runtime dependencies -->
</dependencies>
</dependencyManagement>
<distributionManagement>
<relocation>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-tools-bom</artifactId>
<message>This artifact has been renamed to jaxb-tools-bom.</message>
</relocation>
</distributionManagement>
</project>
8 changes: 7 additions & 1 deletion jaxb-bom-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@
<packaging>pom</packaging>
<name>JAXB Tools :: JAXB BOM :: Parent</name>
<description>Parent module for JAXB BOMs.</description>
<distributionManagement>
<relocation>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-tools-bom-parent</artifactId>
<message>This artifact has been renamed to jaxb-tools-bom-parent.</message>
</relocation>
</distributionManagement>
<modules>
<module>jaxb-bom</module>
</modules>
</project>

54 changes: 54 additions & 0 deletions jaxb-tools-bom-parent/jaxb-tools-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-tools-bom-parent</artifactId>
<version>4.0.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>jaxb-tools-bom</artifactId>
<packaging>pom</packaging>
<name>JAXB Tools :: JAXB Tools BOM</name>
<description>JAXB Tools BOM file to align jaxb api and runtime dependencies.</description>
<properties>
<jaxb-api.version>4.0.2</jaxb-api.version>
<istack.version>4.1.2</istack.version>
<fastinfoset.version>2.1.1</fastinfoset.version>
</properties>
<dependencyManagement>
<!-- Start of jaxb-runtime dependencies -->
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<version>${istack.version}</version>
</dependency>
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
<version>${stax-ex.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>${fastinfoset.version}</version>
</dependency>
<!-- End of jaxb-runtime dependencies -->
</dependencies>
</dependencyManagement>
</project>
16 changes: 16 additions & 0 deletions jaxb-tools-bom-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-tools-project</artifactId>
<version>4.0.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>jaxb-tools-bom-parent</artifactId>
<packaging>pom</packaging>
<name>JAXB Tools :: JAXB Tools BOM :: Parent</name>
<description>Parent module for JAXB Tools BOMs.</description>
<modules>
<module>jaxb-tools-bom</module>
</modules>
</project>
37 changes: 37 additions & 0 deletions maven-plugin/tests/p_o-parentbom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>jaxb-maven-plugin-tests-p_o-parentbom</artifactId>
<parent>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-tools-bom</artifactId>
<version>4.0.10-SNAPSHOT</version>
<relativePath>../../../jaxb-tools-bom-parent/jaxb-tools-bom/pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>JAXB Tools :: Maven Plugin :: Test [po parent-bom]</name>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin-testing</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
</plugins>
</build>
</project>
9 changes: 9 additions & 0 deletions maven-plugin/tests/p_o-parentbom/src/main/resources/binding.xjb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<jaxb:bindings version="3.0" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">

<jaxb:bindings schemaLocation="../resources/purchaseorder.xsd">
<jaxb:schemaBindings>
<jaxb:package name="po"/>
</jaxb:schemaBindings>
</jaxb:bindings>
</jaxb:bindings>
66 changes: 66 additions & 0 deletions maven-plugin/tests/p_o-parentbom/src/main/resources/purchaseorder.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">

<xsd:annotation>
<xsd:documentation xml:lang="en">
Purchase order schema for Example.com.
Copyright 2000 Example.com. All rights reserved.
</xsd:documentation>
</xsd:annotation>

<xsd:element name="purchaseOrder" type="PurchaseOrderType"/>

<xsd:element name="comment" type="xsd:string"/>

<xsd:complexType name="PurchaseOrderType">
<xsd:sequence>
<xsd:element name="shipTo" type="USAddress"/>
<xsd:element name="billTo" type="USAddress"/>
<xsd:element ref="comment" minOccurs="0"/>
<xsd:element name="items" type="Items"/>
</xsd:sequence>
<xsd:attribute name="orderDate" type="xsd:date"/>
</xsd:complexType>

<xsd:complexType name="USAddress">
<xsd:sequence>
<xsd:element name="name" type="xsd:string"/>
<xsd:element name="street" type="xsd:string"/>
<xsd:element name="city" type="xsd:string"/>
<xsd:element name="state" type="xsd:string"/>
<xsd:element name="zip" type="xsd:decimal"/>
</xsd:sequence>
<xsd:attribute name="country" type="xsd:NMTOKEN"
fixed="US"/>
</xsd:complexType>

<xsd:complexType name="Items">
<xsd:sequence>
<xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="productName" type="xsd:string"/>
<xsd:element name="quantity">
<xsd:simpleType>
<xsd:restriction base="xsd:positiveInteger">
<xsd:maxExclusive value="100"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="USPrice" type="xsd:decimal"/>
<xsd:element ref="comment" minOccurs="0"/>
<xsd:element name="shipDate" type="xsd:date" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="partNum" type="SKU" use="required"/>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
</xsd:complexType>

<!-- Stock Keeping Unit, a code for identifying products -->
<xsd:simpleType name="SKU">
<xsd:restriction base="xsd:string">
<xsd:pattern value="\d{3}-[A-Z]{2}"/>
</xsd:restriction>
</xsd:simpleType>

</xsd:schema>
1 change: 1 addition & 0 deletions maven-plugin/tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<module>issues</module>
<module>javadoc</module>
<module>p_o</module>
<module>p_o-parentbom</module>
<module>po-multi-specversion</module>
<module>po-scd</module>
<module>res</module>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
</developer>
</developers>
<modules>
<module>jaxb-bom-parent</module>
<module>jaxb-bom-parent</module> <!-- deprecated, to be removed after next release -->
<module>jaxb-tools-bom-parent</module>
<module>jaxb-annotate-parent</module>
<module>jaxb-annox-parent</module>
<module>jaxb-plugins-parent</module>
Expand Down
Loading