Repository: karaf-cellar Updated Branches: refs/heads/cellar-2.3.x af8262b8c -> a2a9ae02e
Upgrade copyright dates in NOTICE files Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/a2a9ae02 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/a2a9ae02 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/a2a9ae02 Branch: refs/heads/cellar-2.3.x Commit: a2a9ae02e1574dc70babae947a020cf19f71ad6e Parents: af8262b Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Feb 23 21:37:59 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Feb 23 21:38:48 2014 +0100 ---------------------------------------------------------------------- NOTICE | 4 +-- bundle/NOTICE | 25 +++++---------- cloud/NOTICE | 25 +++++---------- config/NOTICE | 25 +++++---------- core/NOTICE | 25 +++++---------- dosgi/NOTICE | 25 +++++---------- event/NOTICE | 25 +++++---------- features/NOTICE | 25 +++++---------- hazelcast/NOTICE | 25 +++++---------- management/NOTICE | 25 +++++---------- manual/NOTICE | 39 ++++++++++++++++++++++++ obr/NOTICE | 25 +++++---------- samples/camel-hazelcast-app/consumer/NOTICE | 25 +++++---------- samples/dosgi-greeter/NOTICE | 25 ++++++--------- samples/hazelcast-app/NOTICE | 25 ++++++--------- shell/NOTICE | 25 +++++---------- utils/NOTICE | 25 +++++---------- webconsole/NOTICE | 25 +++++---------- 18 files changed, 172 insertions(+), 271 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 58abba2..addb35c 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,5 @@ Apache Karaf Cellar -Copyright 2011-2012 The Apache Software Foundation - +Copyright 2011-2014 The Apache Software Foundation I. Used Software @@ -35,7 +34,6 @@ Licensed under the MIT License. This product includes software from http://www.json.org. Copyright (c) 2002 JSON.org - II. License Summary - Apache License 2.0 - MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/bundle/NOTICE ---------------------------------------------------------------------- diff --git a/bundle/NOTICE b/bundle/NOTICE index ab78815..addb35c 100644 --- a/bundle/NOTICE +++ b/bundle/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/cloud/NOTICE ---------------------------------------------------------------------- diff --git a/cloud/NOTICE b/cloud/NOTICE index ab78815..addb35c 100644 --- a/cloud/NOTICE +++ b/cloud/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/config/NOTICE ---------------------------------------------------------------------- diff --git a/config/NOTICE b/config/NOTICE index ab78815..addb35c 100644 --- a/config/NOTICE +++ b/config/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/core/NOTICE ---------------------------------------------------------------------- diff --git a/core/NOTICE b/core/NOTICE index ab78815..addb35c 100644 --- a/core/NOTICE +++ b/core/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/dosgi/NOTICE ---------------------------------------------------------------------- diff --git a/dosgi/NOTICE b/dosgi/NOTICE index ab78815..addb35c 100644 --- a/dosgi/NOTICE +++ b/dosgi/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/event/NOTICE ---------------------------------------------------------------------- diff --git a/event/NOTICE b/event/NOTICE index ab78815..addb35c 100644 --- a/event/NOTICE +++ b/event/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/features/NOTICE ---------------------------------------------------------------------- diff --git a/features/NOTICE b/features/NOTICE index ab78815..addb35c 100644 --- a/features/NOTICE +++ b/features/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/hazelcast/NOTICE ---------------------------------------------------------------------- diff --git a/hazelcast/NOTICE b/hazelcast/NOTICE index ab78815..addb35c 100644 --- a/hazelcast/NOTICE +++ b/hazelcast/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/management/NOTICE ---------------------------------------------------------------------- diff --git a/management/NOTICE b/management/NOTICE index ab78815..addb35c 100644 --- a/management/NOTICE +++ b/management/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/manual/NOTICE ---------------------------------------------------------------------- diff --git a/manual/NOTICE b/manual/NOTICE new file mode 100644 index 0000000..addb35c --- /dev/null +++ b/manual/NOTICE @@ -0,0 +1,39 @@ +Apache Karaf Cellar +Copyright 2011-2014 The Apache Software Foundation + +I. Used 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/). +Licensed under the Apache License 2.0. + +This product uses software developed at +Hazelcast (http://www.hazelcast.com/). +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 +JClouds (http://www.jclouds.org/). +Licensed under the Apache License 2.0. + +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 + +II. License Summary +- Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/obr/NOTICE ---------------------------------------------------------------------- diff --git a/obr/NOTICE b/obr/NOTICE index ab78815..addb35c 100644 --- a/obr/NOTICE +++ b/obr/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/samples/camel-hazelcast-app/consumer/NOTICE ---------------------------------------------------------------------- diff --git a/samples/camel-hazelcast-app/consumer/NOTICE b/samples/camel-hazelcast-app/consumer/NOTICE index ab78815..addb35c 100644 --- a/samples/camel-hazelcast-app/consumer/NOTICE +++ b/samples/camel-hazelcast-app/consumer/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/samples/dosgi-greeter/NOTICE ---------------------------------------------------------------------- diff --git a/samples/dosgi-greeter/NOTICE b/samples/dosgi-greeter/NOTICE index 6583a9b..addb35c 100644 --- a/samples/dosgi-greeter/NOTICE +++ b/samples/dosgi-greeter/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -29,8 +24,8 @@ FUSE Source (http://www.fusesource.org/). Licensed under the Apache License 2.0. This product uses software developed at -JLine (http://jline.sourceforge.net). -Licensed under the BSD License. +JClouds (http://www.jclouds.org/). +Licensed under the Apache License 2.0. This product uses software developed at SLF4J (http://www.slf4j.org/). @@ -39,6 +34,6 @@ Licensed under the MIT License. This product includes software from http://www.json.org. Copyright (c) 2002 JSON.org - -III. License Summary +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/samples/hazelcast-app/NOTICE ---------------------------------------------------------------------- diff --git a/samples/hazelcast-app/NOTICE b/samples/hazelcast-app/NOTICE index 6583a9b..addb35c 100644 --- a/samples/hazelcast-app/NOTICE +++ b/samples/hazelcast-app/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -29,8 +24,8 @@ FUSE Source (http://www.fusesource.org/). Licensed under the Apache License 2.0. This product uses software developed at -JLine (http://jline.sourceforge.net). -Licensed under the BSD License. +JClouds (http://www.jclouds.org/). +Licensed under the Apache License 2.0. This product uses software developed at SLF4J (http://www.slf4j.org/). @@ -39,6 +34,6 @@ Licensed under the MIT License. This product includes software from http://www.json.org. Copyright (c) 2002 JSON.org - -III. License Summary +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/shell/NOTICE ---------------------------------------------------------------------- diff --git a/shell/NOTICE b/shell/NOTICE index ab78815..addb35c 100644 --- a/shell/NOTICE +++ b/shell/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/utils/NOTICE ---------------------------------------------------------------------- diff --git a/utils/NOTICE b/utils/NOTICE index ab78815..addb35c 100644 --- a/utils/NOTICE +++ b/utils/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a2a9ae02/webconsole/NOTICE ---------------------------------------------------------------------- diff --git a/webconsole/NOTICE b/webconsole/NOTICE index ab78815..addb35c 100644 --- a/webconsole/NOTICE +++ b/webconsole/NOTICE @@ -1,23 +1,18 @@ Apache Karaf Cellar -Copyright 2011 The Apache Software Foundation +Copyright 2011-2014 The Apache Software Foundation - -I. Included Software +I. Used 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 +Hazelcast (http://www.hazelcast.com/). Licensed under the Apache License 2.0. This product uses software developed at @@ -33,16 +28,12 @@ JClouds (http://www.jclouds.org/). 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 +II. License Summary - Apache License 2.0 +- MIT License
