Rename groupId, maven artifactId to org.jvnet.jaxb / jaxb-maven-plugin

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
   <build>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
-        <version>0.15.3</version>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
+        <version>2.0.0</version>
         <executions>
           <execution>
             <goals>
               <goal>generate</goal>
             </goals>
           </execution>
-	</executions>
+        </executions>
       </plugin>
     </plugins>
   </build>
@@ -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.
 

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">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jvnet.jaxb2.maven2</groupId>
-	<artifactId>maven-jaxb2-plugin-dist</artifactId>
+	<groupId>org.jvnet.jaxb</groupId>
+	<artifactId>jaxb-maven-plugin-dist</artifactId>
 	<packaging>pom</packaging>
-	<name>Maven JAXB 2.x Plugin Dist</name>
+	<name>Maven JAXB Plugin Dist</name>
 	<parent>
-		<groupId>org.jvnet.jaxb2.maven2</groupId>
-		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<groupId>org.jvnet.jaxb</groupId>
+		<artifactId>jaxb-maven-plugin-project</artifactId>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
-			<groupId>org.jvnet.jaxb2.maven2</groupId>
-			<artifactId>maven-jaxb2-plugin-sample-catalog</artifactId>
+			<groupId>org.jvnet.jaxb</groupId>
+			<artifactId>jaxb-maven-plugin-sample-catalog</artifactId>
 			<type>zip</type>
 			<classifier>maven-src</classifier>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2.maven2</groupId>
-			<artifactId>maven-jaxb2-plugin-sample-dtd</artifactId>
+			<groupId>org.jvnet.jaxb</groupId>
+			<artifactId>jaxb-maven-plugin-sample-dtd</artifactId>
 			<type>zip</type>
 			<classifier>maven-src</classifier>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2.maven2</groupId>
-			<artifactId>maven-jaxb2-plugin-sample-episode</artifactId>
+			<groupId>org.jvnet.jaxb</groupId>
+			<artifactId>jaxb-maven-plugin-sample-episode</artifactId>
 			<type>zip</type>
 			<classifier>maven-src</classifier>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2.maven2</groupId>
-			<artifactId>maven-jaxb2-plugin-sample-jaxbplugins</artifactId>
+			<groupId>org.jvnet.jaxb</groupId>
+			<artifactId>jaxb-maven-plugin-sample-jaxbplugins</artifactId>
 			<type>zip</type>
 			<classifier>maven-src</classifier>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2.maven2</groupId>
-			<artifactId>maven-jaxb2-plugin-sample-po</artifactId>
+			<groupId>org.jvnet.jaxb</groupId>
+			<artifactId>jaxb-maven-plugin-sample-po</artifactId>
 			<type>zip</type>
 			<classifier>maven-src</classifier>
 			<version>${project.version}</version>

plugin-core/pom.xml

@@ -1,12 +1,12 @@
 <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>maven-jaxb2-plugin-core</artifactId>
+	<artifactId>jaxb-maven-plugin-core</artifactId>
 	<packaging>jar</packaging>
-	<name>Maven JAXB 2.x Plugin Core</name>
+	<name>Maven JAXB Plugin Core</name>
 	<parent>
-		<groupId>org.jvnet.jaxb2.maven2</groupId>
-		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<groupId>org.jvnet.jaxb</groupId>
+		<artifactId>jaxb-maven-plugin-project</artifactId>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>

plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java → 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<O> getOptionsFactory();
+	protected abstract IOptionsFactory<O> getOptionsFactory();
 
 	protected void cleanPackageDirectory(final File packageDirectory) {
 		final File[] files = packageDirectory.listFiles(new FileFilter() {

plugin-core/src/main/java/org/jvnet/jaxb2/maven2/DependencyResource.java → 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 {
 

plugin-core/src/main/java/org/jvnet/jaxb2/maven2/DependencyResourceResolver.java → 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;
 

plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsFactory.java → 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<O> {
+public interface IOptionsFactory<O> {
 
 	public O createOptions(OptionsConfiguration optionsConfiguration)
 			throws MojoExecutionException;

plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java → 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;

plugin-core/src/main/java/org/jvnet/jaxb2/maven2/ParentFirstClassLoader.java → 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;

plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java → 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)
  */

plugin-core/src/main/java/org/jvnet/jaxb2/maven2/ResourceEntry.java → 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;