Migration to jakarta JAXB3 API and update some dependencies

.gitignore

@@ -1,6 +1,7 @@
 /err
 /std
 target
+bin
 .project
 .settings
 .classpath

README.md

@@ -1,21 +1,21 @@
-# JAXB2 Basics
+# JAXB3 Basics
 
-JAXB2 Basics is an [open source](https://github.com/highsource/jaxb2-basics/blob/master/LICENSE) project
-which provides useful plugins and tools for [JAXB 2.x reference implementation](https://jaxb.java.net/).
+JAXB3 Basics is an [open source](https://github.com/highsource/jaxb2-basics/blob/master/LICENSE) project
+which provides useful plugins and tools for [JAXB 3.x reference implementation](https://jakarta.ee/specifications/xml-binding/3.0/).
 
 # Documentation
 
 Please refer to the [wiki](https://github.com/highsource/jaxb2-basics/wiki) for documentation.
 
-JAXB2 Basics can only be used with JAXB/XJC 2.3.0 and higher. JAXB/XJC versions 2.2.x and earlier are no longer supported.
+JAXB3 Basics can only be used with JAXB/XJC 3.0 and higher. JAXB/XJC versions 2.x and earlier are no longer supported.
 
-JAXB2 Basics can only be used with Java 1.8 and above.
+JAXB3 Basics can only be used with Java 1.8 and above.
 
-## Using JAXB2 Basics
+## Using JAXB3 Basics
 
-* [Using JAXB2 Basics Plugins](https://github.com/highsource/jaxb2-basics/wiki/Using-JAXB2-Basics-Plugins)
+* [Using JAXB3 Basics Plugins](https://github.com/highsource/jaxb2-basics/wiki/Using-JAXB2-Basics-Plugins)
 
-## JAXB2 Basics Plugins
+## JAXB3 Basics Plugins
 * [SimpleEquals Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-SimpleEquals-Plugin) - generates runtime-free reflection-free `equals(...)` methods.
 * [SimpleHashCode Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-SimpleHashCode-Plugin) - generates runtime-free reflection-free `hashCode()` methods.
 * Equals Plugin - generates reflection-free strategic `equals(...)` method.
@@ -30,6 +30,8 @@ JAXB2 Basics can only be used with Java 1.8 and above.
 * [Simplify Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-Simplify-Plugin) - simplifies weird properties like `aOrBOrC`.
 * [EnumValue Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-EnumValue-Plugin) - makes all the generated enums implement the `EnumValue<T>` interface.
 * JAXBIndex Plugin - generated `jaxb.index` files listing schema-derived classes.
+* Fluent-Api Plugin - generates a fluent api in addition to the default (JavaBean) setter methods
+* Value-Constructor Plugin - generates two constructors for each generated class, one of which is a default constructor, the other takes an argument for each field in the class and initialises the field with the  argument value
 * [FixJAXB1058 Plugin](https://github.com/highsource/jaxb2-basics/wiki/JAXB2-FixJAXB1058-Plugin) - fixes [JAXB-1058](https://java.net/jira/browse/JAXB-1058).
 
 ## Credits ##

ant/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>jaxb2-basics-ant</artifactId>
+	<artifactId>jaxb3-basics-ant</artifactId>
 	<packaging>jar</packaging>
-	<name>JAXB2 Basics - Ant Task</name>
+	<name>JAXB3 Basics - Ant Task</name>
 	<parent>
-		<groupId>org.jvnet.jaxb2_commons</groupId>
-		<artifactId>jaxb2-basics-project</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<groupId>org.jvnet.jaxb3_commons</groupId>
+		<artifactId>jaxb3-basics-project</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -16,7 +16,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

ant/src/main/java/org/jvnet/jaxb2_commons/xjc/XJC2Task.java → ant/src/main/java/org/jvnet/jaxb3_commons/xjc/XJC2Task.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.xjc;
+package org.jvnet.jaxb3_commons.xjc;
 
 import org.apache.tools.ant.BuildException;
 

basic/pom.xml

@@ -1,21 +1,21 @@
 <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>jaxb3-basics</artifactId>
 	<packaging>jar</packaging>
-	<name>JAXB2 Basics - Basic Plugins</name>
+	<name>JAXB3 Basics - Basic Plugins</name>
 	<parent>
-		<groupId>org.jvnet.jaxb2_commons</groupId>
-		<artifactId>jaxb2-basics-project</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<groupId>org.jvnet.jaxb3_commons</groupId>
+		<artifactId>jaxb3-basics-project</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
-			<groupId>org.jvnet.jaxb2_commons</groupId>
-			<artifactId>jaxb2-basics-runtime</artifactId>
+			<groupId>org.jvnet.jaxb3_commons</groupId>
+			<artifactId>jaxb3-basics-runtime</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2_commons</groupId>
-			<artifactId>jaxb2-basics-tools</artifactId>
+			<groupId>org.jvnet.jaxb3_commons</groupId>
+			<artifactId>jaxb3-basics-tools</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
@@ -32,8 +32,8 @@
 			<artifactId>javaparser</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2.maven2</groupId>
-			<artifactId>maven-jaxb2-plugin-testing</artifactId>
+			<groupId>org.jvnet.jaxb</groupId>
+			<artifactId>jaxb3-maven-plugin-testing</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -78,7 +78,7 @@
 										<pluginExecution>
 											<pluginExecutionFilter>
 												<groupId>
-													org.jvnet.jaxb2.maven2
+													org.jvnet.jaxb
 												</groupId>
 												<artifactId>
 													maven-jaxb2-plugin

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/Customizations.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/Customizations.java

@@ -1,10 +1,10 @@
-package org.jvnet.jaxb2_commons.plugin;
+package org.jvnet.jaxb3_commons.plugin;
 
 import javax.xml.namespace.QName;
 
 public class Customizations {
 
-	public static String NAMESPACE_URI = "http://jaxb2-commons.dev.java.net/basic";
+	public static String NAMESPACE_URI = "http://jaxb3-commons.dev.java.net/basic";
 
 	public static QName GENERATED_ELEMENT_NAME = new QName(NAMESPACE_URI,
 			"generated");

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/CustomizedIgnoring.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/CustomizedIgnoring.java

@@ -1,8 +1,8 @@
-package org.jvnet.jaxb2_commons.plugin;
+package org.jvnet.jaxb3_commons.plugin;
 
 import javax.xml.namespace.QName;
 
-import org.jvnet.jaxb2_commons.util.CustomizationUtils;
+import org.jvnet.jaxb3_commons.util.CustomizationUtils;
 
 import com.sun.tools.xjc.model.CClassInfo;
 import com.sun.tools.xjc.model.CEnumLeafInfo;

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/Ignoring.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/Ignoring.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin;
+package org.jvnet.jaxb3_commons.plugin;
 
 import com.sun.tools.xjc.model.CClassInfo;
 import com.sun.tools.xjc.model.CEnumLeafInfo;

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/autoinheritance/AutoInheritancePlugin.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/autoinheritance/AutoInheritancePlugin.java

@@ -1,9 +1,9 @@
-package org.jvnet.jaxb2_commons.plugin.autoinheritance;
+package org.jvnet.jaxb3_commons.plugin.autoinheritance;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin;
+import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin;
 import org.xml.sax.ErrorHandler;
 
 import com.sun.codemodel.JClass;

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import org.apache.commons.lang3.Validate;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/AbstractCodeGenerator.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import org.apache.commons.lang3.Validate;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java

@@ -1,16 +1,16 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Arrays;
 import java.util.Collection;
 
 import javax.xml.namespace.QName;
 
-import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin;
-import org.jvnet.jaxb2_commons.plugin.Customizations;
-import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring;
-import org.jvnet.jaxb2_commons.plugin.Ignoring;
-import org.jvnet.jaxb2_commons.util.FieldAccessorFactory;
-import org.jvnet.jaxb2_commons.util.PropertyFieldAccessorFactory;
+import org.jvnet.jaxb3_commons.plugin.AbstractParameterizablePlugin;
+import org.jvnet.jaxb3_commons.util.FieldAccessorFactory;
+import org.jvnet.jaxb3_commons.util.PropertyFieldAccessorFactory;
+import org.jvnet.jaxb3_commons.plugin.Customizations;
+import org.jvnet.jaxb3_commons.plugin.CustomizedIgnoring;
+import org.jvnet.jaxb3_commons.plugin.Ignoring;
 import org.xml.sax.ErrorHandler;
 
 import com.sun.codemodel.JCodeModel;

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/Arguments.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/Arguments.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ArrayCodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ArrayCodeGenerator.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/BooleanCodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/BooleanCodeGenerator.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ByteCodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ByteCodeGenerator.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CharCodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CharCodeGenerator.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CodeGenerationAbstraction.java

@@ -1,16 +1,16 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 import org.apache.commons.lang3.Validate;
-import org.jvnet.jaxb2_commons.codemodel.JCMType;
-import org.jvnet.jaxb2_commons.codemodel.JCMTypeFactory;
+import org.jvnet.jaxb3_commons.codemodel.JCMType;
+import org.jvnet.jaxb3_commons.codemodel.JCMTypeFactory;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationImplementor.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CodeGenerationImplementor.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/CodeGenerator.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/DoubleCodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/DoubleCodeGenerator.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/FloatCodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/FloatCodeGenerator.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/IntCodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/IntCodeGenerator.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/JAXBElementCodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/JAXBElementCodeGenerator.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -9,7 +9,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.commons.lang3.Validate;
-import org.jvnet.jaxb2_commons.codemodel.JCMTypeFactory;
+import org.jvnet.jaxb3_commons.codemodel.JCMTypeFactory;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ListCodeGenerator.java

@@ -1,10 +1,10 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 import org.apache.commons.lang3.Validate;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/LongCodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/LongCodeGenerator.java

@@ -1,4 +1,4 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java → basic/src/main/java/org/jvnet/jaxb3_commons/plugin/codegenerator/ObjectCodeGenerator.java

@@ -1,13 +1,13 @@
-package org.jvnet.jaxb2_commons.plugin.codegenerator;
+package org.jvnet.jaxb3_commons.plugin.codegenerator;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
-import org.jvnet.jaxb2_commons.codemodel.JConditionable;
+import org.jvnet.jaxb3_commons.codemodel.JConditionable;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;