servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1090361 - /servicemix/smx4/bundles/trunk/opensaml-2.4.1/pom.xml
Date Fri, 08 Apr 2011 17:43:22 GMT
Author: dkulp
Date: Fri Apr  8 17:43:21 2011
New Revision: 1090361

URL: http://svn.apache.org/viewvc?rev=1090361&view=rev
Log:
Opensaml does really bad classloader things that don't work well in OSGi.  Merge the three
required jars into a single bundle to deal with those issues.

Modified:
    servicemix/smx4/bundles/trunk/opensaml-2.4.1/pom.xml

Modified: servicemix/smx4/bundles/trunk/opensaml-2.4.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/opensaml-2.4.1/pom.xml?rev=1090361&r1=1090360&r2=1090361&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/opensaml-2.4.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/opensaml-2.4.1/pom.xml Fri Apr  8 17:43:21 2011
@@ -39,9 +39,12 @@
         <pkgGroupId>org.opensaml</pkgGroupId>
         <pkgArtifactId>opensaml</pkgArtifactId>
         <pkgVersion>2.4.1</pkgVersion>
-        <servicemix.osgi.export.pkg>
-             org.opensaml
-        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.export>
+             org.opensaml.util*;version="1.4.1";-split-package:=merge-first,
+             org.opensaml.ws*;version="1.4.1";-split-package:=merge-first,
+             org.opensaml.xml*;version="1.3.1";-split-package:=merge-first,
+             org.opensaml*;version="2.4.1";-split-package:=merge-first
+        </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
             !org.opensaml*,
             javax.crypto,
@@ -82,6 +85,18 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>openws</artifactId>
+            <version>1.4.1</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>xmltooling</artifactId>
+            <version>1.3.1</version>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -89,6 +104,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <version>1.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -99,16 +115,10 @@
                             <artifactSet>
                                 <includes>
                                     <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                    <include>${pkgGroupId}:openws</include>
+                                    <include>${pkgGroupId}:xmltooling</include>
                                 </includes>
                             </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <includes>
-                                        <include>*.xml</include>
-                                    </includes>
-                                </filter>
-                            </filters>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
                         </configuration>



Mime
View raw message