You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2020/12/03 10:51:09 UTC
[tomee] 01/02: Cleanup build reactor and concentrate RAT
configuration in the same place
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 3472378b59a35abd8a835363e275318fe6d2533a
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Thu Dec 3 11:37:35 2020 +0100
Cleanup build reactor and concentrate RAT configuration in the same place
---
assembly/openejb-standalone/pom.xml | 9 -----
container/openejb-core/pom.xml | 13 -------
container/openejb-jee/pom.xml | 13 -------
itests/openejb-itests-client/pom.xml | 9 -----
pom.xml | 71 ++++++++++++++++++++++++++----------
server/openejb-axis/pom.xml | 13 -------
server/openejb-client/pom.xml | 9 -----
server/openejb-server/pom.xml | 9 -----
tomee/tomee-catalina/pom.xml | 13 -------
tomee/tomee-embedded/pom.xml | 4 --
tomee/tomee-webservices/pom.xml | 13 -------
11 files changed, 52 insertions(+), 124 deletions(-)
diff --git a/assembly/openejb-standalone/pom.xml b/assembly/openejb-standalone/pom.xml
index c8dee87..74b459e 100644
--- a/assembly/openejb-standalone/pom.xml
+++ b/assembly/openejb-standalone/pom.xml
@@ -84,15 +84,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/DATA-README.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 6b208ad..c2db2d1 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -409,19 +409,6 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.examples</exclude>
- <exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.help</exclude>
- <exclude>src/main/resources/META-INF/org.apache.openejb.resource.jdbc.DataSourcePlugin/*
- </exclude>
- <exclude>src/main/resources/META-INF/services/org/apache/activemq/broker/openejb</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/container/openejb-jee/pom.xml b/container/openejb-jee/pom.xml
index 7574dbe..61b5a47 100644
--- a/container/openejb-jee/pom.xml
+++ b/container/openejb-jee/pom.xml
@@ -39,19 +39,6 @@
</openejb.osgi.import.pkg>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/schema/xml.xsd</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/itests/openejb-itests-client/pom.xml b/itests/openejb-itests-client/pom.xml
index 8779002..72069a3 100644
--- a/itests/openejb-itests-client/pom.xml
+++ b/itests/openejb-itests-client/pom.xml
@@ -79,15 +79,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/org.apache.openejb.cli/test.help</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
diff --git a/pom.xml b/pom.xml
index deb1ad4..7ff9836 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,7 +394,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>4.0.0</version>
+ <version>6.0.3</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
@@ -661,13 +661,17 @@
<profile>
<id>style</id>
<modules>
- <module>container/openejb-core</module>
- <module>container/openejb-loader</module>
- <module>container/openejb-junit</module>
- <module>container/openejb-jpa-integration</module>
- <module>container/openejb-javaagent</module>
- <module>container/openejb-api</module>
+ <module>boms</module>
+ <module>itests</module>
+ <module>maven</module>
+ <module>gradle</module>
+ <module>container</module>
+ <module>server</module>
+ <module>mp-jwt</module>
+ <module>assembly</module>
+ <module>tck</module>
<module>arquillian</module>
+ <module>utils</module>
<module>tomee</module>
</modules>
<properties>
@@ -781,18 +785,6 @@
</profile>
<profile>
<id>rat</id>
- <modules>
- <module>itests</module>
- <module>maven</module>
- <module>gradle</module>
- <module>container</module>
- <module>server</module>
- <module>examples</module>
- <module>arquillian</module>
- <module>assembly</module>
- <module>utils</module>
- <module>tomee</module>
- </modules>
<build>
<plugins>
<plugin>
@@ -809,8 +801,25 @@
<configuration>
<reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile>
<excludes>
+ <exclude>.git/**</exclude>
+ <exclude>.github/**</exclude>
<exclude>**/target/**/*</exclude>
<exclude>**/js/livereload.js</exclude>
+ <exclude>doap_tomee.rdf</exclude>
+ <exclude>**/src/main/resources/META-INF/**/*.xsd</exclude>
+ <exclude>**/src/main/xsdlist/xsdlist.txt</exclude>
+ <exclude>**/META-INF/services/**</exclude>
+ <exclude>**/META-INF/org.apache.openejb**</exclude>
+ <exclude>**/META-INF/org.apache.openejb**/**</exclude>
+
+ <exclude>**/src/main/resources/login.config</exclude>
+ <exclude>**/src/main/resources/default.exclusions</exclude>
+ <exclude>**/src/main/resources/default.openejb.conf</exclude>
+ <exclude>**/src/test/resources/altddapp2/META-INF/test.env-entries.properties</exclude>
+ <exclude>**/src/test/resources/META-INF/multiple</exclude>
+ <exclude>**/src/test/resources/cdi-login.config</exclude>
+ <exclude>**/src/test/resources/openejb.json</exclude>
+ <exclude>**/src/test/resources/appresource.resources.json</exclude>
<!-- left around after creating the site -->
<exclude>**/cobertura.ser</exclude>
@@ -820,6 +829,7 @@
<exclude>**/hsqldb.log</exclude>
<!-- IDEA files -->
+ <exclude>.idea/**</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/*.ipr</exclude>
<exclude>**/*.iws</exclude>
@@ -828,6 +838,29 @@
<exclude>**/.*</exclude>
<exclude>**/.*/*</exclude>
<exclude>**/eclipse-classes/**/*</exclude>
+
+ <!-- ASCIIDOC files -->
+ <exclude>docs/**</exclude>
+ <exclude>**/*.adoc</exclude>
+
+ <!-- examples -->
+ <exclude>examples/**/*.jsp</exclude>
+ <exclude>examples/**/*.css</exclude>
+ <exclude>examples/**/*.json</exclude>
+ <exclude>examples/**/*.handlebars</exclude>
+ <exclude>examples/**/*.properties</exclude>
+ <exclude>examples/**/*.feature</exclude>
+ <exclude>examples/**/*.pem</exclude>
+ <exclude>examples/**/*.log</exclude>
+ <exclude>examples/**/*.md</exclude>
+ <exclude>examples/**/login.config</exclude>
+ <exclude>examples/**/placeholder</exclude>
+ <exclude>examples/**/Dockerfile</exclude>
+ <exclude>examples/**/bootstrap/**</exclude>
+ <exclude>examples/**/META-INF/services/**</exclude>
+ <exclude>examples/**/META-INF/org.apache.openejb**</exclude>
+ <exclude>examples/**/META-INF/org.apache.openejb**/**</exclude>
+
</excludes>
</configuration>
</plugin>
diff --git a/server/openejb-axis/pom.xml b/server/openejb-axis/pom.xml
index 829526a..345b781 100644
--- a/server/openejb-axis/pom.xml
+++ b/server/openejb-axis/pom.xml
@@ -46,19 +46,6 @@
</openejb.osgi.export>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/schema/soap_encoding_1_1.xsd</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml
index 30c8467..51d6f8c 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -97,15 +97,6 @@
<useFile>false</useFile>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/org.apache.openejb.client.IdentityResolver/*</exclude>
- </excludes>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml
index 5d66ad8..170d96e 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -38,15 +38,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/org.apache.openejb.cli/*</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
diff --git a/tomee/tomee-catalina/pom.xml b/tomee/tomee-catalina/pom.xml
index 23678f3..120897e 100644
--- a/tomee/tomee-catalina/pom.xml
+++ b/tomee/tomee-catalina/pom.xml
@@ -46,19 +46,6 @@
</plugins>
</reporting>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/org.apache.openejb.tomcat/ServerClassLoader</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml
index af0d75c..792ab2f 100644
--- a/tomee/tomee-embedded/pom.xml
+++ b/tomee/tomee-embedded/pom.xml
@@ -36,10 +36,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
diff --git a/tomee/tomee-webservices/pom.xml b/tomee/tomee-webservices/pom.xml
index f75871c..a145ba5 100644
--- a/tomee/tomee-webservices/pom.xml
+++ b/tomee/tomee-webservices/pom.xml
@@ -33,19 +33,6 @@
<properties>
<tomee.build.name>${project.groupId}.tomee.webservices</tomee.build.name>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/org.apache.openejb.tomcat/ServerClassLoader</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>