Merge pull request #547 from opengeospatial/DocumentBuilderFactory-544

Move xml-apis dependency to common-libs
opengeospatial · Jul 28, 2022 · 0ef53d4 · 0ef53d4
2 parents 010b912 + ae42dce
commit 0ef53d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/site/markdown/installation.md b/src/site/markdown/installation.md
@@ -126,7 +126,7 @@ The recommended JVM options for the Tomcat instance are shown below.
 Note that the maximum memory heap size (`-Xmx`) may need to be increased
 as the number of concurrent users increases.
 
-`CATALINA_OPTS="-server -Xmx1024m -XX:MaxPermSize=128m -DTE_BASE=$TE_BASE -Dderby.system.home=$DERBY_DATA -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"`
+`CATALINA_OPTS="-server -Xmx1024m -XX:MaxPermSize=128m -DTE_BASE=$TE_BASE -Dderby.system.home=$DERBY_DATA"`
 
 Unpack the contents of the teamengine-common-libs archive into the
 CATALINA_BASE/lib directory. Deploy the `teamengine.war` component by

diff --git a/teamengine-web/pom.xml b/teamengine-web/pom.xml
@@ -150,6 +150,7 @@
             WEB-INF/lib/asm-*.jar,
             WEB-INF/lib/derby-*.jar,
             WEB-INF/lib/xercesImpl-*.jar,
+            WEB-INF/lib/xml-apis-*.jar,
           </packagingExcludes>
           <archive>
             <manifest>

diff --git a/teamengine-web/src/assembly/common-libs.xml b/teamengine-web/src/assembly/common-libs.xml
@@ -16,6 +16,7 @@
         <include>org.apache.derby:derby</include>
         <include>org.opengis.cite.teamengine:teamengine-realm</include>
         <include>xerces:xercesImpl</include>
+        <include>xml-apis:xml-apis</include>
       </includes>
       <scope>runtime</scope>
       <useProjectArtifact>false</useProjectArtifact>