geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r650971 - in /geronimo/server/trunk/assemblies: geronimo-boilerplate-minimal/ geronimo-boilerplate-minimal/src/main/underlay/ geronimo-framework/ geronimo-jetty6-javaee5/ geronimo-jetty6-minimal/ geronimo-tomcat6-javaee5/ geronimo-tomcat6-m...
Date Wed, 23 Apr 2008 18:04:02 GMT
Author: jdillon
Date: Wed Apr 23 11:03:51 2008
New Revision: 650971

URL: http://svn.apache.org/viewvc?rev=650971&view=rev
Log:
Drop .txt suffix on legal muck to be more consistent with maven-remote-resources-plugin, and
allow the common ianal-maven-plugin config to be used
Drop per-module legal muck

Added:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/DISCLAIMER
      - copied unchanged from r650911, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/DISCLAIMER.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE
      - copied unchanged from r650911, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE
      - copied unchanged from r650911, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE.txt
Removed:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/DISCLAIMER.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-framework/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/NOTICE.txt
Modified:
    geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=650971&r1=650970&r2=650971&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Wed Apr 23 11:03:51 2008
@@ -202,27 +202,6 @@
                     </execution>
                 </executions>
             </plugin>
-            
-            <!--
-            HACK: Assemblies contain legal files with .txt extentions.
-            -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>ianal-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <requiredFiles>
-                                <requiredFile>LICENSE.txt</requiredFile>
-                                <requiredFile>NOTICE.txt</requiredFile>
-                            </requiredFiles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=650971&r1=650970&r2=650971&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Wed Apr 23 11:03:51 2008
@@ -672,27 +672,6 @@
                     </execution>
                 </executions>
             </plugin>
-            
-            <!--
-            HACK: Assemblies contain legal files with .txt extentions.
-            -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>ianal-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <requiredFiles>
-                                <requiredFile>LICENSE.txt</requiredFile>
-                                <requiredFile>NOTICE.txt</requiredFile>
-                            </requiredFiles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?rev=650971&r1=650970&r2=650971&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Wed Apr 23 11:03:51 2008
@@ -326,27 +326,6 @@
                     </execution>
                 </executions>
             </plugin>
-            
-            <!--
-            HACK: Assemblies contain legal files with .txt extentions.
-            -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>ianal-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <requiredFiles>
-                                <requiredFile>LICENSE.txt</requiredFile>
-                                <requiredFile>NOTICE.txt</requiredFile>
-                            </requiredFiles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=650971&r1=650970&r2=650971&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Wed Apr 23 11:03:51
2008
@@ -644,27 +644,6 @@
                     </execution>
                 </executions>
             </plugin>
-            
-            <!--
-            HACK: Assemblies contain legal files with .txt extentions.
-            -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>ianal-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <requiredFiles>
-                                <requiredFile>LICENSE.txt</requiredFile>
-                                <requiredFile>NOTICE.txt</requiredFile>
-                            </requiredFiles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?rev=650971&r1=650970&r2=650971&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Wed Apr 23 11:03:51
2008
@@ -326,27 +326,6 @@
                     </execution>
                 </executions>
             </plugin>
-            
-            <!--
-            HACK: Assemblies contain legal files with .txt extentions.
-            -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>ianal-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <requiredFiles>
-                                <requiredFile>LICENSE.txt</requiredFile>
-                                <requiredFile>NOTICE.txt</requiredFile>
-                            </requiredFiles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 



Mime
View raw message