FELIX-1632 Remove reference to KXml from NOTICE and LICENSE and update OSGi copyright years
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@817969 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/LICENSE.kxml2 b/webconsole/LICENSE.kxml2
deleted file mode 100644
index 1fe595b..0000000
--- a/webconsole/LICENSE.kxml2
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
diff --git a/webconsole/NOTICE b/webconsole/NOTICE
index 0df574c..9e69bd8 100644
--- a/webconsole/NOTICE
+++ b/webconsole/NOTICE
@@ -10,13 +10,9 @@
This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
-This product includes software from http://kxml.sourceforge.net.
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-Licensed under the BSD License
-
This product includes software from http://www.json.org.
Copyright (c) 2002 JSON.org
Licensed under the JSON License
@@ -47,13 +43,12 @@
This product uses software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
III. License Summary
- Apache License 2.0
-- BSD License
- JSON License
- MIT License
- Creative Commons Attribution 2.5 License