Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migration to jakarta JAXB3 API and update some dependencies #165

Closed
wants to merge 5 commits into from
Closed

Migration to jakarta JAXB3 API and update some dependencies #165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2026bcf
Migration to jakarta JAXB3 API and update some dependencies
Feb 8, 2023
29e128d
migration back to 'official' jaxb3-maven-plugin and fixes for cxf bui…
Feb 13, 2023
7c59236
fix bin directory creation
Mar 7, 2023
d61e4fa
take back old plugin (commons_lang, namespace_prefix and default_value)
Mar 7, 2023
5b9a499
revert deleting distributionManagement
Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 10 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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 ##
Expand Down
12 changes: 6 additions & 6 deletions ant/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -16,7 +16,7 @@
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
<artifactId>jakarta.activation</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...org/jvnet/jaxb2_commons/xjc/XJC2Task.java → ...org/jvnet/jaxb3_commons/xjc/XJC2Task.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.xjc;
package org.jvnet.jaxb3_commons.xjc;

import org.apache.tools.ant.BuildException;

Expand Down
22 changes: 11 additions & 11 deletions basic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -32,8 +32,8 @@
<artifactId>javaparser</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin-testing</artifactId>
<groupId>com.evolvedbinary.maven.jvnet</groupId>
<artifactId>jaxb-maven-plugin-testing</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
26 changes: 0 additions & 26 deletions basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .../jaxb2_commons/plugin/Customizations.java → .../jaxb3_commons/plugin/Customizations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
4 changes: 2 additions & 2 deletions ...b2_commons/plugin/CustomizedIgnoring.java → ...b3_commons/plugin/CustomizedIgnoring.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../jvnet/jaxb2_commons/plugin/Ignoring.java → .../jvnet/jaxb3_commons/plugin/Ignoring.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...utoinheritance/AutoInheritancePlugin.java → ...utoinheritance/AutoInheritancePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...or/AbstractCodeGenerationImplementor.java → ...or/AbstractCodeGenerationImplementor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import org.apache.commons.lang3.Validate;

Expand Down
2 changes: 1 addition & 1 deletion .../codegenerator/AbstractCodeGenerator.java → .../codegenerator/AbstractCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import org.apache.commons.lang3.Validate;

Expand Down
14 changes: 7 additions & 7 deletions ...enerator/AbstractCodeGeneratorPlugin.java → ...enerator/AbstractCodeGeneratorPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...mmons/plugin/codegenerator/Arguments.java → ...mmons/plugin/codegenerator/Arguments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import java.util.Collection;

Expand Down
2 changes: 1 addition & 1 deletion ...gin/codegenerator/ArrayCodeGenerator.java → ...gin/codegenerator/ArrayCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import java.util.Collection;

Expand Down
2 changes: 1 addition & 1 deletion ...n/codegenerator/BooleanCodeGenerator.java → ...n/codegenerator/BooleanCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import java.util.Collection;

Expand Down
2 changes: 1 addition & 1 deletion ...ugin/codegenerator/ByteCodeGenerator.java → ...ugin/codegenerator/ByteCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import java.util.Collection;

Expand Down
2 changes: 1 addition & 1 deletion ...ugin/codegenerator/CharCodeGenerator.java → ...ugin/codegenerator/CharCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import java.util.Collection;

Expand Down
8 changes: 4 additions & 4 deletions ...egenerator/CodeGenerationAbstraction.java → ...egenerator/CodeGenerationAbstraction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...egenerator/CodeGenerationImplementor.java → ...egenerator/CodeGenerationImplementor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...s/plugin/codegenerator/CodeGenerator.java → ...s/plugin/codegenerator/CodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import java.util.Collection;

Expand Down
2 changes: 1 addition & 1 deletion ...in/codegenerator/DoubleCodeGenerator.java → ...in/codegenerator/DoubleCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import java.util.Collection;

Expand Down
2 changes: 1 addition & 1 deletion ...gin/codegenerator/FloatCodeGenerator.java → ...gin/codegenerator/FloatCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import java.util.Collection;

Expand Down
2 changes: 1 addition & 1 deletion ...lugin/codegenerator/IntCodeGenerator.java → ...lugin/codegenerator/IntCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import java.util.Collection;

Expand Down
4 changes: 2 additions & 2 deletions ...degenerator/JAXBElementCodeGenerator.java → ...degenerator/JAXBElementCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ugin/codegenerator/ListCodeGenerator.java → ...ugin/codegenerator/ListCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ugin/codegenerator/LongCodeGenerator.java → ...ugin/codegenerator/LongCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import java.util.Collection;

Expand Down
6 changes: 3 additions & 3 deletions ...in/codegenerator/ObjectCodeGenerator.java → ...in/codegenerator/ObjectCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...gin/codegenerator/ShortCodeGenerator.java → ...gin/codegenerator/ShortCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jvnet.jaxb2_commons.plugin.codegenerator;
package org.jvnet.jaxb3_commons.plugin.codegenerator;

import java.util.Collection;

Expand Down
Loading