From 28d0db993e5a167360f5b975b4dd5ba3bf1529ff Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Sat, 5 Apr 2014 15:29:53 +0000
Subject: QPID-5657: update the geronimo jms 1.1 spec jar from 1.0 to 1.1.1,
 for the Ant build.

Work by me and Andrew MacBean <andymacbean@gmail.com>.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585106 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/build.deps                               |  2 +-
 qpid/java/ivy.retrieve.xml                         |  2 +-
 qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml   | 22 ----------------------
 qpid/java/lib/poms/geronimo-jms_1.1_spec-1.1.1.xml | 22 ++++++++++++++++++++++
 4 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml
 create mode 100644 qpid/java/lib/poms/geronimo-jms_1.1_spec-1.1.1.xml

(limited to 'qpid/java')

diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index a0efbea658..c93c055cd1 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -28,7 +28,7 @@ bcel=lib/required/bcel-5.2.jar
 
 derby-db=lib/required/derby-10.8.2.2.jar
 
-geronimo-jms=lib/required/geronimo-jms_1.1_spec-1.0.jar
+geronimo-jms=lib/required/geronimo-jms_1.1_spec-1.1.1.jar
 geronimo-j2ee=lib/required/geronimo-j2ee-connector_1.5_spec-2.0.0.jar
 geronimo-jta=lib/required/geronimo-jta_1.1_spec-1.1.1.jar
 geronimo-kernel=lib/required/geronimo-kernel-2.2.1.jar
diff --git a/qpid/java/ivy.retrieve.xml b/qpid/java/ivy.retrieve.xml
index e604023940..671e31ae33 100644
--- a/qpid/java/ivy.retrieve.xml
+++ b/qpid/java/ivy.retrieve.xml
@@ -45,7 +45,7 @@
     <dependency org="org.apache.geronimo.framework" name="geronimo-kernel" rev="2.2.1" transitive="false"/>
     <dependency org="org.apache.geronimo.specs" name="geronimo-ejb_3.0_spec" rev="1.0.1" transitive="false"/>
     <dependency org="org.apache.geronimo.specs" name="geronimo-j2ee-connector_1.5_spec" rev="2.0.0" transitive="false"/>
-    <dependency org="org.apache.geronimo.specs" name="geronimo-jms_1.1_spec" rev="1.0" transitive="false"/>
+    <dependency org="org.apache.geronimo.specs" name="geronimo-jms_1.1_spec" rev="1.1.1" transitive="false"/>
     <dependency org="org.apache.geronimo.specs" name="geronimo-jta_1.1_spec" rev="1.1.1" transitive="false"/>
     <dependency org="org.apache.geronimo.specs" name="geronimo-servlet_3.0_spec" rev="1.0" transitive="false"/>
     <dependency org="com.google.code.gson" name="gson" rev="2.0" transitive="false"/>
diff --git a/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml b/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml
deleted file mode 100644
index 0fe38d5477..0000000000
--- a/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.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.geronimo.specs</groupId>
-  <artifactId>geronimo-jms_1.1_spec</artifactId>
-  <version>1.0</version>
-</dep>
diff --git a/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.1.1.xml b/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.1.1.xml
new file mode 100644
index 0000000000..08419eb972
--- /dev/null
+++ b/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.1.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.geronimo.specs</groupId>
+  <artifactId>geronimo-jms_1.1_spec</artifactId>
+  <version>1.1.1</version>
+</dep>
-- 
cgit v1.2.1