From 9b92aa7b4a55c8cdc84405125429aab85165afe2 Mon Sep 17 00:00:00 2001
From: Juan Hernandez <juan.hernandez@redhat.com>
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 @@
</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 --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