servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [servicemix-bundles] branch master updated: [SM-3942] Create OSGi bundle for qpid 6.3.3
Date Fri, 18 Jan 2019 08:27:46 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git


The following commit(s) were added to refs/heads/master by this push:
     new 5c1aaa9  [SM-3942] Create OSGi bundle for qpid 6.3.3
5c1aaa9 is described below

commit 5c1aaa901bfafe0f500450cb40800c9565eb5a9d
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
AuthorDate: Fri Jan 18 09:21:48 2019 +0100

    [SM-3942] Create OSGi bundle for qpid 6.3.3
---
 pom.xml                                            |  1 +
 {qpid-6.1.7 => qpid-6.3.3}/pom.xml                 | 52 +++-------------------
 .../src/main/resources/OSGI-INF/bundle.info        |  0
 3 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/pom.xml b/pom.xml
index dfc8762..60f0fb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,7 @@
         <module>braintree-java-2.91.0</module>
         <module>grpc-1.18.0</module>
         <module>jedis-3.0.1</module>
+        <module>qpid-6.3.3</module>
     </modules>
 
 </project>
diff --git a/qpid-6.1.7/pom.xml b/qpid-6.3.3/pom.xml
similarity index 77%
rename from qpid-6.1.7/pom.xml
rename to qpid-6.3.3/pom.xml
index e3eb5b8..f82c79a 100644
--- a/qpid-6.1.7/pom.xml
+++ b/qpid-6.3.3/pom.xml
@@ -31,7 +31,7 @@
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.qpid</artifactId>
     <packaging>bundle</packaging>
-    <version>6.1.7_2-SNAPSHOT</version>
+    <version>6.3.3_1-SNAPSHOT</version>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps qpid-common and qpid-client ${pkgVersion} jar
files.</description>
 
@@ -39,15 +39,14 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.apache.qpid</pkgGroupId>
         <pkgArtifactId>qpid</pkgArtifactId>
-        <pkgVersion>6.1.7</pkgVersion>
+        <pkgVersion>6.3.3</pkgVersion>
         <servicemix.osgi.export>
-            org.apache.qpid.proton*;version=0.12,
+            org.apache.qpid.proton*;version=0.31.0,
             org.apache.qpid*;version=${pkgVersion}
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
@@ -69,46 +68,18 @@
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}-common</artifactId>
-            <version>${pkgVersion}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}-client</artifactId>
             <version>${pkgVersion}</version>
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>proton-j</artifactId>
-            <version>0.12.2</version>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>proton-jms</artifactId>
-            <version>0.12.2</version>
+            <version>0.31.0</version>
         </dependency>
 
         <!-- sources -->
         <dependency>
             <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}-common</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}-client</artifactId>
             <version>${pkgVersion}</version>
             <classifier>sources</classifier>
@@ -116,13 +87,7 @@
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>proton-j</artifactId>
-            <version>0.12.2</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>proton-jms</artifactId>
-            <version>0.12.2</version>
+            <version>0.31.0</version>
             <classifier>sources</classifier>
         </dependency>
     </dependencies>
@@ -145,7 +110,6 @@
                                     <include>${pkgGroupId}:${pkgArtifactId}-client</include>
                                     <include>${pkgGroupId}:proton-api</include>
                                     <include>${pkgGroupId}:proton-j-impl</include>
-                                    <include>${pkgGroupId}:proton-jms</include>
                                 </includes>
                             </artifactSet>
                             <filters>
@@ -176,12 +140,6 @@
                                         <exclude>**/*</exclude>
                                     </excludes>
                                 </filter>
-                                <filter>
-                                    <artifact>${pkgGroupId}:proton-jms</artifact>
-                                    <excludes>
-                                        <exclude>**/*</exclude>
-                                    </excludes>
-                                </filter>
                             </filters>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
diff --git a/qpid-6.1.7/src/main/resources/OSGI-INF/bundle.info b/qpid-6.3.3/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from qpid-6.1.7/src/main/resources/OSGI-INF/bundle.info
rename to qpid-6.3.3/src/main/resources/OSGI-INF/bundle.info


Mime
View raw message