trying to fix license files ...
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1078195 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/runtime/DEPENDENCIES b/dependencymanager/runtime/DEPENDENCIES
index 429316b..e8b5698 100644
--- a/dependencymanager/runtime/DEPENDENCIES
+++ b/dependencymanager/runtime/DEPENDENCIES
@@ -14,7 +14,8 @@
II. Used Third-Party Software
This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
III. Overall License Summary
diff --git a/dependencymanager/runtime/LICENSE b/dependencymanager/runtime/LICENSE
index d5afa1b..d645695 100644
--- a/dependencymanager/runtime/LICENSE
+++ b/dependencymanager/runtime/LICENSE
@@ -200,34 +200,3 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-APACHE FELIX OSGI DEPENDENCY MANAGER RUNTIME SUBCOMPONENTS:
-
-The Apache Felix OSGi Dependency Manager Runtime includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-For the For the JSON component:
-
-Copyright (c) 2002 JSON.org
-
-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 shall be used for Good, not Evil.
-
-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/dependencymanager/runtime/NOTICE b/dependencymanager/runtime/NOTICE
index 0298840..3175387 100644
--- a/dependencymanager/runtime/NOTICE
+++ b/dependencymanager/runtime/NOTICE
@@ -5,8 +5,6 @@
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
-Licensed under the Apache License 2.0.
-
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+Licensed under the JSON License