This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.contentloader-2.0.2-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git
commit 577365502716fa4df7989d7ba605d8b00e751c6c Author: Jukka Zitting <[email protected]> AuthorDate: Mon Jun 16 15:06:24 2008 +0000 SLING-539: Merge LICENSE.* information to LICENSE files - kXML license git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/contentloader@668182 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/resources/META-INF/LICENSE | 30 ++++++++++++++++++++++++++++++ src/main/resources/META-INF/LICENSE.kxml2 | 19 ------------------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE index d645695..1a45730 100644 --- a/src/main/resources/META-INF/LICENSE +++ b/src/main/resources/META-INF/LICENSE @@ -200,3 +200,33 @@ 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 SLING SUBCOMPONENTS: + +Apache Sling includes subcomponents with separate copyright notices and +license terms. Your use of these subcomponents is subject to the terms +and conditions of the following licenses. + +kXML parser + + 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/src/main/resources/META-INF/LICENSE.kxml2 b/src/main/resources/META-INF/LICENSE.kxml2 deleted file mode 100644 index 1fe595b..0000000 --- a/src/main/resources/META-INF/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. -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
