Skip to content

Commit

Permalink
JT-261 : add relocation parts in main published pom.xml files
Browse files Browse the repository at this point in the history
  • Loading branch information
Laurent SCHOELENS committed Aug 10, 2023
1 parent 259b901 commit 51415ff
Show file tree
Hide file tree
Showing 53 changed files with 81 additions and 53 deletions.
2 changes: 1 addition & 1 deletion dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-project</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Expand Down
8 changes: 7 additions & 1 deletion plugin-2.3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-project</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<distributionManagement>
<relocation>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
</relocation>
</distributionManagement>
<prerequisites>
<maven>${maven.version}</maven>
</prerequisites>
Expand Down
8 changes: 7 additions & 1 deletion plugin-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-project</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<distributionManagement>
<relocation>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin-core</artifactId>
</relocation>
</distributionManagement>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
Expand Down
8 changes: 7 additions & 1 deletion plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,14 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-project</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<distributionManagement>
<relocation>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
</relocation>
</distributionManagement>
<prerequisites>
<maven>${maven.version}</maven>
</prerequisites>
Expand Down
6 changes: 5 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-project</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Maven JAXB 2.x Plugin Project</name>
<description>Maven2 plugin for JAXB 2.x XJC compiler to generate Java sources from XML Schemas.</description>
Expand Down Expand Up @@ -184,6 +184,10 @@
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<relocation>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin-project</artifactId>
</relocation>
</distributionManagement>
<dependencies>
<!-- JUnit -->
Expand Down
2 changes: 1 addition & 1 deletion samples/catalog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-samples</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
2 changes: 1 addition & 1 deletion samples/dtd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-samples</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
2 changes: 1 addition & 1 deletion samples/episode/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-samples</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
2 changes: 1 addition & 1 deletion samples/jaxbplugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-samples</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
2 changes: 1 addition & 1 deletion samples/po/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-samples</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
2 changes: 1 addition & 1 deletion samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-project</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<modules>
<module>catalog</module>
Expand Down
8 changes: 7 additions & 1 deletion testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-project</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<distributionManagement>
<relocation>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin-testing</artifactId>
</relocation>
</distributionManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion tests/JAXB-1044/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-JAXB-1044]</name>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-49/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-49]</name>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-53/a/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-53</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-53-a</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-53/b/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-53</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-53-b</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-53/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-53</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-69/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-69]</name>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-70/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-70]</name>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79-a</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79-b</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-79/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82-a</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82-b</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-82/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-86/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-86]</name>
Expand Down
2 changes: 1 addition & 1 deletion tests/MAVEN_JAXB2_PLUGIN-87/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-87]</name>
Expand Down
2 changes: 1 addition & 1 deletion tests/catalog-xml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-catalog-xml</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/catalog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-catalog</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/episodes/a/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-episodes</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-episodes-a</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/episodes/b/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-episodes</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-episodes-b</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/episodes/c/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-episodes</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-episodes-c</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/episodes/d/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-episodes</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-episodes-d</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/episodes/e/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-episodes</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-episodes-e</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/episodes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-episodes</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/gh-issue-16/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Maven JAXB 2.x Plugin Tests [GitHub Issue #16]</name>
Expand Down
2 changes: 1 addition & 1 deletion tests/gh-issue-22/a/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-gh-issue-22</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-gh-issue-22-a</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/gh-issue-22/b/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-gh-issue-22</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-gh-issue-22-b</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/gh-issue-22/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-gh-issue-22</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/gh-issue-23/one-non-strict/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-tests-gh-issue-23</artifactId>
<version>0.15.4-SNAPSHOT</version>
<version>0.16.0-SNAPSHOT</version>
</parent>
<artifactId>maven-jaxb2-plugin-tests-gh-issue-23-one-non-strict</artifactId>
<packaging>jar</packaging>
Expand Down
Loading

0 comments on commit 51415ff

Please sign in to comment.