You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/10/13 23:55:57 UTC
git commit: Revert "Account the the jsoup license URL which appears
to have changed." because https://github.com/jhy/jsoup/issues/471 fixed
Repository: maven
Updated Branches:
refs/heads/master 46b3467a2 -> 603f26add
Revert "Account the the jsoup license URL which appears to have
changed." because https://github.com/jhy/jsoup/issues/471 fixed
This reverts commit 71f8d04be62b970dd730053bdf6b75ebaa04c8de.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/603f26ad
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/603f26ad
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/603f26ad
Branch: refs/heads/master
Commit: 603f26addf28bcd89a9d48cae8575a3de73277f0
Parents: 46b3467
Author: Hervé Boutemy <hb...@apache.org>
Authored: Mon Oct 13 23:52:15 2014 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Mon Oct 13 23:54:18 2014 +0200
----------------------------------------------------------------------
apache-maven/src/main/appended-resources/META-INF/LICENSE.vm | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/603f26ad/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 f453976..1a46225 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -35,10 +35,6 @@ subject to the terms and conditions of the following licenses.
#if ($url == "https://glassfish.dev.java.net/public/CDDLv1.0.html")
#set ( $url = 'https://glassfish.java.net/public/CDDLv1.0.html' )
#end
-## JSoup URL is now invalid, use a fixed one
-#if ($url == "http://jsoup.com/license")
-#set ( $url = 'http://jsoup.org/license' )
-#end
#if ($url)
#set ( $licFile = 'lib/' + $artId + '.license' )
#set ( $downloaded = $lf.getResourceAsFile($url, "licenses/${licFile}") )