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/01 18:39:10 UTC
[uima-ruta] branch feature/UIMA-6325-Update-to-UIMA-Parent-POM-14
created (now f539900)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch feature/UIMA-6325-Update-to-UIMA-Parent-POM-14
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.
at f539900 [UIMA-6325] Update to UIMA Parent POM 14
This branch includes the following new commits:
new f539900 [UIMA-6325] Update to UIMA Parent POM 14
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[uima-ruta] 01/01: [UIMA-6325] Update to UIMA Parent POM 14
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch feature/UIMA-6325-Update-to-UIMA-Parent-POM-14
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit f5399002ac1fecd15cc1a5a70f2a0566f3ad8691
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Mon Mar 1 19:38:55 2021 +0100
[UIMA-6325] Update to UIMA Parent POM 14
- Clean up rat plugin configuration
---
.../ruta-ep-example-extensions/pom.xml | 6 +---
example-projects/ruta-maven-example/pom.xml | 3 +-
pom.xml | 34 +++++++++++++---------
ruta-basic-type/pom.xml | 4 +--
ruta-core-ext/pom.xml | 3 +-
ruta-core/pom.xml | 5 +---
ruta-ep-addons/pom.xml | 6 +---
ruta-ep-caseditor/pom.xml | 6 +---
ruta-ep-core-ext/pom.xml | 21 -------------
ruta-ep-engine/pom.xml | 22 +-------------
ruta-ep-ide-ui/pom.xml | 6 +---
ruta-ep-ide/pom.xml | 6 +---
ruta-ep-textruler/pom.xml | 21 -------------
ruta-maven-archetype/pom.xml | 4 +--
ruta-maven-plugin/pom.xml | 2 +-
15 files changed, 33 insertions(+), 116 deletions(-)
diff --git a/example-projects/ruta-ep-example-extensions/pom.xml b/example-projects/ruta-ep-example-extensions/pom.xml
index 01f358d..b0e7877 100644
--- a/example-projects/ruta-ep-example-extensions/pom.xml
+++ b/example-projects/ruta-ep-example-extensions/pom.xml
@@ -97,11 +97,7 @@
<execution>
<id>default-cli</id>
<configuration>
- <excludes>
- <exclude>release.properties</exclude> <!-- release generated artifact -->
- <exclude>marker-file-identifying-*</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
- <exclude>issuesFixed/**</exclude>
+ <excludes combine.children="append">
<exclude>src/test/resources/org/apache/uima/ruta/example/extensions/*.txt</exclude> <!-- test data -->
<exclude>src/test/resources/org/apache/uima/ruta/example/extensions/*ruta</exclude> <!-- test data -->
</excludes>
diff --git a/example-projects/ruta-maven-example/pom.xml b/example-projects/ruta-maven-example/pom.xml
index 7df423a..f591a80 100644
--- a/example-projects/ruta-maven-example/pom.xml
+++ b/example-projects/ruta-maven-example/pom.xml
@@ -93,10 +93,9 @@
<execution>
<id>default-cli</id>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<exclude>.buildpath</exclude> <!-- generate IDE file -->
<exclude>src/main/resources/FirstNames.txt</exclude> <!-- dictionary -->
- <exclude>issuesFixed/**</exclude> <!-- generated -->
</excludes>
</configuration>
</execution>
diff --git a/pom.xml b/pom.xml
index a33cdaa..043ffc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,26 +146,34 @@
<pluginManagement>
<plugins>
<plugin>
- <!-- run Release Audit Tool (RAT) -->
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<executions>
<execution>
<id>default-cli</id>
+ <!-- default configuration -->
<configuration>
- <excludes>
- <exclude>target/**</exclude>
+ <excludes combine.children="append">
+ <!-- workaround https://issues.apache.org/jira/browse/RAT-97 -->
<exclude>example-projects/**</exclude>
- <exclude>README*</exclude>
- <exclude>RELEASE_NOTES*</exclude>
- <exclude>issuesFixed/**</exclude>
- <exclude>src/main/resources/docbook-shared/titlepage/*.xsl</exclude>
- <exclude>marker-file-identifying-*</exclude>
- <exclude>ruta-eclipse-update-site/target/**</exclude>
- <exclude>ruta-eclipse-update-site/marker-file-identifying-*</exclude>
- <exclude>ruta-eclipse-update-site/.settings/**</exclude>
- <exclude>ruta-eclipse-update-site/.project</exclude>
- <exclude>DEPENDENCIES</exclude>
+ <exclude>ruta-basic-type/**</exclude>
+ <exclude>ruta-core/**</exclude>
+ <exclude>ruta-core-ext/**</exclude>
+ <exclude>ruta-docbook/**</exclude>
+ <exclude>ruta-eclipse-feature/**</exclude>
+ <exclude>ruta-eclipse-update-site/**</exclude>
+ <exclude>ruta-ep-addons/**</exclude>
+ <exclude>ruta-ep-caseditor/**</exclude>
+ <exclude>ruta-ep-core-ext/**</exclude>
+ <exclude>ruta-ep-engine/**</exclude>
+ <exclude>ruta-ep-ide/**</exclude>
+ <exclude>ruta-ep-ide-ui/**</exclude>
+ <exclude>ruta-ep-parent/**</exclude>
+ <exclude>ruta-ep-textruler/**</exclude>
+ <exclude>ruta-maven-archetype/**</exclude>
+ <exclude>ruta-maven-plugin/**</exclude>
+ <exclude>ruta-parent/**</exclude>
+ <exclude>ruta-typesystem/**</exclude>
</excludes>
</configuration>
</execution>
diff --git a/ruta-basic-type/pom.xml b/ruta-basic-type/pom.xml
index 45ad6c6..847e1f6 100644
--- a/ruta-basic-type/pom.xml
+++ b/ruta-basic-type/pom.xml
@@ -75,10 +75,8 @@
<execution>
<id>default-cli</id>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<exclude>src/main/resources/META-INF/org.apache.uima.fit/*.txt</exclude>
- <exclude>issuesFixed/**</exclude> <!-- generated -->
- <exclude>marker-file-identifying-*</exclude>
</excludes>
</configuration>
</execution>
diff --git a/ruta-core-ext/pom.xml b/ruta-core-ext/pom.xml
index b665411..9863f40 100644
--- a/ruta-core-ext/pom.xml
+++ b/ruta-core-ext/pom.xml
@@ -75,10 +75,9 @@
<execution>
<id>default-cli</id>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<exclude>src/test/resources/org/apache/uima/ruta/block/fst/*.txt</exclude> <!-- test data -->
<exclude>src/test/resources/org/apache/uima/ruta/action/*.*</exclude> <!-- test data -->
- <exclude>issuesFixed/**</exclude> <!-- generated -->
</excludes>
</configuration>
</execution>
diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml
index 5356837..a1fae5b 100644
--- a/ruta-core/pom.xml
+++ b/ruta-core/pom.xml
@@ -186,7 +186,7 @@
<execution>
<id>default-cli</id>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<exclude>src/main/antlr3/org/apache/uima/ruta/parser/RutaLexer.tokens</exclude> <!-- grammar tokens -->
<exclude>src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.tokens</exclude> <!-- grammar tokens -->
<exclude>src/test/resources/org/apache/uima/ruta/**/*.txt</exclude> <!-- test data -->
@@ -197,11 +197,8 @@
<exclude>src/test/resources/org/apache/uima/ruta/engine/*.html</exclude> <!-- test data -->
<exclude>src/test/resources/META-INF/org.apache.uima.fit/types.txt</exclude> <!-- test data -->
<exclude>src/main/resources/META-INF/org.apache.uima.fit/*.txt</exclude>
- <exclude>api-change-report/**</exclude>
- <exclude>issuesFixed/**</exclude> <!-- generated -->
<exclude>input/**</exclude> <!-- temp test data -->
<exclude>TypeSystem.xml</exclude> <!-- temp test data -->
- <exclude>marker-file-identifying-*</exclude>
</excludes>
</configuration>
</execution>
diff --git a/ruta-ep-addons/pom.xml b/ruta-ep-addons/pom.xml
index 2fdb2a3..e93b161 100644
--- a/ruta-ep-addons/pom.xml
+++ b/ruta-ep-addons/pom.xml
@@ -174,12 +174,8 @@
<execution>
<id>default-cli</id>
<configuration>
- <excludes>
- <exclude>release.properties</exclude> <!-- release generated artifact -->
+ <excludes combine.children="append">
<exclude>src/test/resources/ManualTests/*</exclude> <!-- test data -->
- <exclude>marker-file-identifying-*</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
- <exclude>issuesFixed/**</exclude>
</excludes>
</configuration>
</execution>
diff --git a/ruta-ep-caseditor/pom.xml b/ruta-ep-caseditor/pom.xml
index eed81f1..72cc9a2 100644
--- a/ruta-ep-caseditor/pom.xml
+++ b/ruta-ep-caseditor/pom.xml
@@ -135,12 +135,8 @@
<execution>
<id>default-cli</id>
<configuration>
- <excludes>
- <exclude>release.properties</exclude> <!-- release generated artifact -->
+ <excludes combine.children="append">
<exclude>src/test/resources/ManualTests/*</exclude> <!-- test data -->
- <exclude>marker-file-identifying-*</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
- <exclude>issuesFixed/**</exclude>
</excludes>
</configuration>
</execution>
diff --git a/ruta-ep-core-ext/pom.xml b/ruta-ep-core-ext/pom.xml
index a072c93..9151d58 100644
--- a/ruta-ep-core-ext/pom.xml
+++ b/ruta-ep-core-ext/pom.xml
@@ -96,27 +96,6 @@
<build>
<!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
<finalName>org.apache.uima.ruta.core.ext_${parsedVersion.osgiVersion}</finalName>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <configuration>
- <excludes>
- <exclude>release.properties</exclude> <!-- release generated artifact -->
- <exclude>marker-file-identifying-*</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
- <exclude>issuesFixed/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
diff --git a/ruta-ep-engine/pom.xml b/ruta-ep-engine/pom.xml
index 1eb6f2e..bba5a98 100644
--- a/ruta-ep-engine/pom.xml
+++ b/ruta-ep-engine/pom.xml
@@ -219,27 +219,7 @@
<directory>src/main/readme_src</directory>
</resource>
</resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <configuration>
- <excludes>
- <exclude>release.properties</exclude> <!-- release generated artifact -->
- <exclude>marker-file-identifying-*</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
- <exclude>issuesFixed/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
diff --git a/ruta-ep-ide-ui/pom.xml b/ruta-ep-ide-ui/pom.xml
index 4775b98..03932cc 100644
--- a/ruta-ep-ide-ui/pom.xml
+++ b/ruta-ep-ide-ui/pom.xml
@@ -243,16 +243,12 @@
<execution>
<id>default-cli</id>
<configuration>
- <excludes>
- <exclude>release.properties</exclude> <!-- release generated artifact -->
- <exclude>marker-file-identifying-*</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
+ <excludes combine.children="append">
<exclude>src/main/resources/org/apache/uima/ruta/ide/formatter/*.ruta</exclude> <!-- preview file -->
<exclude>src/main/resources/org/apache/uima/ruta/ide/formatter/preferences/*.ruta</exclude> <!-- preview file -->
<exclude>src/main/resources/org/apache/uima/ruta/ide/launching/*.ruta</exclude> <!-- preview file -->
<exclude>src/main/resources/org/apache/uima/ruta/ide/ui/documentation/*.html</exclude> <!-- hover documentation -->
<exclude>src/main/resources/org/apache/uima/ruta/ide/ui/preferences/*.txt</exclude> <!-- preview file -->
- <exclude>issuesFixed/**</exclude>
</excludes>
</configuration>
</execution>
diff --git a/ruta-ep-ide/pom.xml b/ruta-ep-ide/pom.xml
index b2de160..c0f27fd 100644
--- a/ruta-ep-ide/pom.xml
+++ b/ruta-ep-ide/pom.xml
@@ -142,13 +142,9 @@
<execution>
<id>default-cli</id>
<configuration>
- <excludes>
- <exclude>release.properties</exclude> <!-- release generated artifact -->
- <exclude>marker-file-identifying-*</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
+ <excludes combine.children="append">
<exclude>src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.tokens</exclude> <!-- grammar tokens -->
<exclude>src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.tokens</exclude> <!-- grammar tokens -->
- <exclude>issuesFixed/**</exclude>
</excludes>
</configuration>
</execution>
diff --git a/ruta-ep-textruler/pom.xml b/ruta-ep-textruler/pom.xml
index 84b3836..1d23ac3 100644
--- a/ruta-ep-textruler/pom.xml
+++ b/ruta-ep-textruler/pom.xml
@@ -127,27 +127,6 @@
<directory>src/main/readme_src</directory>
</resource>
</resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <configuration>
- <excludes>
- <exclude>release.properties</exclude> <!-- release generated artifact -->
- <exclude>marker-file-identifying-*</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
- <exclude>issuesFixed/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
diff --git a/ruta-maven-archetype/pom.xml b/ruta-maven-archetype/pom.xml
index c6292cd..71db411 100644
--- a/ruta-maven-archetype/pom.xml
+++ b/ruta-maven-archetype/pom.xml
@@ -65,11 +65,9 @@
<execution>
<id>default-cli</id>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<exclude>src/main/resources/archetype-resources/src/main/resources/META-INF/org.apache.uima.fit/*.txt</exclude> <!-- uimafit -->
<exclude>src/main/resources/archetype-resources/src/main/resources/**/*.txt</exclude> <!-- dictionary -->
- <exclude>issuesFixed/**</exclude> <!-- generated -->
- <exclude>marker-file-identifying-*</exclude>
</excludes>
</configuration>
</execution>
diff --git a/ruta-maven-plugin/pom.xml b/ruta-maven-plugin/pom.xml
index 544c151..b481f2a 100644
--- a/ruta-maven-plugin/pom.xml
+++ b/ruta-maven-plugin/pom.xml
@@ -133,7 +133,7 @@
<execution>
<id>default-cli</id>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<exclude>src/test/**/*.ruta</exclude> <!-- test data -->
<exclude>src/it/**/*.ruta</exclude> <!-- test data -->
<exclude>src/it/**/*.txt</exclude> <!-- test data -->