You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/02/19 19:23:09 UTC
git commit: refs/heads/master - Adding springsource artifacts to
package legal docs.
Updated Branches:
refs/heads/master e4baff228 -> 58bcd0eef
Adding springsource artifacts to package legal docs.
Signed-off-by: Chip Childers <ch...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/58bcd0ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/58bcd0ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/58bcd0ee
Branch: refs/heads/master
Commit: 58bcd0eefb67f6fcc362e0581acd29f5448c6e77
Parents: e4baff2
Author: Chip Childers <ch...@gmail.com>
Authored: Tue Feb 19 13:22:42 2013 -0500
Committer: Chip Childers <ch...@gmail.com>
Committed: Tue Feb 19 13:22:42 2013 -0500
----------------------------------------------------------------------
tools/whisker/LICENSE | 7 +++++++
tools/whisker/descriptor-for-packaging.xml | 14 ++++++++++++++
2 files changed, 21 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/58bcd0ee/tools/whisker/LICENSE
----------------------------------------------------------------------
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
index 4080d9c..f192c13 100644
--- a/tools/whisker/LICENSE
+++ b/tools/whisker/LICENSE
@@ -2999,6 +2999,13 @@ Within the target/jar directory
from Jan Van Besien mailto:janvanbesien@gmail.com
java-ipv6.jar from http://code.google.com/p/java-ipv6
+ licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
+ Copyright 2002-2012 the original author or authors.
+ from SpringSource, a division of VMware. http://www.springsource.org/
+ spring-context-3.1.2.RELEASE.jar from https://github.com/SpringSource/spring-framework
+ spring-core-3.1.2.RELEASE.jar from https://github.com/SpringSource/spring-framework
+ spring-web-3.1.2.RELEASE.jar from https://github.com/SpringSource/spring-framework
+
licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows)
Copyright (c) 2009, Caringo, Inc.
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/58bcd0ee/tools/whisker/descriptor-for-packaging.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml
index cc661b7..2e93f4d 100644
--- a/tools/whisker/descriptor-for-packaging.xml
+++ b/tools/whisker/descriptor-for-packaging.xml
@@ -2435,6 +2435,10 @@ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
id='person:janvanbesien'
name='Jan Van Besien'
url='mailto:janvanbesien@gmail.com' />
+ <organisation
+ id='springsource.com'
+ name='SpringSource, a division of VMware.'
+ url='http://www.springsource.org/' />
</organisations>
<primary-license id='ApacheLicenseVersion2'>
<copyright-notice>Copyright (c) 2013 The Apache Software Foundation</copyright-notice>
@@ -2837,6 +2841,16 @@ All rights reserved.
<resource name='java-ipv6.jar' source='http://code.google.com/p/java-ipv6' />
</by-organisation>
</with-license>
+ <with-license id='ApacheLicenseVersion2'>
+ <copyright-notice>
+Copyright 2002-2012 the original author or authors.
+ </copyright-notice>
+ <by-organisation id='springsource.com'>
+ <resource name='spring-core-3.1.2.RELEASE.jar' source='https://github.com/SpringSource/spring-framework' />
+ <resource name='spring-context-3.1.2.RELEASE.jar' source='https://github.com/SpringSource/spring-framework' />
+ <resource name='spring-web-3.1.2.RELEASE.jar' source='https://github.com/SpringSource/spring-framework' />
+ </by-organisation>
+ </with-license>
</within>
<within dir='deps/awsapi-lib'>
<with-license id='ApacheLicenseVersion2'>