You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by dk...@apache.org on 2017/07/05 19:47:55 UTC
activemq-artemis git commit: [ARTEMIS-565] Remove json.org stuff from
license files as we have not depended on that for almost a year
Repository: activemq-artemis
Updated Branches:
refs/heads/master 89a53ad01 -> faae59e6d
[ARTEMIS-565] Remove json.org stuff from license files as we have not depended on that for almost a year
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/faae59e6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/faae59e6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/faae59e6
Branch: refs/heads/master
Commit: faae59e6d46cf0c8927b677ceccdacf12befe70c
Parents: 89a53ad
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jul 5 15:47:06 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jul 5 15:47:06 2017 -0400
----------------------------------------------------------------------
.../main/appended-resources/META-INF/LICENSE | 27 --------------------
.../src/main/resources/licenses/bin/LICENSE | 27 --------------------
2 files changed, 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/faae59e6/artemis-core-client/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/appended-resources/META-INF/LICENSE b/artemis-core-client/src/main/appended-resources/META-INF/LICENSE
deleted file mode 100644
index 81d6e34..0000000
--- a/artemis-core-client/src/main/appended-resources/META-INF/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-
-===============================================================
-= For json processor files. =
-= See: src/main/java/org/apache/activemq/utils/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.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/faae59e6/artemis-distribution/src/main/resources/licenses/bin/LICENSE
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/resources/licenses/bin/LICENSE b/artemis-distribution/src/main/resources/licenses/bin/LICENSE
index 389ea2b..b1164f3 100644
--- a/artemis-distribution/src/main/resources/licenses/bin/LICENSE
+++ b/artemis-distribution/src/main/resources/licenses/bin/LICENSE
@@ -227,33 +227,6 @@
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-===============================================================
-= For json processor files. =
-= See: src/main/java/org/apache/activemq/utils/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.
-
===============================================================
= For Base64.java file =