Repository: servicemix-bundles Updated Branches: refs/heads/master 2905d9e74 -> 18c3fd94a
[SM-2737] Export proton packages 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/18c3fd94 Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/18c3fd94 Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/18c3fd94 Branch: refs/heads/master Commit: 18c3fd94ab177c844313fe181236df0c0a34af71 Parents: 2905d9e Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Nov 26 06:36:53 2015 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Nov 26 06:36:53 2015 +0100 ---------------------------------------------------------------------- pom.xml | 5 +++++ qpid-0.24/pom.xml | 34 ++++++++++++++++++++++++++++++---- qpid-0.26/pom.xml | 34 ++++++++++++++++++++++++++++++---- qpid-0.28/pom.xml | 34 ++++++++++++++++++++++++++++++---- qpid-0.30/pom.xml | 34 ++++++++++++++++++++++++++++++---- qpid-0.32/pom.xml | 25 ++++++++++++++++++++++--- 6 files changed, 147 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/18c3fd94/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c10e15b..99f7a0d 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,11 @@ <module>spring-ldap-2.0.3.RELEASE</module> <module>spring-ldap-2.0.4.RELEASE</module> <module>gae-1.9.28</module> + <module>qpid-0.24</module> + <module>qpid-0.26</module> + <module>qpid-0.32</module> + <module>qpid-0.30</module> + <module>qpid-0.28</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/18c3fd94/qpid-0.24/pom.xml ---------------------------------------------------------------------- diff --git a/qpid-0.24/pom.xml b/qpid-0.24/pom.xml index a57282d..52629a0 100644 --- a/qpid-0.24/pom.xml +++ b/qpid-0.24/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>bundles-pom</artifactId> - <version>10</version> + <version>12</version> <relativePath>../bundles-pom/pom.xml</relativePath> </parent> @@ -35,13 +35,21 @@ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name> <description>This OSGi bundle wraps qpid-common and qpid-client ${pkgVersion} jar files.</description> + <scm> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url> + <tag>HEAD</tag> + </scm> + <properties> <pkgGroupId>org.apache.qpid</pkgGroupId> <pkgArtifactId>qpid</pkgArtifactId> <pkgVersion>0.24</pkgVersion> - <servicemix.osgi.export.pkg> - org.apache.qpid - </servicemix.osgi.export.pkg> + <servicemix.osgi.export> + org.apache.qpid.proton*;version=0.6, + org.apache.qpid*;version=0.24 + </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.jms*, javax.naming*, @@ -65,6 +73,11 @@ <artifactId>${pkgArtifactId}-client</artifactId> <version>${pkgVersion}</version> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-api</artifactId> + <version>0.6</version> + </dependency> <!-- sources --> <dependency> @@ -79,6 +92,12 @@ <version>${pkgVersion}</version> <classifier>sources</classifier> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-api</artifactId> + <version>0.6</version> + <classifier>sources</classifier> + </dependency> </dependencies> <build> @@ -97,6 +116,7 @@ <includes> <include>${pkgGroupId}:${pkgArtifactId}-common</include> <include>${pkgGroupId}:${pkgArtifactId}-client</include> + <include>${pkgGroupId}:proton-api</include> </includes> </artifactSet> <filters> @@ -112,6 +132,12 @@ <exclude>**</exclude> </excludes> </filter> + <filter> + <artifact>${pkgGroupId}:proton-api</artifact> + <excludes> + <exclude>**</exclude> + </excludes> + </filter> </filters> <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <createDependencyReducedPom>false</createDependencyReducedPom> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/18c3fd94/qpid-0.26/pom.xml ---------------------------------------------------------------------- diff --git a/qpid-0.26/pom.xml b/qpid-0.26/pom.xml index fd2e239..873aa48 100644 --- a/qpid-0.26/pom.xml +++ b/qpid-0.26/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>bundles-pom</artifactId> - <version>11</version> + <version>12</version> <relativePath>../bundles-pom/pom.xml</relativePath> </parent> @@ -35,13 +35,21 @@ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name> <description>This OSGi bundle wraps qpid-common and qpid-client ${pkgVersion} jar files.</description> + <scm> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url> + <tag>HEAD</tag> + </scm> + <properties> <pkgGroupId>org.apache.qpid</pkgGroupId> <pkgArtifactId>qpid</pkgArtifactId> <pkgVersion>0.26</pkgVersion> - <servicemix.osgi.export.pkg> - org.apache.qpid - </servicemix.osgi.export.pkg> + <servicemix.osgi.export> + org.apache.qpid.proton*;version=0.6, + org.apache.qpid*;version=0.26 + </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.jms*, javax.naming*, @@ -71,6 +79,11 @@ <artifactId>${pkgArtifactId}-client</artifactId> <version>${pkgVersion}</version> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-api</artifactId> + <version>0.6</version> + </dependency> <!-- sources --> <dependency> @@ -91,6 +104,12 @@ <version>${pkgVersion}</version> <classifier>sources</classifier> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-api</artifactId> + <version>0.6</version> + <classifier>sources</classifier> + </dependency> </dependencies> <build> @@ -109,6 +128,7 @@ <includes> <include>${pkgGroupId}:${pkgArtifactId}-common</include> <include>${pkgGroupId}:${pkgArtifactId}-client</include> + <include>${pkgGroupId}:proton-api</include> </includes> </artifactSet> <filters> @@ -127,6 +147,12 @@ <include>**/*.properties</include> </includes> </filter> + <filter> + <artifact>${pkgGroupId}:proton-api</artifact> + <excludes> + <exclude>**/*</exclude> + </excludes> + </filter> </filters> <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <createDependencyReducedPom>true</createDependencyReducedPom> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/18c3fd94/qpid-0.28/pom.xml ---------------------------------------------------------------------- diff --git a/qpid-0.28/pom.xml b/qpid-0.28/pom.xml index aea8e6a..74729e1 100644 --- a/qpid-0.28/pom.xml +++ b/qpid-0.28/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>bundles-pom</artifactId> - <version>11</version> + <version>12</version> <relativePath>../bundles-pom/pom.xml</relativePath> </parent> @@ -35,13 +35,21 @@ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name> <description>This OSGi bundle wraps qpid-common and qpid-client ${pkgVersion} jar files.</description> + <scm> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url> + <tag>HEAD</tag> + </scm> + <properties> <pkgGroupId>org.apache.qpid</pkgGroupId> <pkgArtifactId>qpid</pkgArtifactId> <pkgVersion>0.28</pkgVersion> - <servicemix.osgi.export.pkg> - org.apache.qpid - </servicemix.osgi.export.pkg> + <servicemix.osgi.export> + org.apache.qpid.proton*;version=0.6, + org.apache.qpid*;version=0.28 + </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.jms*, javax.naming*, @@ -71,6 +79,11 @@ <artifactId>${pkgArtifactId}-client</artifactId> <version>${pkgVersion}</version> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-api</artifactId> + <version>0.6</version> + </dependency> <!-- sources --> <dependency> @@ -91,6 +104,12 @@ <version>${pkgVersion}</version> <classifier>sources</classifier> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-api</artifactId> + <version>0.6</version> + <classifier>sources</classifier> + </dependency> </dependencies> <build> @@ -109,6 +128,7 @@ <includes> <include>${pkgGroupId}:${pkgArtifactId}-common</include> <include>${pkgGroupId}:${pkgArtifactId}-client</include> + <include>${pkgGroupId}:proton-api</include> </includes> </artifactSet> <filters> @@ -127,6 +147,12 @@ <include>**/*.properties</include> </includes> </filter> + <filter> + <artifact>${pkgGroupId}:proton-api</artifact> + <excludes> + <exclude>**/*</exclude> + </excludes> + </filter> </filters> <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <createDependencyReducedPom>true</createDependencyReducedPom> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/18c3fd94/qpid-0.30/pom.xml ---------------------------------------------------------------------- diff --git a/qpid-0.30/pom.xml b/qpid-0.30/pom.xml index 0209796..f4da608 100644 --- a/qpid-0.30/pom.xml +++ b/qpid-0.30/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>bundles-pom</artifactId> - <version>11</version> + <version>12</version> <relativePath>../bundles-pom/pom.xml</relativePath> </parent> @@ -35,13 +35,21 @@ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name> <description>This OSGi bundle wraps qpid-common and qpid-client ${pkgVersion} jar files.</description> + <scm> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url> + <tag>HEAD</tag> + </scm> + <properties> <pkgGroupId>org.apache.qpid</pkgGroupId> <pkgArtifactId>qpid</pkgArtifactId> <pkgVersion>0.30</pkgVersion> - <servicemix.osgi.export.pkg> - org.apache.qpid - </servicemix.osgi.export.pkg> + <servicemix.osgi.export> + org.apache.qpid.proton*;version=0.6, + org.apache.qpid*;version=0.30 + </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.crypto, javax.crypto.spec, @@ -74,6 +82,11 @@ <artifactId>${pkgArtifactId}-client</artifactId> <version>${pkgVersion}</version> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-api</artifactId> + <version>0.6</version> + </dependency> <!-- sources --> <dependency> @@ -94,6 +107,12 @@ <version>${pkgVersion}</version> <classifier>sources</classifier> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-api</artifactId> + <version>0.6</version> + <classifier>sources</classifier> + </dependency> </dependencies> <build> @@ -112,6 +131,7 @@ <includes> <include>${pkgGroupId}:${pkgArtifactId}-common</include> <include>${pkgGroupId}:${pkgArtifactId}-client</include> + <include>${pkgGroupId}:proton-api</include> </includes> </artifactSet> <filters> @@ -130,6 +150,12 @@ <include>**/*.properties</include> </includes> </filter> + <filter> + <artifact>${pkgGroupId}:proton-api</artifact> + <excludes> + <exclude>**/*</exclude> + </excludes> + </filter> </filters> <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <createDependencyReducedPom>true</createDependencyReducedPom> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/18c3fd94/qpid-0.32/pom.xml ---------------------------------------------------------------------- diff --git a/qpid-0.32/pom.xml b/qpid-0.32/pom.xml index 6f69bff..e6f5a31 100644 --- a/qpid-0.32/pom.xml +++ b/qpid-0.32/pom.xml @@ -46,9 +46,10 @@ <pkgGroupId>org.apache.qpid</pkgGroupId> <pkgArtifactId>qpid</pkgArtifactId> <pkgVersion>0.32</pkgVersion> - <servicemix.osgi.export.pkg> - org.apache.qpid - </servicemix.osgi.export.pkg> + <servicemix.osgi.export> + org.apache.qpid.proton*;version=0.6, + org.apache.qpid*;version=0.32 + </servicemix.osgi.export> <servicemix.osgi.import.pkg> javax.crypto, javax.crypto.spec, @@ -81,6 +82,11 @@ <artifactId>${pkgArtifactId}-client</artifactId> <version>${pkgVersion}</version> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-api</artifactId> + <version>0.6</version> + </dependency> <!-- sources --> <dependency> @@ -101,6 +107,12 @@ <version>${pkgVersion}</version> <classifier>sources</classifier> </dependency> + <dependency> + <groupId>${pkgGroupId}</groupId> + <artifactId>proton-api</artifactId> + <version>0.6</version> + <classifier>sources</classifier> + </dependency> </dependencies> <build> @@ -119,6 +131,7 @@ <includes> <include>${pkgGroupId}:${pkgArtifactId}-common</include> <include>${pkgGroupId}:${pkgArtifactId}-client</include> + <include>${pkgGroupId}:proton-api</include> </includes> </artifactSet> <filters> @@ -137,6 +150,12 @@ <include>**/*.properties</include> </includes> </filter> + <filter> + <artifact>${pkgGroupId}:proton-api</artifact> + <excludes> + <exclude>**/*</exclude> + </excludes> + </filter> </filters> <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <createDependencyReducedPom>true</createDependencyReducedPom>
