summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2011-09-10 22:25:45 +0000
committerRobert Gemmell <robbie@apache.org>2011-09-10 22:25:45 +0000
commit27cd097cfccb263e80becc8f12d94ebc529752ad (patch)
tree42a2e84acfa4ceda087d89c3686a6c66e7a56298 /java
parent5270591c7831e559925e720c6bfc0c78c514b95a (diff)
downloadqpid-python-27cd097cfccb263e80becc8f12d94ebc529752ad.tar.gz
QPID-2627: update build.deps to reflect removal of dependency on mina and ensure the generated client poms are correct, delete the associated maven dependency stubs which become unused
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1167617 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/build.deps5
-rw-r--r--java/lib/poms/mina-core-1.1.7.xml22
-rw-r--r--java/lib/poms/mina-filter-ssl-1.1.7.xml22
3 files changed, 1 insertions, 48 deletions
diff --git a/java/build.deps b/java/build.deps
index 100aa87a2a..2c56a4a911 100644
--- a/java/build.deps
+++ b/java/build.deps
@@ -34,9 +34,6 @@ junit=lib/junit-3.8.1.jar
log4j=lib/log4j-1.2.12.jar
-mina-core=lib/mina-core-1.1.7.jar
-mina-filter-ssl=lib/mina-filter-ssl-1.1.7.jar
-
slf4j-api=lib/slf4j-api-1.6.1.jar
slf4j-log4j=lib/slf4j-log4j12-1.6.1.jar
@@ -55,7 +52,7 @@ felix.libs=${osgi-core} ${felix-framework}
commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration}
-common.libs=${slf4j-api} ${mina-core} ${mina-filter-ssl}
+common.libs=${slf4j-api}
client.libs=${geronimo-jms}
tools.libs=${commons-configuration.libs} ${log4j}
broker.libs=${commons-cli} ${commons-logging} ${log4j} ${slf4j-log4j} \
diff --git a/java/lib/poms/mina-core-1.1.7.xml b/java/lib/poms/mina-core-1.1.7.xml
deleted file mode 100644
index eee6108082..0000000000
--- a/java/lib/poms/mina-core-1.1.7.xml
+++ /dev/null
@@ -1,22 +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>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>1.1.7</version>
-</dep>
diff --git a/java/lib/poms/mina-filter-ssl-1.1.7.xml b/java/lib/poms/mina-filter-ssl-1.1.7.xml
deleted file mode 100644
index 52daba7eed..0000000000
--- a/java/lib/poms/mina-filter-ssl-1.1.7.xml
+++ /dev/null
@@ -1,22 +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>org.apache.mina</groupId>
- <artifactId>mina-filter-ssl</artifactId>
- <version>1.1.7</version>
-</dep>