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 2017/11/10 16:21:25 UTC
svn commit: r1814881 - in /uima/uimafit/trunk: uimafit-core/pom.xml
uimafit-legacy-support/pom.xml uimafit-maven-plugin/pom.xml
Author: rec
Date: Fri Nov 10 16:21:25 2017
New Revision: 1814881
URL: http://svn.apache.org/viewvc?rev=1814881&view=rev
Log:
No jira. Ramp up again towards a new release
- Use "combine.children='append'" instead of reconfiguring rat in submodules
- Added a rat exclude for the types.txt file of an integration test for the maven plugin - that file cannot contain a license header
Modified:
uima/uimafit/trunk/uimafit-core/pom.xml
uima/uimafit/trunk/uimafit-legacy-support/pom.xml
uima/uimafit/trunk/uimafit-maven-plugin/pom.xml
Modified: uima/uimafit/trunk/uimafit-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/pom.xml?rev=1814881&r1=1814880&r2=1814881&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/pom.xml (original)
+++ uima/uimafit/trunk/uimafit-core/pom.xml Fri Nov 10 16:21:25 2017
@@ -149,37 +149,29 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <configuration>
- <excludes>
- <!-- Plain documentation -->
- <exclude>README*</exclude>
- <!-- Release files -->
- <exclude>RELEASE_NOTES*</exclude>
- <exclude>issuesFixed/**</exclude>
- <exclude>release.properties</exclude>
- <!-- Build controls -->
- <exclude>.activate-enforce-compatibility</exclude>
- <!-- These test files are unreasonable to bear a license header -->
- <exclude>src/test/resources/log4j.properties</exclude>
- <exclude>src/test/resources/data/docs/unix-newlines.txt.bin</exclude>
- <exclude>src/test/resources/data/docs/windows-newlines.txt.bin</exclude>
- <exclude>src/test/resources/data/docs/bad.xcas</exclude>
- <exclude>src/test/resources/data/docs/test.xcas</exclude>
- <exclude>src/test/resources/data/docs/test.xmi</exclude>
- <exclude>src/test/resources/data/reference/JCasBuilderTest.dump</exclude>
- <exclude>src/test/resources/data/reference/test.xmi.dump</exclude>
- <exclude>src/test/resources/data/reference/SerializationTestAnnotator.xml</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>
- </excludes>
- </configuration>
- </execution>
- </executions>
+ <executions>
+ <execution>
+ <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>
+ <exclude>src/test/resources/data/docs/unix-newlines.txt.bin</exclude>
+ <exclude>src/test/resources/data/docs/windows-newlines.txt.bin</exclude>
+ <exclude>src/test/resources/data/docs/bad.xcas</exclude>
+ <exclude>src/test/resources/data/docs/test.xcas</exclude>
+ <exclude>src/test/resources/data/docs/test.xmi</exclude>
+ <exclude>src/test/resources/data/reference/JCasBuilderTest.dump</exclude>
+ <exclude>src/test/resources/data/reference/test.xmi.dump</exclude>
+ <exclude>src/test/resources/data/reference/SerializationTestAnnotator.xml</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>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</pluginManagement>
Modified: uima/uimafit/trunk/uimafit-legacy-support/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-legacy-support/pom.xml?rev=1814881&r1=1814880&r2=1814881&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-legacy-support/pom.xml (original)
+++ uima/uimafit/trunk/uimafit-legacy-support/pom.xml Fri Nov 10 16:21:25 2017
@@ -109,41 +109,36 @@
</executions>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <configuration>
- <excludes>
- <!-- Plain documentation -->
- <exclude>README*</exclude>
- <!-- Release files -->
- <exclude>RELEASE_NOTES*</exclude>
- <exclude>issuesFixed/**</exclude>
- <exclude>release.properties</exclude>
- <!-- Build controls -->
- <exclude>.activate-enforce-compatibility</exclude>
- <!-- These test files are unreasonable to bear a license header -->
- <exclude>src/test/resources/data/docs/unix-newlines.txt.bin</exclude>
- <exclude>src/test/resources/data/docs/windows-newlines.txt.bin</exclude>
- <exclude>src/test/resources/data/docs/bad.xcas</exclude>
- <exclude>src/test/resources/data/docs/test.xcas</exclude>
- <exclude>src/test/resources/data/docs/test.xmi</exclude>
- <exclude>src/test/resources/data/reference/JCasBuilderTest.dump</exclude>
- <exclude>src/test/resources/data/reference/test.xmi.dump</exclude>
- <!-- These configuration files cannot bear a license header -->
- <exclude>src/test/resources/META-INF/org.uimafit/fsindexes.txt</exclude>
- <exclude>src/test/resources/META-INF/org.uimafit/types.txt</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <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>
+ <exclude>src/test/resources/data/docs/unix-newlines.txt.bin</exclude>
+ <exclude>src/test/resources/data/docs/windows-newlines.txt.bin</exclude>
+ <exclude>src/test/resources/data/docs/bad.xcas</exclude>
+ <exclude>src/test/resources/data/docs/test.xcas</exclude>
+ <exclude>src/test/resources/data/docs/test.xmi</exclude>
+ <exclude>src/test/resources/data/reference/JCasBuilderTest.dump</exclude>
+ <exclude>src/test/resources/data/reference/test.xmi.dump</exclude>
+ <exclude>src/test/resources/data/reference/SerializationTestAnnotator.xml</exclude>
+ <!-- These configuration files cannot bear a license header -->
+ <exclude>src/test/resources/META-INF/org.uimafit/fsindexes.txt</exclude>
+ <exclude>src/test/resources/META-INF/org.uimafit/typepriorities.txt</exclude>
+ <exclude>src/test/resources/META-INF/org.uimafit/types.txt</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
\ No newline at end of file
Modified: uima/uimafit/trunk/uimafit-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-maven-plugin/pom.xml?rev=1814881&r1=1814880&r2=1814881&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-maven-plugin/pom.xml (original)
+++ uima/uimafit/trunk/uimafit-maven-plugin/pom.xml Fri Nov 10 16:21:25 2017
@@ -167,6 +167,25 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <configuration>
+ <excludes combine.children="append">
+ <!-- These configuration files cannot bear a license header -->
+ <exclude>**/META-INF/org.apache.uima.fit/types.txt</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<url>${uimaWebsiteUrl}</url>
<inceptionYear>2012</inceptionYear>