You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2007/09/24 11:14:47 UTC

svn commit: r578719 - in /james/jspf/trunk: pom.xml src/main/appended-resources/supplemental-models.xml src/test/resources/org/apache/james/jspf/libspf2.LICENSE src/test/resources/org/apache/james/jspf/libspf2.LICENSES

Author: bago
Date: Mon Sep 24 02:14:45 2007
New Revision: 578719

URL: http://svn.apache.org/viewvc?rev=578719&view=rev
Log:
Renamed libspf2.LICENSES to libspf2.LICENSE (naming convention for license files).
Added automatic RAT check to the maven build / site generation.
Excluded from RAT checks the resources already taken into consideration in NOTICE.
Changed the NOTICE text to be more specific about included 3rd party files and inspiration sources.

Added:
    james/jspf/trunk/src/test/resources/org/apache/james/jspf/libspf2.LICENSE
      - copied unchanged from r577329, james/jspf/trunk/src/test/resources/org/apache/james/jspf/libspf2.LICENSES
Removed:
    james/jspf/trunk/src/test/resources/org/apache/james/jspf/libspf2.LICENSES
Modified:
    james/jspf/trunk/pom.xml
    james/jspf/trunk/src/main/appended-resources/supplemental-models.xml

Modified: james/jspf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/pom.xml?rev=578719&r1=578718&r2=578719&view=diff
==============================================================================
--- james/jspf/trunk/pom.xml (original)
+++ james/jspf/trunk/pom.xml Mon Sep 24 02:14:45 2007
@@ -200,11 +200,51 @@
         <artifactId>maven-site-plugin</artifactId>
         <version>2.0-beta-5</version>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rat-maven-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <!-- 3rd party resources described in NOTICE:
+                 see the maven-remote-resources-plugin configuration, in this file -->
+            <exclude>src/test/resources/org/apache/james/jspf/pyspf-tests.yml</exclude>
+            <exclude>src/test/resources/org/apache/james/jspf/rfc4408-tests.yml</exclude>
+            <exclude>src/test/resources/org/apache/james/jspf/tests.yml</exclude>
+            <exclude>src/test/resources/org/apache/james/jspf/test_live.txt</exclude>
+            <exclude>src/test/resources/org/apache/james/jspf/test_parser.txt</exclude>
+            <exclude>src/test/resources/org/apache/james/jspf/test_rfc_examples.txt</exclude>
+            <!-- 3rd party descriptors distributed via maven repositories
+                 and included "as is" -->
+            <exclude>stage/commons-cli/poms/commons-cli-1.1.pom</exclude>
+            <exclude>stage/dnsjava/poms/dnsjava-2.0.5.pom</exclude>
+            <exclude>stage/junit/poms/junit-3.8.1.pom</exclude>
+            <exclude>stage/org.apache.james/xmls/james-parent-1.1-site.xml</exclude>
+            <exclude>stage/org.apache.james/xmls/james-parent-1.1-site_en.xml</exclude>
+            <exclude>stage/org.apache.james/xmls/james-project-1.2-site.xml</exclude>
+            <exclude>stage/org.apache.james/xmls/james-project-1.2-site_en.xml</exclude>
+            <exclude>stage/org.jvyaml/poms/jvyaml-0.2.1.pom</exclude>
+            <exclude>stage/uk.nominet/poms/dnsjnio-0.9.8.pom</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </reporting>
   <build>
     <plugins>
       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rat-maven-plugin</artifactId>
+        <version>1.0-alpha-3</version>
+        <executions>
+          <execution>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.1</version>
@@ -281,22 +321,25 @@
 developed by Kent Beck, Erich Gamma, and David Saff
 License: Common Public License Version 1.0  (http://www.opensource.org/licenses/cpl.php)
 
-This product contains code derived from the spfjava library
+This product has been inspired from the spfjava library
 written by Roger Fullerton and Neil Murray.
   
 This product contains DNS-aware tests inspired by DNSJava 
 test code written and copyrighted by Brian Wellington, too.
+(see src\test\java\org\apache\james\jspf\dnsserver\ files)
 
-This product contains resources (SPF parser tests named test*.txt)
-derived from the libspf2 library (http://www.libspf2.org/) and
-distributed under the BSD license and copyright by Wayne Schlitt,
-Shevek. (src\test\resources\org\apache\james\jspf\libspf2.LICENSES)
+This product contains resources (SPF parser tests: test_parser.txt 
+and test_rfc_examples.txt) derived from the libspf2 library 
+(http://www.libspf2.org/) and distributed under the BSD license 
+and copyright by Wayne Schlitt, Shevek. 
+(see src\test\resources\org\apache\james\jspf\libspf2.LICENSE)
 
-This product contains resources (*.yml) from the pyspf library
+This product contains resources (tests.yml, pyspf-tests.yml and 
+rfc4408-tests.yml) from the pyspf library 
 (http://cheeseshop.python.org/pypi/pyspf) distributed under
 the Python Software Foundation License and copyright by Terence Way,
 Stuart Gathman (stuart@bmsi.com) and Scott Kitterman.
-(src\test\resources\org\apache\james\jspf\pyspf.LICENSE)
+(see src\test\resources\org\apache\james\jspf\pyspf.LICENSE)
 
 This file is automatically generated by dependencies declared in pom.xml
 								</postProjectText>

Modified: james/jspf/trunk/src/main/appended-resources/supplemental-models.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/appended-resources/supplemental-models.xml?rev=578719&r1=578718&r2=578719&view=diff
==============================================================================
--- james/jspf/trunk/src/main/appended-resources/supplemental-models.xml (original)
+++ james/jspf/trunk/src/main/appended-resources/supplemental-models.xml Mon Sep 24 02:14:45 2007
@@ -56,6 +56,9 @@
       </licenses>
     </project>
   </supplement>
+  <!-- Also added manually in pom.xml appeneded text because test
+       dependencies are not automatically included by the NOTICE 
+       generator -->
   <supplement>
     <project>
       <groupId>junit</groupId>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org