Updated Branches:
refs/heads/4.1 12630b4f0 -> 865c2cbce
Adding springsource artifacts to package legal docs.
Signed-off-by: Chip Childers <chip.child...@gmail.com>
Conflicts:
tools/whisker/LICENSE
tools/whisker/descriptor-for-packaging.xml
Also fixed the ordering for where we put java-ipv6.jar.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/865c2cbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/865c2cbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/865c2cbc
Branch: refs/heads/4.1
Commit: 865c2cbce6ccf7c492774c0b0f3b99d3ef10fabe
Parents: 12630b4
Author: Chip Childers <chip.child...@gmail.com>
Authored: Tue Feb 19 13:22:42 2013 -0500
Committer: Chip Childers <chip.child...@gmail.com>
Committed: Tue Feb 19 13:29:36 2013 -0500
----------------------------------------------------------------------
tools/whisker/LICENSE | 17 ++++++++++----
tools/whisker/descriptor-for-packaging.xml | 26 +++++++++++++++++-----
2 files changed, 32 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/865c2cbc/tools/whisker/LICENSE
----------------------------------------------------------------------
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
index afa7433..8fa3d32 100644
--- a/tools/whisker/LICENSE
+++ b/tools/whisker/LICENSE
@@ -376,11 +376,6 @@ Within the deps/awsapi-lib directory
from Json.simple Project http://code.google.com/p/json-simple/
json_simple-1.1.jar from
http://code.google.com/p/json-simple/source/checkout
- licensed under the Apache License, Version 2
http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
-
- from Jan Van Besien mailto:janvanbes...@gmail.com
- java-ipv6.jar from http://code.google.com/p/java-ipv6
-
licensed under the BSD (3-clause)
http://www.opensource.org/licenses/BSD-3-Clause (as follows)
Copyright (c) 2002-2011 Atsuhiko Yamanaka, JCraft,Inc.
@@ -2999,6 +2994,18 @@ Within the target/jar directory
jetty-6.1.26.jar from
http://repo1.maven.org/maven2/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26-sources.jar
jetty-util-6.1.26.jar from
http://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26-sources.jar
+ licensed under the Apache License, Version 2
http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
+
+ from Jan Van Besien mailto:janvanbes...@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/865c2cbc/tools/whisker/descriptor-for-packaging.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor-for-packaging.xml
b/tools/whisker/descriptor-for-packaging.xml
index c4f1c2d..c831a84 100644
--- a/tools/whisker/descriptor-for-packaging.xml
+++ b/tools/whisker/descriptor-for-packaging.xml
@@ -2431,6 +2431,10 @@ Innovation Centre, 2006
(http://www.it-innovation.soton.ac.uk).
id='person:janvanbesien'
name='Jan Van Besien'
url='mailto:janvanbes...@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>
@@ -2819,6 +2823,22 @@ All rights reserved.
<resource name='cloud-backport-util-concurrent-3.0.jar'
source='http://backport-jsr166.sourceforge.net/' />
</by-organisation>
</public-domain>
+ <with-license id='ApacheLicenseVersion2'>
+ <copyright-notice></copyright-notice>
+ <by-organisation id='person:janvanbesien'>
+ <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'>
@@ -2970,11 +2990,5 @@ Copyright (c) 1997-2010 Oracle and/or its affiliates.
All rights reserved.
<resource name='rabbitmq-client.jar'
source='http://www.rabbitmq.com/java-client.html' />
</by-organisation>
</with-license>
- <with-license id='ApacheLicenseVersion2'>
- <copyright-notice />
- <by-organisation id='person:janvanbesien'>
- <resource name='java-ipv6.jar'
source='http://code.google.com/p/java-ipv6' />
- </by-organisation>
- </with-license>
</within>
</manifest>
