[KARAF-2161] Upgrade and fix NOTICE file

git-svn-id: https://svn.apache.org/repos/asf/karaf/trunk@1442967 13f79535-47bb-0310-9956-ffa450edef68
apache · Feb 6, 2013 · f3aed3e · f3aed3e
1 parent ebe698d
commit f3aed3e
Show file tree

Hide file tree

Showing 78 changed files with 2,435 additions and 641 deletions.
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -38,7 +38,7 @@ Licensed under the Apache License 2.0.
 
 This product uses software developed at
 AOP Alliance (http://aopalliance.sourceforge.net/).
-Licensed under the LGPL.
+Licensed under the Public Domain.
 
 This product uses software developed at
 Tanuki Software (http://www.tanukisoftware.com/).
@@ -68,5 +68,4 @@ III. License Summary
 - Apache License 2.0
 - BSD License
 - EPL License
-- LGPL License
 - MIT License
diff --git a/archetypes/assembly/NOTICE b/archetypes/assembly/NOTICE
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ Licensed under Public Domain.
 II. Used Software
 
 This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
+FUSE Source (http://www.fusesource.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
+AOP Alliance (http://aopalliance.sourceforge.net/).
-Licensed under the Apache License 2.0.
+Licensed under the Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License
diff --git a/archetypes/blueprint/NOTICE b/archetypes/blueprint/NOTICE
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ Licensed under Public Domain.
 II. Used Software
 
 This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
+FUSE Source (http://www.fusesource.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
+AOP Alliance (http://aopalliance.sourceforge.net/).
-Licensed under the Apache License 2.0.
+Licensed under the Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License
diff --git a/archetypes/bundle/NOTICE b/archetypes/bundle/NOTICE
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ Licensed under Public Domain.
 II. Used Software
 
 This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
+FUSE Source (http://www.fusesource.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
+AOP Alliance (http://aopalliance.sourceforge.net/).
-Licensed under the Apache License 2.0.
+Licensed under the Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License
diff --git a/archetypes/command/NOTICE b/archetypes/command/NOTICE
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ Licensed under Public Domain.
 II. Used Software
 
 This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
+FUSE Source (http://www.fusesource.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
+AOP Alliance (http://aopalliance.sourceforge.net/).
-Licensed under the Apache License 2.0.
+Licensed under the Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License
diff --git a/archetypes/feature/NOTICE b/archetypes/feature/NOTICE
@@ -1,5 +1,5 @@
 Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
+Copyright 2010-2013 The Apache Software Foundation
 
 
 I. Included Software
@@ -8,6 +8,23 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
 This product includes software written by
 Antony Lesuisse.
 Licensed under Public Domain.
@@ -16,20 +33,19 @@ Licensed under Public Domain.
 II. Used Software
 
 This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
+FUSE Source (http://www.fusesource.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
+AOP Alliance (http://aopalliance.sourceforge.net/).
-Licensed under the Apache License 2.0.
+Licensed under the Public Domain.
 
 This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
+Tanuki Software (http://www.tanukisoftware.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
+Jasypt (http://jasypt.sourceforge.net/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -40,9 +56,16 @@ This product uses software developed at
 SLF4J (http://www.slf4j.org/).
 Licensed under the MIT License.
 
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
 This product includes software from http://www.json.org.
 Copyright (c) 2002 JSON.org
 
 
 III. License Summary
 - Apache License 2.0
+- BSD License
+- EPL License
+- MIT License