You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/02/06 17:59:42 UTC

svn commit: r1443068 [1/3] - in /karaf/branches/karaf-2.3.x: ./ admin/command/ admin/core/ admin/management/ archetypes/assembly/ archetypes/blueprint/ archetypes/bundle/ archetypes/command/ archetypes/feature/ archetypes/kar/ client/ demos/branding/sh...

Author: jbonofre
Date: Wed Feb  6 16:59:41 2013
New Revision: 1443068

URL: http://svn.apache.org/viewvc?rev=1443068&view=rev
Log:
[KARAF-2161] Update and fix NOTICE file

Modified:
    karaf/branches/karaf-2.3.x/NOTICE
    karaf/branches/karaf-2.3.x/admin/command/NOTICE
    karaf/branches/karaf-2.3.x/admin/core/NOTICE
    karaf/branches/karaf-2.3.x/admin/management/NOTICE
    karaf/branches/karaf-2.3.x/archetypes/assembly/NOTICE
    karaf/branches/karaf-2.3.x/archetypes/blueprint/NOTICE
    karaf/branches/karaf-2.3.x/archetypes/bundle/NOTICE
    karaf/branches/karaf-2.3.x/archetypes/command/NOTICE
    karaf/branches/karaf-2.3.x/archetypes/feature/NOTICE
    karaf/branches/karaf-2.3.x/archetypes/kar/NOTICE
    karaf/branches/karaf-2.3.x/client/NOTICE
    karaf/branches/karaf-2.3.x/demos/branding/shell/NOTICE
    karaf/branches/karaf-2.3.x/demos/command/NOTICE
    karaf/branches/karaf-2.3.x/demos/deployer/bundle/NOTICE   (contents, props changed)
    karaf/branches/karaf-2.3.x/demos/deployer/feature/NOTICE   (contents, props changed)
    karaf/branches/karaf-2.3.x/demos/deployer/kar/NOTICE
    karaf/branches/karaf-2.3.x/demos/deployer/wrap/NOTICE
    karaf/branches/karaf-2.3.x/demos/dump/NOTICE
    karaf/branches/karaf-2.3.x/demos/web/NOTICE
    karaf/branches/karaf-2.3.x/deployer/blueprint/NOTICE
    karaf/branches/karaf-2.3.x/deployer/features/NOTICE
    karaf/branches/karaf-2.3.x/deployer/kar/NOTICE
    karaf/branches/karaf-2.3.x/deployer/spring/NOTICE
    karaf/branches/karaf-2.3.x/deployer/wrap/NOTICE
    karaf/branches/karaf-2.3.x/diagnostic/command/NOTICE
    karaf/branches/karaf-2.3.x/diagnostic/common/NOTICE
    karaf/branches/karaf-2.3.x/diagnostic/core/NOTICE
    karaf/branches/karaf-2.3.x/diagnostic/management/NOTICE
    karaf/branches/karaf-2.3.x/exception/NOTICE
    karaf/branches/karaf-2.3.x/features/command/NOTICE
    karaf/branches/karaf-2.3.x/features/core/NOTICE
    karaf/branches/karaf-2.3.x/features/management/NOTICE
    karaf/branches/karaf-2.3.x/features/obr/NOTICE
    karaf/branches/karaf-2.3.x/itests/NOTICE
    karaf/branches/karaf-2.3.x/jaas/boot/NOTICE
    karaf/branches/karaf-2.3.x/jaas/command/NOTICE
    karaf/branches/karaf-2.3.x/jaas/config/NOTICE
    karaf/branches/karaf-2.3.x/jaas/jasypt/NOTICE
    karaf/branches/karaf-2.3.x/jaas/modules/NOTICE
    karaf/branches/karaf-2.3.x/main/NOTICE
    karaf/branches/karaf-2.3.x/management/mbeans/bundles/NOTICE
    karaf/branches/karaf-2.3.x/management/mbeans/config/NOTICE
    karaf/branches/karaf-2.3.x/management/mbeans/dev/NOTICE
    karaf/branches/karaf-2.3.x/management/mbeans/log/NOTICE
    karaf/branches/karaf-2.3.x/management/mbeans/obr/NOTICE
    karaf/branches/karaf-2.3.x/management/mbeans/packages/NOTICE
    karaf/branches/karaf-2.3.x/management/mbeans/scr/NOTICE
    karaf/branches/karaf-2.3.x/management/mbeans/services/NOTICE
    karaf/branches/karaf-2.3.x/management/mbeans/system/NOTICE
    karaf/branches/karaf-2.3.x/management/mbeans/web/NOTICE
    karaf/branches/karaf-2.3.x/management/server/NOTICE
    karaf/branches/karaf-2.3.x/shell/commands/NOTICE
    karaf/branches/karaf-2.3.x/shell/config/NOTICE
    karaf/branches/karaf-2.3.x/shell/console/NOTICE
    karaf/branches/karaf-2.3.x/shell/dev/NOTICE
    karaf/branches/karaf-2.3.x/shell/log/NOTICE
    karaf/branches/karaf-2.3.x/shell/obr/NOTICE
    karaf/branches/karaf-2.3.x/shell/osgi/NOTICE
    karaf/branches/karaf-2.3.x/shell/packages/NOTICE
    karaf/branches/karaf-2.3.x/shell/scr/NOTICE
    karaf/branches/karaf-2.3.x/shell/ssh/NOTICE
    karaf/branches/karaf-2.3.x/shell/web/NOTICE
    karaf/branches/karaf-2.3.x/shell/wrapper/NOTICE
    karaf/branches/karaf-2.3.x/tooling/cmdhelp-maven-plugin/NOTICE
    karaf/branches/karaf-2.3.x/tooling/features-maven-plugin/NOTICE
    karaf/branches/karaf-2.3.x/util/NOTICE
    karaf/branches/karaf-2.3.x/webconsole/admin/NOTICE
    karaf/branches/karaf-2.3.x/webconsole/branding/NOTICE
    karaf/branches/karaf-2.3.x/webconsole/console/NOTICE
    karaf/branches/karaf-2.3.x/webconsole/features/NOTICE
    karaf/branches/karaf-2.3.x/webconsole/gogo/NOTICE

