Remove xalan/xercies dependency declarations

Author: mackdk

java/buildconf/build-props.xml

@@ -165,13 +165,11 @@
 
   <property name="build.jar.dependencies"
       value="ant ant-junit ${ant-contrib.path} antlr  ${test.build.jar.dependencies}
-      ${common.jar.dependencies} ${tomcat-jars} ${jasper-jars}
-       xalan-j2" />
+      ${common.jar.dependencies} ${tomcat-jars} ${jasper-jars}" />
 
   <property name="run.jar.dependencies"
       value="antlr objectweb-asm/asm ${cglib-jar} ${c3p0} commons-discovery dom4j ${jaf} ${jta11-jars} ojdbc14 sitemesh
-             taglibs-standard-impl taglibs-standard-jstlel taglibs-standard-spec
-             xalan-j2 xalan-j2-serializer xerces-j2 ${common.jar.dependencies}" />
+             taglibs-standard-impl taglibs-standard-jstlel taglibs-standard-spec ${common.jar.dependencies}" />
 
   <!-- =================== RPM build, use jpackage syntax ======================= -->
   <!-- property name="install.test.jar.dependencies"
@@ -188,12 +186,12 @@
 
   <property name="install.build.jar.dependencies"
       value="ant ant/ant-junit ${ant-contrib.path} antlr ${jasper-jars} ${test.build.jar.dependencies}
-      ${install.common.jar.dependencies} xalan-j2" />
+      ${install.common.jar.dependencies}" />
 
   <property name="install.run.jar.dependencies"
       value="antlr objectweb-asm/asm ${cglib-jar} ${c3p0} commons-discovery dom4j ${jaf} ${jta11-jars} sitemesh
              taglibs-standard-impl taglibs-standard-jstlel taglibs-standard-spec
-             xalan-j2 xalan-j2-serializer xerces-j2 ${install.common.jar.dependencies}" />
+             ${install.common.jar.dependencies}" />
 
   <property name="install.common.jar.dependencies"
       value="bcel ${cglib-jar} commons-beanutils commons-cli commons-codec
@@ -219,7 +217,7 @@
              taglibs-standard-impl taglibs-standard-jstlel taglibs-standard-spec
              postgresql-jdbc ongres-scram/client ongres-scram/common ${stringprep-jars}
              snakeyaml simpleframework/simplexml ${suse-common-jars} ${suse-runtime-jars}
-	     xalan-j2 xalan-j2-serializer xerces-j2 simple-core ${ehcache}" />
+	         simple-core ${ehcache}" />
 
   <property name="taskomatic.jar.dependencies"
       value="${dist.jar.dependencies} jsch" />

java/buildconf/ivy/ivy-suse.xml

@@ -97,9 +97,6 @@
         <dependency org="suse" name="taglibs-standard-jstlel" rev="1.2.5" />
         <dependency org="suse" name="taglibs-standard-spec" rev="1.2.5" />
         <dependency org="suse" name="woodstox-core-asl" rev="4.4.2" />
-        <dependency org="suse" name="xalan" rev="2.7.3" />
-        <dependency org="suse" name="serializer" rev="2.7.3" />
-        <dependency org="suse" name="xercesImpl" rev="2.12.2" />
         <dependency org="suse" name="xmlsec" rev="2.0.7" />
         <dependency org="suse" name="jaxb-api" rev="2.4.0" />
         <dependency org="suse" name="javax.activation" rev="1.2.0" />

java/buildconf/ivy/obs-maven-config.yaml

@@ -290,17 +290,6 @@ artifacts:
   - artifact: woodstox-core-asl
     package: woodstox
     repository: Uyuni_Other
-  - artifact: xalan
-    package: xalan-j2
-    jar: xalan-j2\.jar
-    repository: Leap_sle
-  - artifact: serializer
-    package: xalan-j2
-    jar: xalan-j2-serializer\.jar
-    repository: Leap_sle
-  - artifact: xercesImpl
-    package: xerces-j2
-    repository: Leap
   - artifact: xmlsec
     repository: Uyuni_Other
   - artifact: velocity-engine-core

java/core/pom.xml

@@ -405,18 +405,6 @@
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>woodstox-core-asl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>serializer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.santuario</groupId>
             <artifactId>xmlsec</artifactId>

java/pom.xml

@@ -670,35 +670,6 @@
                 <artifactId>taglibs-standard-spec</artifactId>
                 <version>1.2.5</version>
             </dependency>
-            <dependency>
-                <groupId>xalan</groupId>
-                <artifactId>xalan</artifactId>
-                <version>2.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>xalan</groupId>
-                <artifactId>serializer</artifactId>
-                <version>2.7.3</version>
-                <exclusions>
-                    <!-- We do not provide this at runtime -->
-                    <exclusion>
-                        <groupId>xml-apis</groupId>
-                        <artifactId>xml-apis</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>xerces</groupId>
-                <artifactId>xercesImpl</artifactId>
-                <version>2.12.2</version>
-                <exclusions>
-                    <!-- We do not provide this at runtime -->
-                    <exclusion>
-                        <groupId>xml-apis</groupId>
-                        <artifactId>xml-apis</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.apache.santuario</groupId>
                 <artifactId>xmlsec</artifactId>

java/spacewalk-java.changes.mackdk.drop-xalan-xerces

@@ -0,0 +1 @@
+- Removed xalan and xerces dependency

java/spacewalk-java.spec

@@ -148,7 +148,6 @@ BuildRequires:  tomcat-lib >= 7
 BuildRequires:  tomcat-taglibs-standard
 BuildRequires:  uyuni-base-server
 BuildRequires:  woodstox
-BuildRequires:  xalan-j2
 BuildRequires:  xmlsec
 BuildRequires:  (google-gson >= 2.2.4 with google-gson < 2.10.0)
 BuildRequires:  mvn(org.apache.velocity:velocity-engine-core) >= 2.2
@@ -238,8 +237,6 @@ Requires:       system-lock-formula
 Requires:       tomcat-lib >= 7
 Requires:       tomcat-taglibs-standard
 Requires:       woodstox
-Requires:       xalan-j2 >= 2.6.0
-Requires:       xerces-j2
 Requires:       xmlsec
 Requires:       (/sbin/unix2_chkpwd or /usr/sbin/unix2_chkpwd)
 Requires:       (google-gson >= 2.2.4 with google-gson < 2.10.0)
@@ -386,8 +383,6 @@ Requires:       spacewalk-java-jdbc
 Requires:       spacewalk-java-lib = %{version}
 Requires:       statistics
 Requires:       tomcat-taglibs-standard
-Requires:       xalan-j2 >= 2.6.0
-Requires:       xerces-j2
 Requires:       (/sbin/unix2_chkpwd or /usr/sbin/unix2_chkpwd)
 Requires:       mvn(org.hibernate:hibernate-c3p0)
 Requires:       mvn(org.hibernate:hibernate-core)