From faae59e6d46cf0c8927b677ceccdacf12befe70c Mon Sep 17 00:00:00 2001 From: Daniel Kulp Date: Wed, 5 Jul 2017 15:47:06 -0400 Subject: [PATCH] [ARTEMIS-565] Remove json.org stuff from license files as we have not depended on that for almost a year --- .../main/appended-resources/META-INF/LICENSE | 27 ------------------- .../src/main/resources/licenses/bin/LICENSE | 27 ------------------- 2 files changed, 54 deletions(-) delete mode 100644 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 81d6e34147..0000000000 --- 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. diff --git a/artemis-distribution/src/main/resources/licenses/bin/LICENSE b/artemis-distribution/src/main/resources/licenses/bin/LICENSE index 389ea2bf9b..b1164f30f2 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 =