diff options
| author | Robert Gemmell <robbie@apache.org = robbie = Robert Gemmell robbie@apache.org@apache.org> | 2014-04-13 14:11:38 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org = robbie = Robert Gemmell robbie@apache.org@apache.org> | 2014-04-13 14:11:38 +0000 |
| commit | bc8e8743ac5b462b03cae0880cf0f403f8f5b934 (patch) | |
| tree | 91a799b87d5eb8dc079d89d386585583c67c2184 | |
| parent | ec68fa37994881438bf6a324430b56380c514b40 (diff) | |
| download | qpid-python-bc8e8743ac5b462b03cae0880cf0f403f8f5b934.tar.gz | |
QPID-5048: include the JMS API jar in the client release assemblies as we have in the past
merge from trunk r1586025
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.28@1586993 13f79535-47bb-0310-9956-ffa450edef68
4 files changed, 24 insertions, 0 deletions
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> |