[#375] Rename jaxb2-basics to jaxb-plugins

highsource · Sep 21, 2023 · af41c00 · af41c00
1 parent 7980fac
commit af41c00
Show file tree

Hide file tree

Showing 123 changed files with 51 additions and 51 deletions.
diff --git a/...cs/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java b/...cs/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java
@@ -92,7 +92,7 @@ public Object copy(ObjectLocator locator, Object object,
 		}.copy(new DefaultRootObjectLocator(a), a);
 
 		assertSame(a1.b.a.b, a1.b);
-		// BUG: See https://github.com/highsource/jaxb2-basics/issues/92
+		// BUG: See https://github.com/highsource/jaxb-tools/issues/92
 		// assertSame(a1.b.a, a1);
 	}
 

diff --git a/basics/jaxb-plugins-shaded/pom.xml b/basics/jaxb-plugins-shaded/pom.xml
@@ -11,7 +11,7 @@
   <dependencies>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>

diff --git a/basics/basic/pom.xml → basics/jaxb-plugins/pom.xml b/basics/basic/pom.xml → basics/jaxb-plugins/pom.xml
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>jaxb2-basics</artifactId>
+  <artifactId>jaxb-plugins</artifactId>
   <packaging>jar</packaging>
-  <name>JAXB Tools :: JAXB Basics :: Basic Plugins</name>
+  <name>JAXB Tools :: JAXB Plugins :: Plugins</name>
   <parent>
     <groupId>org.jvnet.jaxb</groupId>
     <artifactId>jaxb-basics-project</artifactId>

