diff --git a/basics/ant/pom.xml b/basics/ant/pom.xml index a179daad6..656d986d3 100644 --- a/basics/ant/pom.xml +++ b/basics/ant/pom.xml @@ -2,10 +2,10 @@ 4.0.0 jaxb2-basics-ant jar - JAXB2 Basics - Ant Task + JAXB Tools :: JAXB Basics :: Ant Task - org.jvnet.jaxb2_commons - jaxb2-basics-project + org.jvnet.jaxb + jaxb-basics-project 2.0.4-SNAPSHOT diff --git a/basics/basic/pom.xml b/basics/basic/pom.xml index 1ef335912..f99e35454 100644 --- a/basics/basic/pom.xml +++ b/basics/basic/pom.xml @@ -2,19 +2,19 @@ 4.0.0 jaxb2-basics jar - JAXB2 Basics - Basic Plugins + JAXB Tools :: JAXB Basics :: Basic Plugins - org.jvnet.jaxb2_commons - jaxb2-basics-project + org.jvnet.jaxb + jaxb-basics-project 2.0.4-SNAPSHOT - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tools @@ -32,8 +32,8 @@ javaparser - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test @@ -78,13 +78,13 @@ - org.jvnet.jaxb2.maven2 + org.jvnet.jaxb - maven-jaxb2-plugin + jaxb-maven-plugin - [0.8.1,) + [2.0.0,) generate diff --git a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java b/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java index c3ceb73b4..7faa615d8 100644 --- a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java +++ b/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunCopyablePlugin extends RunXJC2Mojo { diff --git a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java b/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java index b29251cca..a1e35a0a3 100644 --- a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java +++ b/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunEqualsPlugin extends RunXJC2Mojo { diff --git a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java b/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java index 8faa34696..36cbb663f 100644 --- a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java +++ b/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunMergeablePlugin extends RunXJC2Mojo { diff --git a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java b/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java index 1d435a9e2..b70b81f9b 100644 --- a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java +++ b/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; public class RunToStringPlugin extends RunXJC2Mojo { diff --git a/basics/dist/pom.xml b/basics/dist/pom.xml index 984301dc9..064f64aee 100644 --- a/basics/dist/pom.xml +++ b/basics/dist/pom.xml @@ -2,13 +2,13 @@ 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"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-dist pom - JAXB2 Basics - Distribution + JAXB Tools :: JAXB Basics :: Distribution - org.jvnet.jaxb2_commons - jaxb2-basics-project + org.jvnet.jaxb + jaxb-basics-project 2.0.4-SNAPSHOT diff --git a/basics/plugins/pom.xml b/basics/plugins/pom.xml index 385030046..85ed92ba2 100644 --- a/basics/plugins/pom.xml +++ b/basics/plugins/pom.xml @@ -2,23 +2,23 @@ 4.0.0 jaxb2-basics-plugins jar - JAXB2 Basics - Full Plugins JAR + JAXB Tools :: JAXB Basics :: Full Plugins JAR - org.jvnet.jaxb2_commons - jaxb2-basics-project + org.jvnet.jaxb + jaxb-basics-project 2.0.4-SNAPSHOT - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tools diff --git a/basics/pom.xml b/basics/pom.xml index aeb1ef2c2..671f4c4d6 100644 --- a/basics/pom.xml +++ b/basics/pom.xml @@ -8,7 +8,7 @@ jaxb-basics-project pom - JAXB2 Basics - Project + JAXB Tools :: JAXB Basics :: Project JAXB Basics is a part of JAXB Tools project which implements plugins and tools for JAXB implementation. ant @@ -65,32 +65,32 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-plugins ${project.version} - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-ant ${project.version} - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime ${project.version} - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tools ${project.version} - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-testing ${project.version} - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics ${project.version} diff --git a/basics/runtime/pom.xml b/basics/runtime/pom.xml index a5cb2108c..fcc5999fd 100644 --- a/basics/runtime/pom.xml +++ b/basics/runtime/pom.xml @@ -2,10 +2,10 @@ 4.0.0 jaxb2-basics-runtime jar - JAXB2 Basics - Runtime + JAXB Tools :: JAXB Basics :: Runtime - org.jvnet.jaxb2_commons - jaxb2-basics-project + org.jvnet.jaxb + jaxb-basics-project 2.0.4-SNAPSHOT diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java b/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java index 9b414df67..c67d4a199 100644 --- a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java +++ b/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java @@ -220,10 +220,24 @@ public boolean[] copy(ObjectLocator locator, boolean[] array) { } protected Object copyInternal(ObjectLocator locator, Cloneable object) { + return copyInternal(locator, object, false); + } + + protected Object copyInternal(ObjectLocator locator, Cloneable object, boolean checkCloneable) { + Class clazz = object.getClass(); Method method = null; + if (checkCloneable) { + Class parentClazz = clazz.getSuperclass(); + + while (parentClazz != null && hasCloneableInterface(parentClazz)) { + clazz = parentClazz; + parentClazz = clazz.getSuperclass(); + } + } + try { - method = object.getClass().getMethod("clone", (Class[]) null); + method = clazz.getMethod("clone", (Class[]) null); } catch (NoSuchMethodException nsmex) { method = null; } @@ -236,6 +250,7 @@ protected Object copyInternal(ObjectLocator locator, Cloneable object) { "Object class [" + object.getClass() + "] implements java.lang.Cloneable interface, " + + (checkCloneable ? ("with final determined class [" + clazz + "]") : "") + "but does not provide a public no-arg clone() method. " + "By convention, classes that implement java.lang.Cloneable " + "should override java.lang.Object.clone() method (which is protected) " @@ -253,6 +268,9 @@ protected Object copyInternal(ObjectLocator locator, Cloneable object) { return method.invoke(object, (Object[]) null); } catch (Exception ex) { + if (!checkCloneable && "java.lang.reflect.InaccessibleObjectException".equals(ex.getClass().getName())) { + return copyInternal(locator, object, true); + } throw new UnsupportedOperationException( "Could not clone the object [" + object @@ -268,6 +286,17 @@ protected Object copyInternal(ObjectLocator locator, Cloneable object) { } } + private static boolean hasCloneableInterface(Class clazz) { + if (clazz != null) { + for (Class iface : clazz.getInterfaces()) { + if (iface.isAssignableFrom(Cloneable.class)) { + return true; + } + } + } + return false; + } + @Override public Boolean shouldBeCopiedAndSet(ObjectLocator locator, boolean valueSet) { return valueSet; diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/DefaultCopyStrategyTest.java b/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/DefaultCopyStrategyTest.java new file mode 100644 index 000000000..175b7b94d --- /dev/null +++ b/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/DefaultCopyStrategyTest.java @@ -0,0 +1,46 @@ +package org.jvnet.jaxb2_commons.lang.tests; + +import com.vividsolutions.jts.geom.Coordinate; +import com.vividsolutions.jts.geom.GeometryFactory; +import com.vividsolutions.jts.geom.Polygon; +import org.junit.Assert; +import org.junit.Test; +import org.jvnet.jaxb2_commons.lang.DefaultCopyStrategy; +import org.jvnet.jaxb2_commons.lang.JAXBCopyStrategy; +import org.jvnet.jaxb2_commons.lang.tests.pojo.CloneableNoClone; + +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; + +public class DefaultCopyStrategyTest { + + @Test + public void testPolygonOK() { + final GeometryFactory geometryFactory = new GeometryFactory(); + final Polygon polygon = geometryFactory.createPolygon( + geometryFactory.createLinearRing(new Coordinate[] { + new Coordinate(0, 0, 0), new Coordinate(1, 1, 0), + + new Coordinate(1, 0, 0), new Coordinate(0, 1, 0), + new Coordinate(0, 0, 0) }), null); + + polygon.clone(); + + new DefaultCopyStrategy().copy(null, polygon); + } + + @Test + public void testXMLGregorianCalendarOK() throws DatatypeConfigurationException { + final XMLGregorianCalendar calendar = DatatypeFactory.newInstance().newXMLGregorianCalendar(); + + new DefaultCopyStrategy().copy(null, calendar); + } + @Test + public void testCloneableNoCloneKO() { + final CloneableNoClone object = new CloneableNoClone("no-clone-method-in-it"); + + Assert.assertThrows("Exception UnsupportedOperationException not thrown", + UnsupportedOperationException.class, () -> new DefaultCopyStrategy().copy(null, object)); + } +} diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/pojo/CloneableNoClone.java b/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/pojo/CloneableNoClone.java new file mode 100644 index 000000000..3628b42de --- /dev/null +++ b/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/pojo/CloneableNoClone.java @@ -0,0 +1,13 @@ +package org.jvnet.jaxb2_commons.lang.tests.pojo; + +public class CloneableNoClone implements Cloneable { + private final String attribute; + + public CloneableNoClone(String attribute) { + this.attribute = attribute; + } + + public String getAttribute() { + return attribute; + } +} diff --git a/basics/samples/basic/pom.xml b/basics/samples/basic/pom.xml index a1dab0f13..95ee3e4af 100644 --- a/basics/samples/basic/pom.xml +++ b/basics/samples/basic/pom.xml @@ -4,9 +4,9 @@ 4.0.0 jaxb2-basics-sample-basic pom - JAXB2 Basics - Sample [basic] + JAXB Tools :: JAXB Basics :: Sample [basic] - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-samples 2.0.4-SNAPSHOT @@ -16,15 +16,15 @@ junit - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-plugins - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-testing - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-ant diff --git a/basics/samples/basic/project-pom.xml b/basics/samples/basic/project-pom.xml index 712d529cc..8c3e44e84 100644 --- a/basics/samples/basic/project-pom.xml +++ b/basics/samples/basic/project-pom.xml @@ -21,12 +21,12 @@ provided - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime ${project.version} - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-testing ${project.version} test @@ -42,9 +42,9 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven-jaxb2-plugin.version} + org.jvnet.jaxb + jaxb-maven-plugin + ${project.version} @@ -63,7 +63,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics ${project.version} diff --git a/basics/samples/cxf/pom.xml b/basics/samples/cxf/pom.xml index 01cac6021..60c26a628 100644 --- a/basics/samples/cxf/pom.xml +++ b/basics/samples/cxf/pom.xml @@ -4,9 +4,9 @@ 4.0.0 jaxb2-basics-sample-cxf pom - JAXB2 Basics - Sample [cxf] + JAXB Tools :: JAXB Basics :: Sample [cxf] - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-samples 2.0.4-SNAPSHOT @@ -16,15 +16,15 @@ junit - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-plugins - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-testing - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-ant diff --git a/basics/samples/cxf/project-pom.xml b/basics/samples/cxf/project-pom.xml index 72f5a64c4..c17a886d4 100644 --- a/basics/samples/cxf/project-pom.xml +++ b/basics/samples/cxf/project-pom.xml @@ -33,7 +33,7 @@ provided - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime ${project.version} @@ -98,7 +98,7 @@ ${jaxb-core.version} - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics ${project.version} diff --git a/basics/samples/po-simple/pom.xml b/basics/samples/po-simple/pom.xml index b4c7cb710..2fd7bab58 100644 --- a/basics/samples/po-simple/pom.xml +++ b/basics/samples/po-simple/pom.xml @@ -4,9 +4,9 @@ 4.0.0 jaxb2-basics-sample-po-simple pom - JAXB2 Basics - Sample [po-simple] + JAXB Tools :: JAXB Basics :: Sample [po-simple] - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-samples 2.0.4-SNAPSHOT @@ -16,15 +16,15 @@ junit - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-plugins - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-testing - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-ant diff --git a/basics/samples/po-simple/project-pom.xml b/basics/samples/po-simple/project-pom.xml index c5cced8d9..e2de0f5ab 100644 --- a/basics/samples/po-simple/project-pom.xml +++ b/basics/samples/po-simple/project-pom.xml @@ -21,7 +21,7 @@ provided - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-testing ${project.version} test @@ -37,9 +37,9 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven-jaxb2-plugin.version} + org.jvnet.jaxb + jaxb-maven-plugin + ${project.version} @@ -54,7 +54,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics ${project.version} diff --git a/basics/samples/po/pom.xml b/basics/samples/po/pom.xml index 6bd44aeb3..91d75897c 100644 --- a/basics/samples/po/pom.xml +++ b/basics/samples/po/pom.xml @@ -4,9 +4,9 @@ 4.0.0 jaxb2-basics-sample-po pom - JAXB2 Basics - Sample [po] + JAXB Tools :: JAXB Basics :: Sample [po] - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-samples 2.0.4-SNAPSHOT @@ -16,15 +16,15 @@ junit - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-plugins - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-testing - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-ant diff --git a/basics/samples/po/project-pom.xml b/basics/samples/po/project-pom.xml index 2eadcf6ce..9ad5fc20f 100644 --- a/basics/samples/po/project-pom.xml +++ b/basics/samples/po/project-pom.xml @@ -21,12 +21,12 @@ provided - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime ${project.version} - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-testing ${project.version} test @@ -42,9 +42,9 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven-jaxb2-plugin.version} + org.jvnet.jaxb + jaxb-maven-plugin + ${project.version} @@ -63,7 +63,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics ${project.version} diff --git a/basics/samples/pom.xml b/basics/samples/pom.xml index 80bc8d684..f789c41f5 100644 --- a/basics/samples/pom.xml +++ b/basics/samples/pom.xml @@ -4,10 +4,10 @@ 4.0.0 jaxb2-basics-samples pom - JAXB2 Basics - Samples + JAXB Tools :: JAXB Basics :: Samples - org.jvnet.jaxb2_commons - jaxb2-basics-project + org.jvnet.jaxb + jaxb-basics-project 2.0.4-SNAPSHOT diff --git a/basics/testing/pom.xml b/basics/testing/pom.xml index 8ee73b6b8..1578a1d25 100644 --- a/basics/testing/pom.xml +++ b/basics/testing/pom.xml @@ -2,10 +2,10 @@ 4.0.0 jaxb2-basics-testing jar - JAXB2 Basics - Testing + JAXB Tools :: JAXB Basics :: Testing - org.jvnet.jaxb2_commons - jaxb2-basics-project + org.jvnet.jaxb + jaxb-basics-project 2.0.4-SNAPSHOT @@ -24,11 +24,11 @@ commons-io - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tools - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime diff --git a/basics/tests/JAXB-1058/pom.xml b/basics/tests/JAXB-1058/pom.xml index 33af7e674..e72431855 100644 --- a/basics/tests/JAXB-1058/pom.xml +++ b/basics/tests/JAXB-1058/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-JAXB-1058 jar - JAXB2 Basics - Test [JAXB-1058] + JAXB Tools :: JAXB Basics :: Test [JAXB-1058] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics @@ -25,8 +25,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -34,7 +34,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tests/commons_lang/pom.xml b/basics/tests/commons_lang/pom.xml index 53b42fe01..084d7227e 100644 --- a/basics/tests/commons_lang/pom.xml +++ b/basics/tests/commons_lang/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-commonslang jar - JAXB2 Basics - Test [commons_lang] + JAXB Tools :: JAXB Basics :: Test [commons_lang] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test @@ -26,8 +26,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -35,7 +35,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tests/defaultvalue/pom.xml b/basics/tests/defaultvalue/pom.xml index 56418d00f..928058b50 100644 --- a/basics/tests/defaultvalue/pom.xml +++ b/basics/tests/defaultvalue/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-defaultvalue jar - JAXB2 Basics - Test [default-value] + JAXB Tools :: JAXB Basics :: Test [default-value] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime @@ -25,8 +25,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -34,7 +34,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tests/episodes/a/pom.xml b/basics/tests/episodes/a/pom.xml index fe87bb15e..0b181cb32 100644 --- a/basics/tests/episodes/a/pom.xml +++ b/basics/tests/episodes/a/pom.xml @@ -3,19 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-test-episodes 2.0.4-SNAPSHOT jaxb2-basics-test-episodes-a jar - JAXB2 Basics - Test [episodes-a] + JAXB Tools :: JAXB Basics :: Test [episodes-a] test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -27,7 +27,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tests/episodes/b/pom.xml b/basics/tests/episodes/b/pom.xml index e52fc2826..10e938bee 100644 --- a/basics/tests/episodes/b/pom.xml +++ b/basics/tests/episodes/b/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-test-episodes 2.0.4-SNAPSHOT jaxb2-basics-test-episodes-b jar - JAXB2 Basics - Test [episodes-b] + JAXB Tools :: JAXB Basics :: Test [episodes-b] - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-test-episodes-a ${project.version} @@ -21,8 +21,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -34,13 +34,13 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-test-episodes-a diff --git a/basics/tests/episodes/pom.xml b/basics/tests/episodes/pom.xml index 8f7df9d5f..e3e3cb6ac 100644 --- a/basics/tests/episodes/pom.xml +++ b/basics/tests/episodes/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-episodes pom - JAXB2 Basics - Test [episodes] + JAXB Tools :: JAXB Basics :: Test [episodes] a b diff --git a/basics/tests/ignoring/pom.xml b/basics/tests/ignoring/pom.xml index 37b875032..ed98bbc80 100644 --- a/basics/tests/ignoring/pom.xml +++ b/basics/tests/ignoring/pom.xml @@ -3,19 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-ignoring jar - JAXB2 Basics - Test [ignoring] + JAXB Tools :: JAXB Basics :: Test [ignoring] test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -27,7 +27,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tests/issues/pom.xml b/basics/tests/issues/pom.xml index e1df1c02a..161985541 100644 --- a/basics/tests/issues/pom.xml +++ b/basics/tests/issues/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-issues jar - JAXB2 Basics - Test [issues] + JAXB Tools :: JAXB Basics :: Test [issues] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics @@ -25,8 +25,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -54,7 +54,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunIssuesPlugin.java b/basics/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunIssuesPlugin.java index c7271b214..2a8688aa4 100644 --- a/basics/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunIssuesPlugin.java +++ b/basics/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunIssuesPlugin.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunIssuesPlugin extends RunXJC2Mojo { diff --git a/basics/tests/namespace/pom.xml b/basics/tests/namespace/pom.xml index e79fa3fc1..791c270c5 100644 --- a/basics/tests/namespace/pom.xml +++ b/basics/tests/namespace/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-namespace jar - JAXB2 Basics - Test [namespace] + JAXB Tools :: JAXB Basics :: Test [namespace] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime @@ -25,8 +25,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -34,7 +34,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tests/namespace/src/test/java/org/jvnet/jaxb2_commons/tests/namespace/RunNamespacePlugin.java b/basics/tests/namespace/src/test/java/org/jvnet/jaxb2_commons/tests/namespace/RunNamespacePlugin.java index 36eca2c62..e147b1e33 100644 --- a/basics/tests/namespace/src/test/java/org/jvnet/jaxb2_commons/tests/namespace/RunNamespacePlugin.java +++ b/basics/tests/namespace/src/test/java/org/jvnet/jaxb2_commons/tests/namespace/RunNamespacePlugin.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunNamespacePlugin extends RunXJC2Mojo { diff --git a/basics/tests/one/pom.xml b/basics/tests/one/pom.xml index 9c640ac92..4056170ff 100644 --- a/basics/tests/one/pom.xml +++ b/basics/tests/one/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-one jar - JAXB2 Basics - Test [one] + JAXB Tools :: JAXB Basics :: Test [one] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics @@ -25,8 +25,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -38,7 +38,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/RunOnePlugin.java b/basics/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/RunOnePlugin.java index 49f55f196..cd667f935 100644 --- a/basics/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/RunOnePlugin.java +++ b/basics/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/RunOnePlugin.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunOnePlugin extends RunXJC2Mojo { diff --git a/basics/tests/po/pom.xml b/basics/tests/po/pom.xml index c9fd7fe83..a7b7aeecb 100644 --- a/basics/tests/po/pom.xml +++ b/basics/tests/po/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 0.11.2-SNAPSHOT jaxb2-basics-test-po jar - JAXB2 Basics - Test [po] + JAXB Tools :: JAXB Basics :: Test [po] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics @@ -25,8 +25,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -35,7 +35,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tests/pom.xml b/basics/tests/pom.xml index c5fa8249f..7622e71fe 100644 --- a/basics/tests/pom.xml +++ b/basics/tests/pom.xml @@ -4,10 +4,10 @@ 4.0.0 jaxb2-basics-tests pom - JAXB2 Basics - Tests + JAXB Tools :: JAXB Basics :: Tests - org.jvnet.jaxb2_commons - jaxb2-basics-project + org.jvnet.jaxb + jaxb-basics-project 2.0.4-SNAPSHOT @@ -32,7 +32,7 @@ jaxb-runtime - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime @@ -40,7 +40,7 @@ jakarta.activation - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-testing test diff --git a/basics/tests/simple-hashCode-equals-01/pom.xml b/basics/tests/simple-hashCode-equals-01/pom.xml index 1636f2ea7..91bfbe8ac 100644 --- a/basics/tests/simple-hashCode-equals-01/pom.xml +++ b/basics/tests/simple-hashCode-equals-01/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-tests-simple-hashCode-equals-01 jar - JAXB2 Basics - Test [simple-hashCode-equals-01] + JAXB Tools :: JAXB Basics :: Test [simple-hashCode-equals-01] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics @@ -25,8 +25,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -36,7 +36,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tests/simplify-01/pom.xml b/basics/tests/simplify-01/pom.xml index cb77863a6..ab4079e56 100644 --- a/basics/tests/simplify-01/pom.xml +++ b/basics/tests/simplify-01/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-simplify-01 jar - JAXB2 Basics - Test [simplify-01] + JAXB Tools :: JAXB Basics :: Test [simplify-01] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics @@ -29,8 +29,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -39,7 +39,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tests/simplify-02/pom.xml b/basics/tests/simplify-02/pom.xml index ae34085e3..ab6856fe9 100644 --- a/basics/tests/simplify-02/pom.xml +++ b/basics/tests/simplify-02/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-simplify-02 jar - JAXB2 Basics - Test [simplify-02] + JAXB Tools :: JAXB Basics :: Test [simplify-02] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics @@ -29,8 +29,8 @@ test diff --git a/basics/tests/superclass/pom.xml b/basics/tests/superclass/pom.xml index 7ea5ae36a..e74fe7277 100644 --- a/basics/tests/superclass/pom.xml +++ b/basics/tests/superclass/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-superclass pom - JAXB2 Basics - Test [superclass] + JAXB Tools :: JAXB Basics :: Test [superclass] a b diff --git a/basics/tests/wildcard/pom.xml b/basics/tests/wildcard/pom.xml index 35a2b2ade..15a084905 100644 --- a/basics/tests/wildcard/pom.xml +++ b/basics/tests/wildcard/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-wildcard jar - JAXB2 Basics - Test [wildcard] + JAXB Tools :: JAXB Basics :: Test [wildcard] - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics @@ -25,8 +25,8 @@ test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin true @@ -34,7 +34,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tests/zj/pom.xml b/basics/tests/zj/pom.xml index 7387b221a..a0a10f0a6 100644 --- a/basics/tests/zj/pom.xml +++ b/basics/tests/zj/pom.xml @@ -3,19 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tests 2.0.4-SNAPSHOT jaxb2-basics-test-zj jar - JAXB2 Basics - Test [zj] + JAXB Tools :: JAXB Basics :: Test [zj] test - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin -XtoString @@ -25,7 +25,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics diff --git a/basics/tools/pom.xml b/basics/tools/pom.xml index ebded7349..c52d6f045 100644 --- a/basics/tools/pom.xml +++ b/basics/tools/pom.xml @@ -2,10 +2,10 @@ 4.0.0 jaxb2-basics-tools jar - JAXB2 Basics - Tools + JAXB Tools :: JAXB Basics :: Tools - org.jvnet.jaxb2_commons - jaxb2-basics-project + org.jvnet.jaxb + jaxb-basics-project 2.0.4-SNAPSHOT @@ -26,7 +26,7 @@ commons-lang3 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime diff --git a/basics/tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/FieldAccessorTest.java b/basics/tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/FieldAccessorTest.java index 1a2582261..d3d95c89a 100644 --- a/basics/tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/FieldAccessorTest.java +++ b/basics/tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/FieldAccessorTest.java @@ -12,10 +12,10 @@ public class FieldAccessorTest { @Test public void testGetAndSet() throws URISyntaxException { - final URI uri = new URI("urn:test"); + final URIInternalTest uri = new URIInternalTest("urn:test"); final Accessor schemeAccessor = new FieldAccessor( - URI.class, "scheme", String.class); + URIInternalTest.class, "scheme", String.class); Assert.assertEquals("urn", schemeAccessor.get(uri)); schemeAccessor.set(uri, "nru"); diff --git a/basics/tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/URIInternalTest.java b/basics/tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/URIInternalTest.java new file mode 100644 index 000000000..26f9d55d0 --- /dev/null +++ b/basics/tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/URIInternalTest.java @@ -0,0 +1,17 @@ +package org.jvnet.jaxb2_commons.reflection.util.test; + +import java.net.URI; +import java.net.URISyntaxException; + +public class URIInternalTest { + private transient String scheme; // null ==> relative URI + + public URIInternalTest(String uri) throws URISyntaxException { + URI internalUri = new URI(uri); + this.scheme = internalUri.getScheme(); + } + + public String getScheme() { + return scheme; + } +} diff --git a/maven-plugin/dist/pom.xml b/maven-plugin/dist/pom.xml index 639a07e10..5c114a335 100644 --- a/maven-plugin/dist/pom.xml +++ b/maven-plugin/dist/pom.xml @@ -3,11 +3,11 @@ org.jvnet.jaxb jaxb-maven-plugin-dist pom - Maven JAXB Plugin Dist + JAXB Tools :: Maven Plugin :: Distribution org.jvnet.jaxb jaxb-maven-plugin-project - 2.0.1-SNAPSHOT + 2.0.4-SNAPSHOT diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 2af7c6401..7a7e055c0 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -26,7 +26,6 @@ 1.4.5 3.0.12 1.2.2 - 0.12.0 2.1 3.7.1 1.6.8 diff --git a/maven-plugin/samples/catalog/pom.xml b/maven-plugin/samples/catalog/pom.xml index ef721b1fc..8bcafaca8 100644 --- a/maven-plugin/samples/catalog/pom.xml +++ b/maven-plugin/samples/catalog/pom.xml @@ -3,11 +3,11 @@ org.jvnet.jaxb jaxb-maven-plugin-sample-catalog pom - Maven JAXB Plugin Sample [catalog] + JAXB Tools :: Maven Plugin :: Sample [catalog] org.jvnet.jaxb jaxb-maven-plugin-samples - 2.0.1-SNAPSHOT + 2.0.4-SNAPSHOT install diff --git a/maven-plugin/samples/dtd/pom.xml b/maven-plugin/samples/dtd/pom.xml index 55bff6606..99c2ac6ef 100644 --- a/maven-plugin/samples/dtd/pom.xml +++ b/maven-plugin/samples/dtd/pom.xml @@ -3,11 +3,11 @@ org.jvnet.jaxb jaxb-maven-plugin-sample-dtd pom - Maven JAXB Plugin Sample [dtd] + JAXB Tools :: Maven Plugin :: Sample [dtd] org.jvnet.jaxb jaxb-maven-plugin-samples - 2.0.1-SNAPSHOT + 2.0.4-SNAPSHOT install diff --git a/maven-plugin/samples/episode/pom.xml b/maven-plugin/samples/episode/pom.xml index 63e58445a..2d025adb7 100644 --- a/maven-plugin/samples/episode/pom.xml +++ b/maven-plugin/samples/episode/pom.xml @@ -3,11 +3,11 @@ org.jvnet.jaxb jaxb-maven-plugin-sample-episode pom - Maven JAXB Plugin Sample [episode] + JAXB Tools :: Maven Plugin :: Sample [episode] org.jvnet.jaxb jaxb-maven-plugin-samples - 2.0.1-SNAPSHOT + 2.0.4-SNAPSHOT install diff --git a/maven-plugin/samples/jaxbplugins/pom.xml b/maven-plugin/samples/jaxbplugins/pom.xml index 01a5c7677..98a46953a 100644 --- a/maven-plugin/samples/jaxbplugins/pom.xml +++ b/maven-plugin/samples/jaxbplugins/pom.xml @@ -3,11 +3,11 @@ org.jvnet.jaxb jaxb-maven-plugin-sample-jaxbplugins pom - Maven JAXB Plugin Sample [jaxbplugins] + JAXB Tools :: Maven Plugin :: Sample [jaxbplugins] org.jvnet.jaxb jaxb-maven-plugin-samples - 2.0.1-SNAPSHOT + 2.0.4-SNAPSHOT install diff --git a/maven-plugin/samples/jaxbplugins/project-pom.xml b/maven-plugin/samples/jaxbplugins/project-pom.xml index 2d05244c7..a7fa54497 100644 --- a/maven-plugin/samples/jaxbplugins/project-pom.xml +++ b/maven-plugin/samples/jaxbplugins/project-pom.xml @@ -14,9 +14,9 @@ ${jaxb.version} - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime - ${jaxb2-basics.version} + ${project.version} @@ -40,9 +40,9 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics - ${jaxb2-basics.version} + ${project.version} diff --git a/maven-plugin/samples/po/pom.xml b/maven-plugin/samples/po/pom.xml index 5cc7c1f23..bfff7cd99 100644 --- a/maven-plugin/samples/po/pom.xml +++ b/maven-plugin/samples/po/pom.xml @@ -3,11 +3,11 @@ org.jvnet.jaxb jaxb-maven-plugin-sample-po pom - Maven JAXB Plugin Sample [po] + JAXB Tools :: Maven Plugin :: Sample [po] org.jvnet.jaxb jaxb-maven-plugin-samples - 2.0.1-SNAPSHOT + 2.0.4-SNAPSHOT install diff --git a/maven-plugin/samples/pom.xml b/maven-plugin/samples/pom.xml index dab737206..d3ee4ff39 100644 --- a/maven-plugin/samples/pom.xml +++ b/maven-plugin/samples/pom.xml @@ -3,11 +3,11 @@ org.jvnet.jaxb jaxb-maven-plugin-samples pom - Maven JAXB Plugin Samples + JAXB Tools :: Maven Plugin :: Samples org.jvnet.jaxb jaxb-maven-plugin-project - 2.0.1-SNAPSHOT + 2.0.4-SNAPSHOT @@ -17,6 +17,12 @@ maven-plugin provided + + org.jvnet.jaxb + jaxb2-basics + ${project.version} + provided + catalog @@ -40,7 +46,7 @@ none - attached + single @@ -53,10 +59,10 @@ none - + - + run diff --git a/maven-plugin/testing/pom.xml b/maven-plugin/testing/pom.xml index 313bb2613..d73021f29 100644 --- a/maven-plugin/testing/pom.xml +++ b/maven-plugin/testing/pom.xml @@ -2,7 +2,7 @@ 4.0.0 jaxb-maven-plugin-testing jar - Maven JAXB Plugin Testing + JAXB Tools :: Maven Plugin :: Testing org.jvnet.jaxb jaxb-maven-plugin-project diff --git a/maven-plugin/tests/JAXB-1044/pom.xml b/maven-plugin/tests/JAXB-1044/pom.xml index ba8a3b468..e38866b00 100644 --- a/maven-plugin/tests/JAXB-1044/pom.xml +++ b/maven-plugin/tests/JAXB-1044/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-JAXB-1044] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-JAXB-1044] org.glassfish.jaxb diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/pom.xml index d724b3103..288018a2b 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-49] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-49] org.glassfish.jaxb diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/pom.xml index 9231ea3c6..a8fd643d8 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-53-a jar - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-53:a] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-53:a] test diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/pom.xml index 58173b814..0cdd17dc2 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-53-b jar - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-53:b] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-53:b] org.jvnet.jaxb diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml index 56bfb01dc..510a8bb2a 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-53 pom - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-53] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-53] a b diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml index cda65a9a9..2da1cd8dc 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-69] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-69] org.glassfish.jaxb diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml index c4c0e3418..94f85dbd8 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-70] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-70] org.glassfish.jaxb diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml index 0345ec4cc..d77fdd6b4 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-77-common-types - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-77:common-types] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-77:common-types] diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml index 7726f295e..5b259c6b2 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml @@ -9,7 +9,7 @@ jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-77 pom - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-77] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-77] common-types service diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml index 1d82f963a..723c603cc 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-77-service - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-77:service] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-77:service] org.jvnet.jaxb diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml index 1ab995241..e0e67583c 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-79-a jar - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-79:a] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-79:a] test diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml index 58770c52f..603b26149 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-79-b jar - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-79:b] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-79:b] org.jvnet.jaxb diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml index 978bf93f9..2b5a5763c 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-79 pom - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-79] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-79] a b diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml index b72674bcb..e3cd07316 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-82-a jar - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-82:a] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-82:a] org.glassfish.jaxb diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml index 463de704b..acbb6242c 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-82-b jar - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-82:b] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-82:b] org.jvnet.jaxb diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml index 50f6849f8..6f5017978 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-MAVEN_JAXB2_PLUGIN-82 pom - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-82] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-82] a b diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml index d06b6b4c4..76a355cdc 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-86] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-86] org.glassfish.jaxb diff --git a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml index 7368d9d5d..1caf163ca 100644 --- a/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml +++ b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [MAVEN_JAXB2_PLUGIN-87] + JAXB Tools :: Maven Plugin :: Test [MAVEN_JAXB2_PLUGIN-87] org.glassfish.jaxb diff --git a/maven-plugin/tests/catalog-xml/pom.xml b/maven-plugin/tests/catalog-xml/pom.xml index 377339411..1b592ae28 100644 --- a/maven-plugin/tests/catalog-xml/pom.xml +++ b/maven-plugin/tests/catalog-xml/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-catalog-xml jar - Maven JAXB Plugin Tests [catalog-xml] + JAXB Tools :: Maven Plugin :: Test [catalog-xml] org.jvnet.jaxb diff --git a/maven-plugin/tests/catalog/pom.xml b/maven-plugin/tests/catalog/pom.xml index ab74c2870..53495c677 100644 --- a/maven-plugin/tests/catalog/pom.xml +++ b/maven-plugin/tests/catalog/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-catalog jar - Maven JAXB Plugin Tests [catalog] + JAXB Tools :: Maven Plugin :: Test [catalog] org.jvnet.jaxb diff --git a/maven-plugin/tests/episodes/a/pom.xml b/maven-plugin/tests/episodes/a/pom.xml index 1dc68a228..cf013fae5 100644 --- a/maven-plugin/tests/episodes/a/pom.xml +++ b/maven-plugin/tests/episodes/a/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-episodes-a jar - Maven JAXB Plugin Tests [episodes:a] + JAXB Tools :: Maven Plugin :: Test [episodes:a] test diff --git a/maven-plugin/tests/episodes/b/pom.xml b/maven-plugin/tests/episodes/b/pom.xml index a4d431b42..0721eb840 100644 --- a/maven-plugin/tests/episodes/b/pom.xml +++ b/maven-plugin/tests/episodes/b/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-episodes-b jar - Maven JAXB Plugin Tests [episodes:b] + JAXB Tools :: Maven Plugin :: Test [episodes:b] org.jvnet.jaxb diff --git a/maven-plugin/tests/episodes/c/pom.xml b/maven-plugin/tests/episodes/c/pom.xml index 04ffbeb81..06fa95d00 100644 --- a/maven-plugin/tests/episodes/c/pom.xml +++ b/maven-plugin/tests/episodes/c/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-episodes-c jar - Maven JAXB Plugin Tests [episodes:c] + JAXB Tools :: Maven Plugin :: Test [episodes:c] org.jvnet.jaxb diff --git a/maven-plugin/tests/episodes/d/pom.xml b/maven-plugin/tests/episodes/d/pom.xml index ef655e831..15cbf833d 100644 --- a/maven-plugin/tests/episodes/d/pom.xml +++ b/maven-plugin/tests/episodes/d/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-episodes-d jar - Maven JAXB Plugin Tests [episodes:d] + JAXB Tools :: Maven Plugin :: Test [episodes:d] org.jvnet.jaxb diff --git a/maven-plugin/tests/episodes/e/pom.xml b/maven-plugin/tests/episodes/e/pom.xml index 8feace6f7..89a604cf4 100644 --- a/maven-plugin/tests/episodes/e/pom.xml +++ b/maven-plugin/tests/episodes/e/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-episodes-e jar - Maven JAXB Plugin Tests [episodes:e] + JAXB Tools :: Maven Plugin :: Test [episodes:e] org.jvnet.jaxb diff --git a/maven-plugin/tests/episodes/pom.xml b/maven-plugin/tests/episodes/pom.xml index 5481e5cd8..39aaf8c62 100644 --- a/maven-plugin/tests/episodes/pom.xml +++ b/maven-plugin/tests/episodes/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-episodes pom - Maven JAXB Plugin Tests [episodes] + JAXB Tools :: Maven Plugin :: Test [episodes] a b diff --git a/maven-plugin/tests/gh-issue-16/pom.xml b/maven-plugin/tests/gh-issue-16/pom.xml index 995b4131b..cd71c777b 100644 --- a/maven-plugin/tests/gh-issue-16/pom.xml +++ b/maven-plugin/tests/gh-issue-16/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [GitHub Issue #16] + JAXB Tools :: Maven Plugin :: Test [GitHub Issue #16] org.glassfish.jaxb diff --git a/maven-plugin/tests/gh-issue-19/a/pom.xml b/maven-plugin/tests/gh-issue-19/a/pom.xml index 05e49fc13..fee69cae9 100644 --- a/maven-plugin/tests/gh-issue-19/a/pom.xml +++ b/maven-plugin/tests/gh-issue-19/a/pom.xml @@ -9,7 +9,7 @@ jaxb-maven-plugin-tests-gh-issue-19-a jar - Maven JAXB Plugin Tests [GitHub Issue #19:a] + JAXB Tools :: Maven Plugin :: Test [GitHub Issue #19:a] test diff --git a/maven-plugin/tests/gh-issue-19/b/pom.xml b/maven-plugin/tests/gh-issue-19/b/pom.xml index b88f1e3f3..da7de69aa 100644 --- a/maven-plugin/tests/gh-issue-19/b/pom.xml +++ b/maven-plugin/tests/gh-issue-19/b/pom.xml @@ -9,7 +9,7 @@ jaxb-maven-plugin-tests-gh-issue-19-b jar - Maven JAXB Plugin Tests [GitHub Issue #19:b] + JAXB Tools :: Maven Plugin :: Test [GitHub Issue #19:b] ${project.groupId} diff --git a/maven-plugin/tests/gh-issue-19/pom.xml b/maven-plugin/tests/gh-issue-19/pom.xml index 7f9223585..52c567ba8 100644 --- a/maven-plugin/tests/gh-issue-19/pom.xml +++ b/maven-plugin/tests/gh-issue-19/pom.xml @@ -9,7 +9,7 @@ jaxb-maven-plugin-tests-gh-issue-19 pom - Maven JAXB Plugin Tests [GitHub Issue #19] + JAXB Tools :: Maven Plugin :: Test [GitHub Issue #19] a b diff --git a/maven-plugin/tests/gh-issue-22/a/pom.xml b/maven-plugin/tests/gh-issue-22/a/pom.xml index a8a9be573..b72869c69 100644 --- a/maven-plugin/tests/gh-issue-22/a/pom.xml +++ b/maven-plugin/tests/gh-issue-22/a/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-gh-issue-22-a jar - Maven JAXB Plugin Tests [GitHub Issue #22:a] + JAXB Tools :: Maven Plugin :: Test [GitHub Issue #22:a] test diff --git a/maven-plugin/tests/gh-issue-22/b/pom.xml b/maven-plugin/tests/gh-issue-22/b/pom.xml index 3c1e199ed..ae8a71966 100644 --- a/maven-plugin/tests/gh-issue-22/b/pom.xml +++ b/maven-plugin/tests/gh-issue-22/b/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-gh-issue-22-b jar - Maven JAXB Plugin Tests [GitHub Issue #22:b] + JAXB Tools :: Maven Plugin :: Test [GitHub Issue #22:b] org.jvnet.jaxb diff --git a/maven-plugin/tests/gh-issue-22/pom.xml b/maven-plugin/tests/gh-issue-22/pom.xml index 0179d8ac9..af4d1b8c9 100644 --- a/maven-plugin/tests/gh-issue-22/pom.xml +++ b/maven-plugin/tests/gh-issue-22/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-gh-issue-22 pom - Maven JAXB Plugin Tests [GitHub Issue #22] + JAXB Tools :: Maven Plugin :: Test [GitHub Issue #22] a b diff --git a/maven-plugin/tests/gh-issue-23/one-non-strict/pom.xml b/maven-plugin/tests/gh-issue-23/one-non-strict/pom.xml index 833e50333..46fb536ab 100644 --- a/maven-plugin/tests/gh-issue-23/one-non-strict/pom.xml +++ b/maven-plugin/tests/gh-issue-23/one-non-strict/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-gh-issue-23-one-non-strict jar - Maven JAXB Plugin Tests [GitHub Issue #23:one-non-strict] + JAXB Tools :: Maven Plugin :: Test [GitHub Issue #23:one-non-strict] org.glassfish.jaxb diff --git a/maven-plugin/tests/gh-issue-23/pom.xml b/maven-plugin/tests/gh-issue-23/pom.xml index 2fec9ad40..1e56d1d06 100644 --- a/maven-plugin/tests/gh-issue-23/pom.xml +++ b/maven-plugin/tests/gh-issue-23/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-gh-issue-23 pom - Maven JAXB Plugin Tests [GitHub Issue #23] + JAXB Tools :: Maven Plugin :: Test [GitHub Issue #23] one-non-strict two-non-strict diff --git a/maven-plugin/tests/gh-issue-23/two-non-strict/pom.xml b/maven-plugin/tests/gh-issue-23/two-non-strict/pom.xml index 6c484e533..e532b27f9 100644 --- a/maven-plugin/tests/gh-issue-23/two-non-strict/pom.xml +++ b/maven-plugin/tests/gh-issue-23/two-non-strict/pom.xml @@ -7,7 +7,7 @@ jaxb-maven-plugin-tests-gh-issue-23-two-non-strict jar - Maven JAXB Plugin Tests [GitHub Issue #23:two-non-strict] + JAXB Tools :: Maven Plugin :: Test [GitHub Issue #23:two-non-strict] org.glassfish.jaxb diff --git a/maven-plugin/tests/gh-issue-58/pom.xml b/maven-plugin/tests/gh-issue-58/pom.xml index 8ca21adc4..df02cb7e2 100644 --- a/maven-plugin/tests/gh-issue-58/pom.xml +++ b/maven-plugin/tests/gh-issue-58/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [GitHub Issue #58] + JAXB Tools :: Maven Plugin :: Test [GitHub Issue #58] com.sun.xml.bind diff --git a/maven-plugin/tests/issues/pom.xml b/maven-plugin/tests/issues/pom.xml index 74fa031c6..c2087cb39 100644 --- a/maven-plugin/tests/issues/pom.xml +++ b/maven-plugin/tests/issues/pom.xml @@ -8,7 +8,7 @@ ../pom.xml jar - Maven JAXB Plugin Tests [issues] + JAXB Tools :: Maven Plugin :: Test [issues] jakarta.xml.bind diff --git a/maven-plugin/tests/java-9/pom.xml b/maven-plugin/tests/java-9/pom.xml index ee4f751ac..529c18210 100644 --- a/maven-plugin/tests/java-9/pom.xml +++ b/maven-plugin/tests/java-9/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [Java 9] + JAXB Tools :: Maven Plugin :: Test [Java 9] org.glassfish.jaxb diff --git a/maven-plugin/tests/p_o/pom.xml b/maven-plugin/tests/p_o/pom.xml index 29fe63cae..1e7323177 100644 --- a/maven-plugin/tests/p_o/pom.xml +++ b/maven-plugin/tests/p_o/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [p o] + JAXB Tools :: Maven Plugin :: Test [p o] org.glassfish.jaxb diff --git a/maven-plugin/tests/po-2.3/pom.xml b/maven-plugin/tests/po-2.3/pom.xml index c9011f573..eb7e42701 100644 --- a/maven-plugin/tests/po-2.3/pom.xml +++ b/maven-plugin/tests/po-2.3/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [po-2.3] + JAXB Tools :: Maven Plugin :: Test [po-2.3] org.glassfish.jaxb diff --git a/maven-plugin/tests/po-scd/pom.xml b/maven-plugin/tests/po-scd/pom.xml index 1f6d73b52..561839bf0 100644 --- a/maven-plugin/tests/po-scd/pom.xml +++ b/maven-plugin/tests/po-scd/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [po-scd] + JAXB Tools :: Maven Plugin :: Test [po-scd] org.glassfish.jaxb diff --git a/maven-plugin/tests/pom.xml b/maven-plugin/tests/pom.xml index b63bf111a..e453639d3 100644 --- a/maven-plugin/tests/pom.xml +++ b/maven-plugin/tests/pom.xml @@ -2,7 +2,7 @@ 4.0.0 jaxb-maven-plugin-tests pom - Maven JAXB Plugin Tests + JAXB Tools :: Maven Plugin :: Tests org.jvnet.jaxb jaxb-maven-plugin-project @@ -10,6 +10,12 @@ ../pom.xml + + org.jvnet.jaxb + jaxb2-basics + ${project.version} + provided + org.jvnet.jaxb jaxb-maven-plugin @@ -50,20 +56,6 @@ - - org.jvnet.jaxb - jaxb-maven-plugin - ${project.version} - - - generate - - generate - - generate-sources - - - org.jvnet.jaxb jaxb-maven-plugin diff --git a/maven-plugin/tests/res/pom.xml b/maven-plugin/tests/res/pom.xml index ab1dca5f0..934f891da 100644 --- a/maven-plugin/tests/res/pom.xml +++ b/maven-plugin/tests/res/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [res] + JAXB Tools :: Maven Plugin :: Test [res] org.glassfish.jaxb diff --git a/maven-plugin/tests/rnc/pom.xml b/maven-plugin/tests/rnc/pom.xml index 462a62161..d585629a1 100644 --- a/maven-plugin/tests/rnc/pom.xml +++ b/maven-plugin/tests/rnc/pom.xml @@ -9,7 +9,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [rnc] + JAXB Tools :: Maven Plugin :: Test [rnc] org.glassfish.jaxb diff --git a/maven-plugin/tests/tse/pom.xml b/maven-plugin/tests/tse/pom.xml index cde698da4..8bd0bbd72 100644 --- a/maven-plugin/tests/tse/pom.xml +++ b/maven-plugin/tests/tse/pom.xml @@ -7,7 +7,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [tse] + JAXB Tools :: Maven Plugin :: Test [tse] org.glassfish.jaxb diff --git a/maven-plugin/tests/two/pom.xml b/maven-plugin/tests/two/pom.xml index 63c032727..d8c2c2821 100644 --- a/maven-plugin/tests/two/pom.xml +++ b/maven-plugin/tests/two/pom.xml @@ -7,7 +7,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime @@ -23,7 +23,7 @@ jaxb-maven-plugin-tests-two jar - Maven JAXB Plugin Tests [two] + JAXB Tools :: Maven Plugin :: Test [two] test @@ -58,9 +58,9 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics - ${jaxb2-basics.version} + ${project.version} diff --git a/maven-plugin/tests/wsdl-file/pom.xml b/maven-plugin/tests/wsdl-file/pom.xml index e6ab7bdf8..d44727ed4 100644 --- a/maven-plugin/tests/wsdl-file/pom.xml +++ b/maven-plugin/tests/wsdl-file/pom.xml @@ -9,7 +9,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [wsdl-file] + JAXB Tools :: Maven Plugin :: Test [wsdl-file] org.glassfish.jaxb diff --git a/maven-plugin/tests/wsdl/pom.xml b/maven-plugin/tests/wsdl/pom.xml index 2185c369c..788cd1fec 100644 --- a/maven-plugin/tests/wsdl/pom.xml +++ b/maven-plugin/tests/wsdl/pom.xml @@ -9,7 +9,7 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [wsdl] + JAXB Tools :: Maven Plugin :: Test [wsdl] org.glassfish.jaxb diff --git a/maven-plugin/tests/xjc-simple/pom.xml b/maven-plugin/tests/xjc-simple/pom.xml index b60213060..e077f04f8 100644 --- a/maven-plugin/tests/xjc-simple/pom.xml +++ b/maven-plugin/tests/xjc-simple/pom.xml @@ -7,14 +7,14 @@ 2.0.4-SNAPSHOT jar - Maven JAXB Plugin Tests [xjc-simple] + JAXB Tools :: Maven Plugin :: Test [xjc-simple] org.glassfish.jaxb jaxb-runtime - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime @@ -38,9 +38,9 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics - 0.12.0 + ${project.version} true diff --git a/pom.xml b/pom.xml index dea4c99e6..a661fba63 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,6 @@ 2.3.7 2.3.3 ${jaxb23.version} - 0.12.0 4.13.2 1.7.36 1.8.3 @@ -371,9 +370,9 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime - ${jaxb2-basics.version} + ${project.version}