servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1577471 - in /servicemix/smx5/trunk/assembly: ./ src/main/appended-resources/ src/main/appended-resources/META-INF/ src/main/descriptors/ src/main/resources/ src/main/resources/appended-resources/
Date Fri, 14 Mar 2014 10:03:09 GMT
Author: gertv
Date: Fri Mar 14 10:03:09 2014
New Revision: 1577471

URL: http://svn.apache.org/r1577471
Log:
SM-2266: Fix a few issues with the binary/source assembly

Added:
    servicemix/smx5/trunk/assembly/src/main/appended-resources/
    servicemix/smx5/trunk/assembly/src/main/appended-resources/META-INF/
    servicemix/smx5/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm
      - copied, changed from r1577446, servicemix/smx5/trunk/assembly/src/main/resources/appended-resources/META-INF/LICENSE.vm
    servicemix/smx5/trunk/assembly/src/main/appended-resources/META-INF/NOTICE
Removed:
    servicemix/smx5/trunk/assembly/src/main/resources/appended-resources/
Modified:
    servicemix/smx5/trunk/assembly/pom.xml
    servicemix/smx5/trunk/assembly/src/main/descriptors/unix-src.xml
    servicemix/smx5/trunk/assembly/src/main/resources/common-unix-bin.xml

Modified: servicemix/smx5/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/pom.xml?rev=1577471&r1=1577470&r2=1577471&view=diff
==============================================================================
--- servicemix/smx5/trunk/assembly/pom.xml (original)
+++ servicemix/smx5/trunk/assembly/pom.xml Fri Mar 14 10:03:09 2014
@@ -131,13 +131,6 @@
 
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <configuration>
-                    <appendedResourcesDirectory>${basedir}/target/shared/appended-resources</appendedResourcesDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>features-maven-plugin</artifactId>
                 <version>${karaf.version}</version>

Copied: servicemix/smx5/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm (from
r1577446, servicemix/smx5/trunk/assembly/src/main/resources/appended-resources/META-INF/LICENSE.vm)
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm?p2=servicemix/smx5/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm&p1=servicemix/smx5/trunk/assembly/src/main/resources/appended-resources/META-INF/LICENSE.vm&r1=1577446&r2=1577471&rev=1577471&view=diff
==============================================================================
--- servicemix/smx5/trunk/assembly/src/main/resources/appended-resources/META-INF/LICENSE.vm
(original)
+++ servicemix/smx5/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm Fri Mar
14 10:03:09 2014
@@ -37,3 +37,4 @@ $project.name #if ($project.url)($projec
 #end
 #end
 #end
+

Added: servicemix/smx5/trunk/assembly/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/src/main/appended-resources/META-INF/NOTICE?rev=1577471&view=auto
==============================================================================
--- servicemix/smx5/trunk/assembly/src/main/appended-resources/META-INF/NOTICE (added)
+++ servicemix/smx5/trunk/assembly/src/main/appended-resources/META-INF/NOTICE Fri Mar 14
10:03:09 2014
@@ -0,0 +1,8 @@
+This product contains software developed by
+Open Participation Software for Java (http://www.ops4j.org/).
+
+This software contains unmodified binary redistributions for H2 database engine (http://www.h2database.com/),
+which is dual licensed and available under a modified version of the MPL 1.1 (Mozilla Public
License)
+or under the (unmodified) EPL 1.0 (Eclipse Public License).
+An original copy of the license agreement can be found at: http://www.h2database.com/html/license.html
+

Modified: servicemix/smx5/trunk/assembly/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/src/main/descriptors/unix-src.xml?rev=1577471&r1=1577470&r2=1577471&view=diff
==============================================================================
--- servicemix/smx5/trunk/assembly/src/main/descriptors/unix-src.xml (original)
+++ servicemix/smx5/trunk/assembly/src/main/descriptors/unix-src.xml Fri Mar 14 10:03:09 2014
@@ -23,19 +23,19 @@
     <fileSets>
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>${basedir}/../..</directory>
+            <directory>${basedir}/..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
-                <include>BUILDING.txt</include>
-                <include>README.txt</include>
-                <include>RELEASE*.txt</include>
+                <include>BUILDING</include>
+                <include>README</include>
+                <include>RELEASE*</include>
             </includes>
             <lineEnding>unix</lineEnding>
         </fileSet>
 
         <!-- Binary Files -->
         <fileSet>
-            <directory>${basedir}/../..</directory>
+            <directory>${basedir}/..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*.jpeg</include>
@@ -53,7 +53,6 @@
                 <include>**/*.jnilib</include>
                 <include>**/*.cert</include>
                 <include>**/*.jks</include>
-                <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
             </includes>
             <excludes>
                 <exclude>**/eclipse-classes/**</exclude>
@@ -63,7 +62,7 @@
 
         <!-- Text Files -->
         <fileSet>
-            <directory>${basedir}/../..</directory>
+            <directory>${basedir}/..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*</include>
@@ -83,7 +82,6 @@
                 <exclude>**/*.bin</exclude>
                 <exclude>**/*.jnilib</exclude>
                 <exclude>**/*.cert</exclude>
-                <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
                 <exclude>**/target/**</exclude>
                 <exclude>**/build/**</exclude>
                 <exclude>activemq-data/**</exclude>
@@ -110,14 +108,14 @@
         <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
             <outputDirectory>/</outputDirectory>
-            <destName>LICENSE.txt</destName>
+            <destName>LICENSE</destName>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
             <outputDirectory>/</outputDirectory>
-            <destName>NOTICE.txt</destName>
+            <destName>NOTICE</destName>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>

Modified: servicemix/smx5/trunk/assembly/src/main/resources/common-unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/src/main/resources/common-unix-bin.xml?rev=1577471&r1=1577470&r2=1577471&view=diff
==============================================================================
--- servicemix/smx5/trunk/assembly/src/main/resources/common-unix-bin.xml (original)
+++ servicemix/smx5/trunk/assembly/src/main/resources/common-unix-bin.xml Fri Mar 14 10:03:09
2014
@@ -64,9 +64,9 @@
             <fileMode>0755</fileMode>
         </fileSet>
 
-        <!-- Copy license and other files from root -->
+        <!-- Copy README and RELEASE-NOTES from root -->
         <fileSet>
-            <directory>${basedir}/../..</directory>
+            <directory>${basedir}/..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>README</include>



Mime
View raw message