diff --git a/.../jaxb2_commons/plugin/Customizations.java → .../jaxb2_commons/plugin/Customizations.java b/.../jaxb2_commons/plugin/Customizations.java → .../jaxb2_commons/plugin/Customizations.java
diff --git a/...b2_commons/plugin/CustomizedIgnoring.java → ...b2_commons/plugin/CustomizedIgnoring.java b/...b2_commons/plugin/CustomizedIgnoring.java → ...b2_commons/plugin/CustomizedIgnoring.java
diff --git a/.../jvnet/jaxb2_commons/plugin/Ignoring.java → .../jvnet/jaxb2_commons/plugin/Ignoring.java b/.../jvnet/jaxb2_commons/plugin/Ignoring.java → .../jvnet/jaxb2_commons/plugin/Ignoring.java
diff --git a/...utoinheritance/AutoInheritancePlugin.java → ...utoinheritance/AutoInheritancePlugin.java b/...utoinheritance/AutoInheritancePlugin.java → ...utoinheritance/AutoInheritancePlugin.java
diff --git a/...or/AbstractCodeGenerationImplementor.java → ...or/AbstractCodeGenerationImplementor.java b/...or/AbstractCodeGenerationImplementor.java → ...or/AbstractCodeGenerationImplementor.java
diff --git a/.../codegenerator/AbstractCodeGenerator.java → .../codegenerator/AbstractCodeGenerator.java b/.../codegenerator/AbstractCodeGenerator.java → .../codegenerator/AbstractCodeGenerator.java
diff --git a/...enerator/AbstractCodeGeneratorPlugin.java → ...enerator/AbstractCodeGeneratorPlugin.java b/...enerator/AbstractCodeGeneratorPlugin.java → ...enerator/AbstractCodeGeneratorPlugin.java
diff --git a/...mmons/plugin/codegenerator/Arguments.java → ...mmons/plugin/codegenerator/Arguments.java b/...mmons/plugin/codegenerator/Arguments.java → ...mmons/plugin/codegenerator/Arguments.java
diff --git a/...gin/codegenerator/ArrayCodeGenerator.java → ...gin/codegenerator/ArrayCodeGenerator.java b/...gin/codegenerator/ArrayCodeGenerator.java → ...gin/codegenerator/ArrayCodeGenerator.java
diff --git a/...n/codegenerator/BooleanCodeGenerator.java → ...n/codegenerator/BooleanCodeGenerator.java b/...n/codegenerator/BooleanCodeGenerator.java → ...n/codegenerator/BooleanCodeGenerator.java
diff --git a/...ugin/codegenerator/ByteCodeGenerator.java → ...ugin/codegenerator/ByteCodeGenerator.java b/...ugin/codegenerator/ByteCodeGenerator.java → ...ugin/codegenerator/ByteCodeGenerator.java
diff --git a/...ugin/codegenerator/CharCodeGenerator.java → ...ugin/codegenerator/CharCodeGenerator.java b/...ugin/codegenerator/CharCodeGenerator.java → ...ugin/codegenerator/CharCodeGenerator.java
diff --git a/...egenerator/CodeGenerationAbstraction.java → ...egenerator/CodeGenerationAbstraction.java b/...egenerator/CodeGenerationAbstraction.java → ...egenerator/CodeGenerationAbstraction.java
diff --git a/...egenerator/CodeGenerationImplementor.java → ...egenerator/CodeGenerationImplementor.java b/...egenerator/CodeGenerationImplementor.java → ...egenerator/CodeGenerationImplementor.java
diff --git a/...s/plugin/codegenerator/CodeGenerator.java → ...s/plugin/codegenerator/CodeGenerator.java b/...s/plugin/codegenerator/CodeGenerator.java → ...s/plugin/codegenerator/CodeGenerator.java
diff --git a/...in/codegenerator/DoubleCodeGenerator.java → ...in/codegenerator/DoubleCodeGenerator.java b/...in/codegenerator/DoubleCodeGenerator.java → ...in/codegenerator/DoubleCodeGenerator.java
diff --git a/...gin/codegenerator/FloatCodeGenerator.java → ...gin/codegenerator/FloatCodeGenerator.java b/...gin/codegenerator/FloatCodeGenerator.java → ...gin/codegenerator/FloatCodeGenerator.java
diff --git a/...lugin/codegenerator/IntCodeGenerator.java → ...lugin/codegenerator/IntCodeGenerator.java b/...lugin/codegenerator/IntCodeGenerator.java → ...lugin/codegenerator/IntCodeGenerator.java
diff --git a/...degenerator/JAXBElementCodeGenerator.java → ...degenerator/JAXBElementCodeGenerator.java b/...degenerator/JAXBElementCodeGenerator.java → ...degenerator/JAXBElementCodeGenerator.java
diff --git a/...ugin/codegenerator/ListCodeGenerator.java → ...ugin/codegenerator/ListCodeGenerator.java b/...ugin/codegenerator/ListCodeGenerator.java → ...ugin/codegenerator/ListCodeGenerator.java
diff --git a/...ugin/codegenerator/LongCodeGenerator.java → ...ugin/codegenerator/LongCodeGenerator.java b/...ugin/codegenerator/LongCodeGenerator.java → ...ugin/codegenerator/LongCodeGenerator.java
diff --git a/...in/codegenerator/ObjectCodeGenerator.java → ...in/codegenerator/ObjectCodeGenerator.java b/...in/codegenerator/ObjectCodeGenerator.java → ...in/codegenerator/ObjectCodeGenerator.java
diff --git a/...gin/codegenerator/ShortCodeGenerator.java → ...gin/codegenerator/ShortCodeGenerator.java b/...gin/codegenerator/ShortCodeGenerator.java → ...gin/codegenerator/ShortCodeGenerator.java
diff --git a/...in/commons_lang/XjcCommonsLangPlugin.java → ...in/commons_lang/XjcCommonsLangPlugin.java b/...in/commons_lang/XjcCommonsLangPlugin.java → ...in/commons_lang/XjcCommonsLangPlugin.java
diff --git a/...mmons/plugin/copyable/CopyablePlugin.java → ...mmons/plugin/copyable/CopyablePlugin.java b/...mmons/plugin/copyable/CopyablePlugin.java → ...mmons/plugin/copyable/CopyablePlugin.java
diff --git a/...mmons/plugin/copyable/Customizations.java → ...mmons/plugin/copyable/Customizations.java b/...mmons/plugin/copyable/Customizations.java → ...mmons/plugin/copyable/Customizations.java
diff --git a/...plugin/customizations/Customizations.java → ...plugin/customizations/Customizations.java b/...plugin/customizations/Customizations.java → ...plugin/customizations/Customizations.java
diff --git a/.../customizations/CustomizationsPlugin.java → .../customizations/CustomizationsPlugin.java b/.../customizations/CustomizationsPlugin.java → .../customizations/CustomizationsPlugin.java
diff --git a/...efaultvalueplugin/DefaultValuePlugin.java → ...efaultvalueplugin/DefaultValuePlugin.java b/...efaultvalueplugin/DefaultValuePlugin.java → ...efaultvalueplugin/DefaultValuePlugin.java
diff --git a/...plugin/elementwrapper/Customizations.java → ...plugin/elementwrapper/Customizations.java b/...plugin/elementwrapper/Customizations.java → ...plugin/elementwrapper/Customizations.java
diff --git a/.../elementwrapper/ElementWrapperPlugin.java → .../elementwrapper/ElementWrapperPlugin.java b/.../elementwrapper/ElementWrapperPlugin.java → .../elementwrapper/ElementWrapperPlugin.java
diff --git a/...mons/plugin/enumvalue/Customizations.java → ...mons/plugin/enumvalue/Customizations.java b/...mons/plugin/enumvalue/Customizations.java → ...mons/plugin/enumvalue/Customizations.java
diff --git a/...ons/plugin/enumvalue/EnumValuePlugin.java → ...ons/plugin/enumvalue/EnumValuePlugin.java b/...ons/plugin/enumvalue/EnumValuePlugin.java → ...ons/plugin/enumvalue/EnumValuePlugin.java
diff --git a/...commons/plugin/equals/Customizations.java → ...commons/plugin/equals/Customizations.java b/...commons/plugin/equals/Customizations.java → ...commons/plugin/equals/Customizations.java
diff --git a/...2_commons/plugin/equals/EqualsPlugin.java → ...2_commons/plugin/equals/EqualsPlugin.java b/...2_commons/plugin/equals/EqualsPlugin.java → ...2_commons/plugin/equals/EqualsPlugin.java
diff --git a/...plugin/fixjaxb1058/FixJAXB1058Plugin.java → ...plugin/fixjaxb1058/FixJAXB1058Plugin.java b/...plugin/fixjaxb1058/FixJAXB1058Plugin.java → ...plugin/fixjaxb1058/FixJAXB1058Plugin.java
diff --git a/...ons/plugin/fluent_api/Customizations.java → ...ons/plugin/fluent_api/Customizations.java b/...ons/plugin/fluent_api/Customizations.java → ...ons/plugin/fluent_api/Customizations.java
diff --git a/...ns/plugin/fluent_api/FluentApiPlugin.java → ...ns/plugin/fluent_api/FluentApiPlugin.java b/...ns/plugin/fluent_api/FluentApiPlugin.java → ...ns/plugin/fluent_api/FluentApiPlugin.java
diff --git a/...s/plugin/fluent_api/FluentMethodInfo.java → ...s/plugin/fluent_api/FluentMethodInfo.java b/...s/plugin/fluent_api/FluentMethodInfo.java → ...s/plugin/fluent_api/FluentMethodInfo.java
diff --git a/...s/plugin/fluent_api/FluentMethodType.java → ...s/plugin/fluent_api/FluentMethodType.java b/...s/plugin/fluent_api/FluentMethodType.java → ...s/plugin/fluent_api/FluentMethodType.java
diff --git a/...mmons/plugin/hashcode/Customizations.java → ...mmons/plugin/hashcode/Customizations.java b/...mmons/plugin/hashcode/Customizations.java → ...mmons/plugin/hashcode/Customizations.java
diff --git a/...mmons/plugin/hashcode/HashCodePlugin.java → ...mmons/plugin/hashcode/HashCodePlugin.java b/...mmons/plugin/hashcode/HashCodePlugin.java → ...mmons/plugin/hashcode/HashCodePlugin.java
diff --git a/...ns/plugin/inheritance/Customizations.java → ...ns/plugin/inheritance/Customizations.java b/...ns/plugin/inheritance/Customizations.java → ...ns/plugin/inheritance/Customizations.java
diff --git a/...mons/plugin/inheritance/ExtendsClass.java → ...mons/plugin/inheritance/ExtendsClass.java b/...mons/plugin/inheritance/ExtendsClass.java → ...mons/plugin/inheritance/ExtendsClass.java
diff --git a/...ugin/inheritance/ImplementsInterface.java → ...ugin/inheritance/ImplementsInterface.java b/...ugin/inheritance/ImplementsInterface.java → ...ugin/inheritance/ImplementsInterface.java
diff --git a/...plugin/inheritance/InheritancePlugin.java → ...plugin/inheritance/InheritancePlugin.java b/...plugin/inheritance/InheritancePlugin.java → ...plugin/inheritance/InheritancePlugin.java
diff --git a/...ons/plugin/inheritance/ObjectFactory.java → ...ons/plugin/inheritance/ObjectFactory.java b/...ons/plugin/inheritance/ObjectFactory.java → ...ons/plugin/inheritance/ObjectFactory.java
diff --git a/...heritance/ObjectFactoryCustomization.java → ...heritance/ObjectFactoryCustomization.java b/...heritance/ObjectFactoryCustomization.java → ...heritance/ObjectFactoryCustomization.java
diff --git a/...ugin/inheritance/util/JavaTypeParser.java → ...ugin/inheritance/util/JavaTypeParser.java b/...ugin/inheritance/util/JavaTypeParser.java → ...ugin/inheritance/util/JavaTypeParser.java
diff --git a/...ce/util/TypeToJTypeConvertingVisitor.java → ...ce/util/TypeToJTypeConvertingVisitor.java b/...ce/util/TypeToJTypeConvertingVisitor.java → ...ce/util/TypeToJTypeConvertingVisitor.java
diff --git a/...ons/plugin/jaxbindex/JaxbIndexPlugin.java → ...ons/plugin/jaxbindex/JaxbIndexPlugin.java b/...ons/plugin/jaxbindex/JaxbIndexPlugin.java → ...ons/plugin/jaxbindex/JaxbIndexPlugin.java
diff --git a/...mons/plugin/mergeable/Customizations.java → ...mons/plugin/mergeable/Customizations.java b/...mons/plugin/mergeable/Customizations.java → ...mons/plugin/mergeable/Customizations.java
diff --git a/...ons/plugin/mergeable/MergeablePlugin.java → ...ons/plugin/mergeable/MergeablePlugin.java b/...ons/plugin/mergeable/MergeablePlugin.java → ...ons/plugin/mergeable/MergeablePlugin.java
diff --git a/...ons/plugin/model/AbstractModelPlugin.java → ...ons/plugin/model/AbstractModelPlugin.java b/...ons/plugin/model/AbstractModelPlugin.java → ...ons/plugin/model/AbstractModelPlugin.java
diff --git a/...mespace_prefix/NamespacePrefixPlugin.java → ...mespace_prefix/NamespacePrefixPlugin.java b/...mespace_prefix/NamespacePrefixPlugin.java → ...mespace_prefix/NamespacePrefixPlugin.java
diff --git a/...ommons/plugin/setters/Customizations.java → ...ommons/plugin/setters/Customizations.java b/...ommons/plugin/setters/Customizations.java → ...ommons/plugin/setters/Customizations.java
diff --git a/...commons/plugin/setters/SettersPlugin.java → ...commons/plugin/setters/SettersPlugin.java b/...commons/plugin/setters/SettersPlugin.java → ...commons/plugin/setters/SettersPlugin.java
diff --git a/.../plugin/simpleequals/EqualsArguments.java → .../plugin/simpleequals/EqualsArguments.java b/.../plugin/simpleequals/EqualsArguments.java → .../plugin/simpleequals/EqualsArguments.java
diff --git a/...uals/EqualsCodeGenerationImplementor.java → ...uals/EqualsCodeGenerationImplementor.java b/...uals/EqualsCodeGenerationImplementor.java → ...uals/EqualsCodeGenerationImplementor.java
diff --git a/...gin/simpleequals/EqualsCodeGenerator.java → ...gin/simpleequals/EqualsCodeGenerator.java b/...gin/simpleequals/EqualsCodeGenerator.java → ...gin/simpleequals/EqualsCodeGenerator.java
diff --git a/...ugin/simpleequals/SimpleEqualsPlugin.java → ...ugin/simpleequals/SimpleEqualsPlugin.java b/...ugin/simpleequals/SimpleEqualsPlugin.java → ...ugin/simpleequals/SimpleEqualsPlugin.java
diff --git a/...gin/simplehashcode/HashCodeArguments.java → ...gin/simplehashcode/HashCodeArguments.java b/...gin/simplehashcode/HashCodeArguments.java → ...gin/simplehashcode/HashCodeArguments.java
diff --git a/...de/HashCodeCodeGenerationImplementor.java → ...de/HashCodeCodeGenerationImplementor.java b/...de/HashCodeCodeGenerationImplementor.java → ...de/HashCodeCodeGenerationImplementor.java
diff --git a/...simplehashcode/HashCodeCodeGenerator.java → ...simplehashcode/HashCodeCodeGenerator.java b/...simplehashcode/HashCodeCodeGenerator.java → ...simplehashcode/HashCodeCodeGenerator.java
diff --git a/.../simplehashcode/SimpleHashCodePlugin.java → .../simplehashcode/SimpleHashCodePlugin.java b/.../simplehashcode/SimpleHashCodePlugin.java → .../simplehashcode/SimpleHashCodePlugin.java
diff --git a/.../simpletostring/SimpleToStringPlugin.java → .../simpletostring/SimpleToStringPlugin.java b/.../simpletostring/SimpleToStringPlugin.java → .../simpletostring/SimpleToStringPlugin.java
diff --git a/...mmons/plugin/simplify/Customizations.java → ...mmons/plugin/simplify/Customizations.java b/...mmons/plugin/simplify/Customizations.java → ...mmons/plugin/simplify/Customizations.java
diff --git a/...mmons/plugin/simplify/SimplifyPlugin.java → ...mmons/plugin/simplify/SimplifyPlugin.java b/...mmons/plugin/simplify/SimplifyPlugin.java → ...mmons/plugin/simplify/SimplifyPlugin.java
diff --git a/...mmons/plugin/tostring/Customizations.java → ...mmons/plugin/tostring/Customizations.java b/...mmons/plugin/tostring/Customizations.java → ...mmons/plugin/tostring/Customizations.java
diff --git a/...mmons/plugin/tostring/ToStringPlugin.java → ...mmons/plugin/tostring/ToStringPlugin.java b/...mmons/plugin/tostring/ToStringPlugin.java → ...mmons/plugin/tostring/ToStringPlugin.java
diff --git a/...jaxb2_commons/plugin/util/ArrayUtils.java → ...jaxb2_commons/plugin/util/ArrayUtils.java b/...jaxb2_commons/plugin/util/ArrayUtils.java → ...jaxb2_commons/plugin/util/ArrayUtils.java
diff --git a/...ommons/plugin/util/FieldOutlineUtils.java → ...ommons/plugin/util/FieldOutlineUtils.java b/...ommons/plugin/util/FieldOutlineUtils.java → ...ommons/plugin/util/FieldOutlineUtils.java
diff --git a/.../jaxb2_commons/plugin/util/Predicate.java → .../jaxb2_commons/plugin/util/Predicate.java b/.../jaxb2_commons/plugin/util/Predicate.java → .../jaxb2_commons/plugin/util/Predicate.java
diff --git a/...mmons/plugin/util/StrategyClassUtils.java → ...mmons/plugin/util/StrategyClassUtils.java b/...mmons/plugin/util/StrategyClassUtils.java → ...mmons/plugin/util/StrategyClassUtils.java
diff --git a/...gin/value_constructor/Customizations.java → ...gin/value_constructor/Customizations.java b/...gin/value_constructor/Customizations.java → ...gin/value_constructor/Customizations.java
diff --git a/...e_constructor/ValueConstructorPlugin.java → ...e_constructor/ValueConstructorPlugin.java b/...e_constructor/ValueConstructorPlugin.java → ...e_constructor/ValueConstructorPlugin.java
diff --git a/...mmons/plugin/wildcard/Customizations.java → ...mmons/plugin/wildcard/Customizations.java b/...mmons/plugin/wildcard/Customizations.java → ...mmons/plugin/wildcard/Customizations.java
diff --git a/...mmons/plugin/wildcard/WildcardPlugin.java → ...mmons/plugin/wildcard/WildcardPlugin.java b/...mmons/plugin/wildcard/WildcardPlugin.java → ...mmons/plugin/wildcard/WildcardPlugin.java
diff --git a/...ETA-INF/services/com.sun.tools.xjc.Plugin → ...ETA-INF/services/com.sun.tools.xjc.Plugin b/...ETA-INF/services/com.sun.tools.xjc.Plugin → ...ETA-INF/services/com.sun.tools.xjc.Plugin
diff --git a/...gin/copyable/tests/RunCopyablePlugin.java → ...gin/copyable/tests/RunCopyablePlugin.java b/...gin/copyable/tests/RunCopyablePlugin.java → ...gin/copyable/tests/RunCopyablePlugin.java
diff --git a/.../plugin/equals/tests/RunEqualsPlugin.java → .../plugin/equals/tests/RunEqualsPlugin.java b/.../plugin/equals/tests/RunEqualsPlugin.java → .../plugin/equals/tests/RunEqualsPlugin.java
diff --git a/...gin/inheritance/tests/JavaParserTest.java → ...gin/inheritance/tests/JavaParserTest.java b/...gin/inheritance/tests/JavaParserTest.java → ...gin/inheritance/tests/JavaParserTest.java
diff --git a/...inheritance/tests/JavaTypeParserTest.java → ...inheritance/tests/JavaTypeParserTest.java b/...inheritance/tests/JavaTypeParserTest.java → ...inheritance/tests/JavaTypeParserTest.java
diff --git a/...n/mergeable/tests/RunMergeablePlugin.java → ...n/mergeable/tests/RunMergeablePlugin.java b/...n/mergeable/tests/RunMergeablePlugin.java → ...n/mergeable/tests/RunMergeablePlugin.java
diff --git a/...gin/tostring/tests/RunToStringPlugin.java → ...gin/tostring/tests/RunToStringPlugin.java b/...gin/tostring/tests/RunToStringPlugin.java → ...gin/tostring/tests/RunToStringPlugin.java
diff --git a/basics/basic/src/test/resources/schema.xsd → ...axb-plugins/src/test/resources/schema.xsd b/basics/basic/src/test/resources/schema.xsd → ...axb-plugins/src/test/resources/schema.xsd
diff --git a/basics/pom.xml b/basics/pom.xml
@@ -8,14 +8,14 @@
   </parent>
   <artifactId>jaxb-basics-project</artifactId>
   <packaging>pom</packaging>
