This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-archetypes.git
The following commit(s) were added to refs/heads/master by this push: new cd82809 license header fix for rat detection + exclusion of archetype content new 342a7bd Merge pull request #4 from ebarboni/ratcheck cd82809 is described below commit cd82809864bea66113acf85a2fd5548ade1c8f60 Author: Eric Barboni <sk...@apache.org> AuthorDate: Fri Jun 2 11:58:32 2023 +0200 license header fix for rat detection + exclusion of archetype content --- .../{README.MD => README.md} | 21 +++++++++++++++++++++ netbeans-jakartaee-war-archetype/pom.xml | 18 +++++++++++++++--- .../META-INF/archetype-post-generate.groovy | 19 +++++++++++++++++++ .../resources/META-INF/maven/archetype-metadata.xml | 2 +- pom.xml | 2 +- 5 files changed, 57 insertions(+), 5 deletions(-) diff --git a/netbeans-jakartaee-war-archetype/README.MD b/netbeans-jakartaee-war-archetype/README.md similarity index 71% rename from netbeans-jakartaee-war-archetype/README.MD rename to netbeans-jakartaee-war-archetype/README.md index 3e6d8a3..a2f53e5 100644 --- a/netbeans-jakartaee-war-archetype/README.MD +++ b/netbeans-jakartaee-war-archetype/README.md @@ -1,3 +1,24 @@ +<!-- + + 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. + +--> + # Parameters The archetype can be configured via several system properties: diff --git a/netbeans-jakartaee-war-archetype/pom.xml b/netbeans-jakartaee-war-archetype/pom.xml index ec90880..0361e97 100644 --- a/netbeans-jakartaee-war-archetype/pom.xml +++ b/netbeans-jakartaee-war-archetype/pom.xml @@ -9,7 +9,7 @@ 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 - https://www.apache.org/licenses/LICENSE-2.0 + 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 @@ -30,6 +30,18 @@ under the License. <packaging>maven-archetype</packaging> <name>Apache NetBeans Maven Archetypes: Jakarte EE Web Application Archetype</name> - - + <build> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- archetype result should be license agnostic --> + <exclude>src/main/resources/archetype-resources/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy b/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy index 6ccef50..0cadbc3 100644 --- a/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy +++ b/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy @@ -1,3 +1,22 @@ +/* + * 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. + */ + projectDir = new File(new File(request.outputDirectory), request.artifactId) jakartaEEVariant = request.getProperties().get("jakartaEEVariant") diff --git a/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 5db397e..7283f2a 100644 --- a/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -8,7 +8,7 @@ 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 - https://www.apache.org/licenses/LICENSE-2.0 + 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 diff --git a/pom.xml b/pom.xml index c4bab1d..7c97272 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 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 - https://www.apache.org/licenses/LICENSE-2.0 + 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 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists