Author: pderop
Date: Tue Jun 27 06:28:11 2017
New Revision: 1800019
URL: http://svn.apache.org/viewvc?rev=1800019&view=rev
Log:
FELIX-5499 (Removed json licenses)
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/LICENSE
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/LICENSE
felix/trunk/dependencymanager/release/resources/bin/LICENSE
felix/trunk/dependencymanager/release/resources/deps/LICENSE
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/LICENSE
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/LICENSE?rev=1800019&r1=1800018&r2=1800019&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/LICENSE
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/LICENSE
Tue Jun 27 06:28:11 2017
@@ -201,28 +201,3 @@
See the License for the specific language governing permissions and
limitations under the License.
-=========================================================================
-== JSON License ==
-=========================================================================
-
-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.
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/LICENSE
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/LICENSE?rev=1800019&r1=1800018&r2=1800019&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/LICENSE
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/LICENSE
Tue Jun 27 06:28:11 2017
@@ -201,28 +201,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-=========================================================================
-== JSON License ==
-=========================================================================
-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.
Modified: felix/trunk/dependencymanager/release/resources/bin/LICENSE
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/release/resources/bin/LICENSE?rev=1800019&r1=1800018&r2=1800019&view=diff
==============================================================================
--- felix/trunk/dependencymanager/release/resources/bin/LICENSE (original)
+++ felix/trunk/dependencymanager/release/resources/bin/LICENSE Tue Jun 27
06:28:11 2017
@@ -201,28 +201,3 @@
See the License for the specific language governing permissions and
limitations under the License.
-=========================================================================
-== JSON License ==
-=========================================================================
-
-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.
Modified: felix/trunk/dependencymanager/release/resources/deps/LICENSE
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/release/resources/deps/LICENSE?rev=1800019&r1=1800018&r2=1800019&view=diff
==============================================================================
--- felix/trunk/dependencymanager/release/resources/deps/LICENSE (original)
+++ felix/trunk/dependencymanager/release/resources/deps/LICENSE Tue Jun 27
06:28:11 2017
@@ -202,32 +202,6 @@
limitations under the License.
=========================================================================
-== License for JSON ==
-=========================================================================
-
-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.
-
-=========================================================================
== License for Junit ==
=========================================================================