-  <name>JAXB Tools :: JAXB Basics :: Project</name>
+  <name>JAXB Tools :: JAXB Plugins :: Project</name>
   <description>JAXB Basics is a part of JAXB Tools project which implements plugins and tools for JAXB implementation.</description>
   <modules>
     <module>jaxb-plugins-ant</module>
     <module>jaxb-plugins-runtime</module>
     <module>jaxb-plugins-tools</module>
     <module>jaxb-plugins-testing</module>
-    <module>basic</module>
+    <module>jaxb-plugins</module>
     <module>jaxb-plugins-shaded</module>
   </modules>
   <profiles>

diff --git a/basics/samples/basic/project-pom.xml b/basics/samples/basic/project-pom.xml
@@ -73,7 +73,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
               <version>${project.version}</version>
             </plugin>
           </plugins>

diff --git a/basics/samples/cxf/project-pom.xml b/basics/samples/cxf/project-pom.xml
@@ -103,7 +103,7 @@
           </dependency>
           <dependency>
             <groupId>org.jvnet.jaxb</groupId>
-            <artifactId>jaxb2-basics</artifactId>
+            <artifactId>jaxb-plugins</artifactId>
             <version>${project.version}</version>
           </dependency>
         </dependencies>

diff --git a/basics/samples/po-simple/project-pom.xml b/basics/samples/po-simple/project-pom.xml
@@ -70,7 +70,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
               <version>${project.version}</version>
             </plugin>
           </plugins>

