81 lines
3.8 KiB
Diff
81 lines
3.8 KiB
Diff
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 @@
|
|
<artifactId>commons-lang3</artifactId>
|
|
</dependency>
|
|
<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>
|
|
<dependency>
|
|
<groupId>org.glassfish.jaxb</groupId>
|
|
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
|
|
- 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 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;
|
|
|
|
-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/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;
|
|
|
|
-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 {
|
|
|
|
--
|
|
2.33.0
|
|
|