diff --git a/.gitignore b/.gitignore index ad324cd..d95acf7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /maven-jaxb2-plugin-0.8.1.tar.gz +/maven-jaxb2-plugin-0.9.1.tar.gz diff --git a/maven-jaxb2-plugin-0.9.1-dont-use-internal-resolver.patch b/maven-jaxb2-plugin-0.9.1-dont-use-internal-resolver.patch new file mode 100644 index 0000000..c89743f --- /dev/null +++ b/maven-jaxb2-plugin-0.9.1-dont-use-internal-resolver.patch @@ -0,0 +1,126 @@ +diff -Nru maven-jaxb2-plugin-0.9.1/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java maven-jaxb2-plugin-0.9.1-gil/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java +--- maven-jaxb2-plugin-0.9.1/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java 2014-04-03 01:20:50.000000000 +0200 ++++ maven-jaxb2-plugin-0.9.1-gil/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java 2015-01-20 10:58:15.523411556 +0100 +@@ -12,8 +12,8 @@ + import org.jvnet.jaxb2.maven2.util.StringUtils; + 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; + import com.sun.tools.xjc.BadCommandLineException; + import com.sun.tools.xjc.Language; + import com.sun.tools.xjc.Options; +diff -Nru maven-jaxb2-plugin-0.9.1/plugin-2.0/src/main/java/org/jvnet/mjiip/v_2_0/OptionsFactory.java maven-jaxb2-plugin-0.9.1-gil/plugin-2.0/src/main/java/org/jvnet/mjiip/v_2_0/OptionsFactory.java +--- maven-jaxb2-plugin-0.9.1/plugin-2.0/src/main/java/org/jvnet/mjiip/v_2_0/OptionsFactory.java 2014-04-03 01:20:50.000000000 +0200 ++++ maven-jaxb2-plugin-0.9.1-gil/plugin-2.0/src/main/java/org/jvnet/mjiip/v_2_0/OptionsFactory.java 2015-01-20 10:57:54.442578432 +0100 +@@ -10,8 +10,8 @@ + import org.jvnet.jaxb2.maven2.util.StringUtils; + 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; + import com.sun.tools.xjc.BadCommandLineException; + import com.sun.tools.xjc.Language; + import com.sun.tools.xjc.Options; +diff -Nru maven-jaxb2-plugin-0.9.1/plugin-2.1/src/main/java/org/jvnet/mjiip/v_2_1/OptionsFactory.java maven-jaxb2-plugin-0.9.1-gil/plugin-2.1/src/main/java/org/jvnet/mjiip/v_2_1/OptionsFactory.java +--- maven-jaxb2-plugin-0.9.1/plugin-2.1/src/main/java/org/jvnet/mjiip/v_2_1/OptionsFactory.java 2014-04-03 01:20:50.000000000 +0200 ++++ maven-jaxb2-plugin-0.9.1-gil/plugin-2.1/src/main/java/org/jvnet/mjiip/v_2_1/OptionsFactory.java 2015-01-20 10:57:30.017930396 +0100 +@@ -10,8 +10,8 @@ + import org.jvnet.jaxb2.maven2.util.StringUtils; + 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; + import com.sun.tools.xjc.BadCommandLineException; + import com.sun.tools.xjc.Language; + import com.sun.tools.xjc.Options; +diff -Nru maven-jaxb2-plugin-0.9.1/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java maven-jaxb2-plugin-0.9.1-gil/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java +--- maven-jaxb2-plugin-0.9.1/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2014-04-03 01:20:50.000000000 +0200 ++++ maven-jaxb2-plugin-0.9.1-gil/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2015-01-20 10:57:01.682498831 +0100 +@@ -12,8 +12,8 @@ + import org.jvnet.jaxb2.maven2.util.StringUtils; + 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; + import com.sun.tools.xjc.BadCommandLineException; + import com.sun.tools.xjc.Language; + import com.sun.tools.xjc.Options; +diff -Nru maven-jaxb2-plugin-0.9.1/plugin-core/pom.xml maven-jaxb2-plugin-0.9.1-gil/plugin-core/pom.xml +--- maven-jaxb2-plugin-0.9.1/plugin-core/pom.xml 2014-09-16 00:19:39.000000000 +0200 ++++ maven-jaxb2-plugin-0.9.1-gil/plugin-core/pom.xml 2015-01-20 10:59:48.109286701 +0100 +@@ -12,9 +12,9 @@ + + + +- com.sun.org.apache.xml.internal +- resolver +- 20050927 ++ xml-resolver ++ xml-resolver ++ 1.2 + + + +diff -Nru maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java +--- maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java 2014-04-03 01:20:50.000000000 +0200 ++++ maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java 2015-01-20 11:00:28.260064257 +0100 +@@ -9,7 +9,7 @@ + import org.jvnet.jaxb2.maven2.util.IOUtils; + import org.xml.sax.InputSource; + +-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; ++import org.apache.xml.resolver.tools.CatalogResolver; + + public class OptionsConfiguration { + +diff -Nru maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java +--- maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java 2014-09-16 00:19:39.000000000 +0200 ++++ maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java 2015-01-20 11:00:49.534886644 +0100 +@@ -51,8 +51,8 @@ + import org.jvnet.jaxb2.maven2.util.IOUtils; + import org.sonatype.plexus.build.incremental.BuildContext; + +-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.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java +--- maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java 2014-04-03 01:20:50.000000000 +0200 ++++ maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java 2015-01-20 11:01:53.819279942 +0100 +@@ -6,7 +6,7 @@ + import java.text.MessageFormat; + + 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.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java +--- maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java 2011-10-30 10:53:41.000000000 +0100 ++++ maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java 2015-01-20 11:02:15.675032357 +0100 +@@ -8,10 +8,10 @@ + import org.jvnet.jaxb2.maven2.DependencyResource; + import org.jvnet.jaxb2.maven2.DependencyResourceResolver; + +-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 --git a/maven-jaxb2-plugin-dont-use-internal-resolver.patch b/maven-jaxb2-plugin-dont-use-internal-resolver.patch deleted file mode 100644 index 1c851cb..0000000 --- a/maven-jaxb2-plugin-dont-use-internal-resolver.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 9b92aa7b4a55c8cdc84405125429aab85165afe2 Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Mon, 20 Feb 2012 19:43:14 +0100 -Subject: [PATCH 1/2] Don't use internal resolver - ---- - .../java/org/jvnet/mjiip/v_2_2/OptionsFactory.java | 4 ++-- - plugin-core/pom.xml | 6 +++--- - .../jvnet/jaxb2/maven2/OptionsConfiguration.java | 2 +- - .../java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java | 4 ++-- - .../resolver/tools/ClasspathCatalogResolver.java | 2 +- - .../resolver/tools/MavenCatalogResolver.java | 4 ++-- - 6 files changed, 11 insertions(+), 11 deletions(-) - -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 778458f..b72a2e3 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 -@@ -12,8 +12,8 @@ import org.jvnet.jaxb2.maven2.OptionsConfiguration; - import org.jvnet.jaxb2.maven2.util.StringUtils; - 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; - import com.sun.tools.xjc.BadCommandLineException; - import com.sun.tools.xjc.Language; - import com.sun.tools.xjc.Options; -diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml -index d8729eb..98664cd 100644 ---- a/plugin-core/pom.xml -+++ b/plugin-core/pom.xml -@@ -12,9 +12,9 @@ - - - -- com.sun.org.apache.xml.internal -- resolver -- 20050927 -+ xml-resolver -+ xml-resolver -+ 1.2 - - - -diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java -index 6f77e03..a0b458d 100644 ---- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java -+++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java -@@ -9,7 +9,7 @@ import java.util.List; - import org.jvnet.jaxb2.maven2.util.IOUtils; - import org.xml.sax.InputSource; - --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.tools.CatalogResolver; - - public class OptionsConfiguration { - -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 63446ab..ff8d5e7 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 -@@ -45,8 +45,8 @@ import org.jvnet.jaxb2.maven2.util.ArtifactUtils; - import org.jvnet.jaxb2.maven2.util.CollectionUtils; - import org.jvnet.jaxb2.maven2.util.IOUtils; - --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 --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 52ce6b2..82c8372 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 -@@ -6,7 +6,7 @@ import java.net.URL; - import java.text.MessageFormat; - - 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 --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 a5e80f1..3d8ed45 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 -@@ -8,10 +8,10 @@ import java.text.MessageFormat; - import org.jvnet.jaxb2.maven2.DependencyResource; - import org.jvnet.jaxb2.maven2.DependencyResourceResolver; - --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; --- -1.7.9 - diff --git a/sources b/sources index ad9153f..db8447e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa17ab43a24401adc30a569c0eaf5819 maven-jaxb2-plugin-0.8.1.tar.gz +d83ecd43a5bc588250318f0f7dc5af08 maven-jaxb2-plugin-0.9.1.tar.gz