Author: jbonofre
Date: Thu Dec 23 06:46:02 2010
New Revision: 1052181
URL: http://svn.apache.org/viewvc?rev=1052181&view=rev
Log:
[SMX4-705] Create OSGi bundle for qpid 0.8.0.
Added:
servicemix/smx4/bundles/trunk/qpid-0.8.0/
servicemix/smx4/bundles/trunk/qpid-0.8.0/pom.xml
- copied, changed from r1051037,
servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml
Modified:
servicemix/smx4/bundles/trunk/pom.xml
servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml
Modified: servicemix/smx4/bundles/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1052181&r1=1052180&r2=1052181&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Thu Dec 23 06:46:02 2010
@@ -42,6 +42,7 @@
<name>Apache ServiceMix :: Bundles</name>
<modules>
+ <module>qpid-0.8.0</module>
</modules>
</project>
Modified: servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml?rev=1052181&r1=1052180&r2=1052181&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml Thu Dec 23 06:46:02 2010
@@ -44,7 +44,7 @@
org.apache.qpid
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- !org.apache.qpid,
+ !org.apache.qpid*,
edu.emory.mathcs.backport.java.util.concurrent*;resolution:=optional,
javax.jms*;version="[1.1,2)",
javax.naming*,
@@ -114,6 +114,9 @@
</excludes>
</filter>
</filters>
+
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+
<createDependencyReducedPom>false</createDependencyReducedPom>
+
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
</configuration>
</execution>
</executions>
Copied: servicemix/smx4/bundles/trunk/qpid-0.8.0/pom.xml (from r1051037,
servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml)
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/qpid-0.8.0/pom.xml?p2=servicemix/smx4/bundles/trunk/qpid-0.8.0/pom.xml&p1=servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml&r1=1051037&r2=1052181&rev=1052181&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/qpid-0.8.0/pom.xml Thu Dec 23 06:46:02 2010
@@ -25,12 +25,13 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
<version>5</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.qpid</artifactId>
<packaging>bundle</packaging>
- <version>0.6.0_2-SNAPSHOT</version>
+ <version>0.8.0_1-SNAPSHOT</version>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
@@ -39,20 +40,18 @@
<properties>
<pkgGroupId>org.apache.qpid</pkgGroupId>
<pkgArtifactId>qpid</pkgArtifactId>
- <pkgVersion>0.6.0</pkgVersion>
+ <pkgVersion>0.8.0</pkgVersion>
<servicemix.osgi.export.pkg>
org.apache.qpid
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- !org.apache.qpid,
+ !org.apache.qpid*,
edu.emory.mathcs.backport.java.util.concurrent*;resolution:=optional,
javax.jms*;version="[1.1,2)",
javax.naming*,
javax.net*,
javax.security*,
javax.transaction*,
- org.apache.commons.collections*;version="[3.2,4)",
- org.apache.commons.lang*;version="[2.4,3)",
org.apache.mina*;version="[1.1,2)",
org.slf4j*;resolution:=optional,
*
@@ -70,13 +69,13 @@
<dependencies>
<dependency>
<groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}-client</artifactId>
+ <artifactId>${pkgArtifactId}-common</artifactId>
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}-common</artifactId>
+ <artifactId>${pkgArtifactId}-client</artifactId>
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
@@ -96,28 +95,32 @@
<configuration>
<artifactSet>
<includes>
-
<include>${pkgGroupId}:${pkgArtifactId}-client</include>
<include>${pkgGroupId}:${pkgArtifactId}-common</include>
+
<include>${pkgGroupId}:${pkgArtifactId}-client</include>
</includes>
</artifactSet>
<filters>
<filter>
-
<artifact>${pkgGroupId}:${pkgArtifactId}-client</artifact>
+
<artifact>${pkgGroupId}:${pkgArtifactId}-common</artifact>
<excludes>
<exclude>**</exclude>
</excludes>
</filter>
<filter>
-
<artifact>${pkgGroupId}:${pkgArtifactId}-common</artifact>
+
<artifact>${pkgGroupId}:${pkgArtifactId}-client</artifact>
<excludes>
<exclude>**</exclude>
</excludes>
</filter>
</filters>
+
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+
<createDependencyReducedPom>false</createDependencyReducedPom>
+
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
+
</project>
\ No newline at end of file
