svn commit: r577651 - in /incubator/servicemix/branches/servicemix-3.1.2/build: pom.xml src/main/java/org/apache/servicemix/maven/plugin/legal/LegalMojo.java

[ffang]

Author: ffang
Date: Thu Sep 20 02:29:49 2007
New Revision: 577651

URL: http://svn.apache.org/viewvc?rev=577651&view=rev
Log:
Preparing 3.1.2 release after graduate - remove DISCLAIMER entry copy from build

Modified:
    incubator/servicemix/branches/servicemix-3.1.2/build/pom.xml
    
incubator/servicemix/branches/servicemix-3.1.2/build/src/main/java/org/apache/servicemix/maven/plugin/legal/LegalMojo.java

Modified: incubator/servicemix/branches/servicemix-3.1.2/build/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1.2/build/pom.xml?rev=577651&r1=577650&r2=577651&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1.2/build/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1.2/build/pom.xml Thu Sep 20 
02:29:49 2007
@@ -71,10 +71,8 @@
                             <tasks>
                                 <copy file="${basedir}/../LICENSE" 
tofile="${basedir}/target/legal/META-INF/LICENSE" />
                                 <copy file="${basedir}/../NOTICE" 
tofile="${basedir}/target/legal/META-INF/NOTICE" />
-                                <copy file="${basedir}/../DISCLAIMER" 
tofile="${basedir}/target/legal/META-INF/DISCLAIMER" />
                                 <copy file="${basedir}/../LICENSE" 
tofile="${basedir}/target/classes/META-INF/LICENSE" />
                                 <copy file="${basedir}/../NOTICE" 
tofile="${basedir}/target/classes/META-INF/NOTICE" />
-                                <copy file="${basedir}/../DISCLAIMER" 
tofile="${basedir}/target/classes/META-INF/DISCLAIMER" />
                             </tasks>
                             <sourceRoot>${basedir}/target/legal</sourceRoot>
                         </configuration>
@@ -87,4 +85,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: 
incubator/servicemix/branches/servicemix-3.1.2/build/src/main/java/org/apache/servicemix/maven/plugin/legal/LegalMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1.2/build/src/main/java/org/apache/servicemix/maven/plugin/legal/LegalMojo.java?rev=577651&r1=577650&r2=577651&view=diff
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1.2/build/src/main/java/org/apache/servicemix/maven/plugin/legal/LegalMojo.java
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1.2/build/src/main/java/org/apache/servicemix/maven/plugin/legal/LegalMojo.java
 Thu Sep 20 02:29:49 2007
@@ -84,7 +84,7 @@
     }
 
     protected void copyLegalFiles(File outputDir) throws IOException {
-        String[] names = { "/META-INF/DISCLAIMER", "/META-INF/NOTICE", 
"/META-INF/LICENSE"};
+        String[] names = { "/META-INF/NOTICE", "/META-INF/LICENSE"};
         for (int i = 0; i < names.length; i++) {
             URL res = getClass().getResource(names[i]);
             FileUtils.copyURLToFile(res, new File(outputDir, names[i]));