You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2021/03/03 12:43:04 UTC

[uima-uimaj] 01/03: [UIMA-6322] Clean up rat configuration

This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch feature/UIMA-6322-Clean-up-rat-configuration-v2
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit 8e4cff4736f622480412b7f0a11a6ae9d4962bdb
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Mon Mar 1 15:31:42 2021 +0100

    [UIMA-6322] Clean up rat configuration
    
    - Clean up rat configuration
    - Enable rat on Jenkins builds
---
 Jenkinsfile                     |  2 +-
 pom.xml                         |  9 +--------
 uimaj-cpe/pom.xml               |  6 ++----
 uimaj-ep-cas-editor-ide/pom.xml |  2 --
 uimaj-ep-cas-editor/pom.xml     |  2 --
 uimaj-examples/pom.xml          | 11 ++++++-----
 uimaj-json/pom.xml              |  8 +++-----
 uimaj-parent/pom.xml            | 36 ++++++++++++++++++++++++++++++++++++
 8 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3b51ceb..07e7a23 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,5 +20,5 @@
 defaultPipeline {
   // The Eclipse libraries that our plugins depend unfortunately on required Java 11
   jdk = 'jdk_11_latest'
-  extraMavenArguments = '-Pjacoco,pmd'
+  extraMavenArguments = '-Pjacoco,pmd,run-rat-report'
 }
diff --git a/pom.xml b/pom.xml
index 46b635a..c591575 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,14 +241,8 @@
               <!-- default configuration -->
               <configuration>
                 <excludes combine.children="append">
-                  <exclude>release.properties</exclude> <!-- generated file -->
-                  <exclude>README*</exclude>
-                  <exclude>RELEASE_NOTES*</exclude>
-                  <exclude>issuesFixed/**</exclude> <!-- generated file -->
                   <exclude>src/main/resources/docbook-shared/titlepage/*.xsl</exclude>
-                  <exclude>marker-file-identifying-*</exclude> <!-- empty file -->
-                  <exclude>DEPENDENCIES</exclude>  <!-- generated file -->
-                  <exclude>.idea/**</exclude>
+                  <exclude>src/main/readme/NOTICE-without-jackson</exclude>
                   
                   <!--  workaround https://issues.apache.org/jira/browse/RAT-97 -->
                   <exclude>aggregate-uimaj*/**</exclude>
