Skip to content

Commit 58bcd0e

Browse files
committed
Adding springsource artifacts to package legal docs.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
1 parent e4baff2 commit 58bcd0e

2 files changed

Lines changed: 21 additions & 0 deletions

File tree

tools/whisker/LICENSE

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2999,6 +2999,13 @@ Within the target/jar directory
29992999
from Jan Van Besien mailto:janvanbesien@gmail.com
30003000
java-ipv6.jar from http://code.google.com/p/java-ipv6
30013001

3002+
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
3003+
Copyright 2002-2012 the original author or authors.
3004+
from SpringSource, a division of VMware. http://www.springsource.org/
3005+
spring-context-3.1.2.RELEASE.jar from https://github.com/SpringSource/spring-framework
3006+
spring-core-3.1.2.RELEASE.jar from https://github.com/SpringSource/spring-framework
3007+
spring-web-3.1.2.RELEASE.jar from https://github.com/SpringSource/spring-framework
3008+
30023009
licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows)
30033010

30043011
Copyright (c) 2009, Caringo, Inc.

tools/whisker/descriptor-for-packaging.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2435,6 +2435,10 @@ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
24352435
id='person:janvanbesien'
24362436
name='Jan Van Besien'
24372437
url='mailto:janvanbesien@gmail.com' />
2438+
<organisation
2439+
id='springsource.com'
2440+
name='SpringSource, a division of VMware.'
2441+
url='http://www.springsource.org/' />
24382442
</organisations>
24392443
<primary-license id='ApacheLicenseVersion2'>
24402444
<copyright-notice>Copyright (c) 2013 The Apache Software Foundation</copyright-notice>
@@ -2837,6 +2841,16 @@ All rights reserved.
28372841
<resource name='java-ipv6.jar' source='http://code.google.com/p/java-ipv6' />
28382842
</by-organisation>
28392843
</with-license>
2844+
<with-license id='ApacheLicenseVersion2'>
2845+
<copyright-notice>
2846+
Copyright 2002-2012 the original author or authors.
2847+
</copyright-notice>
2848+
<by-organisation id='springsource.com'>
2849+
<resource name='spring-core-3.1.2.RELEASE.jar' source='https://github.com/SpringSource/spring-framework' />
2850+
<resource name='spring-context-3.1.2.RELEASE.jar' source='https://github.com/SpringSource/spring-framework' />
2851+
<resource name='spring-web-3.1.2.RELEASE.jar' source='https://github.com/SpringSource/spring-framework' />
2852+
</by-organisation>
2853+
</with-license>
28402854
</within>
28412855
<within dir='deps/awsapi-lib'>
28422856
<with-license id='ApacheLicenseVersion2'>

0 commit comments

Comments
 (0)