This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch feature/UIMA-6011-Always-run-RAT-check
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
commit 376511c61b11dfd01099a950cce7f86a9c683bcf
Author: Richard Eckart de Castilho <r...@apache.org>
AuthorDate: Wed Mar 20 19:38:13 2019 +0100
[UIMA-6011] Always run RAT check
- Always enable RAT
- Fix RAT configurations
- Add missing license headers
---
uimafit-benchmark/pom.xml | 6 +-----
.../uima/fit/benchmark/RunnableWithExceptions.java | 22 ++++++++++++++++++++--
uimafit-examples/pom.xml | 7 +++----
uimafit-parent/pom.xml | 15 +++++++++++++++
4 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/uimafit-benchmark/pom.xml b/uimafit-benchmark/pom.xml
index 4394da3..2c89b12 100644
--- a/uimafit-benchmark/pom.xml
+++ b/uimafit-benchmark/pom.xml
@@ -117,12 +117,8 @@
<id>default-cli</id>
<configuration>
<excludes combine.children="append">
- <!-- These test files are unreasonable to bear a license
header -->
- <exclude>src/test/resources/log4j.properties</exclude>
<!-- These configuration files cannot bear a license header
-->
-
<exclude>src/test/resources/META-INF/org.apache.uima.fit/fsindexes.txt</exclude>
-
<exclude>src/test/resources/META-INF/org.apache.uima.fit/typepriorities.txt</exclude>
-
<exclude>src/test/resources/META-INF/org.apache.uima.fit/types.txt</exclude>
+
<exclude>src/main/resources/META-INF/org.apache.uima.fit/types.txt</exclude>
</excludes>
</configuration>
</execution>
diff --git
a/uimafit-benchmark/src/main/java/org/apache/uima/fit/benchmark/RunnableWithExceptions.java
b/uimafit-benchmark/src/main/java/org/apache/uima/fit/benchmark/RunnableWithExceptions.java
index 262c454..2cd5669 100644
---
a/uimafit-benchmark/src/main/java/org/apache/uima/fit/benchmark/RunnableWithExceptions.java
+++
b/uimafit-benchmark/src/main/java/org/apache/uima/fit/benchmark/RunnableWithExceptions.java
@@ -1,5 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.uima.fit.benchmark;
public interface RunnableWithExceptions {
- void run() throws Exception;
- }
\ No newline at end of file
+ void run() throws Exception;
+}
\ No newline at end of file
diff --git a/uimafit-examples/pom.xml b/uimafit-examples/pom.xml
index 56a0442..39e884e 100644
--- a/uimafit-examples/pom.xml
+++ b/uimafit-examples/pom.xml
@@ -122,16 +122,15 @@
<configuration>
<excludes>
<exclude>release.properties</exclude>
- <exclude>README*</exclude>
- <exclude>RELEASE_NOTES*</exclude>
- <exclude>issuesFixed/**</exclude>
<!-- These example are unreasonable to bear a license header
-->
<exclude>src/main/resources/org/apache/uima/fit/examples/pos/sample-gold.txt</exclude>
<exclude>src/main/resources/org/apache/uima/fit/examples/tutorial/ex6/uimaAcronyms.txt</exclude>
<!-- These test files are unreasonable to bear a license
header -->
-
<exclude>src/test/resources/org/apache/uima/fit/examples/xmi/1.xmi</exclude>
<!-- These configuration files cannot bear a license header -->
+
<exclude>src/test/resources/org/apache/uima/fit/examples/xmi/1.xmi</exclude>
<!-- These configuration files cannot bear a license header
-->
<exclude>src/main/resources/META-INF/org.apache.uima.fit/types.txt</exclude>
+ <!-- Logging configuration files -->
+ <exclude>src/main/resources/simplelogger.properties</exclude>
</excludes>
</configuration>
</execution>
diff --git a/uimafit-parent/pom.xml b/uimafit-parent/pom.xml
index 6fe326e..634da24 100644
--- a/uimafit-parent/pom.xml
+++ b/uimafit-parent/pom.xml
@@ -220,6 +220,14 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <!--
+ Normally this only gets executed during releases, but we want
licenses to be checked on
+ every build to make sure the licenses are included in the PRs.
+ -->
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -232,6 +240,9 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.13</version>
+ <configuration>
+ <consoleOutput>true</consoleOutput>
+ </configuration>
<executions>
<execution>
<id>default-cli</id>
@@ -239,12 +250,16 @@
<excludes>
<!-- Plain documentation -->
<exclude>README*</exclude>
+ <!-- GitHub templates -->
+ <exclude>.github/**</exclude>
<!-- Release files -->
<exclude>RELEASE_NOTES*</exclude>
<exclude>issuesFixed/**</exclude>
<exclude>release.properties</exclude>
<!-- Build controls -->
<exclude>.activate-enforce-compatibility</exclude>
+ <!-- Logging configuration files -->
+ <exclude>**/simplelogger.properties</exclude>
</excludes>
</configuration>
</execution>