Modified: karaf/branches/karaf-2.3.x/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/NOTICE Wed Feb  6 16:59:41 2013
@@ -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 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

Modified: karaf/branches/karaf-2.3.x/admin/command/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/command/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/command/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/admin/command/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/admin/core/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/core/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/core/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/admin/core/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/admin/management/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/management/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/management/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/admin/management/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/archetypes/assembly/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/archetypes/assembly/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/archetypes/assembly/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/archetypes/assembly/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/archetypes/blueprint/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/archetypes/blueprint/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/archetypes/blueprint/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/archetypes/blueprint/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/archetypes/bundle/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/archetypes/bundle/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/archetypes/bundle/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/archetypes/bundle/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/archetypes/command/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/archetypes/command/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/archetypes/command/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/archetypes/command/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/archetypes/feature/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/archetypes/feature/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/archetypes/feature/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/archetypes/feature/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/archetypes/kar/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/archetypes/kar/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/archetypes/kar/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/archetypes/kar/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/client/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/client/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/client/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/client/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/demos/branding/shell/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/demos/branding/shell/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/demos/branding/shell/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/demos/branding/shell/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/demos/command/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/demos/command/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/demos/command/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/demos/command/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/demos/deployer/bundle/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/demos/deployer/bundle/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/demos/deployer/bundle/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/demos/deployer/bundle/NOTICE Wed Feb  6 16:59:41 2013
@@ -1,48 +1,71 @@
-Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software written by
-Antony Lesuisse.
-Licensed under Public Domain.
-
-
-II. Used Software
-
-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 uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-JLine (http://jline.sourceforge.net).
-Licensed under the BSD License.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-This product includes software from http://www.json.org.
-Copyright (c) 2002 JSON.org
-
-
-III. License Summary
-- Apache License 2.0
+Apache Karaf
+Copyright 2010-2013 The Apache Software Foundation
+
+
+I. Included Software
+
+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.
+
+
+II. Used Software
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under Public Domain.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Jasypt (http://jasypt.sourceforge.net/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+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

Propchange: karaf/branches/karaf-2.3.x/demos/deployer/bundle/NOTICE
            ('svn:executable' removed)

Modified: karaf/branches/karaf-2.3.x/demos/deployer/feature/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/demos/deployer/feature/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/demos/deployer/feature/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/demos/deployer/feature/NOTICE Wed Feb  6 16:59:41 2013
@@ -1,48 +1,71 @@
-Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software written by
-Antony Lesuisse.
-Licensed under Public Domain.
-
-
-II. Used Software
-
-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 uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-JLine (http://jline.sourceforge.net).
-Licensed under the BSD License.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-This product includes software from http://www.json.org.
-Copyright (c) 2002 JSON.org
-
-
-III. License Summary
-- Apache License 2.0
+Apache Karaf
+Copyright 2010-2013 The Apache Software Foundation
+
+
+I. Included Software
+
+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.
+
+
+II. Used Software
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under Public Domain.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Jasypt (http://jasypt.sourceforge.net/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+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

Propchange: karaf/branches/karaf-2.3.x/demos/deployer/feature/NOTICE
            ('svn:executable' removed)

Modified: karaf/branches/karaf-2.3.x/demos/deployer/kar/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/demos/deployer/kar/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/demos/deployer/kar/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/demos/deployer/kar/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/demos/deployer/wrap/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/demos/deployer/wrap/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/demos/deployer/wrap/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/demos/deployer/wrap/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/demos/dump/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/demos/dump/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/demos/dump/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/demos/dump/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/demos/web/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/demos/web/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/demos/web/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/demos/web/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/deployer/blueprint/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/blueprint/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/blueprint/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/deployer/blueprint/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/deployer/features/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/features/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/features/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/deployer/features/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/deployer/kar/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/kar/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/kar/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/deployer/kar/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/deployer/spring/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/spring/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/spring/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/deployer/spring/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/deployer/wrap/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/wrap/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/wrap/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/deployer/wrap/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/diagnostic/command/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/diagnostic/command/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/diagnostic/command/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/diagnostic/command/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/diagnostic/common/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/diagnostic/common/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/diagnostic/common/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/diagnostic/common/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/diagnostic/core/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/diagnostic/core/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/diagnostic/core/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/diagnostic/core/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/diagnostic/management/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/diagnostic/management/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/diagnostic/management/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/diagnostic/management/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/exception/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/exception/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/exception/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/exception/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/features/command/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/command/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/command/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/features/command/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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

Modified: karaf/branches/karaf-2.3.x/features/core/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/core/NOTICE?rev=1443068&r1=1443067&r2=1443068&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/core/NOTICE (original)
+++ karaf/branches/karaf-2.3.x/features/core/NOTICE Wed Feb  6 16:59:41 2013
@@ -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
 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/).
-Copyright (c) OSGi Alliance (2000, 2010).
+FUSE Source (http://www.fusesource.org/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under 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