From 0471cb9d13980873821d35be3f61e56e63eacd92 Mon Sep 17 00:00:00 2001 From: Laurent SCHOELENS Date: Fri, 12 May 2023 08:20:02 +0200 Subject: [PATCH] GH-262 : Rename groupId, maven artifactId to org.jvnet.jaxb / jaxb-maven-plugin --- README.md | 23 +-- dist/pom.xml | 32 ++-- plugin-2.3/.gitignore | 1 - plugin-2.3/pom.xml | 102 ------------ .../m2e/lifecycle-mapping-metadata.xml | 18 --- plugin-2.3/src/site/site.xml | 6 - plugin-core/pom.xml | 10 +- .../maven}/AbstractXJC2Mojo.java | 8 +- .../maven}/DependencyResource.java | 6 +- .../maven}/DependencyResourceResolver.java | 2 +- .../maven/IOptionsFactory.java} | 4 +- .../maven}/OptionsConfiguration.java | 2 +- .../maven}/ParentFirstClassLoader.java | 2 +- .../maven2 => jaxb/maven}/RawXJC2Mojo.java | 24 +-- .../maven2 => jaxb/maven}/ResourceEntry.java | 2 +- .../AbstractHTTPURILastModifiedResolver.java | 2 +- ...actSchemeAwareURILastModifiedResolver.java | 2 +- .../net/CompositeURILastModifiedResolver.java | 4 +- .../net/FileURILastModifiedResolver.java | 2 +- .../net/HttpURILastModifiedResolver.java | 2 +- .../net/HttpsURILastModifiedResolver.java | 2 +- .../net/JarURILastModifiedResolver.java | 2 +- .../SchemeAwareURILastModifiedResolver.java | 2 +- .../maven}/net/URILastModifiedResolver.java | 2 +- .../maven}/plugin/logging/NullLog.java | 2 +- .../tools/ClasspathCatalogResolver.java | 2 +- .../resolver/tools/MavenCatalogResolver.java | 8 +- .../ReResolvingEntityResolverWrapper.java | 2 +- .../tools/ReResolvingInputSourceWrapper.java | 2 +- .../maven}/util/ArtifactUtils.java | 4 +- .../maven}/util/CollectionUtils.java | 2 +- .../maven2 => jaxb/maven}/util/IOUtils.java | 4 +- .../maven}/util/LocaleUtils.java | 2 +- .../maven}/util/StringUtils.java | 2 +- .../addIfExistsToEpisodeSchemaBindings.xslt | 0 .../maven}/RawXJC2MojoTest.java | 6 +- .../tests/URILastModifiedResolverTest.java | 8 +- .../tools/tests/MavenCatalogResolverTest.java | 2 +- ...ddIfExistsToEpisodeSchemaBindingsTest.java | 4 +- .../maven}/tests/DependencyResourceTest.java | 4 +- .../util/tests/CollectionsUtilsTests.java | 9 +- .../maven}/resolver/tools/tests/a/catalog.cat | 0 .../resolver/tools/tests/a/w3c/1999/xlink.xsd | 0 .../maven}/resolver/tools/tests/b/catalog.cat | 0 .../tests/b/w3c/2005/atom-author-link.xsd | 0 plugin/pom.xml | 31 ++-- .../jvnet/jaxb/maven}/LoggingCodeWriter.java | 2 +- .../jaxb/maven}/LoggingErrorReceiver.java | 2 +- .../org/jvnet/jaxb/maven}/OptionsFactory.java | 8 +- .../java/org/jvnet/jaxb/maven/XJC2Mojo.java | 11 +- .../org/jvnet/mjiip/v_2/OptionsFactory.java | 149 ------------------ .../java/org/jvnet/mjiip/v_2/XJC2Mojo.java | 24 --- plugin/src/site/site.xml | 2 +- .../maven}/JAXBGenerateTest.java | 4 +- .../maven}/JAXBGenerateTestSuite.java | 2 +- plugin/src/test/resources/test-pom.xml | 4 +- pom.xml | 60 ++++--- samples/catalog/pom.xml | 12 +- samples/catalog/project-pom.xml | 10 +- samples/dtd/pom.xml | 12 +- samples/dtd/project-pom.xml | 10 +- samples/episode/a/project-pom.xml | 12 +- samples/episode/b/project-pom.xml | 20 +-- .../episode/b/src/main/resources/catalog.cat | 2 +- samples/episode/c/project-pom.xml | 20 +-- samples/episode/pom.xml | 12 +- samples/episode/project-pom.xml | 10 +- samples/jaxbplugins/pom.xml | 12 +- samples/jaxbplugins/project-pom.xml | 10 +- samples/po/pom.xml | 12 +- samples/po/project-pom.xml | 10 +- samples/pom.xml | 12 +- src/site/site.xml | 2 +- testing/pom.xml | 16 +- .../maven}/test/RunXJC2Mojo.java | 6 +- .../maven}/test/plugin/foo/FooPlugin.java | 2 +- .../services/com.sun.tools.xjc.Plugin | 2 +- .../test/plugin/foo/tests/RunFooPlugin.java | 4 +- tests/JAXB-1044/pom.xml | 18 +-- .../tests/JAXB_1044/RunJAXB_1044Mojo.java | 8 +- tests/MAVEN_JAXB2_PLUGIN-49/pom.xml | 14 +- tests/MAVEN_JAXB2_PLUGIN-53/a/pom.xml | 14 +- .../a/src/main/resources/a.xsd | 4 +- tests/MAVEN_JAXB2_PLUGIN-53/b/pom.xml | 26 +-- .../b/src/main/resources/b.xsd | 12 +- .../b/src/main/resources/catalog.cat | 4 +- .../b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java | 6 +- tests/MAVEN_JAXB2_PLUGIN-53/pom.xml | 10 +- tests/MAVEN_JAXB2_PLUGIN-69/pom.xml | 14 +- tests/MAVEN_JAXB2_PLUGIN-70/pom.xml | 18 +-- .../common-types/pom.xml | 14 +- tests/MAVEN_JAXB2_PLUGIN-77/pom.xml | 10 +- tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml | 24 +-- .../RunMAVEN_JAXB2_PLUGIN_77Mojo.java | 8 +- tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml | 14 +- tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml | 22 +-- .../b/src/main/resources/catalog.cat | 2 +- tests/MAVEN_JAXB2_PLUGIN-79/pom.xml | 10 +- tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml | 14 +- tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml | 22 +-- .../b/src/main/resources/catalog.cat | 2 +- tests/MAVEN_JAXB2_PLUGIN-82/pom.xml | 10 +- tests/MAVEN_JAXB2_PLUGIN-86/pom.xml | 14 +- tests/MAVEN_JAXB2_PLUGIN-87/pom.xml | 14 +- tests/catalog-xml/pom.xml | 18 +-- .../maven}/tests/catalog/RunCatalogMojo.java | 8 +- .../tests/catalog/RunPlainCatalogMojo.java | 6 +- tests/catalog/pom.xml | 18 +-- .../maven}/tests/catalog/RunCatalogMojo.java | 8 +- .../tests/catalog/RunPlainCatalogMojo.java | 6 +- tests/episodes/a/pom.xml | 14 +- tests/episodes/b/pom.xml | 22 +-- .../episodes/b/src/main/resources/catalog.cat | 2 +- tests/episodes/c/pom.xml | 22 +-- tests/episodes/d/pom.xml | 26 +-- .../episodes/d/src/main/resources/catalog.cat | 2 +- tests/episodes/e/pom.xml | 26 +-- .../episodes/e/src/main/resources/catalog.cat | 2 +- tests/episodes/pom.xml | 10 +- tests/gh-issue-16/pom.xml | 18 +-- tests/gh-issue-19/a/pom.xml | 14 +- tests/gh-issue-19/b/pom.xml | 20 +-- .../gh-issue-19/b/src/main/resources/b/b.cat | 4 +- tests/gh-issue-19/pom.xml | 12 +- tests/gh-issue-22/a/pom.xml | 14 +- tests/gh-issue-22/b/pom.xml | 20 +-- tests/gh-issue-22/pom.xml | 10 +- tests/gh-issue-23/one-non-strict/pom.xml | 19 ++- tests/gh-issue-23/pom.xml | 10 +- tests/gh-issue-23/two-non-strict/pom.xml | 20 +-- tests/gh-issue-58/pom.xml | 14 +- tests/issues/pom.xml | 14 +- .../maven/tests/issues/common/Generated.java | 5 + .../maven2/tests/issues/common/Generated.java | 5 - tests/issues/src/main/resources/binding.xjb | 2 +- tests/issues/src/main/resources/schema.xsd | 2 +- tests/java-9/pom.xml | 14 +- .../maven}/java9/Java9Test.java | 2 +- tests/p o/pom.xml | 18 +-- .../{v_2 => }/tests/p_o/RunP_OPlugin.java | 6 +- .../mjiip/{v_2 => }/tests/p_o/RunXJC.java | 2 +- tests/po-2.3/pom.xml | 14 +- tests/po-scd/pom.xml | 14 +- tests/po-scd/src/main/resources/bindings.xjb | 2 +- tests/pom.xml | 18 +-- tests/res/pom.xml | 34 ++-- tests/res/src/main/resources/bindings.xjb | 4 +- .../maven}/tests/res/RunResMojo.java | 14 +- tests/rnc/pom.xml | 18 +-- .../tests/rnc/DatatypeLibraryLoaderTest.java | 2 +- .../maven}/tests/rnc/RunRNCMojo.java | 7 +- tests/tse/pom.xml | 14 +- tests/two/pom.xml | 14 +- tests/wsdl-file/pom.xml | 14 +- tests/wsdl/pom.xml | 14 +- tests/xjc-simple/pom.xml | 14 +- www/docs/guide.html | 2 +- www/index.html | 10 +- 158 files changed, 755 insertions(+), 1049 deletions(-) delete mode 100644 plugin-2.3/.gitignore delete mode 100644 plugin-2.3/pom.xml delete mode 100644 plugin-2.3/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml delete mode 100644 plugin-2.3/src/site/site.xml rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/AbstractXJC2Mojo.java (99%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/DependencyResource.java (96%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/DependencyResourceResolver.java (84%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2/OptionsFactory.java => jaxb/maven/IOptionsFactory.java} (67%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/OptionsConfiguration.java (99%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/ParentFirstClassLoader.java (98%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/RawXJC2Mojo.java (95%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/ResourceEntry.java (96%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/net/AbstractHTTPURILastModifiedResolver.java (98%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/net/AbstractSchemeAwareURILastModifiedResolver.java (96%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/net/CompositeURILastModifiedResolver.java (95%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/net/FileURILastModifiedResolver.java (97%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/net/HttpURILastModifiedResolver.java (87%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/net/HttpsURILastModifiedResolver.java (88%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/net/JarURILastModifiedResolver.java (98%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/net/SchemeAwareURILastModifiedResolver.java (77%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/net/URILastModifiedResolver.java (89%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/plugin/logging/NullLog.java (96%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/resolver/tools/ClasspathCatalogResolver.java (97%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/resolver/tools/MavenCatalogResolver.java (94%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/resolver/tools/ReResolvingEntityResolverWrapper.java (96%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/resolver/tools/ReResolvingInputSourceWrapper.java (97%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/util/ArtifactUtils.java (97%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/util/CollectionUtils.java (98%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/util/IOUtils.java (96%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/util/LocaleUtils.java (96%) rename plugin-core/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/util/StringUtils.java (93%) rename plugin-core/src/main/resources/org/jvnet/{jaxb2/maven2 => jaxb/maven}/addIfExistsToEpisodeSchemaBindings.xslt (100%) rename plugin-core/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/RawXJC2MojoTest.java (91%) rename plugin-core/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/net/tests/URILastModifiedResolverTest.java (84%) rename plugin-core/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/resolver/tools/tests/MavenCatalogResolverTest.java (95%) rename plugin-core/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/tests/AddIfExistsToEpisodeSchemaBindingsTest.java (84%) rename plugin-core/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/tests/DependencyResourceTest.java (95%) rename plugin-core/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/util/tests/CollectionsUtilsTests.java (83%) rename plugin-core/src/test/resources/org/jvnet/{jaxb2/maven2 => jaxb/maven}/resolver/tools/tests/a/catalog.cat (100%) rename plugin-core/src/test/resources/org/jvnet/{jaxb2/maven2 => jaxb/maven}/resolver/tools/tests/a/w3c/1999/xlink.xsd (100%) rename plugin-core/src/test/resources/org/jvnet/{jaxb2/maven2 => jaxb/maven}/resolver/tools/tests/b/catalog.cat (100%) rename plugin-core/src/test/resources/org/jvnet/{jaxb2/maven2 => jaxb/maven}/resolver/tools/tests/b/w3c/2005/atom-author-link.xsd (100%) rename {plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3 => plugin/src/main/java/org/jvnet/jaxb/maven}/LoggingCodeWriter.java (97%) rename {plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3 => plugin/src/main/java/org/jvnet/jaxb/maven}/LoggingErrorReceiver.java (97%) rename {plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3 => plugin/src/main/java/org/jvnet/jaxb/maven}/OptionsFactory.java (94%) rename plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/XJC23Mojo.java => plugin/src/main/java/org/jvnet/jaxb/maven/XJC2Mojo.java (93%) delete mode 100644 plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java delete mode 100644 plugin/src/main/java/org/jvnet/mjiip/v_2/XJC2Mojo.java rename plugin/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/JAXBGenerateTest.java (94%) rename plugin/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/JAXBGenerateTestSuite.java (94%) rename testing/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/test/RunXJC2Mojo.java (93%) rename testing/src/main/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/test/plugin/foo/FooPlugin.java (97%) rename testing/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/test/plugin/foo/tests/RunFooPlugin.java (72%) rename tests/JAXB-1044/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/tests/JAXB_1044/RunJAXB_1044Mojo.java (72%) rename tests/MAVEN_JAXB2_PLUGIN-53/b/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/tests/MAVEN_JAXB2_PLUGIN_53/b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java (68%) rename tests/MAVEN_JAXB2_PLUGIN-77/service/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/tests/MAVEN_JAXB2_PLUGIN_77/RunMAVEN_JAXB2_PLUGIN_77Mojo.java (76%) rename tests/catalog-xml/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/tests/catalog/RunCatalogMojo.java (60%) rename tests/{catalog/src/test/java/org/jvnet/jaxb2/maven2 => catalog-xml/src/test/java/org/jvnet/jaxb/maven}/tests/catalog/RunPlainCatalogMojo.java (65%) rename tests/catalog/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/tests/catalog/RunCatalogMojo.java (60%) rename tests/{catalog-xml/src/test/java/org/jvnet/jaxb2/maven2 => catalog/src/test/java/org/jvnet/jaxb/maven}/tests/catalog/RunPlainCatalogMojo.java (65%) create mode 100644 tests/issues/src/main/java/org/jvnet/jaxb/maven/tests/issues/common/Generated.java delete mode 100644 tests/issues/src/main/java/org/jvnet/jaxb2/maven2/tests/issues/common/Generated.java rename tests/java-9/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/java9/Java9Test.java (93%) rename tests/p o/src/test/java/org/jvnet/mjiip/{v_2 => }/tests/p_o/RunP_OPlugin.java (59%) rename tests/p o/src/test/java/org/jvnet/mjiip/{v_2 => }/tests/p_o/RunXJC.java (84%) rename tests/res/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/tests/res/RunResMojo.java (75%) rename tests/rnc/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/tests/rnc/DatatypeLibraryLoaderTest.java (93%) rename tests/rnc/src/test/java/org/jvnet/{jaxb2/maven2 => jaxb/maven}/tests/rnc/RunRNCMojo.java (82%) diff --git a/README.md b/README.md index ba049bada..24801c9c5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # JAXB Maven Plugin # -Welcome to the `org.jvnet.jaxb2.maven2:maven-jaxb2-plugin`, the most advanced and feature-full Maven plugin for XML Schema compilation. +Welcome to the `org.jvnet.jaxb:jaxb-maven-plugin`, the most advanced and feature-full Maven plugin for XML Schema compilation. ## Quick start ## @@ -13,16 +13,16 @@ Welcome to the `org.jvnet.jaxb2.maven2:maven-jaxb2-plugin`, the most advanced an - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.15.3 + org.jvnet.jaxb + jaxb-maven-plugin + 2.0.0 generate - + @@ -32,10 +32,13 @@ Welcome to the `org.jvnet.jaxb2.maven2:maven-jaxb2-plugin`, the most advanced an ### JAXB Versions -If you need a specific JAXB version, you can explicitly use one of the following variants: +The current version 2.X of this plugin supports only JAXB 2.3. -* `org.jvnet.jaxb2.maven2:maven-jaxb23-plugin` - JAXB 2.3. -* `org.jvnet.jaxb2.maven2:maven-jaxb2-plugin` - "most actual version", at the moment same as `org.jvnet.jaxb2.maven2:maven-jaxb23-plugin`. +If you need an older JAXB version, you can use one of the following variants, which are no more supported : + +* `org.jvnet.jaxb2.maven2:maven-jaxb20-plugin:0.15.2` - JAXB 2.0. +* `org.jvnet.jaxb2.maven2:maven-jaxb21-plugin:0.15.2` - JAXB 2.1. +* `org.jvnet.jaxb2.maven2:maven-jaxb22-plugin:0.15.1` - JAXB 2.2. ### Java versions @@ -58,11 +61,11 @@ Please refer to the [wiki](https://github.com/highsource/maven-jaxb2-plugin/wiki ## Disclaimer ## -This project is not developed, supported or in any other way affiliated with Apache. The `org.jvnet.jaxb2.maven2:maven-jaxb2-plugin` is not an Apache product (and does not pretend to be one), it is a completely independent development. +This project is not developed, supported or in any other way affiliated with Apache. The `org.jvnet.jaxb:jaxb-maven-plugin` is not an Apache product (and does not pretend to be one), it is a completely independent development. This project is also *not* developed by or affiliated with Oracle or Sun. Even if it is featured on [https://jaxb.java.net/](https://jaxb.java.net) pages, -**This plugin is in no way _official_ JAXB2 Maven plugin by Sun or Oracle.** +**This plugin is in no way _official_ JAXB Maven plugin by Sun or Oracle.** This is a completely indepentent development. [I](https://github.com/highsource) am *not* an Oracle employee. diff --git a/dist/pom.xml b/dist/pom.xml index 5633da331..3a756cfe3 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -2,47 +2,47 @@ 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"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-dist + org.jvnet.jaxb + jaxb-maven-plugin-dist pom - Maven JAXB 2.x Plugin Dist + Maven JAXB Plugin Dist - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-project - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-project + 2.0.0-SNAPSHOT - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-catalog + org.jvnet.jaxb + jaxb-maven-plugin-sample-catalog zip maven-src ${project.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-dtd + org.jvnet.jaxb + jaxb-maven-plugin-sample-dtd zip maven-src ${project.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-episode + org.jvnet.jaxb + jaxb-maven-plugin-sample-episode zip maven-src ${project.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-jaxbplugins + org.jvnet.jaxb + jaxb-maven-plugin-sample-jaxbplugins zip maven-src ${project.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-po + org.jvnet.jaxb + jaxb-maven-plugin-sample-po zip maven-src ${project.version} diff --git a/plugin-2.3/.gitignore b/plugin-2.3/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/plugin-2.3/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/plugin-2.3/pom.xml b/plugin-2.3/pom.xml deleted file mode 100644 index 0a7b7f5a9..000000000 --- a/plugin-2.3/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - 4.0.0 - maven-jaxb23-plugin - maven-plugin - Maven JAXB 2.3.x Plugin - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-project - 0.15.4-SNAPSHOT - - - ${maven.version} - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-core - - - org.codehaus.plexus - plexus-utils - - - jakarta.xml.bind - jakarta.xml.bind-api - - - org.glassfish.jaxb - jaxb-runtime - - - org.glassfish.jaxb - jaxb-xjc - - - com.sun.activation - jakarta.activation - compile - - - org.apache.maven.plugin-tools - maven-plugin-annotations - - - org.apache.maven.plugin-testing - maven-plugin-testing-harness - test - - - - - - src/main/resources - true - - - ${project.build.directory}/generated-resources/jaxb-xjc-runtime - false - - - - - org.apache.maven.plugins - maven-plugin-plugin - - - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - generate-resources - - unpack - - - - - org.glassfish.jaxb - jaxb-xjc - ${jaxb23.version} - sources - jar - false - ${project.build.directory}/generated-resources/jaxb-xjc-runtime - com/sun/tools/xjc/runtime/*.java - - - - - - - - - diff --git a/plugin-2.3/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/plugin-2.3/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml deleted file mode 100644 index 7d4248442..000000000 --- a/plugin-2.3/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - generate - - - - - true - true - - - - - \ No newline at end of file diff --git a/plugin-2.3/src/site/site.xml b/plugin-2.3/src/site/site.xml deleted file mode 100644 index bd04fc202..000000000 --- a/plugin-2.3/src/site/site.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - ${reports} - - - diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml index 32675d37d..426ef01ac 100644 --- a/plugin-core/pom.xml +++ b/plugin-core/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - maven-jaxb2-plugin-core + jaxb-maven-plugin-core jar - Maven JAXB 2.x Plugin Core + Maven JAXB Plugin Core - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-project - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-project + 2.0.0-SNAPSHOT diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/AbstractXJC2Mojo.java similarity index 99% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/AbstractXJC2Mojo.java index 2d97d086b..0aded440a 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/AbstractXJC2Mojo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2; +package org.jvnet.jaxb.maven; import java.io.File; import java.io.FileFilter; @@ -33,8 +33,8 @@ import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.artifact.MavenMetadataSource; import org.apache.maven.settings.Settings; -import org.jvnet.jaxb2.maven2.util.ArtifactUtils; -import org.jvnet.jaxb2.maven2.util.IOUtils; +import org.jvnet.jaxb.maven.util.ArtifactUtils; +import org.jvnet.jaxb.maven.util.IOUtils; import org.sonatype.plexus.build.incremental.BuildContext; import org.sonatype.plexus.build.incremental.DefaultBuildContext; @@ -1476,7 +1476,7 @@ private void merge(Dependency dependency, } } - protected abstract OptionsFactory getOptionsFactory(); + protected abstract IOptionsFactory getOptionsFactory(); protected void cleanPackageDirectory(final File packageDirectory) { final File[] files = packageDirectory.listFiles(new FileFilter() { diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/DependencyResource.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResource.java similarity index 96% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/DependencyResource.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResource.java index d9d130f8f..9810365b2 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/DependencyResource.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResource.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2.maven2; +package org.jvnet.jaxb.maven; import java.text.MessageFormat; import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Dependency; -import org.jvnet.jaxb2.maven2.resolver.tools.MavenCatalogResolver; -import org.jvnet.jaxb2.maven2.util.StringUtils; +import org.jvnet.jaxb.maven.resolver.tools.MavenCatalogResolver; +import org.jvnet.jaxb.maven.util.StringUtils; public class DependencyResource extends Dependency { diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/DependencyResourceResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResourceResolver.java similarity index 84% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/DependencyResourceResolver.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResourceResolver.java index 7d605601b..ad2a8f9c9 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/DependencyResourceResolver.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResourceResolver.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2; +package org.jvnet.jaxb.maven; import java.net.URL; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsFactory.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/IOptionsFactory.java similarity index 67% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsFactory.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/IOptionsFactory.java index 5788644fd..0cb51d6b9 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsFactory.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/IOptionsFactory.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2.maven2; +package org.jvnet.jaxb.maven; import org.apache.maven.plugin.MojoExecutionException; -public interface OptionsFactory { +public interface IOptionsFactory { public O createOptions(OptionsConfiguration optionsConfiguration) throws MojoExecutionException; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/OptionsConfiguration.java similarity index 99% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/OptionsConfiguration.java index 8536051ff..8702fc4d7 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/OptionsConfiguration.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2; +package org.jvnet.jaxb.maven; import java.io.File; import java.net.URL; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/ParentFirstClassLoader.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/ParentFirstClassLoader.java similarity index 98% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/ParentFirstClassLoader.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/ParentFirstClassLoader.java index 5a895fff1..aa073c97a 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/ParentFirstClassLoader.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/ParentFirstClassLoader.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.jvnet.jaxb2.maven2; +package org.jvnet.jaxb.maven; import java.net.URL; import java.net.URLClassLoader; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java similarity index 95% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java index 6fb4aae27..b4f39b547 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.jvnet.jaxb2.maven2; +package org.jvnet.jaxb.maven; import java.io.File; import java.io.IOException; @@ -61,16 +61,16 @@ import org.apache.maven.settings.Settings; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; -import org.jvnet.jaxb2.maven2.net.CompositeURILastModifiedResolver; -import org.jvnet.jaxb2.maven2.net.FileURILastModifiedResolver; -import org.jvnet.jaxb2.maven2.net.URILastModifiedResolver; -import org.jvnet.jaxb2.maven2.resolver.tools.MavenCatalogResolver; -import org.jvnet.jaxb2.maven2.resolver.tools.ReResolvingEntityResolverWrapper; -import org.jvnet.jaxb2.maven2.util.ArtifactUtils; -import org.jvnet.jaxb2.maven2.util.CollectionUtils; -import org.jvnet.jaxb2.maven2.util.CollectionUtils.Function; -import org.jvnet.jaxb2.maven2.util.IOUtils; -import org.jvnet.jaxb2.maven2.util.LocaleUtils; +import org.jvnet.jaxb.maven.net.CompositeURILastModifiedResolver; +import org.jvnet.jaxb.maven.net.FileURILastModifiedResolver; +import org.jvnet.jaxb.maven.net.URILastModifiedResolver; +import org.jvnet.jaxb.maven.resolver.tools.MavenCatalogResolver; +import org.jvnet.jaxb.maven.resolver.tools.ReResolvingEntityResolverWrapper; +import org.jvnet.jaxb.maven.util.ArtifactUtils; +import org.jvnet.jaxb.maven.util.CollectionUtils; +import org.jvnet.jaxb.maven.util.IOUtils; +import org.jvnet.jaxb.maven.util.LocaleUtils; +import org.jvnet.jaxb.maven.util.CollectionUtils.Function; import org.sonatype.plexus.build.incremental.BuildContext; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; @@ -81,7 +81,7 @@ import com.sun.xml.txw2.annotation.XmlNamespace; /** - * Maven JAXB 2.x Mojo. + * Maven JAXB Mojo. * * @author Aleksei Valikov (valikov@gmx.net) */ diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/ResourceEntry.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/ResourceEntry.java similarity index 96% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/ResourceEntry.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/ResourceEntry.java index b151240b3..dc27d6427 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/ResourceEntry.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/ResourceEntry.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2; +package org.jvnet.jaxb.maven; import org.apache.maven.model.FileSet; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/AbstractHTTPURILastModifiedResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractHTTPURILastModifiedResolver.java similarity index 98% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/AbstractHTTPURILastModifiedResolver.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractHTTPURILastModifiedResolver.java index 4d55c9d79..efdfaa09f 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/AbstractHTTPURILastModifiedResolver.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractHTTPURILastModifiedResolver.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.net; +package org.jvnet.jaxb.maven.net; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/AbstractSchemeAwareURILastModifiedResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractSchemeAwareURILastModifiedResolver.java similarity index 96% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/AbstractSchemeAwareURILastModifiedResolver.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractSchemeAwareURILastModifiedResolver.java index 07d30e9fe..f02279be1 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/AbstractSchemeAwareURILastModifiedResolver.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractSchemeAwareURILastModifiedResolver.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.net; +package org.jvnet.jaxb.maven.net; import java.net.URI; import java.text.MessageFormat; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/CompositeURILastModifiedResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/CompositeURILastModifiedResolver.java similarity index 95% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/CompositeURILastModifiedResolver.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/net/CompositeURILastModifiedResolver.java index 5bc0cbbeb..1162ea005 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/CompositeURILastModifiedResolver.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/CompositeURILastModifiedResolver.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.net; +package org.jvnet.jaxb.maven.net; import java.net.URI; import java.text.MessageFormat; @@ -7,7 +7,7 @@ import org.apache.commons.lang3.Validate; import org.apache.maven.plugin.logging.Log; -import org.jvnet.jaxb2.maven2.plugin.logging.NullLog; +import org.jvnet.jaxb.maven.plugin.logging.NullLog; public class CompositeURILastModifiedResolver implements URILastModifiedResolver { diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/FileURILastModifiedResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/FileURILastModifiedResolver.java similarity index 97% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/FileURILastModifiedResolver.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/net/FileURILastModifiedResolver.java index 5e2597634..ee24ab4ca 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/FileURILastModifiedResolver.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/FileURILastModifiedResolver.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.net; +package org.jvnet.jaxb.maven.net; import java.io.File; import java.net.URI; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/HttpURILastModifiedResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpURILastModifiedResolver.java similarity index 87% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/HttpURILastModifiedResolver.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpURILastModifiedResolver.java index bb201fb90..0062c65af 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/HttpURILastModifiedResolver.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpURILastModifiedResolver.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.net; +package org.jvnet.jaxb.maven.net; import org.apache.maven.plugin.logging.Log; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/HttpsURILastModifiedResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpsURILastModifiedResolver.java similarity index 88% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/HttpsURILastModifiedResolver.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpsURILastModifiedResolver.java index 367ddbd2d..42577b9fb 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/HttpsURILastModifiedResolver.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpsURILastModifiedResolver.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.net; +package org.jvnet.jaxb.maven.net; import org.apache.maven.plugin.logging.Log; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/JarURILastModifiedResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/JarURILastModifiedResolver.java similarity index 98% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/JarURILastModifiedResolver.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/net/JarURILastModifiedResolver.java index 1a006ad4f..c7703dbd1 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/JarURILastModifiedResolver.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/JarURILastModifiedResolver.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.net; +package org.jvnet.jaxb.maven.net; import java.net.MalformedURLException; import java.net.URI; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/SchemeAwareURILastModifiedResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/SchemeAwareURILastModifiedResolver.java similarity index 77% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/SchemeAwareURILastModifiedResolver.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/net/SchemeAwareURILastModifiedResolver.java index d2a06ed72..37ac63dfa 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/SchemeAwareURILastModifiedResolver.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/SchemeAwareURILastModifiedResolver.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.net; +package org.jvnet.jaxb.maven.net; public interface SchemeAwareURILastModifiedResolver extends URILastModifiedResolver { diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/URILastModifiedResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/URILastModifiedResolver.java similarity index 89% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/URILastModifiedResolver.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/net/URILastModifiedResolver.java index f5796702d..d949784e4 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/net/URILastModifiedResolver.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/URILastModifiedResolver.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.net; +package org.jvnet.jaxb.maven.net; import java.net.URI; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/plugin/logging/NullLog.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/plugin/logging/NullLog.java similarity index 96% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/plugin/logging/NullLog.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/plugin/logging/NullLog.java index cee4d0c7a..72e808636 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/plugin/logging/NullLog.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/plugin/logging/NullLog.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.plugin.logging; +package org.jvnet.jaxb.maven.plugin.logging; import org.apache.maven.plugin.logging.Log; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java similarity index 97% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java index 764bb6930..78031b0a7 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.resolver.tools; +package org.jvnet.jaxb.maven.resolver.tools; import java.net.URI; import java.net.URISyntaxException; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java similarity index 94% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java index a95d51b53..10e7a650e 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.resolver.tools; +package org.jvnet.jaxb.maven.resolver.tools; import java.net.URI; import java.net.URISyntaxException; @@ -6,9 +6,9 @@ import java.text.MessageFormat; import org.apache.maven.plugin.logging.Log; -import org.jvnet.jaxb2.maven2.DependencyResource; -import org.jvnet.jaxb2.maven2.DependencyResourceResolver; -import org.jvnet.jaxb2.maven2.plugin.logging.NullLog; +import org.jvnet.jaxb.maven.DependencyResource; +import org.jvnet.jaxb.maven.DependencyResourceResolver; +import org.jvnet.jaxb.maven.plugin.logging.NullLog; import com.sun.org.apache.xml.internal.resolver.CatalogManager; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ReResolvingEntityResolverWrapper.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingEntityResolverWrapper.java similarity index 96% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ReResolvingEntityResolverWrapper.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingEntityResolverWrapper.java index de4acb638..268018241 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ReResolvingEntityResolverWrapper.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingEntityResolverWrapper.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.resolver.tools; +package org.jvnet.jaxb.maven.resolver.tools; import java.io.IOException; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ReResolvingInputSourceWrapper.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingInputSourceWrapper.java similarity index 97% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ReResolvingInputSourceWrapper.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingInputSourceWrapper.java index 7c50aeb6b..b6df23b64 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ReResolvingInputSourceWrapper.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingInputSourceWrapper.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.resolver.tools; +package org.jvnet.jaxb.maven.resolver.tools; import java.io.IOException; import java.io.InputStream; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/ArtifactUtils.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/ArtifactUtils.java similarity index 97% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/ArtifactUtils.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/util/ArtifactUtils.java index 65e74f094..cde760001 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/ArtifactUtils.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/ArtifactUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.util; +package org.jvnet.jaxb.maven.util; import java.io.File; import java.util.Arrays; @@ -19,7 +19,7 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.artifact.MavenMetadataSource; -import org.jvnet.jaxb2.maven2.util.CollectionUtils.Function; +import org.jvnet.jaxb.maven.util.CollectionUtils.Function; public class ArtifactUtils { diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/CollectionUtils.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/CollectionUtils.java similarity index 98% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/CollectionUtils.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/util/CollectionUtils.java index efe6c9036..14391f322 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/CollectionUtils.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/CollectionUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.util; +package org.jvnet.jaxb.maven.util; import java.util.ArrayList; import java.util.Collection; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/IOUtils.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/IOUtils.java similarity index 96% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/IOUtils.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/util/IOUtils.java index d682a613e..5b5b70ea1 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/IOUtils.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/IOUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.util; +package org.jvnet.jaxb.maven.util; import java.io.File; import java.io.IOException; @@ -11,7 +11,7 @@ import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.Scanner; -import org.jvnet.jaxb2.maven2.util.CollectionUtils.Function; +import org.jvnet.jaxb.maven.util.CollectionUtils.Function; import org.sonatype.plexus.build.incremental.BuildContext; import org.xml.sax.InputSource; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/LocaleUtils.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/LocaleUtils.java similarity index 96% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/LocaleUtils.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/util/LocaleUtils.java index d6bfaa3a7..55139eb86 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/LocaleUtils.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/LocaleUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.util; +package org.jvnet.jaxb.maven.util; import java.util.Locale; diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/StringUtils.java b/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/StringUtils.java similarity index 93% rename from plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/StringUtils.java rename to plugin-core/src/main/java/org/jvnet/jaxb/maven/util/StringUtils.java index b8fcd52e7..3244c2c51 100644 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/util/StringUtils.java +++ b/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/StringUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.util; +package org.jvnet.jaxb.maven.util; import java.util.ArrayList; import java.util.List; diff --git a/plugin-core/src/main/resources/org/jvnet/jaxb2/maven2/addIfExistsToEpisodeSchemaBindings.xslt b/plugin-core/src/main/resources/org/jvnet/jaxb/maven/addIfExistsToEpisodeSchemaBindings.xslt similarity index 100% rename from plugin-core/src/main/resources/org/jvnet/jaxb2/maven2/addIfExistsToEpisodeSchemaBindings.xslt rename to plugin-core/src/main/resources/org/jvnet/jaxb/maven/addIfExistsToEpisodeSchemaBindings.xslt diff --git a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/RawXJC2MojoTest.java b/plugin-core/src/test/java/org/jvnet/jaxb/maven/RawXJC2MojoTest.java similarity index 91% rename from plugin-core/src/test/java/org/jvnet/jaxb2/maven2/RawXJC2MojoTest.java rename to plugin-core/src/test/java/org/jvnet/jaxb/maven/RawXJC2MojoTest.java index 924047ab9..5d2c62679 100644 --- a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/RawXJC2MojoTest.java +++ b/plugin-core/src/test/java/org/jvnet/jaxb/maven/RawXJC2MojoTest.java @@ -1,10 +1,12 @@ -package org.jvnet.jaxb2.maven2; +package org.jvnet.jaxb.maven; import org.apache.maven.plugin.MojoExecutionException; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.jvnet.jaxb.maven.IOptionsFactory; +import org.jvnet.jaxb.maven.RawXJC2Mojo; import java.io.ByteArrayOutputStream; import java.io.File; @@ -48,7 +50,7 @@ public void collectsBindingUrisFromArtifact() throws Exception { final RawXJC2Mojo mojo = new RawXJC2Mojo() { @Override - protected OptionsFactory getOptionsFactory() { + protected IOptionsFactory getOptionsFactory() { throw new UnsupportedOperationException(); } diff --git a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/net/tests/URILastModifiedResolverTest.java b/plugin-core/src/test/java/org/jvnet/jaxb/maven/net/tests/URILastModifiedResolverTest.java similarity index 84% rename from plugin-core/src/test/java/org/jvnet/jaxb2/maven2/net/tests/URILastModifiedResolverTest.java rename to plugin-core/src/test/java/org/jvnet/jaxb/maven/net/tests/URILastModifiedResolverTest.java index 61abc46ab..c69a980f7 100644 --- a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/net/tests/URILastModifiedResolverTest.java +++ b/plugin-core/src/test/java/org/jvnet/jaxb/maven/net/tests/URILastModifiedResolverTest.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.net.tests; +package org.jvnet.jaxb.maven.net.tests; import java.io.IOException; import java.net.MalformedURLException; @@ -8,9 +8,9 @@ import org.apache.maven.plugin.logging.SystemStreamLog; import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2.maven2.net.CompositeURILastModifiedResolver; -import org.jvnet.jaxb2.maven2.net.JarURILastModifiedResolver; -import org.jvnet.jaxb2.maven2.net.URILastModifiedResolver; +import org.jvnet.jaxb.maven.net.CompositeURILastModifiedResolver; +import org.jvnet.jaxb.maven.net.JarURILastModifiedResolver; +import org.jvnet.jaxb.maven.net.URILastModifiedResolver; public class URILastModifiedResolverTest { diff --git a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java b/plugin-core/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java similarity index 95% rename from plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java rename to plugin-core/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java index 588be4d63..8084bb061 100644 --- a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java +++ b/plugin-core/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.resolver.tools.tests; +package org.jvnet.jaxb.maven.resolver.tools.tests; import java.io.IOException; import java.net.URL; diff --git a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/tests/AddIfExistsToEpisodeSchemaBindingsTest.java b/plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/AddIfExistsToEpisodeSchemaBindingsTest.java similarity index 84% rename from plugin-core/src/test/java/org/jvnet/jaxb2/maven2/tests/AddIfExistsToEpisodeSchemaBindingsTest.java rename to plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/AddIfExistsToEpisodeSchemaBindingsTest.java index 0dcb78011..c868da947 100644 --- a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/tests/AddIfExistsToEpisodeSchemaBindingsTest.java +++ b/plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/AddIfExistsToEpisodeSchemaBindingsTest.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2.maven2.tests; +package org.jvnet.jaxb.maven.tests; import java.io.InputStream; import org.codehaus.plexus.util.IOUtil; import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2.maven2.RawXJC2Mojo; +import org.jvnet.jaxb.maven.RawXJC2Mojo; public class AddIfExistsToEpisodeSchemaBindingsTest { diff --git a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/tests/DependencyResourceTest.java b/plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/DependencyResourceTest.java similarity index 95% rename from plugin-core/src/test/java/org/jvnet/jaxb2/maven2/tests/DependencyResourceTest.java rename to plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/DependencyResourceTest.java index 838ad32d1..ca6e129f9 100644 --- a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/tests/DependencyResourceTest.java +++ b/plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/DependencyResourceTest.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2.maven2.tests; +package org.jvnet.jaxb.maven.tests; import org.junit.Test; -import org.jvnet.jaxb2.maven2.DependencyResource; +import org.jvnet.jaxb.maven.DependencyResource; public class DependencyResourceTest { diff --git a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/util/tests/CollectionsUtilsTests.java b/plugin-core/src/test/java/org/jvnet/jaxb/maven/util/tests/CollectionsUtilsTests.java similarity index 83% rename from plugin-core/src/test/java/org/jvnet/jaxb2/maven2/util/tests/CollectionsUtilsTests.java rename to plugin-core/src/test/java/org/jvnet/jaxb/maven/util/tests/CollectionsUtilsTests.java index 044f2539d..41d35ac21 100644 --- a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/util/tests/CollectionsUtilsTests.java +++ b/plugin-core/src/test/java/org/jvnet/jaxb/maven/util/tests/CollectionsUtilsTests.java @@ -1,13 +1,12 @@ -package org.jvnet.jaxb2.maven2.util.tests; +package org.jvnet.jaxb.maven.util.tests; import java.util.Arrays; import java.util.Comparator; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2.maven2.util.CollectionUtils; -import org.jvnet.jaxb2.maven2.util.CollectionUtils.Function; +import org.jvnet.jaxb.maven.util.CollectionUtils; +import org.jvnet.jaxb.maven.util.CollectionUtils.Function; public class CollectionsUtilsTests { diff --git a/plugin-core/src/test/resources/org/jvnet/jaxb2/maven2/resolver/tools/tests/a/catalog.cat b/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/catalog.cat similarity index 100% rename from plugin-core/src/test/resources/org/jvnet/jaxb2/maven2/resolver/tools/tests/a/catalog.cat rename to plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/catalog.cat diff --git a/plugin-core/src/test/resources/org/jvnet/jaxb2/maven2/resolver/tools/tests/a/w3c/1999/xlink.xsd b/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/w3c/1999/xlink.xsd similarity index 100% rename from plugin-core/src/test/resources/org/jvnet/jaxb2/maven2/resolver/tools/tests/a/w3c/1999/xlink.xsd rename to plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/w3c/1999/xlink.xsd diff --git a/plugin-core/src/test/resources/org/jvnet/jaxb2/maven2/resolver/tools/tests/b/catalog.cat b/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/catalog.cat similarity index 100% rename from plugin-core/src/test/resources/org/jvnet/jaxb2/maven2/resolver/tools/tests/b/catalog.cat rename to plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/catalog.cat diff --git a/plugin-core/src/test/resources/org/jvnet/jaxb2/maven2/resolver/tools/tests/b/w3c/2005/atom-author-link.xsd b/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/w3c/2005/atom-author-link.xsd similarity index 100% rename from plugin-core/src/test/resources/org/jvnet/jaxb2/maven2/resolver/tools/tests/b/w3c/2005/atom-author-link.xsd rename to plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/w3c/2005/atom-author-link.xsd diff --git a/plugin/pom.xml b/plugin/pom.xml index ef9260880..f36fbed85 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -1,29 +1,42 @@ 4.0.0 - maven-jaxb2-plugin + jaxb-maven-plugin maven-plugin - Maven JAXB 2.x Plugin + Maven JAXB Plugin https://github.com/highsource/maven-jaxb2-plugin - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-project - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-project + 2.0.0-SNAPSHOT ${maven.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-core + org.jvnet.jaxb + jaxb-maven-plugin-core org.codehaus.plexus plexus-utils - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + jakarta.xml.bind + jakarta.xml.bind-api + + + org.glassfish.jaxb + jaxb-runtime + + + org.glassfish.jaxb + jaxb-xjc + + + com.sun.activation + jakarta.activation + compile org.apache.maven.plugin-tools diff --git a/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/LoggingCodeWriter.java b/plugin/src/main/java/org/jvnet/jaxb/maven/LoggingCodeWriter.java similarity index 97% rename from plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/LoggingCodeWriter.java rename to plugin/src/main/java/org/jvnet/jaxb/maven/LoggingCodeWriter.java index c61d41949..f4425d635 100644 --- a/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/LoggingCodeWriter.java +++ b/plugin/src/main/java/org/jvnet/jaxb/maven/LoggingCodeWriter.java @@ -1,7 +1,7 @@ /** * */ -package org.jvnet.mjiip.v_2_3; +package org.jvnet.jaxb.maven; import java.io.File; import java.io.IOException; diff --git a/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/LoggingErrorReceiver.java b/plugin/src/main/java/org/jvnet/jaxb/maven/LoggingErrorReceiver.java similarity index 97% rename from plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/LoggingErrorReceiver.java rename to plugin/src/main/java/org/jvnet/jaxb/maven/LoggingErrorReceiver.java index 2bad2b72f..3a2d0182b 100644 --- a/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/LoggingErrorReceiver.java +++ b/plugin/src/main/java/org/jvnet/jaxb/maven/LoggingErrorReceiver.java @@ -1,7 +1,7 @@ /** * */ -package org.jvnet.mjiip.v_2_3; +package org.jvnet.jaxb.maven; import org.apache.maven.plugin.logging.Log; import org.xml.sax.SAXParseException; diff --git a/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/OptionsFactory.java b/plugin/src/main/java/org/jvnet/jaxb/maven/OptionsFactory.java similarity index 94% rename from plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/OptionsFactory.java rename to plugin/src/main/java/org/jvnet/jaxb/maven/OptionsFactory.java index a1d1214d1..6f39d9640 100644 --- a/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/OptionsFactory.java +++ b/plugin/src/main/java/org/jvnet/jaxb/maven/OptionsFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.mjiip.v_2_3; +package org.jvnet.jaxb.maven; import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; @@ -6,8 +6,7 @@ import java.util.List; import org.apache.maven.plugin.MojoExecutionException; -import org.jvnet.jaxb2.maven2.OptionsConfiguration; -import org.jvnet.jaxb2.maven2.util.StringUtils; +import org.jvnet.jaxb.maven.util.StringUtils; import org.xml.sax.InputSource; import com.sun.tools.xjc.BadCommandLineException; @@ -15,8 +14,7 @@ import com.sun.tools.xjc.Options; import com.sun.tools.xjc.api.SpecVersion; -public class OptionsFactory implements - org.jvnet.jaxb2.maven2.OptionsFactory { +public class OptionsFactory implements IOptionsFactory { /** * Creates and initializes an instance of XJC options. * diff --git a/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/XJC23Mojo.java b/plugin/src/main/java/org/jvnet/jaxb/maven/XJC2Mojo.java similarity index 93% rename from plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/XJC23Mojo.java rename to plugin/src/main/java/org/jvnet/jaxb/maven/XJC2Mojo.java index 1aa54eef5..96f00b933 100644 --- a/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/XJC23Mojo.java +++ b/plugin/src/main/java/org/jvnet/jaxb/maven/XJC2Mojo.java @@ -1,4 +1,4 @@ -package org.jvnet.mjiip.v_2_3; +package org.jvnet.jaxb.maven; import java.io.File; import java.io.IOException; @@ -9,7 +9,6 @@ import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.ResolutionScope; -import org.jvnet.jaxb2.maven2.RawXJC2Mojo; import com.sun.codemodel.CodeWriter; import com.sun.codemodel.JCodeModel; @@ -25,13 +24,13 @@ * * @author Aleksei Valikov (valikov@gmx.net) */ -@Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true) -public class XJC23Mojo extends RawXJC2Mojo { +@Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE, requiresDependencyCollection = ResolutionScope.COMPILE, threadSafe = true) +public class XJC2Mojo extends RawXJC2Mojo { - private final org.jvnet.jaxb2.maven2.OptionsFactory optionsFactory = new OptionsFactory(); + private final IOptionsFactory optionsFactory = new OptionsFactory(); @Override - protected org.jvnet.jaxb2.maven2.OptionsFactory getOptionsFactory() { + protected IOptionsFactory getOptionsFactory() { return optionsFactory; } diff --git a/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java b/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java deleted file mode 100644 index 4ae2ccb96..000000000 --- a/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java +++ /dev/null @@ -1,149 +0,0 @@ -package org.jvnet.mjiip.v_2; - -import java.nio.charset.Charset; -import java.nio.charset.IllegalCharsetNameException; -import java.text.MessageFormat; -import java.util.List; - -import org.apache.maven.plugin.MojoExecutionException; -import org.jvnet.jaxb2.maven2.OptionsConfiguration; -import org.jvnet.jaxb2.maven2.util.StringUtils; -import org.xml.sax.InputSource; - -import com.sun.tools.xjc.BadCommandLineException; -import com.sun.tools.xjc.Language; -import com.sun.tools.xjc.Options; -import com.sun.tools.xjc.api.SpecVersion; - -public class OptionsFactory implements - org.jvnet.jaxb2.maven2.OptionsFactory { - /** - * Creates and initializes an instance of XJC options. - * - */ - public Options createOptions(OptionsConfiguration optionsConfiguration) - throws MojoExecutionException { - final Options options = new Options(); - - options.verbose = optionsConfiguration.isVerbose(); - options.debugMode = optionsConfiguration.isDebugMode(); - - options.classpaths.addAll(optionsConfiguration.getPlugins()); - - options.target = createSpecVersion(optionsConfiguration - .getSpecVersion()); - - final String encoding = optionsConfiguration.getEncoding(); - - if (encoding != null) { - options.encoding = createEncoding(encoding); - } - - options.setSchemaLanguage(createLanguage(optionsConfiguration - .getSchemaLanguage())); - - options.entityResolver = optionsConfiguration.getEntityResolver(); - - for (InputSource grammar : optionsConfiguration.getGrammars()) { - options.addGrammar(grammar); - } - - for (InputSource bindFile : optionsConfiguration.getBindFiles()) { - options.addBindFile(bindFile); - } - - // Setup Other Options - - options.defaultPackage = optionsConfiguration.getGeneratePackage(); - options.targetDir = optionsConfiguration.getGenerateDirectory(); - - options.strictCheck = optionsConfiguration.isStrict(); - options.readOnly = optionsConfiguration.isReadOnly(); - options.packageLevelAnnotations = optionsConfiguration - .isPackageLevelAnnotations(); - options.noFileHeader = optionsConfiguration.isNoFileHeader(); - options.enableIntrospection = optionsConfiguration - .isEnableIntrospection(); - options.disableXmlSecurity = optionsConfiguration - .isDisableXmlSecurity(); - - if (optionsConfiguration.getAccessExternalSchema() != null) { - System.setProperty("javax.xml.accessExternalSchema", - optionsConfiguration.getAccessExternalSchema()); - } - if (optionsConfiguration.getAccessExternalDTD() != null) { - System.setProperty("javax.xml.accessExternalDTD", - optionsConfiguration.getAccessExternalDTD()); - } - if (optionsConfiguration.isEnableExternalEntityProcessing()) { - System.setProperty("enableExternalEntityProcessing", Boolean.TRUE.toString()); - } - options.contentForWildcard = optionsConfiguration - .isContentForWildcard(); - - if (optionsConfiguration.isExtension()) { - options.compatibilityMode = Options.EXTENSION; - } - - final List arguments = optionsConfiguration.getArguments(); - try { - options.parseArguments(arguments.toArray(new String[arguments - .size()])); - } - - catch (BadCommandLineException bclex) { - throw new MojoExecutionException("Error parsing the command line [" - + arguments + "]", bclex); - } - - return options; - } - - private SpecVersion createSpecVersion(String specVersion) { - if (specVersion == null) { - return SpecVersion.LATEST; - } else { - final SpecVersion sv = SpecVersion.parse(specVersion); - return sv == null ? SpecVersion.LATEST : sv; - } - - } - - private String createEncoding(String encoding) - throws MojoExecutionException { - if (encoding == null) { - return null; - } - try { - if (!Charset.isSupported(encoding)) { - throw new MojoExecutionException( - - MessageFormat.format("Unsupported encoding [{0}].", encoding)); - } - return encoding; - } catch (IllegalCharsetNameException icne) { - throw new MojoExecutionException( - - MessageFormat.format("Unsupported encoding [{0}].", encoding)); - } - - } - - private Language createLanguage(String schemaLanguage) - throws MojoExecutionException { - if (StringUtils.isEmpty(schemaLanguage)) { - return null; - } else if ("AUTODETECT".equalsIgnoreCase(schemaLanguage)) - return null; // nothing, it is AUTDETECT by default. - else if ("XMLSCHEMA".equalsIgnoreCase(schemaLanguage)) - return Language.XMLSCHEMA; - else if ("DTD".equalsIgnoreCase(schemaLanguage)) - return Language.DTD; - else if ("WSDL".equalsIgnoreCase(schemaLanguage)) - return Language.WSDL; - else { - throw new MojoExecutionException(MessageFormat.format( - "Unknown schemaLanguage [{0}].", schemaLanguage)); - } - } -} diff --git a/plugin/src/main/java/org/jvnet/mjiip/v_2/XJC2Mojo.java b/plugin/src/main/java/org/jvnet/mjiip/v_2/XJC2Mojo.java deleted file mode 100644 index acf715dd1..000000000 --- a/plugin/src/main/java/org/jvnet/mjiip/v_2/XJC2Mojo.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.jvnet.mjiip.v_2; - -import org.apache.maven.plugins.annotations.LifecyclePhase; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.ResolutionScope; -import org.jvnet.mjiip.v_2_3.XJC23Mojo; - -import com.sun.tools.xjc.Options; - -/** - * JAXB 2.x Mojo. - * - * @author Aleksei Valikov (valikov@gmx.net) - */ -@Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE, requiresDependencyCollection = ResolutionScope.COMPILE, threadSafe = true) -public class XJC2Mojo extends XJC23Mojo { - - private final org.jvnet.jaxb2.maven2.OptionsFactory optionsFactory = new OptionsFactory(); - - @Override - protected org.jvnet.jaxb2.maven2.OptionsFactory getOptionsFactory() { - return optionsFactory; - } -} diff --git a/plugin/src/site/site.xml b/plugin/src/site/site.xml index 6c65c4986..5dbcad8e7 100644 --- a/plugin/src/site/site.xml +++ b/plugin/src/site/site.xml @@ -1,4 +1,4 @@ - + ${reports} diff --git a/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java b/plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTest.java similarity index 94% rename from plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java rename to plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTest.java index 35cd0ff06..02621fdb2 100644 --- a/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java +++ b/plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTest.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.jvnet.jaxb2.maven2; +package org.jvnet.jaxb.maven; import java.io.File; @@ -23,7 +23,7 @@ import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; -import org.jvnet.mjiip.v_2.XJC2Mojo; +import org.jvnet.jaxb.maven.XJC2Mojo; public abstract class JAXBGenerateTest extends AbstractMojoTestCase { diff --git a/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTestSuite.java b/plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTestSuite.java similarity index 94% rename from plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTestSuite.java rename to plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTestSuite.java index 994ebfbbc..2737bb8c6 100644 --- a/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTestSuite.java +++ b/plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTestSuite.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.jvnet.jaxb2.maven2; +package org.jvnet.jaxb.maven; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/plugin/src/test/resources/test-pom.xml b/plugin/src/test/resources/test-pom.xml index 4c829b8a3..abcc00772 100644 --- a/plugin/src/test/resources/test-pom.xml +++ b/plugin/src/test/resources/test-pom.xml @@ -24,8 +24,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/pom.xml b/pom.xml index 04b28cf19..7f4b1bb2c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,25 +1,25 @@ 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-project - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-project + 2.0.0-SNAPSHOT pom - Maven JAXB 2.x Plugin Project - Maven2 plugin for JAXB 2.x XJC compiler to generate Java sources from XML Schemas. - https://github.com/highsource/maven-jaxb2-plugin + Maven JAXB Plugin Project + Maven plugin for JAXB XJC compiler to generate Java sources from XML Schemas. + https://github.com/highsource/jaxb-maven-plugin BSD-Style License https://github.com/highsource/maven-jaxb2-plugin/blob/master/LICENSE repo - Maven JAXB2 Plugin license is the 3-clause BSD license which is compatible with GPL. Maven JAXB2 Plugin license does not require you to include any acknowledgments for Maven JAXB2 Plugin in advertising materials for your software. + Maven JAXB Plugin license is the 3-clause BSD license which is compatible with GPL. Maven JAXB2 Plugin license does not require you to include any acknowledgments for Maven JAXB2 Plugin in advertising materials for your software. 2006 - - scm:git:https://github.com/highsource/maven-jaxb2-plugin.git - https://github.com/highsource/maven-jaxb2-plugin - ${project.version} + + scm:git:https://github.com/highsource/maven-jaxb2-plugin.git + https://github.com/highsource/maven-jaxb2-plugin + ${project.version} @@ -30,18 +30,17 @@ project creator - - mattrpav - Matt Pavlovich - mattrpav@gmail.com - - maintainer - - + + mattrpav + Matt Pavlovich + mattrpav@gmail.com + + maintainer + + plugin-core - plugin-2.3 plugin testing @@ -235,8 +234,8 @@ - - org.glassfish.jaxb + + org.glassfish.jaxb xsom ${jaxb.version} @@ -282,23 +281,18 @@ ${jaxb.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-core - ${project.version} - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin-core ${project.version} - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin ${project.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing ${project.version} diff --git a/samples/catalog/pom.xml b/samples/catalog/pom.xml index 2779bcda6..aa4e372d4 100644 --- a/samples/catalog/pom.xml +++ b/samples/catalog/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-catalog + org.jvnet.jaxb + jaxb-maven-plugin-sample-catalog pom - Maven JAXB 2.x Plugin Sample [catalog] + Maven JAXB Plugin Sample [catalog] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-samples - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-samples + 2.0.0-SNAPSHOT install diff --git a/samples/catalog/project-pom.xml b/samples/catalog/project-pom.xml index 6e16e322e..eec43ed42 100644 --- a/samples/catalog/project-pom.xml +++ b/samples/catalog/project-pom.xml @@ -2,11 +2,11 @@ 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"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-catalog-maven + org.jvnet.jaxb + jaxb-maven-plugin-sample-catalog-maven ${project.version} jar - Maven JAXB 2.x Plugin Sample [catalog|maven] + Maven JAXB Plugin Sample [catalog|maven] org.glassfish.jaxb @@ -18,8 +18,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin ${project.version} diff --git a/samples/dtd/pom.xml b/samples/dtd/pom.xml index e671fe852..ea3ba188d 100644 --- a/samples/dtd/pom.xml +++ b/samples/dtd/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-dtd + org.jvnet.jaxb + jaxb-maven-plugin-sample-dtd pom - Maven JAXB 2.x Plugin Sample [dtd] + Maven JAXB Plugin Sample [dtd] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-samples - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-samples + 2.0.0-SNAPSHOT install diff --git a/samples/dtd/project-pom.xml b/samples/dtd/project-pom.xml index fb5829c87..1cac871d0 100644 --- a/samples/dtd/project-pom.xml +++ b/samples/dtd/project-pom.xml @@ -2,11 +2,11 @@ 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"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-dtd-maven + org.jvnet.jaxb + jaxb-maven-plugin-sample-dtd-maven ${project.version} jar - Maven JAXB 2.x Plugin Sample [dtd|maven] + Maven JAXB Plugin Sample [dtd|maven] org.glassfish.jaxb @@ -18,8 +18,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin ${project.version} diff --git a/samples/episode/a/project-pom.xml b/samples/episode/a/project-pom.xml index 90b273247..4743f10a3 100644 --- a/samples/episode/a/project-pom.xml +++ b/samples/episode/a/project-pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-episode-maven + org.jvnet.jaxb + jaxb-maven-plugin-sample-episode-maven ${project.version} - maven-jaxb2-plugin-sample-episode-a-maven + jaxb-maven-plugin-sample-episode-a-maven jar - Maven JAXB 2.x Plugin Sample [episode-a|maven] + Maven JAXB Plugin Sample [episode-a|maven] org.glassfish.jaxb @@ -20,8 +20,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/samples/episode/b/project-pom.xml b/samples/episode/b/project-pom.xml index d00299101..49ce7dd87 100644 --- a/samples/episode/b/project-pom.xml +++ b/samples/episode/b/project-pom.xml @@ -2,12 +2,12 @@ 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"> 4.0.0 - maven-jaxb2-plugin-sample-episode-b-maven - Maven JAXB 2.x Plugin Sample [episode-b|maven] + jaxb-maven-plugin-sample-episode-b-maven + Maven JAXB Plugin Sample [episode-b|maven] jar - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-episode-maven + org.jvnet.jaxb + jaxb-maven-plugin-sample-episode-maven ${project.version} @@ -16,8 +16,8 @@ jaxb-runtime - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-episode-a-maven + org.jvnet.jaxb + jaxb-maven-plugin-sample-episode-a-maven ${project.version} provided @@ -26,14 +26,14 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-episode-a-maven + org.jvnet.jaxb + jaxb-maven-plugin-sample-episode-a-maven src/main/resources/catalog.cat diff --git a/samples/episode/b/src/main/resources/catalog.cat b/samples/episode/b/src/main/resources/catalog.cat index 60cee3c0e..143ce46f5 100644 --- a/samples/episode/b/src/main/resources/catalog.cat +++ b/samples/episode/b/src/main/resources/catalog.cat @@ -2,4 +2,4 @@ If the parameter isn't working, this link to schema A is not recognized and the test will fail because of a missing schema. -- -REWRITE_SYSTEM "https://maven-jaxb2-plugin.dev.java.net/svn/maven-jaxb2-plugin/trunk/samples/episode/a/src/main/resources/a.xsd" "maven:org.jvnet.jaxb2.maven2:maven-jaxb2-plugin-sample-episode-a-maven!/a.xsd" \ No newline at end of file +REWRITE_SYSTEM "https://maven-jaxb2-plugin.dev.java.net/svn/maven-jaxb2-plugin/trunk/samples/episode/a/src/main/resources/a.xsd" "maven:org.jvnet.jaxb:jaxb-maven-plugin-sample-episode-a-maven!/a.xsd" \ No newline at end of file diff --git a/samples/episode/c/project-pom.xml b/samples/episode/c/project-pom.xml index 9a17072d1..95d0ca62e 100644 --- a/samples/episode/c/project-pom.xml +++ b/samples/episode/c/project-pom.xml @@ -2,12 +2,12 @@ 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"> 4.0.0 - maven-jaxb2-plugin-sample-episode-c-maven - Maven JAXB 2.x Plugin Sample [episode-c|maven] + jaxb-maven-plugin-sample-episode-c-maven + Maven JAXB Plugin Sample [episode-c|maven] jar - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-episode-maven + org.jvnet.jaxb + jaxb-maven-plugin-sample-episode-maven ${project.version} @@ -16,8 +16,8 @@ jaxb-runtime - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-episode-a-maven + org.jvnet.jaxb + jaxb-maven-plugin-sample-episode-a-maven ${project.version} provided @@ -26,15 +26,15 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-episode-b-maven + org.jvnet.jaxb + jaxb-maven-plugin-sample-episode-b-maven ${project.version} catalog.cat diff --git a/samples/episode/pom.xml b/samples/episode/pom.xml index b95b123f7..71e90edcc 100644 --- a/samples/episode/pom.xml +++ b/samples/episode/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-episode + org.jvnet.jaxb + jaxb-maven-plugin-sample-episode pom - Maven JAXB 2.x Plugin Sample [episode] + Maven JAXB Plugin Sample [episode] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-samples - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-samples + 2.0.0-SNAPSHOT install diff --git a/samples/episode/project-pom.xml b/samples/episode/project-pom.xml index 76fc9a763..e34d84a56 100644 --- a/samples/episode/project-pom.xml +++ b/samples/episode/project-pom.xml @@ -2,11 +2,11 @@ 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"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-episode-maven + org.jvnet.jaxb + jaxb-maven-plugin-sample-episode-maven ${project.version} pom - Maven JAXB 2.x Plugin Sample [episode|maven] + Maven JAXB Plugin Sample [episode|maven] @@ -26,8 +26,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin ${project.version} diff --git a/samples/jaxbplugins/pom.xml b/samples/jaxbplugins/pom.xml index 17795755d..f145b1b63 100644 --- a/samples/jaxbplugins/pom.xml +++ b/samples/jaxbplugins/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-jaxbplugins + org.jvnet.jaxb + jaxb-maven-plugin-sample-jaxbplugins pom - Maven JAXB 2.x Plugin Sample [jaxbplugins] + Maven JAXB Plugin Sample [jaxbplugins] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-samples - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-samples + 2.0.0-SNAPSHOT install diff --git a/samples/jaxbplugins/project-pom.xml b/samples/jaxbplugins/project-pom.xml index 191a8cc25..2d05244c7 100644 --- a/samples/jaxbplugins/project-pom.xml +++ b/samples/jaxbplugins/project-pom.xml @@ -2,11 +2,11 @@ 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"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-jaxbplugins-maven + org.jvnet.jaxb + jaxb-maven-plugin-sample-jaxbplugins-maven ${project.version} jar - Maven JAXB 2.x Plugin Sample [jaxbplugins|maven] + Maven JAXB Plugin Sample [jaxbplugins|maven] org.glassfish.jaxb @@ -23,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin ${project.version} diff --git a/samples/po/pom.xml b/samples/po/pom.xml index 577ff956b..65f91901f 100644 --- a/samples/po/pom.xml +++ b/samples/po/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-po + org.jvnet.jaxb + jaxb-maven-plugin-sample-po pom - Maven JAXB 2.x Plugin Sample [po] + Maven JAXB Plugin Sample [po] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-samples - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-samples + 2.0.0-SNAPSHOT install diff --git a/samples/po/project-pom.xml b/samples/po/project-pom.xml index c719931cb..d6923bf41 100644 --- a/samples/po/project-pom.xml +++ b/samples/po/project-pom.xml @@ -2,11 +2,11 @@ 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"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-sample-po-maven + org.jvnet.jaxb + jaxb-maven-plugin-sample-po-maven ${project.version} jar - Maven JAXB 2.x Plugin Sample [po|maven] + Maven JAXB Plugin Sample [po|maven] org.glassfish.jaxb @@ -18,8 +18,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin ${project.version} diff --git a/samples/pom.xml b/samples/pom.xml index b98d58fd2..17b1dfa05 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-samples + org.jvnet.jaxb + jaxb-maven-plugin-samples pom - Maven JAXB 2.X Plugin Samples + Maven JAXB Plugin Samples - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-project - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-project + 2.0.0-SNAPSHOT catalog diff --git a/src/site/site.xml b/src/site/site.xml index 8a6f4840d..1ee7b9d76 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,4 +1,4 @@ - + - - - + + + diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/catalog.cat b/tests/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/catalog.cat index b2d8e490d..9c8815e73 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/catalog.cat +++ b/tests/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/catalog.cat @@ -1,6 +1,6 @@ -- If the parameter isn't working, this link to schema A is not recognized and the test will fail because of a missing schema. -PUBLIC "http://maven-jaxb2-plugin/samples/episode/a" "a/a.xsd" +PUBLIC "http://jaxb-maven-plugin/samples/episode/a" "a/a.xsd" -- -PUBLIC "http://maven-jaxb2-plugin/samples/episode/a" "maven:org.jvnet.jaxb2.maven2:maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-53-a:jar::!/a.xsd" +PUBLIC "http://jaxb-maven-plugin/samples/episode/a" "maven:org.jvnet.jaxb:jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-53-a:jar::!/a.xsd" diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/b/src/test/java/org/jvnet/jaxb2/maven2/tests/MAVEN_JAXB2_PLUGIN_53/b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java b/tests/MAVEN_JAXB2_PLUGIN-53/b/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_53/b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java similarity index 68% rename from tests/MAVEN_JAXB2_PLUGIN-53/b/src/test/java/org/jvnet/jaxb2/maven2/tests/MAVEN_JAXB2_PLUGIN_53/b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java rename to tests/MAVEN_JAXB2_PLUGIN-53/b/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_53/b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java index f437d3659..dd9801131 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-53/b/src/test/java/org/jvnet/jaxb2/maven2/tests/MAVEN_JAXB2_PLUGIN_53/b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java +++ b/tests/MAVEN_JAXB2_PLUGIN-53/b/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_53/b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2.maven2.tests.MAVEN_JAXB2_PLUGIN_53.b; +package org.jvnet.jaxb.maven.tests.MAVEN_JAXB2_PLUGIN_53.b; import java.io.File; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunMAVEN_JAXB2_PLUGIN_53Mojo extends RunXJC2Mojo { diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml index 3cc51dbe5..e60df5e89 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-53 + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-53 pom - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-53] + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-53] a b diff --git a/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml index 38fd4618e..08cda2133 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-69 + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-69 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-69] + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-69] org.glassfish.jaxb @@ -19,8 +19,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin generate diff --git a/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml index 900175fdd..0bbb6fb7d 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-70 + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-70 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-70] + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-70] org.glassfish.jaxb @@ -19,8 +19,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin generate @@ -31,8 +31,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-po-2.3 + org.jvnet.jaxb + jaxb-maven-plugin-tests-po-2.3 ${project.version} purchaseorder.xsd diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml index b93a8e39e..cb2ad34ea 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml @@ -2,17 +2,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-77 - 2.3.6-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-77 + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-77-common-types - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-77:common-types] + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-77-common-types + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-77:common-types] - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin src/main/resources/META-INF/project/schemas com.company.project.common.types diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml index b9db39a6a..f63f73887 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 2.3.6-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-77 + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-77 pom - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-77] + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-77] common-types service diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml index 4728d6e7a..f15e200a5 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml @@ -2,36 +2,36 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-77 - 2.3.6-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-77 + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-77-service - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-77:service] + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-77-service + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-77:service] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-77-common-types + org.jvnet.jaxb + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-77-common-types ${project.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin true true src/main/resources/META-INF/project/schemas com.company.project.service.types src/main/jaxb/catalog.cat - org.jvnet.jaxb2.maven2.resolver.tools.ClasspathCatalogResolver + org.jvnet.jaxb.maven.resolver.tools.ClasspathCatalogResolver true false diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/service/src/test/java/org/jvnet/jaxb2/maven2/tests/MAVEN_JAXB2_PLUGIN_77/RunMAVEN_JAXB2_PLUGIN_77Mojo.java b/tests/MAVEN_JAXB2_PLUGIN-77/service/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_77/RunMAVEN_JAXB2_PLUGIN_77Mojo.java similarity index 76% rename from tests/MAVEN_JAXB2_PLUGIN-77/service/src/test/java/org/jvnet/jaxb2/maven2/tests/MAVEN_JAXB2_PLUGIN_77/RunMAVEN_JAXB2_PLUGIN_77Mojo.java rename to tests/MAVEN_JAXB2_PLUGIN-77/service/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_77/RunMAVEN_JAXB2_PLUGIN_77Mojo.java index 90ca7c191..32872c625 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-77/service/src/test/java/org/jvnet/jaxb2/maven2/tests/MAVEN_JAXB2_PLUGIN_77/RunMAVEN_JAXB2_PLUGIN_77Mojo.java +++ b/tests/MAVEN_JAXB2_PLUGIN-77/service/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_77/RunMAVEN_JAXB2_PLUGIN_77Mojo.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2.maven2.tests.MAVEN_JAXB2_PLUGIN_77; +package org.jvnet.jaxb.maven.tests.MAVEN_JAXB2_PLUGIN_77; import java.io.File; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunMAVEN_JAXB2_PLUGIN_77Mojo extends RunXJC2Mojo { @@ -14,7 +14,7 @@ protected void configureMojo(AbstractXJC2Mojo mojo) { mojo.setSchemaDirectory(new File(getBaseDir(), "src/main/resources/META-INF/project/schemas")); mojo.setGeneratePackage("com.company.project.service.types"); mojo.setCatalog(new File(getBaseDir(),"src/main/jaxb/catalog.cat")); - mojo.setCatalogResolver("org.jvnet.jaxb2.maven2.resolver.tools.ClasspathCatalogResolver"); + mojo.setCatalogResolver("org.jvnet.jaxb.maven.resolver.tools.ClasspathCatalogResolver"); mojo.setExtension(true); // mojo. // diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml index ddc821d0c..b24ec3a86 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml @@ -3,19 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79 - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-79 + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79-a + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-79-a jar - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-79:a] + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-79:a] test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml index 2d30e0dd2..f20fb6114 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79 - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-79 + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79-b + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-79-b jar - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-79:b] + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-79:b] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79-a + org.jvnet.jaxb + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-79-a ${project.version} provided @@ -22,14 +22,14 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79-a + org.jvnet.jaxb + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-79-a src/main/resources/catalog.cat diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/catalog.cat b/tests/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/catalog.cat index 60e9d47fe..e990ae5f9 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/catalog.cat +++ b/tests/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/catalog.cat @@ -2,5 +2,5 @@ If the parameter isn't working, this link to schema A is not recognized and the test will fail because of a missing schema. -- -REWRITE_SYSTEM "https://maven-jaxb2-plugin.dev.java.net/svn/maven-jaxb2-plugin/trunk/tests/MAVEN_JAXB2_PLUGIN-79/a/src/main/resources/a.xsd" "maven:org.jvnet.jaxb2.maven2:maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79-a:jar::!/a.xsd" +REWRITE_SYSTEM "https://maven-jaxb2-plugin.dev.java.net/svn/maven-jaxb2-plugin/trunk/tests/MAVEN_JAXB2_PLUGIN-79/a/src/main/resources/a.xsd" "maven:org.jvnet.jaxb:jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-79-a:jar::!/a.xsd" diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml index 072502563..04408cc86 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79 + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-79 pom - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-79] + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-79] a b diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml index a09287652..02432a4b3 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82 - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-82 + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82-a + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-82-a jar - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-82:a] + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-82:a] org.glassfish.jaxb @@ -19,8 +19,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml index 887d70262..da703d330 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82 - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-82 + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82-b + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-82-b jar - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-82:b] + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-82:b] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82-a + org.jvnet.jaxb + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-82-a ${project.version} provided @@ -21,14 +21,14 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin src/main/resources/catalog.cat - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82-a + org.jvnet.jaxb + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-82-a diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/catalog.cat b/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/catalog.cat index 0d8381d53..1f4329581 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/catalog.cat +++ b/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/catalog.cat @@ -2,5 +2,5 @@ If the parameter isn't working, this link to schema A is not recognized and the test will fail because of a missing schema. -- -REWRITE_SYSTEM "http://www.ab.org" "maven:org.jvnet.jaxb2.maven2:maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82-a:jar::!" +REWRITE_SYSTEM "http://www.ab.org" "maven:org.jvnet.jaxb:jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-82-a:jar::!" diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml index df21f5001..c46f06b36 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82 + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-82 pom - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-82] + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-82] a b diff --git a/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml index 576357c61..4a7fbfc3c 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-86 + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-86 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-86] + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-86] org.glassfish.jaxb @@ -19,8 +19,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin a diff --git a/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml index 8ea734b07..ad3016a5e 100644 --- a/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml +++ b/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-87 + jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-87 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-87] + Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-87] org.glassfish.jaxb @@ -19,8 +19,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin es diff --git a/tests/catalog-xml/pom.xml b/tests/catalog-xml/pom.xml index a40961214..5ba5e59de 100644 --- a/tests/catalog-xml/pom.xml +++ b/tests/catalog-xml/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-catalog-xml + jaxb-maven-plugin-tests-catalog-xml jar - Maven JAXB 2.x Plugin Tests [catalog-xml] + Maven JAXB Plugin Tests [catalog-xml] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test @@ -25,8 +25,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin generate diff --git a/tests/catalog-xml/src/test/java/org/jvnet/jaxb2/maven2/tests/catalog/RunCatalogMojo.java b/tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java similarity index 60% rename from tests/catalog-xml/src/test/java/org/jvnet/jaxb2/maven2/tests/catalog/RunCatalogMojo.java rename to tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java index 97cff1795..b3f23ff1c 100644 --- a/tests/catalog-xml/src/test/java/org/jvnet/jaxb2/maven2/tests/catalog/RunCatalogMojo.java +++ b/tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2.maven2.tests.catalog; +package org.jvnet.jaxb.maven.tests.catalog; import java.io.File; -import org.jvnet.jaxb2.maven2.resolver.tools.ClasspathCatalogResolver; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.resolver.tools.ClasspathCatalogResolver; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunCatalogMojo extends RunXJC2Mojo { diff --git a/tests/catalog/src/test/java/org/jvnet/jaxb2/maven2/tests/catalog/RunPlainCatalogMojo.java b/tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java similarity index 65% rename from tests/catalog/src/test/java/org/jvnet/jaxb2/maven2/tests/catalog/RunPlainCatalogMojo.java rename to tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java index dbd77c608..3b6828653 100644 --- a/tests/catalog/src/test/java/org/jvnet/jaxb2/maven2/tests/catalog/RunPlainCatalogMojo.java +++ b/tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2.maven2.tests.catalog; +package org.jvnet.jaxb.maven.tests.catalog; import java.io.File; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunPlainCatalogMojo extends RunXJC2Mojo { diff --git a/tests/catalog/pom.xml b/tests/catalog/pom.xml index ea5760532..112c5c8ca 100644 --- a/tests/catalog/pom.xml +++ b/tests/catalog/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-catalog + jaxb-maven-plugin-tests-catalog jar - Maven JAXB 2.x Plugin Tests [catalog] + Maven JAXB Plugin Tests [catalog] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test @@ -25,8 +25,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin generate diff --git a/tests/catalog/src/test/java/org/jvnet/jaxb2/maven2/tests/catalog/RunCatalogMojo.java b/tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java similarity index 60% rename from tests/catalog/src/test/java/org/jvnet/jaxb2/maven2/tests/catalog/RunCatalogMojo.java rename to tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java index 97cff1795..b3f23ff1c 100644 --- a/tests/catalog/src/test/java/org/jvnet/jaxb2/maven2/tests/catalog/RunCatalogMojo.java +++ b/tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2.maven2.tests.catalog; +package org.jvnet.jaxb.maven.tests.catalog; import java.io.File; -import org.jvnet.jaxb2.maven2.resolver.tools.ClasspathCatalogResolver; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.resolver.tools.ClasspathCatalogResolver; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunCatalogMojo extends RunXJC2Mojo { diff --git a/tests/catalog-xml/src/test/java/org/jvnet/jaxb2/maven2/tests/catalog/RunPlainCatalogMojo.java b/tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java similarity index 65% rename from tests/catalog-xml/src/test/java/org/jvnet/jaxb2/maven2/tests/catalog/RunPlainCatalogMojo.java rename to tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java index dbd77c608..3b6828653 100644 --- a/tests/catalog-xml/src/test/java/org/jvnet/jaxb2/maven2/tests/catalog/RunPlainCatalogMojo.java +++ b/tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2.maven2.tests.catalog; +package org.jvnet.jaxb.maven.tests.catalog; import java.io.File; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunPlainCatalogMojo extends RunXJC2Mojo { diff --git a/tests/episodes/a/pom.xml b/tests/episodes/a/pom.xml index eadd8a277..78dc054a3 100644 --- a/tests/episodes/a/pom.xml +++ b/tests/episodes/a/pom.xml @@ -3,19 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-episodes - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-episodes-a + jaxb-maven-plugin-tests-episodes-a jar - Maven JAXB 2.x Plugin Tests [episodes:a] + Maven JAXB Plugin Tests [episodes:a] test - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/tests/episodes/b/pom.xml b/tests/episodes/b/pom.xml index 167981e4b..8976e9f6b 100644 --- a/tests/episodes/b/pom.xml +++ b/tests/episodes/b/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-episodes - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-episodes-b + jaxb-maven-plugin-tests-episodes-b jar - Maven JAXB 2.x Plugin Tests [episodes:b] + Maven JAXB Plugin Tests [episodes:b] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-episodes-a + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes-a ${project.version} provided @@ -22,14 +22,14 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin true - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-episodes-a + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes-a src/main/resources/catalog.cat diff --git a/tests/episodes/b/src/main/resources/catalog.cat b/tests/episodes/b/src/main/resources/catalog.cat index 47abfcfa8..63fa3256e 100644 --- a/tests/episodes/b/src/main/resources/catalog.cat +++ b/tests/episodes/b/src/main/resources/catalog.cat @@ -2,5 +2,5 @@ If the parameter isn't working, this link to schema A is not recognized and the test will fail because of a missing schema. -- -REWRITE_SYSTEM "https://maven-jaxb2-plugin.dev.java.net/svn/maven-jaxb2-plugin/trunk/tests/episodes/a/src/main/resources/a.xsd" "maven:org.jvnet.jaxb2.maven2:maven-jaxb2-plugin-tests-episodes-a:jar::!/a.xsd" +REWRITE_SYSTEM "https://maven-jaxb2-plugin.dev.java.net/svn/maven-jaxb2-plugin/trunk/tests/episodes/a/src/main/resources/a.xsd" "maven:org.jvnet.jaxb:jaxb-maven-plugin-tests-episodes-a:jar::!/a.xsd" diff --git a/tests/episodes/c/pom.xml b/tests/episodes/c/pom.xml index a62fae453..6922554c7 100644 --- a/tests/episodes/c/pom.xml +++ b/tests/episodes/c/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-episodes - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-episodes-c + jaxb-maven-plugin-tests-episodes-c jar - Maven JAXB 2.x Plugin Tests [episodes:c] + Maven JAXB Plugin Tests [episodes:c] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-episodes-a + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes-a ${project.version} provided @@ -22,15 +22,15 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin true - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-episodes-b + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes-b ${project.version} catalog.cat diff --git a/tests/episodes/d/pom.xml b/tests/episodes/d/pom.xml index 325f24f1b..7704cc221 100644 --- a/tests/episodes/d/pom.xml +++ b/tests/episodes/d/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-episodes - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-episodes-d + jaxb-maven-plugin-tests-episodes-d jar - Maven JAXB 2.x Plugin Tests [episodes:d] + Maven JAXB Plugin Tests [episodes:d] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-episodes-a + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes-a ${project.version} provided @@ -22,20 +22,20 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin true - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-episodes-a + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes-a src/main/resources/catalog.cat diff --git a/tests/episodes/d/src/main/resources/catalog.cat b/tests/episodes/d/src/main/resources/catalog.cat index f9cad888d..3409f8e34 100644 --- a/tests/episodes/d/src/main/resources/catalog.cat +++ b/tests/episodes/d/src/main/resources/catalog.cat @@ -2,4 +2,4 @@ If the parameter isn't working, this link to schema A is not recognized and the test will fail because of a missing schema. -- -PUBLIC "a" "maven:org.jvnet.jaxb2.maven2:maven-jaxb2-plugin-tests-episodes-a:jar::!/a.xsd" +PUBLIC "a" "maven:org.jvnet.jaxb:jaxb-maven-plugin-tests-episodes-a:jar::!/a.xsd" diff --git a/tests/episodes/e/pom.xml b/tests/episodes/e/pom.xml index f95c30ee1..bdb9ad2a2 100644 --- a/tests/episodes/e/pom.xml +++ b/tests/episodes/e/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-episodes - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-episodes-e + jaxb-maven-plugin-tests-episodes-e jar - Maven JAXB 2.x Plugin Tests [episodes:e] + Maven JAXB Plugin Tests [episodes:e] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-episodes-a + org.jvnet.jaxb + jaxb-maven-plugin-tests-episodes-a ${project.version} provided @@ -22,20 +22,20 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin true src/main/resources/catalog.cat diff --git a/tests/episodes/e/src/main/resources/catalog.cat b/tests/episodes/e/src/main/resources/catalog.cat index f9cad888d..3409f8e34 100644 --- a/tests/episodes/e/src/main/resources/catalog.cat +++ b/tests/episodes/e/src/main/resources/catalog.cat @@ -2,4 +2,4 @@ If the parameter isn't working, this link to schema A is not recognized and the test will fail because of a missing schema. -- -PUBLIC "a" "maven:org.jvnet.jaxb2.maven2:maven-jaxb2-plugin-tests-episodes-a:jar::!/a.xsd" +PUBLIC "a" "maven:org.jvnet.jaxb:jaxb-maven-plugin-tests-episodes-a:jar::!/a.xsd" diff --git a/tests/episodes/pom.xml b/tests/episodes/pom.xml index aceedb46a..f4d674e81 100644 --- a/tests/episodes/pom.xml +++ b/tests/episodes/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-episodes + jaxb-maven-plugin-tests-episodes pom - Maven JAXB 2.x Plugin Tests [episodes] + Maven JAXB Plugin Tests [episodes] a b diff --git a/tests/gh-issue-16/pom.xml b/tests/gh-issue-16/pom.xml index 0641fc48c..d85e3f35a 100644 --- a/tests/gh-issue-16/pom.xml +++ b/tests/gh-issue-16/pom.xml @@ -2,30 +2,30 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-gh-issue-16 + jaxb-maven-plugin-tests-gh-issue-16 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [GitHub Issue #16] + Maven JAXB Plugin Tests [GitHub Issue #16] org.glassfish.jaxb jaxb-runtime - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin generate diff --git a/tests/gh-issue-19/a/pom.xml b/tests/gh-issue-19/a/pom.xml index 72d144cfa..2b0fd4f9e 100644 --- a/tests/gh-issue-19/a/pom.xml +++ b/tests/gh-issue-19/a/pom.xml @@ -3,19 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-gh-issue-19 - 0.12.1-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-gh-issue-19 + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-gh-issue-19-a + jaxb-maven-plugin-tests-gh-issue-19-a jar - Maven JAXB 2.x Plugin Tests [GitHub Issue #19:a] + Maven JAXB Plugin Tests [GitHub Issue #19:a] test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin a/a.xsd diff --git a/tests/gh-issue-19/b/pom.xml b/tests/gh-issue-19/b/pom.xml index 7797eb038..9267a93d4 100644 --- a/tests/gh-issue-19/b/pom.xml +++ b/tests/gh-issue-19/b/pom.xml @@ -3,22 +3,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-gh-issue-19 - 0.12.1-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-gh-issue-19 + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-gh-issue-19-b + jaxb-maven-plugin-tests-gh-issue-19-b jar - Maven JAXB 2.x Plugin Tests [GitHub Issue #19:b] + Maven JAXB Plugin Tests [GitHub Issue #19:b] ${project.groupId} - maven-jaxb2-plugin-tests-gh-issue-19-a + jaxb-maven-plugin-tests-gh-issue-19-a ${project.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test @@ -26,8 +26,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true diff --git a/tests/gh-issue-19/b/src/main/resources/b/b.cat b/tests/gh-issue-19/b/src/main/resources/b/b.cat index b0bf5ba0a..5b79dc3f2 100644 --- a/tests/gh-issue-19/b/src/main/resources/b/b.cat +++ b/tests/gh-issue-19/b/src/main/resources/b/b.cat @@ -1,2 +1,2 @@ -REWRITE_SYSTEM "../a" "maven:org.jvnet.jaxb2.maven2:maven-jaxb2-plugin-tests-gh-issue-19-a:jar::!/a" -REWRITE_SYSTEM "file:/C:/Projects/workspaces/mj2p/maven-jaxb2-plugin-project/tests/gh-issue-19/b/src/main/resources/a" "maven:org.jvnet.jaxb2.maven2:maven-jaxb2-plugin-tests-gh-issue-19-a:jar::!/a" \ No newline at end of file +REWRITE_SYSTEM "../a" "maven:org.jvnet.jaxb:jaxb-maven-plugin-tests-gh-issue-19-a:jar::!/a" +REWRITE_SYSTEM "file:/C:/Projects/workspaces/mj2p/maven-jaxb2-plugin-project/tests/gh-issue-19/b/src/main/resources/a" "maven:org.jvnet.jaxb:jaxb-maven-plugin-tests-gh-issue-19-a:jar::!/a" \ No newline at end of file diff --git a/tests/gh-issue-19/pom.xml b/tests/gh-issue-19/pom.xml index 9c533aa1a..ea862b9f5 100644 --- a/tests/gh-issue-19/pom.xml +++ b/tests/gh-issue-19/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.12.1-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-gh-issue-19 + jaxb-maven-plugin-tests-gh-issue-19 pom - Maven JAXB 2.x Plugin Tests [GitHub Issue #19] + Maven JAXB Plugin Tests [GitHub Issue #19] a b @@ -24,4 +24,4 @@ test - \ No newline at end of file + diff --git a/tests/gh-issue-22/a/pom.xml b/tests/gh-issue-22/a/pom.xml index de522b96f..50bfb18f9 100644 --- a/tests/gh-issue-22/a/pom.xml +++ b/tests/gh-issue-22/a/pom.xml @@ -3,19 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-gh-issue-22 - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-gh-issue-22 + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-gh-issue-22-a + jaxb-maven-plugin-tests-gh-issue-22-a jar - Maven JAXB 2.x Plugin Tests [GitHub Issue #22:a] + Maven JAXB Plugin Tests [GitHub Issue #22:a] test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/tests/gh-issue-22/b/pom.xml b/tests/gh-issue-22/b/pom.xml index c84cb8ddd..ce30b411e 100644 --- a/tests/gh-issue-22/b/pom.xml +++ b/tests/gh-issue-22/b/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-gh-issue-22 - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-gh-issue-22 + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-gh-issue-22-b + jaxb-maven-plugin-tests-gh-issue-22-b jar - Maven JAXB 2.x Plugin Tests [GitHub Issue #22:b] + Maven JAXB Plugin Tests [GitHub Issue #22:b] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test @@ -21,14 +21,14 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin ${project.groupId} - maven-jaxb2-plugin-tests-gh-issue-22-a + jaxb-maven-plugin-tests-gh-issue-22-a ${project.version} a.xsd diff --git a/tests/gh-issue-22/pom.xml b/tests/gh-issue-22/pom.xml index 900d58313..341d971f1 100644 --- a/tests/gh-issue-22/pom.xml +++ b/tests/gh-issue-22/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-gh-issue-22 + jaxb-maven-plugin-tests-gh-issue-22 pom - Maven JAXB 2.x Plugin Tests [GitHub Issue #22] + Maven JAXB Plugin Tests [GitHub Issue #22] a b diff --git a/tests/gh-issue-23/one-non-strict/pom.xml b/tests/gh-issue-23/one-non-strict/pom.xml index a8395aa2f..5f39423ab 100644 --- a/tests/gh-issue-23/one-non-strict/pom.xml +++ b/tests/gh-issue-23/one-non-strict/pom.xml @@ -3,30 +3,29 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-gh-issue-23 - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-gh-issue-23 + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-gh-issue-23-one-non-strict + jaxb-maven-plugin-tests-gh-issue-23-one-non-strict jar - Maven JAXB 2.x Plugin Tests [GitHub Issue #23:one-non-strict] + Maven JAXB Plugin Tests [GitHub Issue #23:one-non-strict] org.glassfish.jaxb jaxb-runtime - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - + org.jvnet.jaxb + jaxb-maven-plugin generate diff --git a/tests/gh-issue-23/pom.xml b/tests/gh-issue-23/pom.xml index 9791bfdf9..8e0505154 100644 --- a/tests/gh-issue-23/pom.xml +++ b/tests/gh-issue-23/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-gh-issue-23 + jaxb-maven-plugin-tests-gh-issue-23 pom - Maven JAXB 2.x Plugin Tests [GitHub Issue #23] + Maven JAXB Plugin Tests [GitHub Issue #23] one-non-strict two-non-strict diff --git a/tests/gh-issue-23/two-non-strict/pom.xml b/tests/gh-issue-23/two-non-strict/pom.xml index cb6e91c38..2c956455f 100644 --- a/tests/gh-issue-23/two-non-strict/pom.xml +++ b/tests/gh-issue-23/two-non-strict/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-gh-issue-23 - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests-gh-issue-23 + 2.0.0-SNAPSHOT - maven-jaxb2-plugin-tests-gh-issue-23-two-non-strict + jaxb-maven-plugin-tests-gh-issue-23-two-non-strict jar - Maven JAXB 2.x Plugin Tests [GitHub Issue #23:two-non-strict] + Maven JAXB Plugin Tests [GitHub Issue #23:two-non-strict] org.glassfish.jaxb @@ -17,20 +17,20 @@ ${project.groupId} - maven-jaxb2-plugin-tests-gh-issue-23-one-non-strict + jaxb-maven-plugin-tests-gh-issue-23-one-non-strict ${project.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin generate diff --git a/tests/gh-issue-58/pom.xml b/tests/gh-issue-58/pom.xml index f0e0db1ba..565634634 100644 --- a/tests/gh-issue-58/pom.xml +++ b/tests/gh-issue-58/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-gh-issue-58 + jaxb-maven-plugin-tests-gh-issue-58 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [GitHub Issue #58] + Maven JAXB Plugin Tests [GitHub Issue #58] com.sun.xml.bind @@ -20,8 +20,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true diff --git a/tests/issues/pom.xml b/tests/issues/pom.xml index f59d82b70..c68d48b52 100644 --- a/tests/issues/pom.xml +++ b/tests/issues/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-issues + jaxb-maven-plugin-tests-issues - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [issues] + Maven JAXB Plugin Tests [issues] jakarta.xml.bind @@ -28,8 +28,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.glassfish.jaxb diff --git a/tests/issues/src/main/java/org/jvnet/jaxb/maven/tests/issues/common/Generated.java b/tests/issues/src/main/java/org/jvnet/jaxb/maven/tests/issues/common/Generated.java new file mode 100644 index 000000000..710fb6f43 --- /dev/null +++ b/tests/issues/src/main/java/org/jvnet/jaxb/maven/tests/issues/common/Generated.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.maven.tests.issues.common; + +public class Generated +{ +} diff --git a/tests/issues/src/main/java/org/jvnet/jaxb2/maven2/tests/issues/common/Generated.java b/tests/issues/src/main/java/org/jvnet/jaxb2/maven2/tests/issues/common/Generated.java deleted file mode 100644 index 62329f2ec..000000000 --- a/tests/issues/src/main/java/org/jvnet/jaxb2/maven2/tests/issues/common/Generated.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jvnet.jaxb2.maven2.tests.issues.common; - -public class Generated -{ -} diff --git a/tests/issues/src/main/resources/binding.xjb b/tests/issues/src/main/resources/binding.xjb index 6387d7bf8..8d1d98e1f 100644 --- a/tests/issues/src/main/resources/binding.xjb +++ b/tests/issues/src/main/resources/binding.xjb @@ -7,7 +7,7 @@ - + diff --git a/tests/issues/src/main/resources/schema.xsd b/tests/issues/src/main/resources/schema.xsd index 97b4e5e46..830c072ed 100644 --- a/tests/issues/src/main/resources/schema.xsd +++ b/tests/issues/src/main/resources/schema.xsd @@ -14,7 +14,7 @@ - + diff --git a/tests/java-9/pom.xml b/tests/java-9/pom.xml index 476e99244..0c2eae9a4 100644 --- a/tests/java-9/pom.xml +++ b/tests/java-9/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-java-9 + jaxb-maven-plugin-tests-java-9 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [Java 9] + Maven JAXB Plugin Tests [Java 9] org.glassfish.jaxb @@ -19,8 +19,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin generate diff --git a/tests/java-9/src/test/java/org/jvnet/jaxb2/maven2/java9/Java9Test.java b/tests/java-9/src/test/java/org/jvnet/jaxb/maven/java9/Java9Test.java similarity index 93% rename from tests/java-9/src/test/java/org/jvnet/jaxb2/maven2/java9/Java9Test.java rename to tests/java-9/src/test/java/org/jvnet/jaxb/maven/java9/Java9Test.java index 32235eff8..57592a209 100644 --- a/tests/java-9/src/test/java/org/jvnet/jaxb2/maven2/java9/Java9Test.java +++ b/tests/java-9/src/test/java/org/jvnet/jaxb/maven/java9/Java9Test.java @@ -1,5 +1,5 @@ //Copyright (c) 2017 by Disy Informationssysteme GmbH -package org.jvnet.jaxb2.maven2.java9; +package org.jvnet.jaxb.maven.java9; import static org.junit.Assert.assertNotNull; diff --git a/tests/p o/pom.xml b/tests/p o/pom.xml index 0e989e62c..9e98ffbcd 100644 --- a/tests/p o/pom.xml +++ b/tests/p o/pom.xml @@ -2,30 +2,30 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-p_o + jaxb-maven-plugin-tests-p_o - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [p o] + Maven JAXB Plugin Tests [p o] org.glassfish.jaxb jaxb-runtime - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/tests/p o/src/test/java/org/jvnet/mjiip/v_2/tests/p_o/RunP_OPlugin.java b/tests/p o/src/test/java/org/jvnet/mjiip/tests/p_o/RunP_OPlugin.java similarity index 59% rename from tests/p o/src/test/java/org/jvnet/mjiip/v_2/tests/p_o/RunP_OPlugin.java rename to tests/p o/src/test/java/org/jvnet/mjiip/tests/p_o/RunP_OPlugin.java index 3a351d00c..17be0726e 100644 --- a/tests/p o/src/test/java/org/jvnet/mjiip/v_2/tests/p_o/RunP_OPlugin.java +++ b/tests/p o/src/test/java/org/jvnet/mjiip/tests/p_o/RunP_OPlugin.java @@ -1,7 +1,7 @@ -package org.jvnet.mjiip.v_2.tests.p_o; +package org.jvnet.mjiip.tests.p_o; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunP_OPlugin extends RunXJC2Mojo { diff --git a/tests/p o/src/test/java/org/jvnet/mjiip/v_2/tests/p_o/RunXJC.java b/tests/p o/src/test/java/org/jvnet/mjiip/tests/p_o/RunXJC.java similarity index 84% rename from tests/p o/src/test/java/org/jvnet/mjiip/v_2/tests/p_o/RunXJC.java rename to tests/p o/src/test/java/org/jvnet/mjiip/tests/p_o/RunXJC.java index 15983e53d..cda52d01a 100644 --- a/tests/p o/src/test/java/org/jvnet/mjiip/v_2/tests/p_o/RunXJC.java +++ b/tests/p o/src/test/java/org/jvnet/mjiip/tests/p_o/RunXJC.java @@ -1,4 +1,4 @@ -package org.jvnet.mjiip.v_2.tests.p_o; +package org.jvnet.mjiip.tests.p_o; import com.sun.tools.xjc.Driver; diff --git a/tests/po-2.3/pom.xml b/tests/po-2.3/pom.xml index 21de07d37..8428973ed 100644 --- a/tests/po-2.3/pom.xml +++ b/tests/po-2.3/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-po-2.3 + jaxb-maven-plugin-tests-po-2.3 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [po-2.3] + Maven JAXB Plugin Tests [po-2.3] org.glassfish.jaxb @@ -19,8 +19,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/tests/po-scd/pom.xml b/tests/po-scd/pom.xml index 8c66db652..a9478c59a 100644 --- a/tests/po-scd/pom.xml +++ b/tests/po-scd/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-po-scd + jaxb-maven-plugin-tests-po-scd - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [po-scd] + Maven JAXB Plugin Tests [po-scd] org.glassfish.jaxb @@ -19,8 +19,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true diff --git a/tests/po-scd/src/main/resources/bindings.xjb b/tests/po-scd/src/main/resources/bindings.xjb index 847d7f8c6..fd840fed3 100644 --- a/tests/po-scd/src/main/resources/bindings.xjb +++ b/tests/po-scd/src/main/resources/bindings.xjb @@ -6,7 +6,7 @@ - + diff --git a/tests/pom.xml b/tests/pom.xml index b93035bb4..be733bafd 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -2,13 +2,13 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests + jaxb-maven-plugin-tests pom - Maven JAXB 2.x Plugin Tests + Maven JAXB Plugin Tests - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-project - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-project + 2.0.0-SNAPSHOT catalog @@ -43,8 +43,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin ${project.version} @@ -57,8 +57,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin ${project.version} diff --git a/tests/res/pom.xml b/tests/res/pom.xml index dfb2df6c6..ddc60effb 100644 --- a/tests/res/pom.xml +++ b/tests/res/pom.xml @@ -2,35 +2,35 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-res + jaxb-maven-plugin-tests-res - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [res] + Maven JAXB Plugin Tests [res] org.glassfish.jaxb jaxb-runtime - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-po-2.3 + org.jvnet.jaxb + jaxb-maven-plugin-tests-po-2.3 ${project.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-po-2.3 + org.jvnet.jaxb + jaxb-maven-plugin-tests-po-2.3 ${project.version} @@ -38,8 +38,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin generate @@ -68,8 +68,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-po-2.3 + org.jvnet.jaxb + jaxb-maven-plugin-tests-po-2.3 purchaseorder.xsd @@ -77,8 +77,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests-po-scd + org.jvnet.jaxb + jaxb-maven-plugin-tests-po-scd ${project.version} purchaseorder.xsd diff --git a/tests/res/src/main/resources/bindings.xjb b/tests/res/src/main/resources/bindings.xjb index 04065aedc..0185463b6 100644 --- a/tests/res/src/main/resources/bindings.xjb +++ b/tests/res/src/main/resources/bindings.xjb @@ -4,9 +4,9 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - + diff --git a/tests/res/src/test/java/org/jvnet/jaxb2/maven2/tests/res/RunResMojo.java b/tests/res/src/test/java/org/jvnet/jaxb/maven/tests/res/RunResMojo.java similarity index 75% rename from tests/res/src/test/java/org/jvnet/jaxb2/maven2/tests/res/RunResMojo.java rename to tests/res/src/test/java/org/jvnet/jaxb/maven/tests/res/RunResMojo.java index 7a1cf68a1..69090d4cf 100644 --- a/tests/res/src/test/java/org/jvnet/jaxb2/maven2/tests/res/RunResMojo.java +++ b/tests/res/src/test/java/org/jvnet/jaxb/maven/tests/res/RunResMojo.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2.maven2.tests.res; +package org.jvnet.jaxb.maven.tests.res; import java.io.File; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.DependencyResource; -import org.jvnet.jaxb2.maven2.ResourceEntry; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.DependencyResource; +import org.jvnet.jaxb.maven.ResourceEntry; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunResMojo extends RunXJC2Mojo { @@ -18,8 +18,8 @@ protected void configureMojo(AbstractXJC2Mojo mojo) { final ResourceEntry purchaseorder_xsd = new ResourceEntry(); final DependencyResource purchaseorder_xsd_dependencyResource = new DependencyResource(); purchaseorder_xsd.setDependencyResource(purchaseorder_xsd_dependencyResource); - purchaseorder_xsd.getDependencyResource().setGroupId("org.jvnet.jaxb2.maven2"); - purchaseorder_xsd.getDependencyResource().setArtifactId("maven-jaxb2-plugin-tests-po-2.3"); + purchaseorder_xsd.getDependencyResource().setGroupId("org.jvnet.jaxb"); + purchaseorder_xsd.getDependencyResource().setArtifactId("jaxb-maven-plugin-tests-po-2.3"); purchaseorder_xsd.getDependencyResource().setResource("purchaseorder.xsd"); mojo.setSchemas(new ResourceEntry[]{ purchaseorder_xsd diff --git a/tests/rnc/pom.xml b/tests/rnc/pom.xml index 70aefc223..ad6ba5033 100644 --- a/tests/rnc/pom.xml +++ b/tests/rnc/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-rnc + jaxb-maven-plugin-tests-rnc - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.12.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [rnc] + Maven JAXB Plugin Tests [rnc] org.glassfish.jaxb @@ -21,16 +21,16 @@ ${jaxb.version} - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin ${project.version} diff --git a/tests/rnc/src/test/java/org/jvnet/jaxb2/maven2/tests/rnc/DatatypeLibraryLoaderTest.java b/tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/DatatypeLibraryLoaderTest.java similarity index 93% rename from tests/rnc/src/test/java/org/jvnet/jaxb2/maven2/tests/rnc/DatatypeLibraryLoaderTest.java rename to tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/DatatypeLibraryLoaderTest.java index 16cabed76..4ad083bc4 100644 --- a/tests/rnc/src/test/java/org/jvnet/jaxb2/maven2/tests/rnc/DatatypeLibraryLoaderTest.java +++ b/tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/DatatypeLibraryLoaderTest.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2.maven2.tests.rnc; +package org.jvnet.jaxb.maven.tests.rnc; import org.junit.Test; import org.kohsuke.rngom.dt.builtin.BuiltinDatatypeLibraryFactory; diff --git a/tests/rnc/src/test/java/org/jvnet/jaxb2/maven2/tests/rnc/RunRNCMojo.java b/tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/RunRNCMojo.java similarity index 82% rename from tests/rnc/src/test/java/org/jvnet/jaxb2/maven2/tests/rnc/RunRNCMojo.java rename to tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/RunRNCMojo.java index cc5f0ac84..8174a4ce9 100644 --- a/tests/rnc/src/test/java/org/jvnet/jaxb2/maven2/tests/rnc/RunRNCMojo.java +++ b/tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/RunRNCMojo.java @@ -1,11 +1,10 @@ -package org.jvnet.jaxb2.maven2.tests.rnc; +package org.jvnet.jaxb.maven.tests.rnc; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; import com.sun.tools.xjc.reader.Ring; - public class RunRNCMojo extends RunXJC2Mojo { @Override diff --git a/tests/tse/pom.xml b/tests/tse/pom.xml index b9e63c56c..be432ae30 100644 --- a/tests/tse/pom.xml +++ b/tests/tse/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-tse + jaxb-maven-plugin-tests-tse - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [tse] + Maven JAXB Plugin Tests [tse] org.glassfish.jaxb @@ -19,8 +19,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/tests/two/pom.xml b/tests/two/pom.xml index fa1c9410e..ea8f7c439 100644 --- a/tests/two/pom.xml +++ b/tests/two/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT @@ -23,15 +23,15 @@ test - maven-jaxb2-plugin-tests-two + jaxb-maven-plugin-tests-two jar - Maven JAXB 2.x Plugin Tests [two] + Maven JAXB Plugin Tests [two] test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin generate diff --git a/tests/wsdl-file/pom.xml b/tests/wsdl-file/pom.xml index 2a42d1f7f..2d3733438 100644 --- a/tests/wsdl-file/pom.xml +++ b/tests/wsdl-file/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-wsdl-file + jaxb-maven-plugin-tests-wsdl-file - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.13.2-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [wsdl-file] + Maven JAXB Plugin Tests [wsdl-file] org.glassfish.jaxb @@ -25,8 +25,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin *.wsdl diff --git a/tests/wsdl/pom.xml b/tests/wsdl/pom.xml index 4a843f98e..56c5f738f 100644 --- a/tests/wsdl/pom.xml +++ b/tests/wsdl/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-wsdl + jaxb-maven-plugin-tests-wsdl - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.13.2-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [wsdl] + Maven JAXB Plugin Tests [wsdl] org.glassfish.jaxb @@ -25,8 +25,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/tests/xjc-simple/pom.xml b/tests/xjc-simple/pom.xml index 7137362ab..efec91704 100644 --- a/tests/xjc-simple/pom.xml +++ b/tests/xjc-simple/pom.xml @@ -2,14 +2,14 @@ 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"> 4.0.0 - maven-jaxb2-plugin-tests-xjc-simple + jaxb-maven-plugin-tests-xjc-simple - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-tests - 0.15.4-SNAPSHOT + org.jvnet.jaxb + jaxb-maven-plugin-tests + 2.0.0-SNAPSHOT jar - Maven JAXB 2.x Plugin Tests [xjc-simple] + Maven JAXB Plugin Tests [xjc-simple] org.glassfish.jaxb @@ -23,8 +23,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin + org.jvnet.jaxb + jaxb-maven-plugin generate diff --git a/www/docs/guide.html b/www/docs/guide.html index aa5d6d6fb..24b465bc7 100644 --- a/www/docs/guide.html +++ b/www/docs/guide.html @@ -1,7 +1,7 @@ -Maven2 JAXB2 Plugin User Guide +Maven JAXB Plugin User Guide

User guide was moved to the following addres: http://confluence.highsource.org/display/MJIIP/User+Guide. diff --git a/www/index.html b/www/index.html index c94b7d72f..8eaa4e175 100644 --- a/www/index.html +++ b/www/index.html @@ -1,6 +1,6 @@ - JAXB2 Maven2 Plugin + JAXB Maven Plugin @@ -10,12 +10,12 @@ duke -

Maven 2 JAXB 2.x Plugin

+

Maven JAXB Plugin

-

This Maven 2 plugin wraps the JAXB 2.x XJC compiler and provides the +

This Maven plugin wraps the JAXB XJC compiler and provides the capability to generate java sources from schemas.

Quickstart

@@ -29,8 +29,8 @@

Quickstart

<build>
 	<plugins>
 		<plugin>
-			<groupId>org.jvnet.jaxb2.maven2</groupId>
-			<artifactId>maven-jaxb2-plugin</artifactId>
+			<groupId>org.jvnet.jaxb</groupId>
+			<artifactId>jaxb-maven-plugin</artifactId>
 			<executions>
 				<execution>
 					<goals>