From 3da02406950f8838a77faeb821cd9632ad124f74 Mon Sep 17 00:00:00 2001 From: Steveice10 Date: Thu, 19 Dec 2013 17:16:33 -0800 Subject: [PATCH] Updated version to 1.3-SNAPSHOT, changed license and pom.xml data for rewrite --- HEADER.txt | 33 --------------------------------- LICENSE.txt | 32 ++++---------------------------- README.md | 17 +++++++++-------- pom.xml | 8 ++++---- 4 files changed, 17 insertions(+), 73 deletions(-) delete mode 100644 HEADER.txt diff --git a/HEADER.txt b/HEADER.txt deleted file mode 100644 index 71eae9f..0000000 --- a/HEADER.txt +++ /dev/null @@ -1,33 +0,0 @@ -/* - * OpenNBT License - * - * JNBT Copyright (c) 2010 Graham Edgecombe - * OpenNBT Copyright(c) 2012 Steveice10 - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ diff --git a/LICENSE.txt b/LICENSE.txt index bfbcb0b..075fd67 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,31 +1,7 @@ -OpenNBT License +Copyright (C) 2013-2014 Steveice10 -JNBT Copyright (c) 2010 Graham Edgecombe -OpenNBT Copyright (c) 2012 Steveice10 -All rights reserved. +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: -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the JNBT team nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. +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. \ No newline at end of file diff --git a/README.md b/README.md index 5909d50..b47ddd3 100644 --- a/README.md +++ b/README.md @@ -6,16 +6,17 @@ About OpenNBT -------------- -OpenNBT is a library for reading and writing NBT files, originally a continuation of Graham Edgecombe's jNBT library before it was rewritten. - - -License --------------- - -OpenNBT is licensed under the [BSD](http://www.opensource.org/licenses/BSD-3-Clause) license. (See LICENSE.txt for more info) +OpenNBT is a library for reading and writing NBT files, with some extra custom tags added to allow the storage of more data types. Building the Source -------------- -OpenNBT uses Maven to manage dependencies. Simply run 'mvn clean install' in the source's directory. You can also download a build [here](http://ci.spacebase.ch/job/OpenNBT/). +OpenNBT uses Maven to manage dependencies. Simply run 'mvn clean install' in the source's directory. +You can also download a build [here](http://build.spacebase.ch/job/OpenNBT/). + + +License +-------------- + +OpenNBT is licensed under the [MIT license](http://www.opensource.org/licenses/mit-license.html). \ No newline at end of file diff --git a/pom.xml b/pom.xml index 639a0f2..631e433 100644 --- a/pom.xml +++ b/pom.xml @@ -2,17 +2,17 @@ 4.0.0 ch.spacebase opennbt - 1.2 + 1.3-SNAPSHOT jar OpenNBT - A continuation of Graham Edgecombe's jNBT library. + A library for reading and writing NBT files, written in Java. http://github.com/Steveice10/OpenNBT/ - BSD 3-Clause License - http://www.opensource.org/licenses/BSD-3-Clause + MIT + http://www.opensource.org/licenses/mit-license.html repo