@@ -270,7 +264,6 @@
                   <exclude>uimaj-bootstrap/**</exclude>
                   <exclude>uimaj-internal-tools/**</exclude>
                   <exclude>uimaj-json/**</exclude>
-                  <exclude>src/main/readme/NOTICE-without-jackson</exclude>
                </excludes>
               </configuration>
             </execution>
diff --git a/uimaj-cpe/pom.xml b/uimaj-cpe/pom.xml
index fbc687c..2285249 100644
--- a/uimaj-cpe/pom.xml
+++ b/uimaj-cpe/pom.xml
@@ -97,12 +97,10 @@
             <execution>
               <id>default-cli</id>
               <configuration>
-                <excludes>
-                  <exclude>release.properties</exclude> <!-- release generated artifact -->
+                <excludes combine.children="append">
                   <exclude>checkpoint_synchPoint.xml*</exclude> <!-- test data -->
                   <exclude>checkpoint.dat*</exclude> <!-- test data -->
-                  <exclude>marker-file-identifying-*</exclude>
-                </excludes>              
+                </excludes>
               </configuration>
             </execution>
           </executions>
diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml
index 7009bfe..0478879 100644
--- a/uimaj-ep-cas-editor-ide/pom.xml
+++ b/uimaj-ep-cas-editor-ide/pom.xml
@@ -308,9 +308,7 @@
               <id>default-cli</id>
               <configuration>
                 <excludes combine.children="append">
-                  <exclude>release.properties</exclude> <!-- release generated artifact -->
                   <exclude>src/test/resources/ManualTests/*</exclude> <!-- test data -->
-                  <exclude>marker-file-identifying-*</exclude>
                 </excludes>              
               </configuration>
             </execution>
diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml
index 461d772..b0a5ed0 100644
--- a/uimaj-ep-cas-editor/pom.xml
+++ b/uimaj-ep-cas-editor/pom.xml
@@ -304,9 +304,7 @@
               <id>default-cli</id>
               <configuration>
                 <excludes combine.children="append">
-                  <exclude>release.properties</exclude> <!-- release generated artifact -->
                   <exclude>src/test/resources/ManualTests/*</exclude> <!-- test data -->
-                  <exclude>marker-file-identifying-*</exclude>
                 </excludes>              
               </configuration>
             </execution>
diff --git a/uimaj-examples/pom.xml b/uimaj-examples/pom.xml
index 28f0a06..22e669b 100644
--- a/uimaj-examples/pom.xml
+++ b/uimaj-examples/pom.xml
@@ -115,11 +115,12 @@
               <id>default-cli</id>
               <configuration>
                 <excludes combine.children="append">
-                  <exclude>src/main/data/*.txt</exclude> <!-- sample data -->
-                  <exclude>src/main/run_configuration/*.launch</exclude> <!-- generated Eclipse launch files -->
-                  <exclude>src/main/eclipseProject/*readme.txt</exclude> <!-- readme -->
-                  <exclude>src/main/resources/org/apache/uima/tutorial/ex6/*.txt</exclude> <!-- sample data -->
-                </excludes>              
+                  <!-- sample data -->
+                  <exclude>src/main/data/*.txt</exclude> 
+                  <exclude>src/main/resources/org/apache/uima/tutorial/ex6/*.txt</exclude>
+                  <!-- readme -->
+                  <exclude>src/main/eclipseProject/*readme.txt</exclude> 
+                </excludes>
               </configuration>
             </execution>
           </executions>
diff --git a/uimaj-json/pom.xml b/uimaj-json/pom.xml
index 75e557d..87a7d59 100644
--- a/uimaj-json/pom.xml
+++ b/uimaj-json/pom.xml
@@ -76,13 +76,11 @@
 	            <execution>
 	              <id>default-cli</id>
 	              <configuration>
-	                <excludes>
-	                  <exclude>release.properties</exclude> <!-- generated file -->
-	                  <exclude>src/test/resources/CasSerialization/expected/json/*.txt</exclude>                  
-                    <exclude>src/test/resources/CasSerialization/expected/xmi/*.xml</exclude>                  
+	                <excludes combine.children="append">
+	                  <exclude>src/test/resources/CasSerialization/expected/json/*.txt</exclude>
+                    <exclude>src/test/resources/CasSerialization/expected/xmi/*.xml</exclude>
 	                  <exclude>src/test/resources/CASTests/json/expected/*.json</exclude>
 	                  <exclude>src/test/java/org/apache/uima/test/*.java</exclude>
-	                  <exclude>marker-file-identifying-*</exclude>              
 	               </excludes>
 	              </configuration>
 	            </execution>
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index 09c2d54..0950914 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -174,4 +174,40 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+
+  <build>
+    <plugins>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>default-cli</id>
+              <goals><goal>check</goal></goals>
+              <phase>verify</phase>
+              <!-- default configuration -->
+              <configuration>
+                <excludes combine.children="append">
+                  <exclude>.factorypath</exclude>
+                  <exclude>.idea/**</exclude>
+                  <!-- Eclipse launch files - no need for a license -->
+                  <exclude>**/run_configuration/*.launch</exclude>
+                  <!-- Maven profile trigger files -->
+                  <exclude>marker-file-identifying-*</exclude>
+                  <!-- Generated files -->
+                  <exclude>release.properties</exclude>
+                  <exclude>issuesFixed/**</exclude>
+                  <exclude>DEPENDENCIES</exclude>
+                  <!-- Simple documentation files not requiring an explicit licenese -->
+                  <exclude>README*</exclude>
+                  <exclude>RELEASE_NOTES*</exclude>
+               </excludes>
+              </configuration>
+            </execution>
+          </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+  
 </project>