diff --git a/basics/samples/po/project-pom.xml b/basics/samples/po/project-pom.xml
@@ -73,7 +73,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
               <version>${project.version}</version>
             </plugin>
           </plugins>

diff --git a/basics/tests/JAXB-1058/pom.xml b/basics/tests/JAXB-1058/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -35,7 +35,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/commons_lang/pom.xml b/basics/tests/commons_lang/pom.xml
@@ -35,7 +35,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/defaultvalue/pom.xml b/basics/tests/defaultvalue/pom.xml
@@ -35,7 +35,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/episodes/a/pom.xml b/basics/tests/episodes/a/pom.xml
@@ -28,7 +28,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/episodes/b/pom.xml b/basics/tests/episodes/b/pom.xml
@@ -35,7 +35,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
           <episodes>

diff --git a/basics/tests/ignoring/pom.xml b/basics/tests/ignoring/pom.xml
@@ -28,7 +28,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/issues/pom.xml b/basics/tests/issues/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -55,7 +55,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/namespace/pom.xml b/basics/tests/namespace/pom.xml
@@ -35,7 +35,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/one/pom.xml b/basics/tests/one/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -39,7 +39,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/po/pom.xml b/basics/tests/po/pom.xml
@@ -37,7 +37,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/qa-simple/pom.xml b/basics/tests/qa-simple/pom.xml
@@ -39,7 +39,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/qa-strategic/pom.xml b/basics/tests/qa-strategic/pom.xml
@@ -40,7 +40,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/simple-hashCode-equals-01/pom.xml b/basics/tests/simple-hashCode-equals-01/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -32,12 +32,12 @@
           <args>
             <arg>-XsimpleEquals</arg>
             <arg>-XsimpleHashCode</arg>
