From 888581cb9781259073d190edede25e6253ec7dd9 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kpvdr@apache.org>
Date: Mon, 21 Oct 2013 22:04:51 +0000
Subject: QPID-4984: WIP - Merge from trunk r.1534385.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/linearstore@1534394 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/lib/poms/bcel-5.2.xml   | 22 ++++++++++++++++++++++
 qpid/java/lib/poms/dojo-1.9.1.xml | 23 +++++++++++++++++++++++
 qpid/java/lib/poms/je-5.0.84.xml  | 22 ----------------------
 qpid/java/lib/poms/je-5.0.97.xml  | 22 ++++++++++++++++++++++
 4 files changed, 67 insertions(+), 22 deletions(-)
 create mode 100644 qpid/java/lib/poms/bcel-5.2.xml
 create mode 100644 qpid/java/lib/poms/dojo-1.9.1.xml
 delete mode 100644 qpid/java/lib/poms/je-5.0.84.xml
 create mode 100644 qpid/java/lib/poms/je-5.0.97.xml

(limited to 'qpid/java/lib')

diff --git a/qpid/java/lib/poms/bcel-5.2.xml b/qpid/java/lib/poms/bcel-5.2.xml
new file mode 100644
index 0000000000..b218981e8a
--- /dev/null
+++ b/qpid/java/lib/poms/bcel-5.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>org.apache.bcel</groupId>
+  <artifactId>bcel</artifactId>
+  <version>5.2</version>
+</dep>
diff --git a/qpid/java/lib/poms/dojo-1.9.1.xml b/qpid/java/lib/poms/dojo-1.9.1.xml
new file mode 100644
index 0000000000..0b8c341353
--- /dev/null
+++ b/qpid/java/lib/poms/dojo-1.9.1.xml
@@ -0,0 +1,23 @@
+<?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.dojotoolkit</groupId>
+  <artifactId>dojo</artifactId>
+  <version>1.9.1</version>
+  <deptype>zip</deptype>
+</dep>
diff --git a/qpid/java/lib/poms/je-5.0.84.xml b/qpid/java/lib/poms/je-5.0.84.xml
deleted file mode 100644
index 7a556bbe1c..0000000000
--- a/qpid/java/lib/poms/je-5.0.84.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>com.sleepycat</groupId>
-  <artifactId>je</artifactId>
-  <version>5.0.84</version>
-</dep>
diff --git a/qpid/java/lib/poms/je-5.0.97.xml b/qpid/java/lib/poms/je-5.0.97.xml
new file mode 100644
index 0000000000..9ab0f3a1fe
--- /dev/null
+++ b/qpid/java/lib/poms/je-5.0.97.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>com.sleepycat</groupId>
+  <artifactId>je</artifactId>
+  <version>5.0.97</version>
+</dep>
-- 
cgit v1.2.1