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 @@
</parent>
<dependencies>
<dependency>
- <groupId>com.sun.org.apache.xml.internal</groupId>
- <artifactId>resolver</artifactId>
- <version>20050927</version>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>1.2</version>
</dependency>
<!-- Maven plugin and api classes -->
<dependency>
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;