servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1563441 - in /servicemix/smx4/bundles/trunk: pom.xml spring-beans-3.2.7.RELEASE/pom.xml
Date Sat, 01 Feb 2014 16:50:05 GMT
Author: jbonofre
Date: Sat Feb  1 16:50:05 2014
New Revision: 1563441

URL: http://svn.apache.org/r1563441
Log:
[SMX4-1685] Fix shading of resources in spring-beans 3.2.7.RELEASE bundle

Modified:
    servicemix/smx4/bundles/trunk/pom.xml
    servicemix/smx4/bundles/trunk/spring-beans-3.2.7.RELEASE/pom.xml

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1563441&r1=1563440&r2=1563441&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Sat Feb  1 16:50:05 2014
@@ -44,8 +44,8 @@
     <modules>
         <!-- add modules for all bundles to released in the next batch here -->
         <module>opensaml-2.6.1</module>
-        <module>spring-core-3.2.7.RELEASE</module>
         <module>spring-beans-3.2.7.RELEASE</module>
+        <module>spring-core-3.2.7.RELEASE</module>
         <module>spring-web-3.2.7.RELEASE</module>
         <module>spring-webmvc-3.2.7.RELEASE</module>
     </modules>

Modified: servicemix/smx4/bundles/trunk/spring-beans-3.2.7.RELEASE/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/spring-beans-3.2.7.RELEASE/pom.xml?rev=1563441&r1=1563440&r2=1563441&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/spring-beans-3.2.7.RELEASE/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/spring-beans-3.2.7.RELEASE/pom.xml Sat Feb  1 16:50:05 2014
@@ -73,23 +73,34 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <configuration>
-                    <artifactSet>
-                        <includes>
-                            <include>${pkgGroupId}:${pkgArtifactId}</include>
-                        </includes>
-                    </artifactSet>
-                    <filters>
-                        <filter>
-                            <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                            <includes>
-                                <include>META-INF/spring.*</include>
-                            </includes>
-                        </filter>
-                    </filters>
-                    <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                    <createDependencyReducedPom>true</createDependencyReducedPom>
-                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <includes>
+                                        <include>**/*.gif</include>
+                                        <include>**/*.xsd</include>
+                                        <include>**/*.dtd</include>
+                                        <include>META-INF/spring.*</include>
+                                    </includes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>



Mime
View raw message