servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1615553 - in /servicemix/smx4/bundles/trunk: aws-java-sdk-1.7.12/pom.xml aws-java-sdk-1.7.5/pom.xml aws-java-sdk-1.8.3/pom.xml pom.xml
Date Mon, 04 Aug 2014 13:29:41 GMT
Author: jbonofre
Date: Mon Aug  4 13:29:41 2014
New Revision: 1615553

URL: http://svn.apache.org/r1615553
Log:
[SMX4-1790] Embed common-http and joda in AWS bundles to avoid classloader issues (NCDF)

Modified:
    servicemix/smx4/bundles/trunk/aws-java-sdk-1.7.12/pom.xml
    servicemix/smx4/bundles/trunk/aws-java-sdk-1.7.5/pom.xml
    servicemix/smx4/bundles/trunk/aws-java-sdk-1.8.3/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/aws-java-sdk-1.7.12/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/aws-java-sdk-1.7.12/pom.xml?rev=1615553&r1=1615552&r2=1615553&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/aws-java-sdk-1.7.12/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/aws-java-sdk-1.7.12/pom.xml Mon Aug  4 13:29:41 2014
@@ -52,14 +52,18 @@
             org.w3c.dom,
             org.xml.sax*,
             org.apache.commons.codec*;version="[1.3,2)",
-            org.apache.http*;version="[4,5)",
-            org.apache.http.conn.routing;version="[4,5)",
             org.apache.commons.logging*;version="[1.1,2)";resolution:=optional,
             org.aspectj.lang*;version="[1,2)";resolution:=optional,
-            org.joda.time*;resolution:=optional,
             org.junit*;version="[4,5)";resolution:=optional,
-            org.springframework*;version="[2.5,4)";resolution:=optional
+            org.springframework*;version="[2.5,4)";resolution:=optional,
+            javax.security.auth.x500;resolution:=optional, 
+            org.ietf.jgss;resolution:=optional
         </servicemix.osgi.import.pkg>
+        <servicemix.osgi.private.pkg>
+            org.apache.http.*,
+            org.joda.convert*,
+            org.joda.time*
+        </servicemix.osgi.private.pkg>
     </properties>
 
     <dependencies>
@@ -68,6 +72,11 @@
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
         </dependency>
+        <dependency>
+            <groupId>org.joda</groupId>
+            <artifactId>joda-convert</artifactId>
+            <version>1.5</version>
+        </dependency>
 
         <!-- sources -->
         <dependency>
@@ -93,13 +102,20 @@
                             <artifactSet>
                                 <includes>
                                     <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                    <include>org.joda:joda-convert</include>
                                 </includes>
                             </artifactSet>
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
                                     <excludes>
