From 5a522b41140445735db6b0e2dd0f20501ac56a88 Mon Sep 17 00:00:00 2001
From: Robert Gemmell
 <robbie@apache.org =  robbie = Robert Gemmell robbie@apache.org@apache.org>
Date: Sun, 13 Apr 2014 14:12:12 +0000
Subject: QPID-5675: remove the unused xalan dependency, matching previous
 change in the maven build

merge from trunk r1586028

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.28@1586995 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/build.deps               |  4 +---
 qpid/java/ivy.retrieve.xml         |  1 -
 qpid/java/lib/poms/xalan-2.7.0.xml | 30 ------------------------------
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 qpid/java/lib/poms/xalan-2.7.0.xml

diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index d596a6b228..73fbc7a300 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -47,8 +47,6 @@ log4j=lib/required/log4j-1.2.16.jar
 slf4j-api=lib/required/slf4j-api-1.6.4.jar
 slf4j-log4j=lib/required/slf4j-log4j12-1.6.4.jar
 
-xalan=lib/required/xalan-2.7.0.jar
-
 jetty=lib/required/jetty-server-8.1.14.v20131031.jar
 jetty-continuation=lib/required/jetty-continuation-8.1.14.v20131031.jar
 jetty-security=lib/required/jetty-security-8.1.14.v20131031.jar
@@ -77,7 +75,7 @@ amqp-1-0-client-jms.libs=${geronimo-jms}
 amqp-1-0-client-websocket.libs = ${jetty} ${jetty-continuation} ${jetty-security} ${jetty-http} ${jetty-io} ${jetty-servlet} ${jetty-util} ${servlet-api} ${jetty-websocket}
 tools.libs=${commons-configuration.libs} ${log4j}
 broker-core.libs=${commons-cli} ${commons-logging} ${log4j} ${slf4j-log4j} \
-    ${xalan} ${derby-db} ${commons-configuration.libs} \
+    ${derby-db} ${commons-configuration.libs} \
     ${jackson-core} ${jackson-mapper} ${jetty} ${jetty-continuation} ${jetty-security} ${jetty-http} ${jetty-io} ${jetty-servlet} ${jetty-util} ${servlet-api} ${jetty-websocket} ${bcel}
 
 #Borrow the broker-core libs, hack for release binary generation
diff --git a/qpid/java/ivy.retrieve.xml b/qpid/java/ivy.retrieve.xml
index 1c2d178cee..acfd0632d6 100644
--- a/qpid/java/ivy.retrieve.xml
+++ b/qpid/java/ivy.retrieve.xml
@@ -69,7 +69,6 @@
     <dependency org="org.eclipse.jetty" name="jetty-security" rev="8.1.14.v20131031" transitive="false"/>
     <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="8.1.14.v20131031" transitive="false"/>
     <dependency org="org.eclipse.jetty" name="jetty-util" rev="8.1.14.v20131031" transitive="false"/>
-    <dependency org="xalan" name="xalan" rev="2.7.0" transitive="false"/>
     <dependency org="velocity" name="velocity" rev="1.4" transitive="false"/>
     <dependency org="velocity" name="velocity-dep" rev="1.4" transitive="false"/>
     <dependency org="org.dojotoolkit" name="dojo" rev="1.9.1" transitive="false">
diff --git a/qpid/java/lib/poms/xalan-2.7.0.xml b/qpid/java/lib/poms/xalan-2.7.0.xml
deleted file mode 100644
index 3fd89aacd8..0000000000
--- a/qpid/java/lib/poms/xalan-2.7.0.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>xalan</groupId>
-  <artifactId>xalan</artifactId>
-  <version>2.7.0</version>
-  <exclusions>
-    <exclusion>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-    </exclusion>
-  </exclusions>
-</dep>
-
-
-- 
cgit v1.2.1