From e0533da0f25b54e6ab5371a1a4510594a00f5c29 Mon Sep 17 00:00:00 2001
From: Frank Gasdorf <fgdrf@users.sourceforge.net>
Date: Fri, 5 Nov 2021 23:52:04 +0100
Subject: [PATCH] [CQ-2136] using org.apache.xml.resolver from Orbit (#574)

* [CQ-18796] using Orbit org.apache.commons.io

and exclude unused commons-math from libs-bundle

Change-Id: Ic39792cd55b6e1cd734a4efba21fa579df4a3e12
Signed-off-by: Frank Gasdorf <fgdrf@users.sourceforge.net>

* [CQ-2136] using org.apache.xml.resolver from Orbit

Change-Id: Ia8b98b4ee6ee5ca5c48bd72a31bccd1a2e827bee
Signed-off-by: Frank Gasdorf <fgdrf@users.sourceforge.net>
---
 .../org.locationtech.udig.target.target       |   1 +
 .../org.locationtech.udig.libs.tests.launch   | 206 ++++++++++++++----
 .../udig/libs/tests/GeoToolsTest.java         |  14 +-
 plugins/org.locationtech.udig.libs/.classpath |   1 -
 .../META-INF/MANIFEST.MF                      |  11 +-
 .../build.properties                          |   1 -
 .../org.locationtech.udig.libs/pom-libs.xml   |   7 +
 7 files changed, 187 insertions(+), 54 deletions(-)

diff --git a/extras/org.locationtech.udig.target/org.locationtech.udig.target.target b/extras/org.locationtech.udig.target/org.locationtech.udig.target.target
index bf958aa708..43b78dda04 100644
--- a/extras/org.locationtech.udig.target/org.locationtech.udig.target.target
+++ b/extras/org.locationtech.udig.target/org.locationtech.udig.target.target
@@ -131,6 +131,7 @@
 <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
 <unit id="org.apache.ws.commons.util" version="1.0.2.v20160817-1930"/>
 <unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/>
+<unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/>
 <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/>
 </location>
 </locations>
diff --git a/plugins/org.locationtech.udig.libs.tests/org.locationtech.udig.libs.tests.launch b/plugins/org.locationtech.udig.libs.tests/org.locationtech.udig.libs.tests.launch
index f895d6a496..b7f4c71213 100644
--- a/plugins/org.locationtech.udig.libs.tests/org.locationtech.udig.libs.tests.launch
+++ b/plugins/org.locationtech.udig.libs.tests/org.locationtech.udig.libs.tests.launch
@@ -1,45 +1,167 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="net.sf.opencsv,org.locationtech.udig.bookmarks,org.locationtech.udig.bookmarks.tests,org.locationtech.udig.catalog.arcgrid,org.locationtech.udig.catalog.arcsde,org.locationtech.udig.catalog.csw,org.locationtech.udig.catalog.db2,org.locationtech.udig.catalog.geotiff,org.locationtech.udig.catalog.geotools,org.locationtech.udig.catalog.google2,org.locationtech.udig.catalog.imageio,org.locationtech.udig.catalog.jgrass,org.locationtech.udig.catalog.kml,org.locationtech.udig.catalog.mysql,org.locationtech.udig.catalog.oracle,org.locationtech.udig.catalog.postgis,org.locationtech.udig.catalog.rasterings,org.locationtech.udig.catalog.shp,org.locationtech.udig.catalog.teradata,org.locationtech.udig.catalog.test.geotiff,org.locationtech.udig.catalog.tests,org.locationtech.udig.catalog.tests.shp,org.locationtech.udig.catalog.tests.ui,org.locationtech.udig.catalog.tests.wfs,org.locationtech.udig.catalog.tests.wms,org.locationtech.udig.catalog.wfs,org.locationtech.udig.catalog.wms,org.locationtech.udig.catalog.wmt,org.locationtech.udig.catalog.worldimage,org.locationtech.udig.context,org.locationtech.udig.feature.editor,org.locationtech.udig.graph,org.locationtech.udig.help,org.locationtech.udig.image.georeferencing,org.locationtech.udig.info,org.locationtech.udig.issues,org.locationtech.udig.issues.test,org.locationtech.udig.jconsole,org.locationtech.udig.legend,org.locationtech.udig.libs.db2,org.locationtech.udig.libs.oracle,org.locationtech.udig.location,org.locationtech.udig.location.test,org.locationtech.udig.mapgraphic.tests,org.locationtech.udig.omsbox,org.locationtech.udig.printing.model,org.locationtech.udig.printing.model.edit,org.locationtech.udig.printing.ui,org.locationtech.udig.project.tests,org.locationtech.udig.project.tests.ui,org.locationtech.udig.project.ui.editor,org.locationtech.udig.render.feature.basic,org.locationtech.udig.render.feature.basic.test,org.locationtech.udig.render.feature.shapefile,org.locationtech.udig.render.gridcoverage.basic,org.locationtech.udig.render.wms.basic,org.locationtech.udig.render.wms.basic.test,org.locationtech.udig.render.wmt.basic,org.locationtech.udig.socket,org.locationtech.udig.style.advanced,org.locationtech.udig.style.jgrass,org.locationtech.udig.style.tests,org.locationtech.udig.style.wms,org.locationtech.udig.tests.catalog.wmt,org.locationtech.udig.tests.info,org.locationtech.udig.tool.default,org.locationtech.udig.tool.default.tests,org.locationtech.udig.tool.edit.tests,org.locationtech.udig.tool.select,org.locationtech.udig.tool.select.tests,org.locationtech.udig.tools,org.locationtech.udig.tools.edit,org.locationtech.udig.tools.jgrass,org.locationtech.udig.tools.tests,org.locationtech.udig.tutorials.catalog.csv,org.locationtech.udig.tutorials.catalog.tests.csv,org.locationtech.udig.tutorials.customapp,org.locationtech.udig.tutorials.distanceTool,org.locationtech.udig.tutorials.examples,org.locationtech.udig.tutorials.featureeditor,org.locationtech.udig.tutorials.genericprojectelement,org.locationtech.udig.tutorials.mapgraphic,org.locationtech.udig.tutorials.preferredzoomlevels,org.locationtech.udig.tutorials.raster,org.locationtech.udig.tutorials.rcp,org.locationtech.udig.tutorials.render.csv,org.locationtech.udig.tutorials.shpexport,org.locationtech.udig.tutorials.style.color,org.locationtech.udig.tutorials.tool-view,org.locationtech.udig.tutorials.tool.coordinate,org.locationtech.udig.tutorials.tool.coverage,org.locationtech.udig.tutorials.tracking,org.locationtech.udig.tutorials.urladapter,org.locationtech.udig.tutorials.workbench,org.locationtech.udig.ui.tests,org.locationtech.udig.validation,org.locationtech.udig.validation.test,org.locationtech.udig_base"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.locationtech.udig.libs.tests"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.locationtech.udig.libs.tests"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.locationtech.udig.libs.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.locationtech.udig.product"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.ibm.icu@default:default,com.lowagie.text@default:default,javax.media.jai_imageio@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,net.miginfocom.layout.swt@default:default,net.miginfocom.layout@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.el@default:default,org.apache.commons.logging@default:default,org.apache.jasper@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.lucene@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime@default:true,org.eclipse.draw2d@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences*3.4.2.v20120111-2020@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.update.core@default:default,org.eclipse.update.ui@default:default,org.eclipse.xsd@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.mortbay.jetty.server@default:default,org.mortbay.jetty.util@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,org.eclipse.swt@default:default,org.eclipse.swt.gtk.linux.x86@default:default,org.eclipse.swt.gtk.linux.x86_64@default:default,org.eclipse.swt.win32.win32.x86@default:default,org.eclipse.swt.win32.win32.x86_64@default:default,org.eclipse.swt.cocoa.macosx.x86@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.locationtech.udig.browser@default:default,org.locationtech.udig.catalog.ui@default:default,org.locationtech.udig.catalog@default:default,org.locationtech.udig.core@default:default,org.locationtech.udig.libs.tests@default:default,org.locationtech.udig.libs@default:default,org.locationtech.udig.mapgraphic@default:default,org.locationtech.udig.project.edit@default:default,org.locationtech.udig.project.ui@default:default,org.locationtech.udig.project@default:default,org.locationtech.udig.style.sld@default:default,org.locationtech.udig.style@default:default,org.locationtech.udig.ui@default:default,org.locationtech.udig@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <booleanAttribute key="askclear" value="false"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="false"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="false"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/org.locationtech.udig.libs.tests"/>
+    <booleanAttribute key="default" value="false"/>
+    <setAttribute key="deselected_workspace_bundles"/>
+    <booleanAttribute key="includeOptional" value="true"/>
+    <stringAttribute key="location" value="${workspace_loc:org.locationtech.udig.libs.tests/target}"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/org.locationtech.udig.libs.tests"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="4"/>
+    </listAttribute>
+    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.locationtech.udig.libs.tests"/>
+    <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+    <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.locationtech.udig.libs.tests"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.locationtech.udig.product"/>
+    <booleanAttribute key="run_in_ui_thread" value="true"/>
+    <setAttribute key="selected_target_bundles">
+        <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.ibm.icu@default:default"/>
+        <setEntry value="com.sun.jna.platform@default:default"/>
+        <setEntry value="com.sun.jna@default:default"/>
+        <setEntry value="com.sun.xml.bind@default:default"/>
+        <setEntry value="javax.activation@default:default"/>
+        <setEntry value="javax.inject@default:default"/>
+        <setEntry value="javax.media.jai_imageio@default:default"/>
+        <setEntry value="javax.servlet@default:default"/>
+        <setEntry value="javax.xml.bind@default:default"/>
+        <setEntry value="javax.xml.stream@default:default"/>
+        <setEntry value="javax.xml@default:default"/>
+        <setEntry value="net.bytebuddy.byte-buddy-agent@default:default"/>
+        <setEntry value="net.bytebuddy.byte-buddy@default:default"/>
+        <setEntry value="net.miginfocom.layout.swt@default:default"/>
+        <setEntry value="net.miginfocom.layout@default:default"/>
+        <setEntry value="org.apache.batik.anim@default:default"/>
+        <setEntry value="org.apache.batik.awt.util@default:default"/>
+        <setEntry value="org.apache.batik.bridge@default:default"/>
+        <setEntry value="org.apache.batik.constants*1.13.0.v20200622-2037@default:default"/>
+        <setEntry value="org.apache.batik.css*1.13.0.v20200622-2037@default:default"/>
+        <setEntry value="org.apache.batik.dom.svg@default:default"/>
+        <setEntry value="org.apache.batik.dom@default:default"/>
+        <setEntry value="org.apache.batik.ext@default:default"/>
+        <setEntry value="org.apache.batik.gvt@default:default"/>
+        <setEntry value="org.apache.batik.i18n*1.13.0.v20200622-2037@default:default"/>
+        <setEntry value="org.apache.batik.parser@default:default"/>
+        <setEntry value="org.apache.batik.script@default:default"/>
+        <setEntry value="org.apache.batik.util*1.13.0.v20200622-2037@default:default"/>
+        <setEntry value="org.apache.batik.xml@default:default"/>
+        <setEntry value="org.apache.commons.codec@default:default"/>
+        <setEntry value="org.apache.commons.httpclient@default:default"/>
+        <setEntry value="org.apache.commons.io@default:default"/>
+        <setEntry value="org.apache.commons.jxpath@default:default"/>
+        <setEntry value="org.apache.commons.logging*1.2.0.v20180409-1502@default:default"/>
+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
+        <setEntry value="org.apache.felix.scr@1:true"/>
+        <setEntry value="org.apache.log4j@default:default"/>
+        <setEntry value="org.apache.ws.commons.util@default:default"/>
+        <setEntry value="org.apache.xalan@default:default"/>
+        <setEntry value="org.apache.xerces@default:default"/>
+        <setEntry value="org.apache.xml.resolver@default:default"/>
+        <setEntry value="org.apache.xml.serializer@default:default"/>
+        <setEntry value="org.apache.xmlgraphics*2.4.0.v20200622-2037@default:default"/>
+        <setEntry value="org.eclipse.ant.core@default:default"/>
+        <setEntry value="org.eclipse.compare.core@default:default"/>
+        <setEntry value="org.eclipse.core.commands@default:default"/>
+        <setEntry value="org.eclipse.core.contenttype@default:default"/>
+        <setEntry value="org.eclipse.core.databinding.observable@default:default"/>
+        <setEntry value="org.eclipse.core.databinding.property@default:default"/>
+        <setEntry value="org.eclipse.core.databinding@default:default"/>
+        <setEntry value="org.eclipse.core.expressions@default:default"/>
+        <setEntry value="org.eclipse.core.filesystem.win32.x86_64@default:false"/>
+        <setEntry value="org.eclipse.core.filesystem@default:default"/>
+        <setEntry value="org.eclipse.core.jobs@default:default"/>
+        <setEntry value="org.eclipse.core.resources.win32.x86_64@default:false"/>
+        <setEntry value="org.eclipse.core.resources@default:default"/>
+        <setEntry value="org.eclipse.core.runtime@default:true"/>
+        <setEntry value="org.eclipse.core.variables@default:default"/>
+        <setEntry value="org.eclipse.e4.core.commands@default:default"/>
+        <setEntry value="org.eclipse.e4.core.contexts@default:default"/>
+        <setEntry value="org.eclipse.e4.core.di.annotations@default:default"/>
+        <setEntry value="org.eclipse.e4.core.di.extensions.supplier@default:default"/>
+        <setEntry value="org.eclipse.e4.core.di.extensions@default:default"/>
+        <setEntry value="org.eclipse.e4.core.di@default:default"/>
+        <setEntry value="org.eclipse.e4.core.services@default:default"/>
+        <setEntry value="org.eclipse.e4.emf.xpath@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.bindings@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.css.core@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.css.swt.theme@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.css.swt@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.di@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.model.workbench@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.services@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.widgets@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.workbench.addons.swt@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.workbench.renderers.swt@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.workbench.swt@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.workbench3@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.workbench@default:default"/>
+        <setEntry value="org.eclipse.emf.common@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore.change@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore.xmi@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore@default:default"/>
+        <setEntry value="org.eclipse.equinox.app@default:default"/>
+        <setEntry value="org.eclipse.equinox.bidi@default:default"/>
+        <setEntry value="org.eclipse.equinox.common@2:true"/>
+        <setEntry value="org.eclipse.equinox.event@default:default"/>
+        <setEntry value="org.eclipse.equinox.preferences@default:default"/>
+        <setEntry value="org.eclipse.equinox.registry@default:default"/>
+        <setEntry value="org.eclipse.help@default:default"/>
+        <setEntry value="org.eclipse.jface.databinding@default:default"/>
+        <setEntry value="org.eclipse.jface@default:default"/>
+        <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
+        <setEntry value="org.eclipse.osgi.services@default:default"/>
+        <setEntry value="org.eclipse.osgi.util@default:default"/>
+        <setEntry value="org.eclipse.osgi@-1:true"/>
+        <setEntry value="org.eclipse.swt.win32.win32.x86_64@default:false"/>
+        <setEntry value="org.eclipse.swt@default:default"/>
+        <setEntry value="org.eclipse.team.core@default:default"/>
+        <setEntry value="org.eclipse.ui.workbench@default:default"/>
+        <setEntry value="org.eclipse.ui@default:default"/>
+        <setEntry value="org.eclipse.xsd@default:default"/>
+        <setEntry value="org.hamcrest.core@default:default"/>
+        <setEntry value="org.junit@default:default"/>
+        <setEntry value="org.mockito@default:default"/>
+        <setEntry value="org.objenesis@default:default"/>
+        <setEntry value="org.w3c.css.sac@default:default"/>
+        <setEntry value="org.w3c.dom.events@default:default"/>
+        <setEntry value="org.w3c.dom.smil@default:default"/>
+        <setEntry value="org.w3c.dom.svg@default:default"/>
+    </setAttribute>
+    <setAttribute key="selected_workspace_bundles">
+        <setEntry value="org.locationtech.udig.core.tests@default:false"/>
+        <setEntry value="org.locationtech.udig.core@default:default"/>
+        <setEntry value="org.locationtech.udig.libs.jfreechart@default:default"/>
+        <setEntry value="org.locationtech.udig.libs.tests@default:default"/>
+        <setEntry value="org.locationtech.udig.libs@default:default"/>
+        <setEntry value="org.locationtech.udig.log4j.appender@default:false"/>
+        <setEntry value="org.locationtech.udig.ui.tests@default:default"/>
+        <setEntry value="org.locationtech.udig.ui@default:default"/>
+    </setAttribute>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <stringAttribute key="testApplication" value="org.locationtech.udig.ui.application"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useProduct" value="false"/>
 </launchConfiguration>
diff --git a/plugins/org.locationtech.udig.libs.tests/src/org/locationtech/udig/libs/tests/GeoToolsTest.java b/plugins/org.locationtech.udig.libs.tests/src/org/locationtech/udig/libs/tests/GeoToolsTest.java
index 3a0ab8f521..96057270ad 100644
--- a/plugins/org.locationtech.udig.libs.tests/src/org/locationtech/udig/libs/tests/GeoToolsTest.java
+++ b/plugins/org.locationtech.udig.libs.tests/src/org/locationtech/udig/libs/tests/GeoToolsTest.java
@@ -23,6 +23,7 @@
 import org.geotools.renderer.style.svg.SVGGraphicFactory;
 import org.geotools.util.Version;
 import org.geotools.util.factory.GeoTools;
+import org.geotools.xml.resolver.SchemaCatalog;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -39,7 +40,7 @@
  * @since 1.2.0
  */
 public class GeoToolsTest {
-    
+
     /**
      * @throws java.lang.Exception
      */
@@ -62,14 +63,14 @@ public void testGeoTools(){
     @Test
     public void testSVGGraphicsFactory() throws Exception {
         URL url = GeoToolsTest.class.getResource("example.svg");
-        
+
         SVGGraphicFactory svgFactory = new SVGGraphicFactory();
         FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(null);
         Literal expr = ff.literal( url.toExternalForm() );
-        
+
         Icon icon = svgFactory.getIcon(null, expr, "image/svg",16 );
         assertNotNull( icon );
-        
+
     }
 
 //    @Ignore("FIXME: due to migration to batik bundle from Orbit")
@@ -81,4 +82,9 @@ public void testSVGGraphicsFactory() throws Exception {
 //        SAXSVGDocumentFactory f = new SAXSVGDocumentFactory(parser);
 //        f.createDocument(url.toString());
 //    }
+
+    @Test
+    public void testLoadClassSchemaCatalogWithResolverDependencies() throws Exception {
+        assertNotNull("class need org.apache.xml.resolver dependency to load", SchemaCatalog.build(new URL("http://maven.apache.org/xsd/maven-4.0.0.xsd")));
+    }
 }
diff --git a/plugins/org.locationtech.udig.libs/.classpath b/plugins/org.locationtech.udig.libs/.classpath
index 2c55a6c8f0..a83643b32a 100644
--- a/plugins/org.locationtech.udig.libs/.classpath
+++ b/plugins/org.locationtech.udig.libs/.classpath
@@ -194,7 +194,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/uom-lib-common-1.0.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/uom-se-1.0.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/wkb4j-1.0-RC1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xml-commons-resolver-1.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-compiler-3.0.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gdal-2.2.0.jar"/>
diff --git a/plugins/org.locationtech.udig.libs/META-INF/MANIFEST.MF b/plugins/org.locationtech.udig.libs/META-INF/MANIFEST.MF
index ff1b495934..3ea4ad2b70 100644
--- a/plugins/org.locationtech.udig.libs/META-INF/MANIFEST.MF
+++ b/plugins/org.locationtech.udig.libs/META-INF/MANIFEST.MF
@@ -182,6 +182,11 @@ Import-Package: com.google.common.annotations;version="27.0.0",
  org.apache.commons.io.output;version="2.4.0",
  org.apache.ws.commons.serialize;version="1.0.2",
  org.apache.ws.commons.util;version="1.0.2",
+ org.apache.xml.resolver;version="1.2.0",
+ org.apache.xml.resolver.apps;version="1.2.0",
+ org.apache.xml.resolver.helpers;version="1.2.0",
+ org.apache.xml.resolver.readers;version="1.2.0",
+ org.apache.xml.resolver.tools;version="1.2.0",
  org.jfree;version="1.0.13",
  org.jfree.base;version="1.0.13",
  org.jfree.base.config;version="1.0.13",
@@ -433,7 +438,6 @@ Bundle-ClassPath: .,
  lib/uom-lib-common-1.0.2.jar,
  lib/uom-se-1.0.8.jar,
  lib/wkb4j-1.0-RC1.jar,
- lib/xml-commons-resolver-1.2.jar,
  lib/xpp3_min-1.1.4c.jar
 Export-Package: .,
  au.com.objectix.jgridshift,
@@ -651,11 +655,6 @@ Export-Package: .,
  org.apache.commons.lang3.math;version="3.8.1",
  org.apache.commons.pool;version="1.5.4",
  org.apache.commons.pool.impl;version="1.5.4",
- org.apache.xml.resolver;version="1.2.0",
- org.apache.xml.resolver.apps;version="1.2.0",
- org.apache.xml.resolver.helpers;version="1.2.0",
- org.apache.xml.resolver.readers;version="1.2.0",
- org.apache.xml.resolver.tools;version="1.2.0",
  org.codehaus.janino,
  org.codehaus.janino.samples,
  org.codehaus.janino.tools,
diff --git a/plugins/org.locationtech.udig.libs/build.properties b/plugins/org.locationtech.udig.libs/build.properties
index b82692ffcd..2908ad4667 100644
--- a/plugins/org.locationtech.udig.libs/build.properties
+++ b/plugins/org.locationtech.udig.libs/build.properties
@@ -205,7 +205,6 @@ bin.includes = .,\
                lib/uom-lib-common-1.0.2.jar,\
                lib/uom-se-1.0.8.jar,\
                lib/wkb4j-1.0-RC1.jar,\
-               lib/xml-commons-resolver-1.2.jar,\
                log4j.xml,\
                lib/xpp3_min-1.1.4c.jar
 src.includes = pom-libs.xml,\
diff --git a/plugins/org.locationtech.udig.libs/pom-libs.xml b/plugins/org.locationtech.udig.libs/pom-libs.xml
index 5aea905065..f37bf74690 100644
--- a/plugins/org.locationtech.udig.libs/pom-libs.xml
+++ b/plugins/org.locationtech.udig.libs/pom-libs.xml
@@ -483,6 +483,13 @@
 			<version>3.1</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.xml</groupId>
+			<artifactId>xml-commons-resolver</artifactId>
+			<version>1.2</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- add jdbc drivers dependencies -->
 		<!-- normally drivers will be retrieved from the dependencies of the 
 			 corresponding gt-jdbc-xxx geotools packages. Usually the latest