Skip to content

Commit 6918809

Browse files
laurentschoelensmattrpav
laurentschoelens
authored and
mattrpav
committed
[#480] rename jaxb-bom to jaxb-tools-bom
Also add extra test project (fix undefined vars) to validate new jaxb-tools-bom
1 parent d10bc68 commit 6918809

File tree

9 files changed

+199
-38
lines changed

9 files changed

+199
-38
lines changed

‎jaxb-bom-parent/jaxb-bom/pom.xml‎

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,11 @@
1010
<packaging>pom</packaging>
1111
<name>JAXB Tools :: JAXB BOM</name>
1212
<description>JAXB BOM file to align jaxb api and runtime dependencies.</description>
13-
<dependencyManagement>
14-
<!-- Start of jaxb-runtime dependencies -->
15-
<dependencies>
16-
<dependency>
17-
<groupId>org.glassfish.jaxb</groupId>
18-
<artifactId>jaxb-runtime</artifactId>
19-
<version>${jaxb.version}</version>
20-
</dependency>
21-
<dependency>
22-
<groupId>jakarta.xml.bind</groupId>
23-
<artifactId>jakarta.xml.bind-api</artifactId>
24-
<version>${jaxb-api.version}</version>
25-
</dependency>
26-
<dependency>
27-
<groupId>org.glassfish.jaxb</groupId>
28-
<artifactId>txw2</artifactId>
29-
<version>${jaxb.version}</version>
30-
</dependency>
31-
<dependency>
32-
<groupId>com.sun.istack</groupId>
33-
<artifactId>istack-commons-runtime</artifactId>
34-
<version>${istack.version}</version>
35-
</dependency>
36-
<dependency>
37-
<groupId>org.jvnet.staxex</groupId>
38-
<artifactId>stax-ex</artifactId>
39-
<version>${stax-ex.version}</version>
40-
</dependency>
41-
<dependency>
42-
<groupId>com.sun.xml.fastinfoset</groupId>
43-
<artifactId>FastInfoset</artifactId>
44-
<version>${fastinfoset.version}</version>
45-
</dependency>
46-
<!-- End of jaxb-runtime dependencies -->
47-
</dependencies>
48-
</dependencyManagement>
13+
<distributionManagement>
14+
<relocation>
15+
<groupId>org.jvnet.jaxb</groupId>
16+
<artifactId>jaxb-tools-bom</artifactId>
17+
<message>This artifact has been renamed to jaxb-tools-bom.</message>
18+
</relocation>
19+
</distributionManagement>
4920
</project>

‎jaxb-bom-parent/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@
1010
<packaging>pom</packaging>
1111
<name>JAXB Tools :: JAXB BOM :: Parent</name>
1212
<description>Parent module for JAXB BOMs.</description>
13+
<distributionManagement>
14+
<relocation>
15+
<groupId>org.jvnet.jaxb</groupId>
16+
<artifactId>jaxb-tools-bom-parent</artifactId>
17+
<message>This artifact has been renamed to jaxb-tools-bom-parent.</message>
18+
</relocation>
19+
</distributionManagement>
1320
<modules>
1421
<module>jaxb-bom</module>
1522
</modules>
1623
</project>
17-

‎jaxb-tools-bom-parent/jaxb-tools-bom/pom.xml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<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">
2+
<modelVersion>4.0.0</modelVersion>
3+
<parent>
4+
<groupId>org.jvnet.jaxb</groupId>
5+
<artifactId>jaxb-tools-bom-parent</artifactId>
6+
<version>4.0.10-SNAPSHOT</version>
7+
<relativePath>../pom.xml</relativePath>
8+
</parent>
9+
<artifactId>jaxb-tools-bom</artifactId>
10+
<packaging>pom</packaging>
11+
<name>JAXB Tools :: JAXB Tools BOM</name>
12+
<description>JAXB Tools BOM file to align jaxb api and runtime dependencies.</description>
13+
<properties>
14+
<jaxb-api.version>4.0.2</jaxb-api.version>
15+
<istack.version>4.1.2</istack.version>
16+
<fastinfoset.version>2.1.1</fastinfoset.version>
17+
</properties>
18+
<dependencyManagement>
19+
<!-- Start of jaxb-runtime dependencies -->
20+
<dependencies>
21+
<dependency>
22+
<groupId>org.glassfish.jaxb</groupId>
23+
<artifactId>jaxb-runtime</artifactId>
24+
<version>${jaxb.version}</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>jakarta.xml.bind</groupId>
28+
<artifactId>jakarta.xml.bind-api</artifactId>
29+
<version>${jaxb-api.version}</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.glassfish.jaxb</groupId>
33+
<artifactId>txw2</artifactId>
34+
<version>${jaxb.version}</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>com.sun.istack</groupId>
38+
<artifactId>istack-commons-runtime</artifactId>
39+
<version>${istack.version}</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.jvnet.staxex</groupId>
43+
<artifactId>stax-ex</artifactId>
44+
<version>${stax-ex.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>com.sun.xml.fastinfoset</groupId>
48+
<artifactId>FastInfoset</artifactId>
49+
<version>${fastinfoset.version}</version>
50+
</dependency>
51+
<!-- End of jaxb-runtime dependencies -->
52+
</dependencies>
53+
</dependencyManagement>
54+
</project>

‎jaxb-tools-bom-parent/pom.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<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">
2+
<modelVersion>4.0.0</modelVersion>
3+
<parent>
4+
<groupId>org.jvnet.jaxb</groupId>
5+
<artifactId>jaxb-tools-project</artifactId>
6+
<version>4.0.10-SNAPSHOT</version>
7+
<relativePath>../pom.xml</relativePath>
8+
</parent>
9+
<artifactId>jaxb-tools-bom-parent</artifactId>
10+
<packaging>pom</packaging>
11+
<name>JAXB Tools :: JAXB Tools BOM :: Parent</name>
12+
<description>Parent module for JAXB Tools BOMs.</description>
13+
<modules>
14+
<module>jaxb-tools-bom</module>
15+
</modules>
16+
</project>

‎maven-plugin/tests/p_o-parentbom/pom.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<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">
2+
<modelVersion>4.0.0</modelVersion>
3+
<artifactId>jaxb-maven-plugin-tests-p_o-parentbom</artifactId>
4+
<parent>
5+
<groupId>org.jvnet.jaxb</groupId>
6+
<artifactId>jaxb-tools-bom</artifactId>
7+
<version>4.0.10-SNAPSHOT</version>
8+
<relativePath>../../../jaxb-tools-bom-parent/jaxb-tools-bom/pom.xml</relativePath>
9+
</parent>
10+
<packaging>jar</packaging>
11+
<name>JAXB Tools :: Maven Plugin :: Test [po parent-bom]</name>
12+
<dependencies>
13+
<dependency>
14+
<groupId>org.glassfish.jaxb</groupId>
15+
<artifactId>jaxb-runtime</artifactId>
16+
</dependency>
17+
<dependency>
18+
<groupId>jakarta.xml.bind</groupId>
19+
<artifactId>jakarta.xml.bind-api</artifactId>
20+
</dependency>
21+
<dependency>
22+
<groupId>org.jvnet.jaxb</groupId>
23+
<artifactId>jaxb-maven-plugin-testing</artifactId>
24+
<version>${project.version}</version>
25+
<scope>test</scope>
26+
</dependency>
27+
</dependencies>
28+
<build>
29+
<plugins>
30+
<plugin>
31+
<groupId>org.jvnet.jaxb</groupId>
32+
<artifactId>jaxb-maven-plugin</artifactId>
33+
<version>${project.version}</version>
34+
</plugin>
35+
</plugins>
36+
</build>
37+
</project>

‎maven-plugin/tests/p_o-parentbom/src/main/resources/binding.xjb‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<jaxb:bindings version="3.0" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
2+
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
4+
<jaxb:bindings schemaLocation="../resources/purchaseorder.xsd">
5+
<jaxb:schemaBindings>
6+
<jaxb:package name="po"/>
7+
</jaxb:schemaBindings>
8+
</jaxb:bindings>
9+
</jaxb:bindings>

‎maven-plugin/tests/p_o-parentbom/src/main/resources/purchaseorder.xsd‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
2+
3+
<xsd:annotation>
4+
<xsd:documentation xml:lang="en">
5+
Purchase order schema for Example.com.
6+
Copyright 2000 Example.com. All rights reserved.
7+
</xsd:documentation>
8+
</xsd:annotation>
9+
10+
<xsd:element name="purchaseOrder" type="PurchaseOrderType"/>
11+
12+
<xsd:element name="comment" type="xsd:string"/>
13+
14+
<xsd:complexType name="PurchaseOrderType">
15+
<xsd:sequence>
16+
<xsd:element name="shipTo" type="USAddress"/>
17+
<xsd:element name="billTo" type="USAddress"/>
18+
<xsd:element ref="comment" minOccurs="0"/>
19+
<xsd:element name="items" type="Items"/>
20+
</xsd:sequence>
21+
<xsd:attribute name="orderDate" type="xsd:date"/>
22+
</xsd:complexType>
23+
24+
<xsd:complexType name="USAddress">
25+
<xsd:sequence>
26+
<xsd:element name="name" type="xsd:string"/>
27+
<xsd:element name="street" type="xsd:string"/>
28+
<xsd:element name="city" type="xsd:string"/>
29+
<xsd:element name="state" type="xsd:string"/>
30+
<xsd:element name="zip" type="xsd:decimal"/>
31+
</xsd:sequence>
32+
<xsd:attribute name="country" type="xsd:NMTOKEN"
33+
fixed="US"/>
34+
</xsd:complexType>
35+
36+
<xsd:complexType name="Items">
37+
<xsd:sequence>
38+
<xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
39+
<xsd:complexType>
40+
<xsd:sequence>
41+
<xsd:element name="productName" type="xsd:string"/>
42+
<xsd:element name="quantity">
43+
<xsd:simpleType>
44+
<xsd:restriction base="xsd:positiveInteger">
45+
<xsd:maxExclusive value="100"/>
46+
</xsd:restriction>
47+
</xsd:simpleType>
48+
</xsd:element>
49+
<xsd:element name="USPrice" type="xsd:decimal"/>
50+
<xsd:element ref="comment" minOccurs="0"/>
51+
<xsd:element name="shipDate" type="xsd:date" minOccurs="0"/>
52+
</xsd:sequence>
53+
<xsd:attribute name="partNum" type="SKU" use="required"/>
54+
</xsd:complexType>
55+
</xsd:element>
56+
</xsd:sequence>
57+
</xsd:complexType>
58+
59+
<!-- Stock Keeping Unit, a code for identifying products -->
60+
<xsd:simpleType name="SKU">
61+
<xsd:restriction base="xsd:string">
62+
<xsd:pattern value="\d{3}-[A-Z]{2}"/>
63+
</xsd:restriction>
64+
</xsd:simpleType>
65+
66+
</xsd:schema>

‎maven-plugin/tests/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<module>issues</module>
3434
<module>javadoc</module>
3535
<module>p_o</module>
36+
<module>p_o-parentbom</module>
3637
<module>po-multi-specversion</module>
3738
<module>po-scd</module>
3839
<module>res</module>

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
</developer>
4848
</developers>
4949
<modules>
50-
<module>jaxb-bom-parent</module>
50+
<module>jaxb-bom-parent</module> <!-- deprecated, to be removed after next release -->
51+
<module>jaxb-tools-bom-parent</module>
5152
<module>jaxb-annotate-parent</module>
5253
<module>jaxb-annox-parent</module>
5354
<module>jaxb-plugins-parent</module>

0 commit comments

Comments
 (0)