diff --git a/0.13.0.tar.gz b/0.13.0.tar.gz deleted file mode 100644 index e2833f1..0000000 Binary files a/0.13.0.tar.gz and /dev/null differ diff --git a/jaxb-tools-0.15.1.tar.gz b/jaxb-tools-0.15.1.tar.gz new file mode 100644 index 0000000..ea0b46b Binary files /dev/null and b/jaxb-tools-0.15.1.tar.gz differ diff --git a/maven-jaxb2-plugin-0.13.0-adapt-for-maven-3.patch b/maven-jaxb2-plugin-0.13.0-adapt-for-maven-3.patch index 496b4ea..587a307 100644 --- a/maven-jaxb2-plugin-0.13.0-adapt-for-maven-3.patch +++ b/maven-jaxb2-plugin-0.13.0-adapt-for-maven-3.patch @@ -1,15 +1,16 @@ -diff -Nru maven-jaxb2-plugin-0.13.0/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java maven-jaxb2-plugin-0.13.0.maven3/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java ---- maven-jaxb2-plugin-0.13.0/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java 2015-08-30 11:39:57.000000000 +0200 -+++ maven-jaxb2-plugin-0.13.0.maven3/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java 2015-10-26 07:08:33.061224903 +0100 -@@ -23,6 +23,7 @@ +diff --git a/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java b/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java +index 8124cb5..78f7aff 100644 +--- a/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java ++++ b/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java +@@ -23,6 +23,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; +import org.apache.maven.project.MavenProjectHelper; - import org.jvnet.mjiip.v_2.XJC2Mojo; public abstract class JAXBGenerateTest extends AbstractMojoTestCase { -@@ -37,7 +38,7 @@ + +@@ -36,7 +37,7 @@ public abstract class JAXBGenerateTest extends AbstractMojoTestCase { super.setUp(); mavenProjectBuilder = (MavenProjectBuilder) getContainer().lookup( @@ -18,41 +19,22 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin/src/test/java/org/jvnet/jaxb2/maven2/ } protected static File getBaseDir() { -diff -Nru maven-jaxb2-plugin-0.13.0/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java maven-jaxb2-plugin-0.13.0.maven3/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java ---- maven-jaxb2-plugin-0.13.0/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java 2015-08-30 11:39:57.000000000 +0200 -+++ maven-jaxb2-plugin-0.13.0.maven3/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java 2015-10-26 07:08:33.061224903 +0100 -@@ -23,6 +23,7 @@ - import org.apache.maven.plugin.testing.AbstractMojoTestCase; - import org.apache.maven.project.MavenProject; - import org.apache.maven.project.MavenProjectBuilder; -+import org.apache.maven.project.MavenProjectHelper; - - public abstract class JAXBGenerateTest extends AbstractMojoTestCase { - -@@ -36,7 +37,7 @@ - super.setUp(); - - mavenProjectBuilder = (MavenProjectBuilder) getContainer().lookup( -- MavenProjectBuilder.ROLE); -+ MavenProjectHelper.ROLE); - } - - protected static File getBaseDir() { -diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml maven-jaxb2-plugin-0.13.0.maven3/plugin-core/pom.xml ---- maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml 2015-10-26 07:10:24.540750466 +0100 -+++ maven-jaxb2-plugin-0.13.0.maven3/plugin-core/pom.xml 2015-10-26 07:08:33.061224903 +0100 -@@ -25,6 +25,10 @@ +diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml +index ec44704..00898f0 100644 +--- a/plugin-core/pom.xml ++++ b/plugin-core/pom.xml +@@ -32,6 +32,10 @@ + txw2 + - - org.apache.maven -+ maven-compat -+ + + org.apache.maven - maven-plugin-api - ++ maven-compat ++ -@@ -37,7 +41,7 @@ + org.apache.maven + maven-plugin-api +@@ -46,7 +50,7 @@ org.apache.maven @@ -61,22 +43,45 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml maven-jaxb2-plugin-0.13. org.apache.maven.plugin-tools -diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java maven-jaxb2-plugin-0.13.0.maven3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java ---- maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java 2015-08-30 11:39:57.000000000 +0200 -+++ maven-jaxb2-plugin-0.13.0.maven3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java 2015-10-26 07:08:33.062224854 +0100 -@@ -1191,7 +1191,7 @@ +diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java +index 2d97d08..925914e 100644 +--- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java ++++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java +@@ -1322,7 +1322,7 @@ public abstract class AbstractXJC2Mojo extends AbstractMojo implements @SuppressWarnings("unchecked") final Set artifacts = MavenMetadataSource .createArtifacts(getArtifactFactory(), -- Arrays.asList(dependencyResource), -+ Arrays.asList((Dependency) dependencyResource), +- Arrays.asList(dependencyResource), ++ Arrays.asList((Dependency) dependencyResource), Artifact.SCOPE_RUNTIME, null, getProject()); if (artifacts.size() != 1) { -diff -Nru maven-jaxb2-plugin-0.13.0/pom.xml maven-jaxb2-plugin-0.13.0.maven3/pom.xml ---- maven-jaxb2-plugin-0.13.0/pom.xml 2015-08-30 11:39:57.000000000 +0200 -+++ maven-jaxb2-plugin-0.13.0.maven3/pom.xml 2015-10-26 07:09:26.349608065 +0100 -@@ -162,7 +162,7 @@ +diff --git a/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java b/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java +index 35cd0ff..da75800 100644 +--- a/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java ++++ b/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java +@@ -23,6 +23,7 @@ import org.apache.maven.plugin.MojoExecutionException; + import org.apache.maven.plugin.testing.AbstractMojoTestCase; + import org.apache.maven.project.MavenProject; + import org.apache.maven.project.MavenProjectBuilder; ++import org.apache.maven.project.MavenProjectHelper; + import org.jvnet.mjiip.v_2.XJC2Mojo; + + public abstract class JAXBGenerateTest extends AbstractMojoTestCase { +@@ -37,7 +38,7 @@ public abstract class JAXBGenerateTest extends AbstractMojoTestCase { + super.setUp(); + + mavenProjectBuilder = (MavenProjectBuilder) getContainer().lookup( +- MavenProjectBuilder.ROLE); ++ MavenProjectHelper.ROLE); + } + + protected static File getBaseDir() { +diff --git a/pom.xml b/pom.xml +index 53d5dac..7070059 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -341,7 +341,7 @@ org.apache.maven @@ -85,3 +90,6 @@ diff -Nru maven-jaxb2-plugin-0.13.0/pom.xml maven-jaxb2-plugin-0.13.0.maven3/pom ${maven.version} +-- +2.33.0 + diff --git a/maven-jaxb2-plugin-0.13.0-dont-use-internal-resolver.patch b/maven-jaxb2-plugin-0.13.0-dont-use-internal-resolver.patch index f1d7919..af49fc2 100644 --- a/maven-jaxb2-plugin-0.13.0-dont-use-internal-resolver.patch +++ b/maven-jaxb2-plugin-0.13.0-dont-use-internal-resolver.patch @@ -1,7 +1,8 @@ -diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml maven-jaxb2-plugin-0.13.0.resolver/plugin-core/pom.xml ---- maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml 2015-08-30 11:39:57.000000000 +0200 -+++ maven-jaxb2-plugin-0.13.0.resolver/plugin-core/pom.xml 2015-10-26 07:04:15.851855712 +0100 -@@ -18,9 +18,9 @@ +diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml +index e6c49b2..ec44704 100644 +--- a/plugin-core/pom.xml ++++ b/plugin-core/pom.xml +@@ -23,9 +23,9 @@ commons-lang3 @@ -12,26 +13,28 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml maven-jaxb2-plugin-0.13. + xml-resolver + 1.2 - -diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java ---- maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java 2015-08-30 11:39:57.000000000 +0200 -+++ maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java 2015-10-26 07:04:15.852855663 +0100 -@@ -74,8 +74,8 @@ - import org.xml.sax.InputSource; - import org.xml.sax.SAXException; - --import com.sun.org.apache.xml.internal.resolver.CatalogManager; --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.CatalogManager; -+import org.apache.xml.resolver.tools.CatalogResolver; - - /** - * Maven JAXB 2.x Mojo. -diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java ---- maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java 2015-08-30 11:39:57.000000000 +0200 -+++ maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java 2015-10-26 07:04:15.853855614 +0100 -@@ -5,7 +5,7 @@ + org.glassfish.jaxb +diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java +index 6fb4aae..2f882be 100644 +--- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java ++++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java +@@ -76,8 +76,8 @@ import org.xml.sax.EntityResolver; + import org.xml.sax.InputSource; + import org.xml.sax.SAXException; + +-import com.sun.org.apache.xml.internal.resolver.CatalogManager; +-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; ++import org.apache.xml.resolver.CatalogManager; ++import org.apache.xml.resolver.tools.CatalogResolver; + import com.sun.xml.txw2.annotation.XmlNamespace; + + /** +diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java +index 764bb69..e5a95c5 100644 +--- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java ++++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java +@@ -5,7 +5,7 @@ import java.net.URISyntaxException; import java.net.URL; public class ClasspathCatalogResolver extends @@ -40,10 +43,11 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/ma public static final String URI_SCHEME_CLASSPATH = "classpath"; -diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java ---- maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java 2015-08-30 11:39:57.000000000 +0200 -+++ maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java 2015-10-26 07:04:15.854855565 +0100 -@@ -10,10 +10,10 @@ +diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java +index a95d51b..5a6c558 100644 +--- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java ++++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java +@@ -10,10 +10,10 @@ import org.jvnet.jaxb2.maven2.DependencyResource; import org.jvnet.jaxb2.maven2.DependencyResourceResolver; import org.jvnet.jaxb2.maven2.plugin.logging.NullLog; @@ -56,10 +60,11 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/ma public static final String URI_SCHEME_MAVEN = "maven"; private final DependencyResourceResolver dependencyResourceResolver; -diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java ---- maven-jaxb2-plugin-0.13.0/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java 2015-08-30 11:39:57.000000000 +0200 -+++ maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java 2015-10-26 07:04:15.855855516 +0100 -@@ -7,8 +7,8 @@ +diff --git a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java b/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java +index 588be4d..e21fabd 100644 +--- a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java ++++ b/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java +@@ -7,8 +7,8 @@ import org.junit.Assert; import org.junit.Test; import org.xml.sax.InputSource; @@ -70,3 +75,6 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/test/java/org/jvnet/jaxb2/ma public class MavenCatalogResolverTest { +-- +2.33.0 + diff --git a/maven-jaxb2-plugin-0.13.0-remove-enconding-option.patch b/maven-jaxb2-plugin-0.13.0-remove-enconding-option.patch index 71c6065..0d0716a 100644 --- a/maven-jaxb2-plugin-0.13.0-remove-enconding-option.patch +++ b/maven-jaxb2-plugin-0.13.0-remove-enconding-option.patch @@ -1,7 +1,88 @@ -diff -Nru maven-jaxb2-plugin-0.13.0/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java maven-jaxb2-plugin-0.13.0.enconding/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java ---- maven-jaxb2-plugin-0.13.0/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java 2015-08-30 11:39:57.000000000 +0200 -+++ maven-jaxb2-plugin-0.13.0.enconding/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java 2015-10-26 07:13:24.427916727 +0100 -@@ -33,12 +33,6 @@ +diff --git a/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java b/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java +index 6cb4ed2..f0688ef 100644 +--- a/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java ++++ b/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java +@@ -32,11 +32,6 @@ public class OptionsFactory implements + + options.target = SpecVersion.V2_2; + +- final String encoding = optionsConfiguration.getEncoding(); +- +- if (encoding != null) { +- options.encoding = createEncoding(encoding); +- } + + options.setSchemaLanguage(createLanguage(optionsConfiguration + .getSchemaLanguage())); +@@ -97,23 +92,6 @@ public class OptionsFactory implements + return options; + } + +- private String createEncoding(String encoding) +- throws MojoExecutionException { +- if (encoding == null) { +- return null; +- } +- try { +- if (!Charset.isSupported(encoding)) { +- throw new MojoExecutionException(MessageFormat.format( +- "Unsupported encoding [{0}].", encoding)); +- } +- return encoding; +- } catch (IllegalCharsetNameException icne) { +- throw new MojoExecutionException(MessageFormat.format( +- "Unsupported encoding [{0}].", encoding)); +- } +- +- } + + private Language createLanguage(String schemaLanguage) + throws MojoExecutionException { +diff --git a/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/OptionsFactory.java b/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/OptionsFactory.java +index a1d1214..d395c96 100644 +--- a/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/OptionsFactory.java ++++ b/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/OptionsFactory.java +@@ -32,11 +32,6 @@ public class OptionsFactory implements + + options.target = SpecVersion.V2_2; + +- final String encoding = optionsConfiguration.getEncoding(); +- +- if (encoding != null) { +- options.encoding = createEncoding(encoding); +- } + + options.setSchemaLanguage(createLanguage(optionsConfiguration + .getSchemaLanguage())); +@@ -97,23 +92,6 @@ public class OptionsFactory implements + return options; + } + +- private String createEncoding(String encoding) +- throws MojoExecutionException { +- if (encoding == null) { +- return null; +- } +- try { +- if (!Charset.isSupported(encoding)) { +- throw new MojoExecutionException(MessageFormat.format( +- "Unsupported encoding [{0}].", encoding)); +- } +- return encoding; +- } catch (IllegalCharsetNameException icne) { +- throw new MojoExecutionException(MessageFormat.format( +- "Unsupported encoding [{0}].", encoding)); +- } +- +- } + + private Language createLanguage(String schemaLanguage) + throws MojoExecutionException { +diff --git a/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java b/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java +index 4ae2ccb..2f3e039 100644 +--- a/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java ++++ b/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java +@@ -33,11 +33,6 @@ public class OptionsFactory implements options.target = createSpecVersion(optionsConfiguration .getSpecVersion()); @@ -10,15 +91,13 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin/src/main/java/org/jvnet/mjiip/v_2/Opt - if (encoding != null) { - options.encoding = createEncoding(encoding); - } -- + options.setSchemaLanguage(createLanguage(optionsConfiguration .getSchemaLanguage())); - -@@ -105,26 +99,6 @@ - } +@@ -109,25 +104,6 @@ public class OptionsFactory implements } -- + - private String createEncoding(String encoding) - throws MojoExecutionException { - if (encoding == null) { @@ -41,44 +120,6 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin/src/main/java/org/jvnet/mjiip/v_2/Opt private Language createLanguage(String schemaLanguage) throws MojoExecutionException { -diff -Nru maven-jaxb2-plugin-0.13.0/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java maven-jaxb2-plugin-0.13.0.enconding/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java ---- maven-jaxb2-plugin-0.13.0/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2015-08-30 11:39:57.000000000 +0200 -+++ maven-jaxb2-plugin-0.13.0.enconding/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2015-10-26 07:13:24.428916678 +0100 -@@ -32,12 +32,6 @@ - - options.target = SpecVersion.V2_2; - -- final String encoding = optionsConfiguration.getEncoding(); -- -- if (encoding != null) { -- options.encoding = createEncoding(encoding); -- } -- - options.setSchemaLanguage(createLanguage(optionsConfiguration - .getSchemaLanguage())); - -@@ -94,24 +88,6 @@ - return options; - } - -- private String createEncoding(String encoding) -- throws MojoExecutionException { -- if (encoding == null) { -- return null; -- } -- try { -- if (!Charset.isSupported(encoding)) { -- throw new MojoExecutionException(MessageFormat.format( -- "Unsupported encoding [{0}].", encoding)); -- } -- return encoding; -- } catch (IllegalCharsetNameException icne) { -- throw new MojoExecutionException(MessageFormat.format( -- "Unsupported encoding [{0}].", encoding)); -- } -- -- } -- - private Language createLanguage(String schemaLanguage) - throws MojoExecutionException { - if (StringUtils.isEmpty(schemaLanguage)) { +-- +2.33.0 + diff --git a/maven-jaxb2-plugin.spec b/maven-jaxb2-plugin.spec index 039f0b2..cc5607d 100644 --- a/maven-jaxb2-plugin.spec +++ b/maven-jaxb2-plugin.spec @@ -1,10 +1,10 @@ Name: maven-jaxb2-plugin -Version: 0.13.0 -Release: 2 +Version: 0.15.1 +Release: 1 Summary: Provides the capability to generate java sources from schemas License: BSD-2-Clause and ASL 2.0 URL: http://java.net/projects/maven-jaxb2-plugin/pages/Home -Source0: https://github.com/highsource/maven-jaxb2-plugin/archive/0.13.0.tar.gz +Source0: https://github.com/highsource/jaxb-tools/archive/%{version}/jaxb-tools-%{version}.tar.gz Patch0: %{name}-0.13.0-dont-use-internal-resolver.patch Patch1: %{name}-0.13.0-adapt-for-maven-3.patch Patch2: %{name}-0.13.0-remove-enconding-option.patch @@ -20,6 +20,13 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-utils) mvn(org.glassfish.jax BuildRequires: mvn(org.glassfish.jaxb:jaxb-xjc) mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) mvn(org.sonatype.plexus:plexus-build-api) BuildRequires: mvn(xml-resolver:xml-resolver) +BuildRequires: mvn(com.sun.activation:jakarta.activation) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) maven +BuildRequires: mvn(org.eclipse.aether:aether-connector-basic) +BuildRequires: mvn(org.eclipse.aether:aether-transport-wagon) +BuildRequires: mvn(org.apache.maven.wagon:wagon-http) +BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) + %description This Maven 2 plugin wraps the JAXB 2.x XJC compiler and provides the capability to generate Java sources from XML Schemas. @@ -30,21 +37,14 @@ Summary: API documentation for %{name} The API documentation of %{name}. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -n jaxb-tools-%{version} -p1 %pom_disable_module plugin-2.0 %pom_disable_module plugin-2.1 %pom_add_dep com.sun.codemodel:codemodel:2.6 plugin %pom_add_dep com.sun.codemodel:codemodel:2.6 plugin-2.2 %build -(cd plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/; - mv DelegatingReaderWrapper.java DelegatingReaderWrapper.java_ - mv DelegatingInputStreamWrapper.java DelegatingInputStreamWrapper.java_ -) -%mvn_build +%mvn_build -b %install %mvn_install @@ -57,6 +57,9 @@ The API documentation of %{name}. %license LICENSE %changelog +* Mon Jan 22 2024 Ge Wang - 0.15.1-1 +- Update to version 0.15.1 + * Tue May 10 2022 xu_ping - 0.13.0-2 - License compliance rectification