From 91f114c7628b4a478e50dc5816240e73be38c422 Mon Sep 17 00:00:00 2001
From: Matt Pavlovich <matt@hyte.io>
Date: Wed, 20 Sep 2023 10:11:07 -0500
Subject: [PATCH] [#375] Rename jaxb2-basics-ant to jaxb-plugins-ant

---
 basics/{ant => jaxb-plugins-ant}/pom.xml               |  4 ++--
 .../main/java/org/jvnet/jaxb2_commons/xjc/XJCTask.java |  0
 basics/pom.xml                                         |  3 +--
 basics/samples/basic/pom.xml                           |  2 +-
 basics/samples/basic/project-build.xml                 |  2 +-
 basics/samples/cxf/pom.xml                             |  2 +-
 basics/samples/po-simple/pom.xml                       |  2 +-
 basics/samples/po-simple/project-build.xml             |  4 ++--
 basics/samples/po/pom.xml                              |  2 +-
 basics/samples/po/project-build.xml                    |  4 ++--
 jaxb-annotate-parent/samples/annotate/pom.xml          |  4 +---
 .../samples/annotate/project-build.xml                 | 10 +++++-----
 pom.xml                                                |  2 +-
 13 files changed, 19 insertions(+), 22 deletions(-)
 rename basics/{ant => jaxb-plugins-ant}/pom.xml (91%)
 rename basics/{ant => jaxb-plugins-ant}/src/main/java/org/jvnet/jaxb2_commons/xjc/XJCTask.java (100%)

diff --git a/basics/ant/pom.xml b/basics/jaxb-plugins-ant/pom.xml
similarity index 91%
rename from basics/ant/pom.xml
rename to basics/jaxb-plugins-ant/pom.xml
index a674b3635..7ef30a00f 100644
--- a/basics/ant/pom.xml
+++ b/basics/jaxb-plugins-ant/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-ant</artifactId>
+  <artifactId>jaxb-plugins-ant</artifactId>
   <packaging>jar</packaging>
-  <name>JAXB Tools :: JAXB Basics :: Ant Task</name>
+  <name>JAXB Tools :: JAXB Plugins :: Ant Task</name>
   <parent>
     <groupId>org.jvnet.jaxb</groupId>
     <artifactId>jaxb-basics-project</artifactId>
diff --git a/basics/ant/src/main/java/org/jvnet/jaxb2_commons/xjc/XJCTask.java b/basics/jaxb-plugins-ant/src/main/java/org/jvnet/jaxb2_commons/xjc/XJCTask.java
similarity index 100%
rename from basics/ant/src/main/java/org/jvnet/jaxb2_commons/xjc/XJCTask.java
rename to basics/jaxb-plugins-ant/src/main/java/org/jvnet/jaxb2_commons/xjc/XJCTask.java
diff --git a/basics/pom.xml b/basics/pom.xml
index 2a0c1337c..d9466f4ff 100644
--- a/basics/pom.xml
+++ b/basics/pom.xml
@@ -11,7 +11,7 @@
   <name>JAXB Tools :: JAXB Basics :: Project</name>
   <description>JAXB Basics is a part of JAXB Tools project which implements plugins and tools for JAXB implementation.</description>
   <modules>
-    <module>ant</module>
+    <module>jaxb-plugins-ant</module>
     <module>runtime</module>
     <module>tools</module>
     <module>jaxb-plugins-testing</module>
@@ -40,7 +40,6 @@
     </profile>
   </profiles>
   <dependencies>
-       <!-- JUnit -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/basics/samples/basic/pom.xml b/basics/samples/basic/pom.xml
index 9f9e05c62..cc9bdb2f3 100644
--- a/basics/samples/basic/pom.xml
+++ b/basics/samples/basic/pom.xml
@@ -25,7 +25,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-ant</artifactId>
+      <artifactId>jaxb-plugins-ant</artifactId>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
diff --git a/basics/samples/basic/project-build.xml b/basics/samples/basic/project-build.xml
index 28ad93a15..349545de4 100644
--- a/basics/samples/basic/project-build.xml
+++ b/basics/samples/basic/project-build.xml
@@ -83,7 +83,7 @@
           <include name="junit-*.jar"/>
           <include name="stax-api-*.jar"/>
           <include name="jaxb-xjc-*.jar"/>
-          <include name="jaxb2-basics-ant-*.jar"/>
+          <include name="jaxb-plugins-ant-*.jar"/>
           <include name="jcl-over-slf4j-*.jar"/>
           <include name="relaxng-datatype-*.jar"/>
           <include name="rngom-*.jar"/>
diff --git a/basics/samples/cxf/pom.xml b/basics/samples/cxf/pom.xml
index 42038c842..4f9f38aa8 100644
--- a/basics/samples/cxf/pom.xml
+++ b/basics/samples/cxf/pom.xml
@@ -25,7 +25,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-ant</artifactId>
+      <artifactId>jaxb-plugins-ant</artifactId>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
diff --git a/basics/samples/po-simple/pom.xml b/basics/samples/po-simple/pom.xml
index b59e49e97..11abccabc 100644
--- a/basics/samples/po-simple/pom.xml
+++ b/basics/samples/po-simple/pom.xml
@@ -25,7 +25,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-ant</artifactId>
+      <artifactId>jaxb-plugins-ant</artifactId>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
diff --git a/basics/samples/po-simple/project-build.xml b/basics/samples/po-simple/project-build.xml
index 0a972e355..419e046b5 100644
--- a/basics/samples/po-simple/project-build.xml
+++ b/basics/samples/po-simple/project-build.xml
@@ -69,7 +69,7 @@
   </target>
   <target name="generate-sources">
     <taskdef name="xjc" classname="org.jvnet.jaxb2_commons.xjc.XJCTask">
-			<!-- XJC Task classpath -->
+      <!-- XJC Task classpath -->
       <classpath>
         <fileset dir="${basedir}/lib">
           <include name="codemodel-*.jar"/>
@@ -81,7 +81,7 @@
           <include name="jsr173_api-*.jar"/>
           <include name="stax-api-*.jar"/>
           <include name="jaxb-xjc-*.jar"/>
-          <include name="jaxb2-basics-ant-*.jar"/>
+          <include name="jaxb-plugins-ant-*.jar"/>
           <include name="jcl-over-slf4j-*.jar"/>
           <include name="relaxng-datatype-*.jar"/>
           <include name="rngom-*.jar"/>
diff --git a/basics/samples/po/pom.xml b/basics/samples/po/pom.xml
index b5b4d327a..8c9dc7209 100644
--- a/basics/samples/po/pom.xml
+++ b/basics/samples/po/pom.xml
@@ -25,7 +25,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-ant</artifactId>
+      <artifactId>jaxb-plugins-ant</artifactId>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
diff --git a/basics/samples/po/project-build.xml b/basics/samples/po/project-build.xml
index fad42356f..2bbaa83b7 100644
--- a/basics/samples/po/project-build.xml
+++ b/basics/samples/po/project-build.xml
@@ -69,7 +69,7 @@
   </target>
   <target name="generate-sources">
     <taskdef name="xjc" classname="org.jvnet.jaxb2_commons.xjc.XJCTask">
-			<!-- XJC Task classpath -->
+      <!-- XJC Task classpath -->
       <classpath>
         <fileset dir="${basedir}/lib">
           <include name="codemodel-*.jar"/>
@@ -82,7 +82,7 @@
           <include name="junit-*.jar"/>
           <include name="stax-api-*.jar"/>
           <include name="jaxb-xjc-*.jar"/>
-          <include name="jaxb2-basics-ant-*.jar"/>
+          <include name="jaxb-plugins-ant-*.jar"/>
           <include name="jcl-over-slf4j-*.jar"/>
           <include name="relaxng-datatype-*.jar"/>
           <include name="rngom-*.jar"/>
diff --git a/jaxb-annotate-parent/samples/annotate/pom.xml b/jaxb-annotate-parent/samples/annotate/pom.xml
index a867746be..52269664e 100644
--- a/jaxb-annotate-parent/samples/annotate/pom.xml
+++ b/jaxb-annotate-parent/samples/annotate/pom.xml
@@ -52,9 +52,8 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-ant</artifactId>
+      <artifactId>jaxb-plugins-ant</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
@@ -63,7 +62,6 @@
       <groupId>com.sun.activation</groupId>
       <artifactId>jakarta.activation</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-search</artifactId>
diff --git a/jaxb-annotate-parent/samples/annotate/project-build.xml b/jaxb-annotate-parent/samples/annotate/project-build.xml
index db190f3b4..fa111cf28 100644
--- a/jaxb-annotate-parent/samples/annotate/project-build.xml
+++ b/jaxb-annotate-parent/samples/annotate/project-build.xml
@@ -75,7 +75,7 @@
   </target>
   <target name="generate-sources">
     <taskdef name="xjc" classname="org.jvnet.jaxb2_commons.xjc.XJCTask">
-			<!-- XJC Task classpath -->
+      <!-- XJC Task classpath -->
       <classpath>
         <fileset dir="${basedir}/lib">
           <include name="commons-text-*.jar"/>
@@ -89,7 +89,7 @@
           <include name="junit-*.jar"/>
           <include name="stax-api-*.jar"/>
           <include name="jaxb-xjc-*.jar"/>
-          <include name="jaxb2-basics-ant-*.jar"/>
+          <include name="jaxb-plugins-ant-*.jar"/>
           <include name="jcl-over-slf4j-*.jar"/>
           <include name="relaxng-datatype-*.jar"/>
           <include name="rngom-*.jar"/>
@@ -107,14 +107,14 @@
       <schema dir="${basedir}/src/main/resources">
         <include name="**/*.xsd"/>
       </schema>
-			<!-- Plugins -->
+      <!-- Plugins -->
       <classpath>
         <fileset dir="${basedir}/lib">
-					<!-- JAXB2 Basics library -->
+          <!-- JAXB2 Basics library -->
           <include name="jaxb2-basics-*.jar"/>
           <include name="jaxb-annox-*.jar"/>
           <include name="jaxb-basics-annotate-*.jar"/>
-					<!-- JAXB2 Basics library dependencies -->
+          <!-- JAXB2 Basics library dependencies -->
           <include name="hibernate-search-*.jar" />
           <include name="javaparser-*.jar"/>
           <include name="commons-beanutils-*.jar"/>
diff --git a/pom.xml b/pom.xml
index 49a57ca07..63e6393ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -457,7 +457,7 @@
       </dependency>
       <dependency>
         <groupId>org.jvnet.jaxb</groupId>
-        <artifactId>jaxb2-basics-ant</artifactId>
+        <artifactId>jaxb-plugins-ant</artifactId>
         <version>${project.version}</version>
       </dependency>