Skip to content

[#465] Class collision between old jaxb2-basics-runtime and new one #543

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 2 commits into from
Jun 11, 2024
Merged

[#465] Class collision between old jaxb2-basics-runtime and new one #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
264d37f
[#465] create empty org.jvnet.jaxb2_commons:jaxb2-basics-runtime project
laurentschoelens Apr 18, 2024
3c871ee
[#465] adding maven test case for dep tree
laurentschoelens Jun 10, 2024
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
40 changes: 40 additions & 0 deletions basics/jaxb2-basics-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<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>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-runtime</artifactId>
<packaging>jar</packaging>
<name>JAXB Tools :: JAXB2 Basics :: Runtime [EMPTY]</name>
<description>
This is an empty jar to override
org.jvnet.jaxb2_commons:jaxb2-basics-runtime versions below v2
when you have both org.jvnet.jaxb2_commons:jaxb2-basics-runtime and
org.jvnet.jaxb:jaxb2-basics-runtime artifacts in the same application.
See https://github.com/highsource/jaxb-tools/issues/465
</description>
<parent>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-basics-project</artifactId>
<version>2.0.10-SNAPSHOT</version>
</parent>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>empty-javadoc</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>javadoc</classifier>
<skipIfEmpty>false</skipIfEmpty>
<classesDirectory>${basedir}/src/main/javadoc</classesDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
8 changes: 8 additions & 0 deletions basics/jaxb2-basics-runtime/src/main/javadoc/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Empty jaxb2-basics-runtime

This is an empty jar to override
`org.jvnet.jaxb2_commons:jaxb2-basics-runtime` versions below v2
when you have both `org.jvnet.jaxb2_commons:jaxb2-basics-runtime` and
`org.jvnet.jaxb:jaxb2-basics-runtime` artifacts in the same application.

See https://github.com/highsource/jaxb-tools/issues/465
8 changes: 8 additions & 0 deletions basics/jaxb2-basics-runtime/src/main/resources/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Empty jaxb2-basics-runtime

This is an empty jar to override
`org.jvnet.jaxb2_commons:jaxb2-basics-runtime` versions below v2
when you have both `org.jvnet.jaxb2_commons:jaxb2-basics-runtime` and
`org.jvnet.jaxb:jaxb2-basics-runtime` artifacts in the same application.

See https://github.com/highsource/jaxb-tools/issues/465
1 change: 1 addition & 0 deletions basics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<name>JAXB Tools :: JAXB Basics :: Project</name>
<description>JAXB Basics is a part of JAXB Tools project which implements plugins and tools for JAXB implementation.</description>
<modules>
<module>jaxb2-basics-runtime</module>
<module>ant</module>
<module>runtime</module>
<module>tools</module>
Expand Down
5 changes: 5 additions & 0 deletions basics/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
<artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-runtime</artifactId>
<version>[2.0.0,9999.0)</version>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
Expand Down
29 changes: 29 additions & 0 deletions basics/tests/po-mixed-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<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-basics-project</artifactId>
<version>2.0.10-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>jaxb2-basics-test-po-mixed-runtime</artifactId>
<packaging>jar</packaging>
<name>JAXB Tools :: JAXB Basics :: Test [po-mixed-runtime]</name>
<dependencies>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb2-basics-test-po</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb2-basics-test-po-old-runtime</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<defaultGoal>test</defaultGoal>
</build>
</project>
49 changes: 49 additions & 0 deletions basics/tests/po-old-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<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>jaxb2-basics-tests</artifactId>
<version>2.0.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>jaxb2-basics-test-po-old-runtime</artifactId>
<packaging>jar</packaging>
<name>JAXB Tools :: JAXB Basics :: Test [po-old-runtime]</name>
<dependencies>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-runtime</artifactId>
<version>0.13.1</version>
</dependency>
</dependencies>
<build>
<defaultGoal>test</defaultGoal>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<configuration>
<extension>true</extension>
<args>
<arg>-Xequals</arg>
<arg>-XhashCode</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>0.13.1</version>
</plugin>
</plugins>
</configuration>
</plugin>
</plugins>
</build>
</project>
66 changes: 66 additions & 0 deletions basics/tests/po-old-runtime/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>
2 changes: 2 additions & 0 deletions basics/tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
<module>one</module>
<module>parentpointer</module>
<module>po</module>
<module>po-old-runtime</module>
<module>po-mixed-runtime</module>
<module>propertylistenerinjector</module>
<module>qa-simple</module>
<module>qa-strategic</module>
Expand Down