This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git
The following commit(s) were added to refs/heads/master by this push: new 5a143fe Use NOTICE and LICENSE files from repository in artefacts. new 7ad44f9 Merge pull request #18 from ebarboni/notice2023 5a143fe is described below commit 5a143fe807b2b86fcdf26b132928e7b651ee8a5b Author: Eric Barboni <sk...@apache.org> AuthorDate: Wed Mar 1 14:34:38 2023 +0100 Use NOTICE and LICENSE files from repository in artefacts. --- NOTICE | 2 +- pom.xml | 57 +++++++++++++++++++++++++++++++++++++++--- src/assembly/bin/BINARY_NOTICE | 2 +- 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/NOTICE b/NOTICE index cae0247..be834e3 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache NetBeans Packager (NBPackage) -Copyright 2022 The Apache Software Foundation +Copyright 2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/pom.xml b/pom.xml index 1ab5db9..916b2bd 100644 --- a/pom.xml +++ b/pom.xml @@ -41,10 +41,10 @@ under the License. <url>https://github.com/apache/netbeans-nbpackage</url> </scm> <distributionManagement> - <site> - <id>netbeans.bits</id> - <url>https://bits.netbeans.org/nbpackage</url> - </site> + <site> + <id>netbeans.bits</id> + <url>https://bits.netbeans.org/nbpackage</url> + </site> </distributionManagement> <dependencies> <dependency> @@ -129,6 +129,41 @@ under the License. </execution> </executions> </plugin> + <plugin> + <!-- skip to ensure use of NOTICE and LICENSE from repository --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <!-- add NOTICE and LICENSE from repository to apidoc - + see also resources configuration below for source and binary jar --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>licensenoticecopy</id> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/apidocs/META-INF</outputDirectory> + <resources> + <resource> + <directory>${basedir}</directory> + <includes> + <include>NOTICE</include> + <include>LICENSE</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> @@ -176,6 +211,20 @@ under the License. </executions> </plugin> </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <!-- include NOTICE and LICENSE from repository inside META-INF --> + <resource> + <directory>${basedir}</directory> + <targetPath>META-INF</targetPath> + <includes> + <include>NOTICE</include> + <include>LICENSE</include> + </includes> + </resource> + </resources> </build> <properties> diff --git a/src/assembly/bin/BINARY_NOTICE b/src/assembly/bin/BINARY_NOTICE index 647b4aa..66d29c0 100644 --- a/src/assembly/bin/BINARY_NOTICE +++ b/src/assembly/bin/BINARY_NOTICE @@ -1,5 +1,5 @@ Apache NetBeans Packager (NBPackage) -Copyright 2022 The Apache Software Foundation +Copyright 2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). --------------------------------------------------------------------- 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