You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by dk...@apache.org on 2008/03/14 02:26:43 UTC
svn commit: r636947 - in
/maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF:
DEPENDENCIES.vm LICENSE.vm NOTICE.vm
Author: dkulp
Date: Thu Mar 13 18:26:41 2008
New Revision: 636947
URL: http://svn.apache.org/viewvc?rev=636947&view=rev
Log:
[MRRESOURCES-32] Patch from David Jencks applied
Added:
maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/DEPENDENCIES.vm
Modified:
maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/LICENSE.vm
maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
Added: maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/DEPENDENCIES.vm
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/DEPENDENCIES.vm?rev=636947&view=auto
==============================================================================
--- maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/DEPENDENCIES.vm (added)
+++ maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/DEPENDENCIES.vm Thu Mar 13 18:26:41 2008
@@ -0,0 +1,39 @@
+##
+## 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.
+##
+## $Date: 2008-03-09 23:17:06 -0700 (Sun, 09 Mar 2008) $ $Rev: 635446 $
+##
+// ------------------------------------------------------------------
+// Transitive dependencies of this project determined from the
+// maven pom organized by organization.
+// ------------------------------------------------------------------
+
+#if ($projectName)$projectName#else${project.name}#end
+
+#foreach ( $organizationName in $projectsSortedByOrganization.keySet() )
+From: '$organizationName.name'#if($organizationName.url) ($organizationName.url)#end
+
+#foreach ( $project in $projectsSortedByOrganization.get( $organizationName ) )
+ - $project.name #if ($project.url)($project.url)#end $project.artifact
+#foreach ( $license in $project.licenses)
+ License: $license.name #if ($license.url) ($license.url)#end
+#end
+
+#end
+
+#end
Modified: maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/LICENSE.vm?rev=636947&r1=636946&r2=636947&view=diff
==============================================================================
--- maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/LICENSE.vm (original)
+++ maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/LICENSE.vm Thu Mar 13 18:26:41 2008
@@ -1,3 +1,23 @@
+##
+## 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.
+##
+## $Date: 2007-12-11 14:18:43 -0800 (Tue, 11 Dec 2007) $ $Rev: 603385 $
+##
Apache License
Version 2.0, January 2004
Modified: maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm?rev=636947&r1=636946&r2=636947&view=diff
==============================================================================
--- maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm (original)
+++ maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm Thu Mar 13 18:26:41 2008
@@ -1,3 +1,23 @@
+##
+## 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.
+##
+## $Date: 2008-03-10 23:12:56 -0700 (Mon, 10 Mar 2008) $ $Rev: 635811 $
+##
// ------------------------------------------------------------------
// NOTICE file corresponding to the section 4d of The Apache License,
// Version 2.0, in this case for #if ($projectName)$projectName#else${project.name}#end
@@ -8,24 +28,6 @@
Copyright ${projectTimespan}#if($project.organization.name) $project.organization.name#else The Apache Software Foundation#end
-#if($preProjectText)
-$preProjectText
-#end
-#foreach ( $organizationName in $projectsSortedByOrganization.keySet() )
-This product includes/uses software developed by '$organizationName.name'#if($organizationName.url) ($organizationName.url)#end
-
-#foreach ( $project in $projectsSortedByOrganization.get( $organizationName ) )
- - $project.name#if ($addVersion) (version $project.version)#end#if ($addArtifact) ($project.artifact)#end#if($project.url) ($project.url)#end
-#if ($addLicense)#foreach ( $license in $project.licenses)
-
- License: $license.name #if ($license.url) ($license.url)#end
-#end#end
-
-#end
-
-#end
-
-#if($postProjectText)
-$postProjectText
-#end
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).