You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2019/09/11 10:29:07 UTC
[cayenne] 01/03: Update RAT check
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 39bde7c5bce57137c008bdedef11199961bdf6e2
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Tue Sep 10 15:57:18 2019 +0300
Update RAT check
---
build-tools/cayenne-checkers/pom.xml | 49 +++++++++++++++++++++++++++++++++++-
pom.xml | 12 ++++++++-
rat.sh | 37 ++++++++++++++-------------
3 files changed, 78 insertions(+), 20 deletions(-)
diff --git a/build-tools/cayenne-checkers/pom.xml b/build-tools/cayenne-checkers/pom.xml
index 696d103..226118f 100644
--- a/build-tools/cayenne-checkers/pom.xml
+++ b/build-tools/cayenne-checkers/pom.xml
@@ -53,6 +53,43 @@
<url>https://cayenne.apache.org/</url>
</organization>
+ <repositories>
+ <repository>
+ <id>objectstyle</id>
+ <name>ObjectStyle Repository</name>
+ <url>https://maven.objectstyle.org/nexus/content/groups/cayenne-deps</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>https://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>objectstyle</id>
+ <name>ObjectStyle repository</name>
+ <url>https://maven.objectstyle.org/nexus/content/groups/cayenne-deps</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
@@ -70,7 +107,17 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
+ <version>0.13</version>
+ <configuration>
+ <licenses>
+ <license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20">
+ <notes>Also allow the license url to be https.</notes>
+ <patterns>
+ <pattern>https://www.apache.org/licenses/LICENSE-2.0</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 7034f88..b27b9db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -831,7 +831,17 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
+ <version>0.13</version>
+ <configuration>
+ <licenses>
+ <license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20">
+ <notes>Also allow the license url to be https.</notes>
+ <patterns>
+ <pattern>https://www.apache.org/licenses/LICENSE-2.0</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ </configuration>
</plugin>
<plugin>
<groupId>org.objectstyle.japp</groupId>
diff --git a/rat.sh b/rat.sh
index 79d7ddc..93209d0 100755
--- a/rat.sh
+++ b/rat.sh
@@ -49,25 +49,26 @@ echo "Running rat, this may take a while..." 1>&2
# TODO: read excludes from buildbot config at 'build-tools/rat-excludes'
java -jar $RAT -d $DIR \
- -e '.classpath' \
- -e '.project' \
- -e '.gitignore' \
- -e '_*.java' \
- -e '*.plist' \
- -e 'index.eomodeld' \
- -e '*.fspec' \
+ -e '\.classpath' \
+ -e '\.project' \
+ -e '\.gitignore' \
+ -e '\_.+\.java' \
+ -e '.+\.plist' \
+ -e 'index\.eomodeld' \
+ -e '.+\.fspec' \
-e 'DiagramLayout' \
- -e 'excludes.txt' \
- -e '*.map.xml' \
+ -e 'excludes\.txt' \
+ -e '.+\.map\.xml' \
-e 'cayenne-*.xml' \
- -e 'cayenne.xml' \
- -e '*.driver.xml' \
- -e 'CLOVER.txt' \
- -e '*.html' \
- -e '*.css' \
- -e '*.jceks' \
- -e 'plain.txt' \
- -e 'derby.log' \
- -e '*.iml'
+ -e 'cayenne\.xml' \
+ -e '.+\.driver\.xml' \
+ -e 'CLOVER\.txt' \
+ -e '.+\.html' \
+ -e '.+\.css' \
+ -e '.+\.jceks' \
+ -e 'plain\.txt' \
+ -e 'derby\.log' \
+ -e '.+\.iml' \
+ -e 'report.txt'