From bd516336ebe48c486eb4ae0c62a05bac221c38ca Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Thu, 14 Jul 2011 13:02:43 +0000
Subject: QPID-2498: upgrade Mina to 1.1.7.

Applied patch by Keith Wall <keith.wall@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1146677 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/lib/backport-util-concurrent-2.2.jar     | Bin 326319 -> 0 bytes
 qpid/java/lib/mina-core-1.0.1.jar                  | Bin 313338 -> 0 bytes
 qpid/java/lib/mina-core-1.1.7.jar                  | Bin 0 -> 315582 bytes
 qpid/java/lib/mina-filter-ssl-1.0.1.jar            | Bin 28950 -> 0 bytes
 qpid/java/lib/mina-filter-ssl-1.1.7.jar            | Bin 0 -> 29188 bytes
 .../java/lib/poms/backport-util-concurrent-2.2.xml |  22 ---------------------
 qpid/java/lib/poms/mina-core-1.0.1.xml             |   2 +-
 qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml       |   2 +-
 8 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 qpid/java/lib/backport-util-concurrent-2.2.jar
 delete mode 100755 qpid/java/lib/mina-core-1.0.1.jar
 create mode 100644 qpid/java/lib/mina-core-1.1.7.jar
 delete mode 100755 qpid/java/lib/mina-filter-ssl-1.0.1.jar
 create mode 100644 qpid/java/lib/mina-filter-ssl-1.1.7.jar
 delete mode 100644 qpid/java/lib/poms/backport-util-concurrent-2.2.xml

(limited to 'qpid/java/lib')

diff --git a/qpid/java/lib/backport-util-concurrent-2.2.jar b/qpid/java/lib/backport-util-concurrent-2.2.jar
deleted file mode 100644
index 20a16877bd..0000000000
Binary files a/qpid/java/lib/backport-util-concurrent-2.2.jar and /dev/null differ
diff --git a/qpid/java/lib/mina-core-1.0.1.jar b/qpid/java/lib/mina-core-1.0.1.jar
deleted file mode 100755
index f12067aa90..0000000000
Binary files a/qpid/java/lib/mina-core-1.0.1.jar and /dev/null differ
diff --git a/qpid/java/lib/mina-core-1.1.7.jar b/qpid/java/lib/mina-core-1.1.7.jar
new file mode 100644
index 0000000000..a5fc451cc7
Binary files /dev/null and b/qpid/java/lib/mina-core-1.1.7.jar differ
diff --git a/qpid/java/lib/mina-filter-ssl-1.0.1.jar b/qpid/java/lib/mina-filter-ssl-1.0.1.jar
deleted file mode 100755
index 53738e6498..0000000000
Binary files a/qpid/java/lib/mina-filter-ssl-1.0.1.jar and /dev/null differ
diff --git a/qpid/java/lib/mina-filter-ssl-1.1.7.jar b/qpid/java/lib/mina-filter-ssl-1.1.7.jar
new file mode 100644
index 0000000000..40bdc919e1
Binary files /dev/null and b/qpid/java/lib/mina-filter-ssl-1.1.7.jar differ
diff --git a/qpid/java/lib/poms/backport-util-concurrent-2.2.xml b/qpid/java/lib/poms/backport-util-concurrent-2.2.xml
deleted file mode 100644
index 6df4cfca40..0000000000
--- a/qpid/java/lib/poms/backport-util-concurrent-2.2.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>backport-util-concurrent</groupId>
-  <artifactId>backport-util-concurrent</artifactId>
-  <version>2.2</version>
-</dep>
diff --git a/qpid/java/lib/poms/mina-core-1.0.1.xml b/qpid/java/lib/poms/mina-core-1.0.1.xml
index 87fb96999f..eee6108082 100644
--- a/qpid/java/lib/poms/mina-core-1.0.1.xml
+++ b/qpid/java/lib/poms/mina-core-1.0.1.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>org.apache.mina</groupId>
   <artifactId>mina-core</artifactId>
-  <version>1.0.1</version>
+  <version>1.1.7</version>
 </dep>
diff --git a/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml b/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
index ae41d7ed63..52daba7eed 100644
--- a/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
+++ b/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>org.apache.mina</groupId>
   <artifactId>mina-filter-ssl</artifactId>
-  <version>1.0.1</version>
+  <version>1.1.7</version>
 </dep>
-- 
cgit v1.2.1