From ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 Mon Sep 17 00:00:00 2001
From: "Stephen D. Huston" <shuston@apache.org>
Date: Fri, 21 Oct 2011 01:19:00 +0000
Subject: Undo bad merge from trunk - merged at wrong level.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68
---
 java/lib/poms/backport-util-concurrent-2.2.xml | 22 ++++++++++++++++++++++
 java/lib/poms/mina-core-1.0.1.xml              | 22 ++++++++++++++++++++++
 java/lib/poms/mina-filter-ssl-1.0.1.xml        | 22 ++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 java/lib/poms/backport-util-concurrent-2.2.xml
 create mode 100644 java/lib/poms/mina-core-1.0.1.xml
 create mode 100644 java/lib/poms/mina-filter-ssl-1.0.1.xml

(limited to 'java/lib/poms')

diff --git a/java/lib/poms/backport-util-concurrent-2.2.xml b/java/lib/poms/backport-util-concurrent-2.2.xml
new file mode 100644
index 0000000000..6df4cfca40
--- /dev/null
+++ b/java/lib/poms/backport-util-concurrent-2.2.xml
@@ -0,0 +1,22 @@
+<?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/java/lib/poms/mina-core-1.0.1.xml b/java/lib/poms/mina-core-1.0.1.xml
new file mode 100644
index 0000000000..87fb96999f
--- /dev/null
+++ b/java/lib/poms/mina-core-1.0.1.xml
@@ -0,0 +1,22 @@
+<?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.0.1</version>
+</dep>
diff --git a/java/lib/poms/mina-filter-ssl-1.0.1.xml b/java/lib/poms/mina-filter-ssl-1.0.1.xml
new file mode 100644
index 0000000000..ae41d7ed63
--- /dev/null
+++ b/java/lib/poms/mina-filter-ssl-1.0.1.xml
@@ -0,0 +1,22 @@
+<?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.0.1</version>
+</dep>
-- 
cgit v1.2.1