From 7f3de30cb1ab39a5ea3e550221fad7911214e314 Mon Sep 17 00:00:00 2001 From: gil Date: Oct 26 2015 06:23:57 +0000 Subject: update to 0.13.0 --- diff --git a/.gitignore b/.gitignore index 10e14e2..a1f23d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /maven-jaxb2-plugin-0.8.1.tar.gz /maven-jaxb2-plugin-0.9.1.tar.gz /0.12.3.tar.gz +/0.13.0.tar.gz diff --git a/maven-jaxb2-plugin-0.12.3-adapt-for-maven-3.patch b/maven-jaxb2-plugin-0.12.3-adapt-for-maven-3.patch deleted file mode 100644 index f0d1b14..0000000 --- a/maven-jaxb2-plugin-0.12.3-adapt-for-maven-3.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/pom.xml maven-jaxb2-plugin-0.12.3.maven3/plugin-core/pom.xml ---- maven-jaxb2-plugin-0.12.3/plugin-core/pom.xml 2015-02-11 16:45:41.724475461 +0100 -+++ maven-jaxb2-plugin-0.12.3.maven3/plugin-core/pom.xml 2015-02-11 16:48:37.455478052 +0100 -@@ -25,6 +25,10 @@ - - - org.apache.maven -+ maven-compat -+ -+ -+ org.apache.maven - maven-plugin-api - - -diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java maven-jaxb2-plugin-0.12.3.maven3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java ---- maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java 2014-12-18 22:08:31.000000000 +0100 -+++ maven-jaxb2-plugin-0.12.3.maven3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java 2015-02-11 16:50:54.738667954 +0100 -@@ -1142,7 +1142,7 @@ - @SuppressWarnings("unchecked") - final Set artifacts = MavenMetadataSource - .createArtifacts(getArtifactFactory(), -- Arrays.asList(dependencyResource), -+ Arrays.asList((Dependency) dependencyResource), - Artifact.SCOPE_RUNTIME, null, getProject()); - - if (artifacts.size() != 1) { -diff -Nru maven-jaxb2-plugin-0.12.3/pom.xml maven-jaxb2-plugin-0.12.3.maven3/pom.xml ---- maven-jaxb2-plugin-0.12.3/pom.xml 2014-12-18 22:08:31.000000000 +0100 -+++ maven-jaxb2-plugin-0.12.3.maven3/pom.xml 2015-02-11 16:49:16.398262581 +0100 -@@ -147,6 +147,11 @@ - - - org.apache.maven -+ maven-compat -+ ${maven.version} -+ -+ -+ org.apache.maven - maven-project - ${maven.version} - diff --git a/maven-jaxb2-plugin-0.12.3-dont-use-internal-resolver.patch b/maven-jaxb2-plugin-0.12.3-dont-use-internal-resolver.patch deleted file mode 100644 index 11e1367..0000000 --- a/maven-jaxb2-plugin-0.12.3-dont-use-internal-resolver.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/pom.xml maven-jaxb2-plugin-0.12.3.resolver/plugin-core/pom.xml ---- maven-jaxb2-plugin-0.12.3/plugin-core/pom.xml 2014-12-18 22:08:31.000000000 +0100 -+++ maven-jaxb2-plugin-0.12.3.resolver/plugin-core/pom.xml 2015-02-11 17:13:34.668128244 +0100 -@@ -18,9 +18,9 @@ - commons-lang3 - - -- com.sun.org.apache.xml.internal -- resolver -- 20050927 -+ xml-resolver -+ xml-resolver -+ 1.2 - - - -diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java ---- maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java 2014-12-18 22:08:31.000000000 +0100 -+++ maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java 2015-02-11 16:37:55.439042014 +0100 -@@ -61,8 +61,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.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java ---- maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java 2014-12-18 22:08:31.000000000 +0100 -+++ maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java 2015-02-11 16:38:30.136061416 +0100 -@@ -5,7 +5,7 @@ - import java.net.URL; - - public class ClasspathCatalogResolver extends -- com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver { -+ org.apache.xml.resolver.tools.CatalogResolver { - - public static final String URI_SCHEME_CLASSPATH = "classpath"; - -diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java ---- maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java 2014-12-18 22:08:31.000000000 +0100 -+++ maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java 2015-02-11 16:39:20.909163152 +0100 -@@ -10,10 +10,10 @@ - import org.jvnet.jaxb2.maven2.DependencyResourceResolver; - import org.jvnet.jaxb2.maven2.plugin.logging.NullLog; - --import com.sun.org.apache.xml.internal.resolver.CatalogManager; -+import org.apache.xml.resolver.CatalogManager; - - public class MavenCatalogResolver extends -- com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver { -+ org.apache.xml.resolver.tools.CatalogResolver { - - public static final String URI_SCHEME_MAVEN = "maven"; - private final DependencyResourceResolver dependencyResourceResolver; -diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java ---- maven-jaxb2-plugin-0.12.3/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java 2014-12-18 22:08:31.000000000 +0100 -+++ maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java 2015-02-11 17:10:15.514496463 +0100 -@@ -7,8 +7,8 @@ - import org.junit.Test; - import org.xml.sax.InputSource; - --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; - - public class MavenCatalogResolverTest { - diff --git a/maven-jaxb2-plugin-0.12.3-remove-enconding-option.patch b/maven-jaxb2-plugin-0.12.3-remove-enconding-option.patch deleted file mode 100644 index b63c3a1..0000000 --- a/maven-jaxb2-plugin-0.12.3-remove-enconding-option.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Nru maven-jaxb2-plugin-0.12.3/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java maven-jaxb2-plugin-0.12.3.enconding/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java ---- maven-jaxb2-plugin-0.12.3/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2014-12-18 22:08:31.000000000 +0100 -+++ maven-jaxb2-plugin-0.12.3.enconding/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2015-02-11 16:58:11.334829818 +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)) { 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 new file mode 100644 index 0000000..496b4ea --- /dev/null +++ b/maven-jaxb2-plugin-0.13.0-adapt-for-maven-3.patch @@ -0,0 +1,87 @@ +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 @@ + 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 @@ + super.setUp(); + + mavenProjectBuilder = (MavenProjectBuilder) getContainer().lookup( +- MavenProjectBuilder.ROLE); ++ MavenProjectHelper.ROLE); + } + + 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 @@ + + + org.apache.maven ++ maven-compat ++ ++ ++ org.apache.maven + maven-plugin-api + + +@@ -37,7 +41,7 @@ + + + org.apache.maven +- maven-project ++ maven-core + + + 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 @@ + @SuppressWarnings("unchecked") + final Set artifacts = MavenMetadataSource + .createArtifacts(getArtifactFactory(), +- 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 @@ + + + org.apache.maven +- maven-project ++ maven-compat + ${maven.version} + + 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 new file mode 100644 index 0000000..f1d7919 --- /dev/null +++ b/maven-jaxb2-plugin-0.13.0-dont-use-internal-resolver.patch @@ -0,0 +1,72 @@ +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 @@ + commons-lang3 + + +- com.sun.org.apache.xml.internal +- resolver +- 20050927 ++ xml-resolver ++ 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 @@ + import java.net.URL; + + public class ClasspathCatalogResolver extends +- com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver { ++ org.apache.xml.resolver.tools.CatalogResolver { + + 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 @@ + import org.jvnet.jaxb2.maven2.DependencyResourceResolver; + import org.jvnet.jaxb2.maven2.plugin.logging.NullLog; + +-import com.sun.org.apache.xml.internal.resolver.CatalogManager; ++import org.apache.xml.resolver.CatalogManager; + + public class MavenCatalogResolver extends +- com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver { ++ org.apache.xml.resolver.tools.CatalogResolver { + + 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 @@ + import org.junit.Test; + import org.xml.sax.InputSource; + +-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; + + public class MavenCatalogResolverTest { + diff --git a/maven-jaxb2-plugin-0.13.0-remove-enconding-option.patch b/maven-jaxb2-plugin-0.13.0-remove-enconding-option.patch new file mode 100644 index 0000000..71c6065 --- /dev/null +++ b/maven-jaxb2-plugin-0.13.0-remove-enconding-option.patch @@ -0,0 +1,84 @@ +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 @@ + options.target = createSpecVersion(optionsConfiguration + .getSpecVersion()); + +- final String encoding = optionsConfiguration.getEncoding(); +- +- if (encoding != null) { +- options.encoding = createEncoding(encoding); +- } +- + options.setSchemaLanguage(createLanguage(optionsConfiguration + .getSchemaLanguage())); + +@@ -105,26 +99,6 @@ + } + + } +- +- 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 -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)) { diff --git a/maven-jaxb2-plugin.spec b/maven-jaxb2-plugin.spec index 8324670..6eb68eb 100644 --- a/maven-jaxb2-plugin.spec +++ b/maven-jaxb2-plugin.spec @@ -1,30 +1,39 @@ Name: maven-jaxb2-plugin -Version: 0.12.3 -Release: 2%{?dist} +Version: 0.13.0 +Release: 1%{?dist} Summary: Provides the capability to generate java sources from schemas License: BSD and ASL 2.0 URL: http://java.net/projects/maven-jaxb2-plugin/pages/Home Source0: https://github.com/highsource/maven-jaxb2-plugin/archive/%{version}.tar.gz # Don't try to use an internal bundled resolver, as this is not available in # Fedora: -Patch0: %{name}-0.12.3-dont-use-internal-resolver.patch +Patch0: %{name}-0.13.0-dont-use-internal-resolver.patch # Adapt for Maven 3: -Patch1: %{name}-0.12.3-adapt-for-maven-3.patch +Patch1: %{name}-0.13.0-adapt-for-maven-3.patch # Remove the enconding option as the version of the XJC compiler that we build # in Fedora doesn't have it: -Patch2: %{name}-0.12.3-remove-enconding-option.patch +Patch2: %{name}-0.13.0-remove-enconding-option.patch BuildArch: noarch BuildRequires: java-headless BuildRequires: maven-local -BuildRequires: xml-commons-resolver -BuildRequires: maven-enforcer-plugin -BuildRequires: junit -BuildRequires: glassfish-jaxb -BuildRequires: codemodel +BuildRequires: mvn(com.sun.codemodel:codemodel) +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-lang3) +BuildRequires: mvn(org.apache.maven:maven-compat) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.glassfish.jaxb:jaxb-runtime) +BuildRequires: mvn(org.glassfish.jaxb:jaxb-xjc) BuildRequires: mvn(org.slf4j:slf4j-api) - +BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) +BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) +BuildRequires: mvn(xml-resolver:xml-resolver) %description This Maven 2 plugin wraps the JAXB 2.x XJC compiler and provides the capability @@ -42,30 +51,16 @@ The API documentation of %{name}. %patch1 -p1 %patch2 -p1 -# Build only version 2.2 +# use glassfish-jaxb = 2.0.5 %pom_disable_module plugin-2.0 -%pom_disable_module plugin -%pom_disable_module testing - +# use glassfish-jaxb = 2.1.13 +%pom_disable_module plugin-2.1 # Add dependency on codemodel: +# because org.glassfish.jaxb:codemodel:2.2.11 have missing classes use @ runtime by these plugins: +%pom_add_dep com.sun.codemodel:codemodel:2.6 plugin %pom_add_dep com.sun.codemodel:codemodel:2.6 plugin-2.2 -sed -i "s|MavenProjectBuilder.ROLE|org.apache.maven.project.MavenProjectHelper.ROLE|" \ - plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java - -%if %{?fedora} <= 21 -# use glassfish-jaxb >= 2.2.7 -%pom_disable_module plugin-2.2 -%mvn_file :maven-jaxb21-plugin %{name} -%else -# use glassfish-jaxb >= 2.1.14 -%pom_disable_module plugin-2.1 -%mvn_file :maven-jaxb22-plugin %{name} -%endif - -%mvn_file :%{name}-core %{name}-core - %build %mvn_build @@ -81,6 +76,9 @@ sed -i "s|MavenProjectBuilder.ROLE|org.apache.maven.project.MavenProjectHelper.R %license LICENSE %changelog +* Mon Oct 26 2015 gil cattaneo 0.13.0-1 +- Update to 0.13.0 + * Wed Jun 17 2015 Fedora Release Engineering - 0.12.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index bf91909..b71594e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9699a164b5206c850b91dc6ba5babbb8 0.12.3.tar.gz +f6b235f23f1254d1c0b32a1e2e787320 0.13.0.tar.gz