This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-7.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-7.1.x by this push:
new cdd37c09f2 Updates RAT checks, fixes RAT license issues
cdd37c09f2 is described below
commit cdd37c09f22de38f663af3a9b345e454131c7d62
Author: Richard Zowalla <[email protected]>
AuthorDate: Fri Apr 22 15:51:11 2022 +0200
Updates RAT checks, fixes RAT license issues
---
assembly/openejb-standalone/pom.xml | 9 ---------
container/openejb-core/pom.xml | 13 -------------
.../org/apache/openejb/monitoring/MBeanPojoWrapper.java | 16 ++++++++++++++++
.../test/resources/altddPU1/META-INF/bartest.ejb-jar.xml | 16 ++++++++++++++++
.../src/test/resources/altddPU1/META-INF/persistence.xml | 16 ++++++++++++++++
.../test/resources/altddapp1/META-INF/test.ejb-jar.xml | 16 ++++++++++++++++
.../src/test/resources/altddapp2/META-INF/ejb-jar.xml | 16 ++++++++++++++++
.../resources/altddapp2/META-INF/footest.ejb-jar.xml | 16 ++++++++++++++++
.../test/resources/altddapp2/META-INF/test.ejb-jar.xml | 16 ++++++++++++++++
.../resources/convert/oej2/simple/geronimo-openejb.xml | 16 ++++++++++++++++
.../convert/oej2/simple/openejb-jar-expected.xml | 16 ++++++++++++++++
.../test/resources/convert/oej2/simple/openejb-jar.xml | 16 ++++++++++++++++
.../src/test/resources/mixedcase/mEta-iNf/ejb-jar.xml | 16 ++++++++++++++++
container/openejb-jee/pom.xml | 13 -------------
server/openejb-server/pom.xml | 9 ---------
tomee/tomee-catalina/pom.xml | 13 -------------
16 files changed, 176 insertions(+), 57 deletions(-)
diff --git a/assembly/openejb-standalone/pom.xml
b/assembly/openejb-standalone/pom.xml
index 1d9a0305b1..fadcaa1713 100644
--- a/assembly/openejb-standalone/pom.xml
+++ b/assembly/openejb-standalone/pom.xml
@@ -83,15 +83,6 @@
</execution>
</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>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index f1b0fdf339..7b992bb018 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -405,19 +405,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-core/src/main/java/org/apache/openejb/monitoring/MBeanPojoWrapper.java
b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/MBeanPojoWrapper.java
index 12004a7e5c..26bbbd4e4e 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/MBeanPojoWrapper.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/MBeanPojoWrapper.java
@@ -1,3 +1,19 @@
+/*
+ * 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.openejb.monitoring;
import org.apache.openejb.util.Duration;
diff --git
a/container/openejb-core/src/test/resources/altddPU1/META-INF/bartest.ejb-jar.xml
b/container/openejb-core/src/test/resources/altddPU1/META-INF/bartest.ejb-jar.xml
index 7128e44d45..3992873e22 100644
---
a/container/openejb-core/src/test/resources/altddPU1/META-INF/bartest.ejb-jar.xml
+++
b/container/openejb-core/src/test/resources/altddPU1/META-INF/bartest.ejb-jar.xml
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"; version="3.0"
metadata-complete="false">
<enterprise-beans>
<session>
diff --git
a/container/openejb-core/src/test/resources/altddPU1/META-INF/persistence.xml
b/container/openejb-core/src/test/resources/altddPU1/META-INF/persistence.xml
index 705fa6282c..84ea17453a 100644
---
a/container/openejb-core/src/test/resources/altddPU1/META-INF/persistence.xml
+++
b/container/openejb-core/src/test/resources/altddPU1/META-INF/persistence.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence"; version="2.0">
<persistence-unit name="unit">
diff --git
a/container/openejb-core/src/test/resources/altddapp1/META-INF/test.ejb-jar.xml
b/container/openejb-core/src/test/resources/altddapp1/META-INF/test.ejb-jar.xml
index 6f2fb0cad4..2a09c36417 100644
---
a/container/openejb-core/src/test/resources/altddapp1/META-INF/test.ejb-jar.xml
+++
b/container/openejb-core/src/test/resources/altddapp1/META-INF/test.ejb-jar.xml
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"; version="3.0"
metadata-complete="false">
<enterprise-beans>
<session>
diff --git
a/container/openejb-core/src/test/resources/altddapp2/META-INF/ejb-jar.xml
b/container/openejb-core/src/test/resources/altddapp2/META-INF/ejb-jar.xml
index 433757bbfb..550e7f2394 100644
--- a/container/openejb-core/src/test/resources/altddapp2/META-INF/ejb-jar.xml
+++ b/container/openejb-core/src/test/resources/altddapp2/META-INF/ejb-jar.xml
@@ -1 +1,17 @@
+<!--
+ 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.
+-->
<ejb-jar/>
\ No newline at end of file
diff --git
a/container/openejb-core/src/test/resources/altddapp2/META-INF/footest.ejb-jar.xml
b/container/openejb-core/src/test/resources/altddapp2/META-INF/footest.ejb-jar.xml
index 20f750201c..11d2b74d4a 100644
---
a/container/openejb-core/src/test/resources/altddapp2/META-INF/footest.ejb-jar.xml
+++
b/container/openejb-core/src/test/resources/altddapp2/META-INF/footest.ejb-jar.xml
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ejb-jar>
<enterprise-beans>
<session id="OrangeBean">
diff --git
a/container/openejb-core/src/test/resources/altddapp2/META-INF/test.ejb-jar.xml
b/container/openejb-core/src/test/resources/altddapp2/META-INF/test.ejb-jar.xml
index 433757bbfb..550e7f2394 100644
---
a/container/openejb-core/src/test/resources/altddapp2/META-INF/test.ejb-jar.xml
+++
b/container/openejb-core/src/test/resources/altddapp2/META-INF/test.ejb-jar.xml
@@ -1 +1,17 @@
+<!--
+ 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.
+-->
<ejb-jar/>
\ No newline at end of file
diff --git
a/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml
b/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml
index 38e3e146a7..c72f410cb1 100644
---
a/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml
+++
b/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
<ns5:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2";
xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/application-1.2";
xmlns:ns3="http://geronimo.apache.org/xml/ns/openejb-clustering-wadi-1.2";
xmlns:ns4="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:ns5="http://tomee.apache.org/xml/ns/openejb-jar-2.2";
xmlns:ns6="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";
xmlns:ns7="http://geronimo.apache.org/xml/ns/security-2.0";
xmlns:ns8="http://java.sun.com/xml/ns/p [...]
<environment>
<moduleId>
diff --git
a/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar-expected.xml
b/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar-expected.xml
index a53124adcc..910d6d6e82 100644
---
a/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar-expected.xml
+++
b/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar-expected.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
<openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1";>
<properties>module.property.a=valuea
module.property.b=valueb
diff --git
a/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml
b/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml
index 172d4ba66a..69807eb539 100644
---
a/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml
+++
b/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
<openejb-jar xmlns="http://tomee.apache.org/xml/ns/openejb-jar-2.2";
xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2";>
<dep:environment>
<dep:moduleId>
diff --git
a/container/openejb-core/src/test/resources/mixedcase/mEta-iNf/ejb-jar.xml
b/container/openejb-core/src/test/resources/mixedcase/mEta-iNf/ejb-jar.xml
index 7a1137a9eb..bd26d0f619 100644
--- a/container/openejb-core/src/test/resources/mixedcase/mEta-iNf/ejb-jar.xml
+++ b/container/openejb-core/src/test/resources/mixedcase/mEta-iNf/ejb-jar.xml
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ejb-jar>
<enterprise-beans>
<session id="OrangeBean">
diff --git a/container/openejb-jee/pom.xml b/container/openejb-jee/pom.xml
index b5831c9db5..f5147b491e 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/server/openejb-server/pom.xml b/server/openejb-server/pom.xml
index ce81f451ab..9a93304f91 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -37,15 +37,6 @@
</resource>
</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>
diff --git a/tomee/tomee-catalina/pom.xml b/tomee/tomee-catalina/pom.xml
index 45473fd923..0d651504e8 100644
--- a/tomee/tomee-catalina/pom.xml
+++ b/tomee/tomee-catalina/pom.xml
@@ -42,19 +42,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>