-						<!-- arg>-XsimpleToString</arg-->
+            <!-- arg>-XsimpleToString</arg-->
           </args>
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/simplify-01/pom.xml b/basics/tests/simplify-01/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
     <dependency>
       <groupId>joda-time</groupId>
@@ -40,7 +40,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/simplify-02/pom.xml b/basics/tests/simplify-02/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
     <dependency>
       <groupId>joda-time</groupId>
@@ -39,7 +39,7 @@
 					<plugins>
 						<plugin>
 							<groupId>org.jvnet.jaxb</groupId>
-							<artifactId>jaxb2-basics</artifactId>
+							<artifactId>jaxb-plugins</artifactId>
 						</plugin>
 					</plugins>
 				</configuration>

diff --git a/basics/tests/superclass/a/pom.xml b/basics/tests/superclass/a/pom.xml
@@ -28,7 +28,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/superclass/b/pom.xml b/basics/tests/superclass/b/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -45,7 +45,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>

diff --git a/basics/tests/wildcard/pom.xml b/basics/tests/wildcard/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -35,7 +35,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/basics/tests/zj/pom.xml b/basics/tests/zj/pom.xml
@@ -26,7 +26,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/jaxb-annotate-parent/tests/issues/pom.xml b/jaxb-annotate-parent/tests/issues/pom.xml
@@ -80,7 +80,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>

diff --git a/jaxb-annotate-parent/tests/pom.xml b/jaxb-annotate-parent/tests/pom.xml
@@ -61,7 +61,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/maven-plugin/plugin/src/test/resources/test-pom.xml b/maven-plugin/plugin/src/test/resources/test-pom.xml
@@ -10,11 +10,11 @@
   <dependencies>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-testing</artifactId>
+      <artifactId>jaxb-plugins-testing</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -41,7 +41,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>

diff --git a/maven-plugin/samples/jaxbplugins/project-pom.xml b/maven-plugin/samples/jaxbplugins/project-pom.xml
@@ -41,7 +41,7 @@
               <plugins>
                 <plugin>
                   <groupId>org.jvnet.jaxb</groupId>
-                  <artifactId>jaxb2-basics</artifactId>
+                  <artifactId>jaxb-plugins</artifactId>
                   <version>${project.version}</version>
                 </plugin>
               </plugins>

diff --git a/maven-plugin/samples/pom.xml b/maven-plugin/samples/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -44,7 +44,7 @@
         <executions>
           <execution>
             <id>maven-assembly</id>
-						<!--phase>package</phase-->
+            <!--phase>package</phase-->
             <phase>none</phase>
             <goals>
               <goal>single</goal>