Use the latest remote-resources snapshot (for now, testing purposes) to update the license links
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/380dc43a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/380dc43a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/380dc43a Branch: refs/heads/slf4j-logback Commit: 380dc43a7abb6878962e4c133bd9c02e4330dd23 Parents: 50a24e5 Author: Daniel Kulp <dk...@apache.org> Authored: Mon Jul 8 13:45:40 2013 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Mon Jul 8 13:45:40 2013 -0400 ---------------------------------------------------------------------- apache-maven/pom.xml | 18 ++++++++++++++++++ .../main/appended-resources/META-INF/LICENSE.vm | 13 ++++++++++++- apache-maven/src/main/assembly/bin.xml | 7 +++++++ 3 files changed, 37 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/380dc43a/apache-maven/pom.xml ---------------------------------------------------------------------- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 40a3501..2b59498 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -94,6 +94,11 @@ <pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <version>1.5-SNAPSHOT</version> + </plugin> + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> @@ -158,6 +163,19 @@ </plugins> </build> + <pluginRepositories> + <pluginRepository> + <id>apache.snapshots</id> + <url>http://repository.apache.org/snapshots/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + </pluginRepositories> + <profiles> <profile> <id>apache-release</id> http://git-wip-us.apache.org/repos/asf/maven/blob/380dc43a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm ---------------------------------------------------------------------- diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm index 2506a19..1a46225 100644 --- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm +++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm @@ -28,9 +28,20 @@ subject to the terms and conditions of the following licenses. #foreach ( $project in $projects ) #foreach ( $license in $project.licenses) #if ( ! ($apacheTxt == $license.name) ) +#set ( $artId = $project.artifact.artifactId) +#set ( $lf = $locator ) +#set ( $url = $license.url ) +## glass fish URL is now invalid, use a fixed one +#if ($url == "https://glassfish.dev.java.net/public/CDDLv1.0.html";) +#set ( $url = 'https://glassfish.java.net/public/CDDLv1.0.html' ) +#end +#if ($url) +#set ( $licFile = 'lib/' + $artId + '.license' ) +#set ( $downloaded = $lf.getResourceAsFile($url, "licenses/${licFile}") ) +#end $project.name #if ($project.url)($project.url)#end $project.artifact - License: $license.name #if ($license.url) ($license.url)#end + License: $license.name #if ($url) $url ($licFile)#end #end #end http://git-wip-us.apache.org/repos/asf/maven/blob/380dc43a/apache-maven/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/apache-maven/src/main/assembly/bin.xml b/apache-maven/src/main/assembly/bin.xml index cec673d..9167b54 100644 --- a/apache-maven/src/main/assembly/bin.xml +++ b/apache-maven/src/main/assembly/bin.xml @@ -56,6 +56,13 @@ under the License. </includes> </fileSet> <fileSet> + <directory>target/licenses/lib</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>**</include> + </includes> + </fileSet> + <fileSet> <directory>src/bin</directory> <outputDirectory>bin</outputDirectory> <includes>
