Repository: servicemix-bundles Updated Branches: refs/heads/master f24333cb6 -> 919afc481
SM-2737 - Add proton-j-impl and proton-jms dependencies in qpid bundles Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/919afc48 Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/919afc48 Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/919afc48 Branch: refs/heads/master Commit: 919afc4810e6b532c5dbe0e3d233326ed2f25f44 Parents: f24333c Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Dec 1 14:16:43 2015 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Dec 1 14:16:43 2015 +0100 ---------------------------------------------------------------------- qpid-0.28/pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++ qpid-0.30/pom.xml | 37 +++++++++++++++++++++++++++++++++++++ qpid-0.32/pom.xml | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/919afc48/qpid-0.28/pom.xml ---------------------------------------------------------------------- diff --git a/qpid-0.28/pom.xml b/qpid-0.28/pom.xml index 947b8e4..461f3d0 100644 --- a/qpid-0.28/pom.xml +++ b/qpid-0.28/pom.xml @@ -51,12 +51,16 @@ org.apache.qpid*;version=0.28 </servicemix.osgi.export> <servicemix.osgi.import.pkg> + javax.crypto, + javax.crypto.spec, javax.jms*, javax.naming*, javax.net*, javax.security*, javax.transaction*, + javax.xml.bind;resolution:=optional, edu.emory.mathcs.backport.java.util.concurrent;resolution:=optional, + org.bouncycastle*;resolution:=optional, org.ietf.jgss;resolution:=optional, org.slf4j;resolution:=optional </servicemix.osgi.import.pkg> @@ -84,6 +88,16 @@ <artifactId>proton-api</artifactId> <version>0.6</version> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-j-impl</artifactId> + <version>0.6</version> + </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-jms</artifactId> + <version>0.6</version> + </dependency> <!-- sources --> <dependency> @@ -110,6 +124,18 @@ <version>0.6</version> <classifier>sources</classifier> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-j-impl</artifactId> + <version>0.6</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-jms</artifactId> + <version>0.6</version> + <classifier>sources</classifier> + </dependency> </dependencies> <build> @@ -129,6 +155,8 @@ <include>${pkgGroupId}:${pkgArtifactId}-common</include> <include>${pkgGroupId}:${pkgArtifactId}-client</include> <include>${pkgGroupId}:proton-api</include> + <include>${pkgGroupId}:proton-j-impl</include> + <include>${pkgGroupId}:proton-jms</include> </includes> </artifactSet> <filters> @@ -153,6 +181,18 @@ <exclude>**/*</exclude> </excludes> </filter> + <filter> + <artifact>${pkgGroupId}:proton-j-impl</artifact> + <excludes> + <exclude>**/*</exclude> + </excludes> + </filter> + <filter> + <artifact>${pkgGroupId}:proton-jms</artifact> + <excludes> + <exclude>**/*</exclude> + </excludes> + </filter> </filters> <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <createDependencyReducedPom>true</createDependencyReducedPom> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/919afc48/qpid-0.30/pom.xml ---------------------------------------------------------------------- diff --git a/qpid-0.30/pom.xml b/qpid-0.30/pom.xml index a1155dc..c8e88af 100644 --- a/qpid-0.30/pom.xml +++ b/qpid-0.30/pom.xml @@ -60,6 +60,7 @@ javax.transaction*, javax.xml.bind;resolution:=optional, edu.emory.mathcs.backport.java.util.concurrent;resolution:=optional, + org.bouncycastle*;resolution:=optional, org.ietf.jgss;resolution:=optional, org.slf4j;resolution:=optional </servicemix.osgi.import.pkg> @@ -87,6 +88,16 @@ <artifactId>proton-api</artifactId> <version>0.6</version> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-j-impl</artifactId> + <version>0.6</version> + </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-jms</artifactId> + <version>0.6</version> + </dependency> <!-- sources --> <dependency> @@ -113,6 +124,18 @@ <version>0.6</version> <classifier>sources</classifier> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-j-impl</artifactId> + <version>0.6</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-jms</artifactId> + <version>0.6</version> + <classifier>sources</classifier> + </dependency> </dependencies> <build> @@ -132,6 +155,8 @@ <include>${pkgGroupId}:${pkgArtifactId}-common</include> <include>${pkgGroupId}:${pkgArtifactId}-client</include> <include>${pkgGroupId}:proton-api</include> + <include>${pkgGroupId}:proton-j-impl</include> + <include>${pkgGroupId}:proton-jms</include> </includes> </artifactSet> <filters> @@ -156,6 +181,18 @@ <exclude>**/*</exclude> </excludes> </filter> + <filter> + <artifact>${pkgGroupId}:proton-j-impl</artifact> + <excludes> + <exclude>**/*</exclude> + </excludes> + </filter> + <filter> + <artifact>${pkgGroupId}:proton-jms</artifact> + <excludes> + <exclude>**/*</exclude> + </excludes> + </filter> </filters> <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <createDependencyReducedPom>true</createDependencyReducedPom> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/919afc48/qpid-0.32/pom.xml ---------------------------------------------------------------------- diff --git a/qpid-0.32/pom.xml b/qpid-0.32/pom.xml index cfd671a..0a290d9 100644 --- a/qpid-0.32/pom.xml +++ b/qpid-0.32/pom.xml @@ -60,6 +60,7 @@ javax.transaction*, javax.xml.bind;resolution:=optional, edu.emory.mathcs.backport.java.util.concurrent;resolution:=optional, + org.bouncycastle*;resolution:=optional, org.ietf.jgss;resolution:=optional, org.slf4j;resolution:=optional </servicemix.osgi.import.pkg> @@ -87,6 +88,16 @@ <artifactId>proton-api</artifactId> <version>0.6</version> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-j-impl</artifactId> + <version>0.6</version> + </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-jms</artifactId> + <version>0.6</version> + </dependency> <!-- sources --> <dependency> @@ -113,6 +124,18 @@ <version>0.6</version> <classifier>sources</classifier> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-j-impl</artifactId> + <version>0.6</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-jms</artifactId> + <version>0.6</version> + <classifier>sources</classifier> + </dependency> </dependencies> <build> @@ -132,6 +155,8 @@ <include>${pkgGroupId}:${pkgArtifactId}-common</include> <include>${pkgGroupId}:${pkgArtifactId}-client</include> <include>${pkgGroupId}:proton-api</include> + <include>${pkgGroupId}:proton-j-impl</include> + <include>${pkgGroupId}:proton-jms</include> </includes> </artifactSet> <filters> @@ -156,6 +181,18 @@ <exclude>**/*</exclude> </excludes> </filter> + <filter> + <artifact>${pkgGroupId}:proton-j-impl</artifact> + <excludes> + <exclude>**/*</exclude> + </excludes> + </filter> + <filter> + <artifact>${pkgGroupId}:proton-jms</artifact> + <excludes> + <exclude>**/*</exclude> + </excludes> + </filter> </filters> <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <createDependencyReducedPom>true</createDependencyReducedPom>
