This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch release90
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/release90 by this push:
new 4cc7d0e [NETBEANS-830][NETBEANS-831] Fix license info for jaxb
implementation
4cc7d0e is described below
commit 4cc7d0e36c509e0347d217acbb66ea0e3df600df
Author: Matthias Bläsing <mblaes...@doppel-helix.eu>
AuthorDate: Wed Jun 6 21:35:50 2018 +0200
[NETBEANS-830][NETBEANS-831] Fix license info for jaxb implementation
The license infos were extracted/retrieved from the sources of the
originating projects. JAXB1 and XJC are both missing the license
references.
---
...2-license.txt => jaxb-2.2.5-2-jaxb-license.txt} | 2 +-
...-license.txt => jaxb-2.2.5-2-jaxb1-license.txt} | 94 ++++++++++++++++++++-
...-2-license.txt => jaxb-2.2.5-2-xjc-license.txt} | 31 ++++++-
.../licenses/CDDL-1.1-BSD-MIT-jaxb1-xjc | 98 ++++++++++++++++++++--
.../licenses/CDDL-1.1-MIT-jaxb-xjc | 33 ++++++--
5 files changed, 238 insertions(+), 20 deletions(-)
diff --git a/libs.jaxb/external/jaxb-2.2.5-2-license.txt
b/libs.jaxb/external/jaxb-2.2.5-2-jaxb-license.txt
similarity index 99%
copy from libs.jaxb/external/jaxb-2.2.5-2-license.txt
copy to libs.jaxb/external/jaxb-2.2.5-2-jaxb-license.txt
index 6750e28..4e56690 100644
--- a/libs.jaxb/external/jaxb-2.2.5-2-license.txt
+++ b/libs.jaxb/external/jaxb-2.2.5-2-jaxb-license.txt
@@ -4,7 +4,7 @@ Version: 2.2.5-2
Origin: Oracle
URL: https://jaxb.java.net/
License: CDDL-1.1
-Files: jaxb-impl-2.2.5-2.jar jaxb1-impl-2.2.5-2.jar jaxb-xjc-2.2.5-2.jar
+Files: jaxb-impl-2.2.5-2.jar
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
diff --git a/libs.jaxb/external/jaxb-2.2.5-2-license.txt
b/libs.jaxb/external/jaxb-2.2.5-2-jaxb1-license.txt
similarity index 80%
copy from libs.jaxb/external/jaxb-2.2.5-2-license.txt
copy to libs.jaxb/external/jaxb-2.2.5-2-jaxb1-license.txt
index 6750e28..93decb8 100644
--- a/libs.jaxb/external/jaxb-2.2.5-2-license.txt
+++ b/libs.jaxb/external/jaxb-2.2.5-2-jaxb1-license.txt
@@ -3,8 +3,98 @@ Description: JAXB Reference Implementation
Version: 2.2.5-2
Origin: Oracle
URL: https://jaxb.java.net/
-License: CDDL-1.1
-Files: jaxb-impl-2.2.5-2.jar jaxb1-impl-2.2.5-2.jar jaxb-xjc-2.2.5-2.jar
+License: CDDL-1.1-BSD-MIT-jaxb1-xjc
+Files: jaxb1-impl-2.2.5-2.jar
+
+=========== Parts of the work are: ===========
+
+Copyright (c) 2001-2002, SourceForge ISO-RELAX Project (ASAMI Tomoharu, Daisuke
+Okajima, Kohsuke Kawaguchi, and MURATA Makoto)
+
+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.
+
+=========== Parts of the work are: ===========
+
+Copyright (c) 2001-2009 Sun Microsystems, Inc. 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.
+
+- Redistribution in binary form must reproduct 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 Sun Microsystems, Inc. or the names of
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+This software is provided "AS IS," without a warranty of any kind. ALL
+EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND
+ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR LIABILITIES
+SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE, MODIFICATION
+OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL
+SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE,
+EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+=========== Parts of the work are: ===========
+
+Copyright (c) 2001, Thai Open Source Software Center Ltd, Sun Microsystems.
+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 names of the copyright holders 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 REGENTS 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.
+
+
+=========== Parts of the work are: ===========
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
diff --git a/libs.jaxb/external/jaxb-2.2.5-2-license.txt
b/libs.jaxb/external/jaxb-2.2.5-2-xjc-license.txt
similarity index 94%
copy from libs.jaxb/external/jaxb-2.2.5-2-license.txt
copy to libs.jaxb/external/jaxb-2.2.5-2-xjc-license.txt
index 6750e28..cf3ae6e 100644
--- a/libs.jaxb/external/jaxb-2.2.5-2-license.txt
+++ b/libs.jaxb/external/jaxb-2.2.5-2-xjc-license.txt
@@ -3,8 +3,35 @@ Description: JAXB Reference Implementation
Version: 2.2.5-2
Origin: Oracle
URL: https://jaxb.java.net/
-License: CDDL-1.1
-Files: jaxb-impl-2.2.5-2.jar jaxb1-impl-2.2.5-2.jar jaxb-xjc-2.2.5-2.jar
+License: CDDL-1.1-MIT-jaxb-xjc
+Files: jaxb-xjc-2.2.5-2.jar
+
+Parts of the work are:
+
+Copyright (c) 2004 Kohsuke Kawaguchi
+
+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.
+
+Parts of the work are:
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
diff --git a/libs.jaxb/external/jaxb-2.2.5-2-license.txt
b/nbbuild/licenses/CDDL-1.1-BSD-MIT-jaxb1-xjc
similarity index 80%
copy from libs.jaxb/external/jaxb-2.2.5-2-license.txt
copy to nbbuild/licenses/CDDL-1.1-BSD-MIT-jaxb1-xjc
index 6750e28..5e5c48d 100644
--- a/libs.jaxb/external/jaxb-2.2.5-2-license.txt
+++ b/nbbuild/licenses/CDDL-1.1-BSD-MIT-jaxb1-xjc
@@ -1,10 +1,92 @@
-Name: JAXB
-Description: JAXB Reference Implementation
-Version: 2.2.5-2
-Origin: Oracle
-URL: https://jaxb.java.net/
-License: CDDL-1.1
-Files: jaxb-impl-2.2.5-2.jar jaxb1-impl-2.2.5-2.jar jaxb-xjc-2.2.5-2.jar
+=========== Parts of the work are: ===========
+
+Copyright (c) 2001-2002, SourceForge ISO-RELAX Project (ASAMI Tomoharu, Daisuke
+Okajima, Kohsuke Kawaguchi, and MURATA Makoto)
+
+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.
+
+=========== Parts of the work are: ===========
+
+Copyright (c) 2001-2009 Sun Microsystems, Inc. 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.
+
+- Redistribution in binary form must reproduct 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 Sun Microsystems, Inc. or the names of
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+This software is provided "AS IS," without a warranty of any kind. ALL
+EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND
+ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR LIABILITIES
+SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE, MODIFICATION
+OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL
+SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE,
+EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+=========== Parts of the work are: ===========
+
+Copyright (c) 2001, Thai Open Source Software Center Ltd, Sun Microsystems.
+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 names of the copyright holders 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 REGENTS 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.
+
+
+=========== Parts of the work are: ===========
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
@@ -352,4 +434,4 @@ State of California (excluding conflict-of-law provisions).
Any
litigation relating to this License shall be subject to the jurisdiction
of the Federal Courts of the Northern District of California and the
state courts of the State of California, with venue lying in Santa Clara
-County, California.
+County, California.
\ No newline at end of file
diff --git a/libs.jaxb/external/jaxb-2.2.5-2-license.txt
b/nbbuild/licenses/CDDL-1.1-MIT-jaxb-xjc
similarity index 94%
rename from libs.jaxb/external/jaxb-2.2.5-2-license.txt
rename to nbbuild/licenses/CDDL-1.1-MIT-jaxb-xjc
index 6750e28..0e2ab72 100644
--- a/libs.jaxb/external/jaxb-2.2.5-2-license.txt
+++ b/nbbuild/licenses/CDDL-1.1-MIT-jaxb-xjc
@@ -1,10 +1,29 @@
-Name: JAXB
-Description: JAXB Reference Implementation
-Version: 2.2.5-2
-Origin: Oracle
-URL: https://jaxb.java.net/
-License: CDDL-1.1
-Files: jaxb-impl-2.2.5-2.jar jaxb1-impl-2.2.5-2.jar jaxb-xjc-2.2.5-2.jar
+Parts of the work are:
+
+Copyright (c) 2004 Kohsuke Kawaguchi
+
+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.
+
+Parts of the work are:
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
--
To stop receiving notification emails like this one, please contact
matthiasblaes...@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