-                                        <exclude>**/*.class</exclude>
+                                        <exclude>**/*</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.joda:joda-convert</artifact>
+                                    <excludes>
+                                        <exclude>**/*</exclude>
                                     </excludes>
                                 </filter>
                             </filters>

Modified: servicemix/smx4/bundles/trunk/aws-java-sdk-1.7.5/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/aws-java-sdk-1.7.5/pom.xml?rev=1615553&r1=1615552&r2=1615553&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/aws-java-sdk-1.7.5/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/aws-java-sdk-1.7.5/pom.xml Mon Aug  4 13:29:41 2014
@@ -52,14 +52,18 @@
             org.w3c.dom,
             org.xml.sax*,
             org.apache.commons.codec*;version="[1.3,2)",
-            org.apache.http*;version="[4,5)",
-            org.apache.http.conn.routing;version="[4,5)",
             org.apache.commons.logging*;version="[1.1,2)";resolution:=optional,
             org.aspectj.lang*;version="[1,2)";resolution:=optional,
-            org.joda.time.format;resolution:=optional,
             org.junit*;version="[4,5)";resolution:=optional,
-            org.springframework*;version="[2.5,4)";resolution:=optional
+            org.springframework*;version="[2.5,4)";resolution:=optional,
+            javax.security.auth.x500;resolution:=optional, 
+            org.ietf.jgss;resolution:=optional
         </servicemix.osgi.import.pkg>
+        <servicemix.osgi.private.pkg>
+            org.apache.http.*,
+            org.joda.convert*,
+            org.joda.time*
+        </servicemix.osgi.private.pkg>
     </properties>
 
     <dependencies>
@@ -68,6 +72,11 @@
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
         </dependency>
+        <dependency>
+            <groupId>org.joda</groupId>
+            <artifactId>joda-convert</artifactId>
+            <version>1.5</version>
+        </dependency>
 
         <!-- sources -->
         <dependency>
@@ -93,13 +102,20 @@
                             <artifactSet>
                                 <includes>
                                     <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                    <include>org.joda:joda-convert</include>
                                 </includes>
                             </artifactSet>
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
                                     <excludes>
-                                        <exclude>**/*.class</exclude>
+                                        <exclude>**/*</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.joda:joda-convert</artifact>
+                                    <excludes>
+                                        <exclude>**/*</exclude>
                                     </excludes>
                                 </filter>
                             </filters>

Modified: servicemix/smx4/bundles/trunk/aws-java-sdk-1.8.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/aws-java-sdk-1.8.3/pom.xml?rev=1615553&r1=1615552&r2=1615553&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/aws-java-sdk-1.8.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/aws-java-sdk-1.8.3/pom.xml Mon Aug  4 13:29:41 2014
@@ -53,14 +53,18 @@
             org.w3c.dom,
             org.xml.sax*,
             org.apache.commons.codec*;version="[1.3,2)",
-            org.apache.http*;version="[4,5)",
-            org.apache.http.conn.routing;version="[4,5)",
             org.apache.commons.logging*;version="[1.1,2)";resolution:=optional,
             org.aspectj.lang*;version="[1,2)";resolution:=optional,
-            org.joda.time*;resolution:=optional,
             org.junit*;version="[4,5)";resolution:=optional,
-            org.springframework*;version="[2.5,4)";resolution:=optional
+            org.springframework*;version="[2.5,4)";resolution:=optional,
+            javax.security.auth.x500;resolution:=optional, 
+            org.ietf.jgss;resolution:=optional
         </servicemix.osgi.import.pkg>
+        <servicemix.osgi.private.pkg>
+            org.apache.http.*,
+            org.joda.convert*,
+            org.joda.time*
+        </servicemix.osgi.private.pkg>
     </properties>
 
     <dependencies>
@@ -69,6 +73,11 @@
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
         </dependency>
+        <dependency>
+            <groupId>org.joda</groupId>
+            <artifactId>joda-convert</artifactId>
+            <version>1.5</version>
+        </dependency>
 
         <!-- sources -->
         <dependency>
@@ -94,13 +103,20 @@
                             <artifactSet>
                                 <includes>
                                     <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                    <include>org.joda:joda-convert</include>
                                 </includes>
                             </artifactSet>
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
                                     <excludes>
-                                        <exclude>**/*.class</exclude>
+                                        <exclude>**/*</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.joda:joda-convert</artifact>
+                                    <excludes>
+                                        <exclude>**/*</exclude>
                                     </excludes>
                                 </filter>
                             </filters>

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1615553&r1=1615552&r2=1615553&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Mon Aug  4 13:29:41 2014
@@ -43,6 +43,9 @@
 
     <modules>
         <!-- add modules for all bundles to released in the next batch here -->
+        <module>aws-java-sdk-1.8.3</module>
+        <module>aws-java-sdk-1.7.12</module>
+        <module>aws-java-sdk-1.7.5</module>
         <module>opensaml-2.6.1</module>
         <module>opensaml-2.6.0</module>
         <module>opensaml-2.5.3</module>



Mime
View raw message