servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1346898 - in /servicemix/smx4/bundles/trunk: bundles-pom/pom.xml quickfix-1.5.2/LICENSE.txt quickfix-1.5.2/NOTICE.txt src-assembly/src/main/resources/assemblies/src-assembly.xml src-assembly/src/main/resources/assemblies/src.xml
Date Wed, 06 Jun 2012 14:08:44 GMT
Author: jbonofre
Date: Wed Jun  6 14:08:43 2012
New Revision: 1346898

URL: http://svn.apache.org/viewvc?rev=1346898&view=rev
Log:
[SMX4-1176] Improvement of the src-assembly and bundles-pom to automatically include LICENSE
and NOTICE in the bundles src distribution

Added:
    servicemix/smx4/bundles/trunk/src-assembly/src/main/resources/assemblies/src-assembly.xml
      - copied, changed from r1346868, servicemix/smx4/bundles/trunk/src-assembly/src/main/resources/assemblies/src.xml
Removed:
    servicemix/smx4/bundles/trunk/quickfix-1.5.2/LICENSE.txt
    servicemix/smx4/bundles/trunk/quickfix-1.5.2/NOTICE.txt
    servicemix/smx4/bundles/trunk/src-assembly/src/main/resources/assemblies/src.xml
Modified:
    servicemix/smx4/bundles/trunk/bundles-pom/pom.xml

Modified: servicemix/smx4/bundles/trunk/bundles-pom/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/bundles-pom/pom.xml?rev=1346898&r1=1346897&r2=1346898&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/bundles-pom/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/bundles-pom/pom.xml Wed Jun  6 14:08:43 2012
@@ -237,9 +237,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.3</version>
                 <executions>
                     <execution>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>process</goal>
                         </goals>
@@ -250,11 +251,6 @@
                             <supplementalModels>
                                 <supplementalModel>target/legal/legal.xml</supplementalModel>
                             </supplementalModels>
-                            <properties>
-                                <addLicense>true</addLicense>
-                                <addArtifact>true</addArtifact>
-                                <projectName>Apache ServiceMix</projectName>
-                            </properties>
                         </configuration>
                     </execution>
                 </executions>
@@ -279,7 +275,7 @@
                         </goals>
                         <configuration>
                             <descriptorRefs>
-                                <descriptorRef>src</descriptorRef>
+                                <descriptorRef>src-assembly</descriptorRef>
                             </descriptorRefs>
                         </configuration>
                     </execution>

Copied: servicemix/smx4/bundles/trunk/src-assembly/src/main/resources/assemblies/src-assembly.xml
(from r1346868, servicemix/smx4/bundles/trunk/src-assembly/src/main/resources/assemblies/src.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/src-assembly/src/main/resources/assemblies/src-assembly.xml?p2=servicemix/smx4/bundles/trunk/src-assembly/src/main/resources/assemblies/src-assembly.xml&p1=servicemix/smx4/bundles/trunk/src-assembly/src/main/resources/assemblies/src.xml&r1=1346868&r2=1346898&rev=1346898&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/src-assembly/src/main/resources/assemblies/src.xml (original)
+++ servicemix/smx4/bundles/trunk/src-assembly/src/main/resources/assemblies/src-assembly.xml
Wed Jun  6 14:08:43 2012
@@ -2,19 +2,32 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
 
-    <id>src-descriptor-id</id>
+    <id>src</id>
 
     <formats>
         <format>zip</format>
+        <format>tar.gz</format>
     </formats>
 
     <fileSets>
         <fileSet>
             <includes>
-                <include>**/*</include>
+                <include>pom.xml</include>
+                <include>src/**/*</include>
             </includes>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
     </fileSets>
 
-</assembly>
\ No newline at end of file
+    <files>
+      <file>
+        <source>target/maven-shared-archive-resources/META-INF/LICENSE</source>
+        <outputDirectory>.</outputDirectory>
+      </file>
+      <file>
+        <source>target/maven-shared-archive-resources/META-INF/NOTICE</source>
+        <outputDirectory>.</outputDirectory>
+      </file>
+    </files>
+
+</assembly>



Mime
View raw message