From 6f23ec4bd812297fe2d14749dd0d0085847a8874 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Wed, 9 Apr 2014 16:39:29 +0000
Subject: QPID-5048: include the JMS API jar in the client release assemblies
 as we have in the past

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586025 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/amqp-1-0-client-jms/src/main/assembly/NOTICE            | 4 ++++
 .../src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml            | 8 ++++++++
 qpid/java/client/src/main/assembly/NOTICE                         | 4 ++++
 qpid/java/client/src/main/assembly/qpid-client-bin.xml            | 8 ++++++++
 4 files changed, 24 insertions(+)

(limited to 'qpid/java')

diff --git a/qpid/java/amqp-1-0-client-jms/src/main/assembly/NOTICE b/qpid/java/amqp-1-0-client-jms/src/main/assembly/NOTICE
index 3838e94c70..c4f26d1b6b 100644
--- a/qpid/java/amqp-1-0-client-jms/src/main/assembly/NOTICE
+++ b/qpid/java/amqp-1-0-client-jms/src/main/assembly/NOTICE
@@ -4,3 +4,7 @@ Copyright 2006-2014 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+###############################################
+
+Apache Geronimo JMS 1.1 Spec
+Copyright 2003-2008 The Apache Software Foundation
\ No newline at end of file
diff --git a/qpid/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml b/qpid/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml
index c15bee1ae8..264d815032 100644
--- a/qpid/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml
+++ b/qpid/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml
@@ -24,6 +24,14 @@
       <outputDirectory>/lib</outputDirectory>
       <useProjectArtifact>true</useProjectArtifact>
     </dependencySet>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
+      <scope>provided</scope>
+      <includes>
+        <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+      </includes>
+    </dependencySet>
   </dependencySets>
 </assembly>
 
diff --git a/qpid/java/client/src/main/assembly/NOTICE b/qpid/java/client/src/main/assembly/NOTICE
index f798a67b05..4952a853c6 100644
--- a/qpid/java/client/src/main/assembly/NOTICE
+++ b/qpid/java/client/src/main/assembly/NOTICE
@@ -4,3 +4,7 @@ Copyright 2006-2014 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+###############################################
+
+Apache Geronimo JMS 1.1 Spec
+Copyright 2003-2008 The Apache Software Foundation
\ No newline at end of file
diff --git a/qpid/java/client/src/main/assembly/qpid-client-bin.xml b/qpid/java/client/src/main/assembly/qpid-client-bin.xml
index b9a54185a5..08762950fd 100644
--- a/qpid/java/client/src/main/assembly/qpid-client-bin.xml
+++ b/qpid/java/client/src/main/assembly/qpid-client-bin.xml
@@ -24,6 +24,14 @@
       <outputDirectory>/lib</outputDirectory>
       <useProjectArtifact>true</useProjectArtifact>
     </dependencySet>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
+      <scope>provided</scope>
+      <includes>
+        <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+      </includes>
+    </dependencySet>
   </dependencySets>
 </assembly>
 
-- 
cgit v1.2.1