[NETBEANS-54] Module Review api.annotations.common - external library: jsr305 locense file updated with missing header fields (see http://wiki.netbeans.org/DevFaqExternalLibraries), so that 'ant verify-libs-and-licenses' no longer complains about jsr305. Maven coordinates added, with side-effect that artifact name changed to jsr305-2.0.0.jar. Notice added for jcip-annotations. NOTE: Checksum in binaries-list for jsr305 changed (artifact build with different JRE version).
- checked Rat report; changed license header in apichanges.xml, removed Oracle license header in file under META-INF/services (excluded from Rat) - skimmed through the module, did not spot files that were not Oracle's to donate. Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/0a957466 Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/0a957466 Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/0a957466 Branch: refs/heads/master Commit: 0a9574660707948a5870aefe7b9115cf429539bf Parents: 9a8e28b Author: Dave Schoorl <[email protected]> Authored: Mon Sep 25 00:30:50 2017 +0200 Committer: Matthias Bläsing <[email protected]> Committed: Sun Oct 15 17:54:53 2017 +0200 ---------------------------------------------------------------------- api.annotations.common/apichanges.xml | 59 ++++++-------------- api.annotations.common/external/binaries-list | 2 +- api.annotations.common/external/jcip-notice.txt | 5 ++ .../external/jsr305-2.0.0-license.txt | 42 ++++++++++++++ .../external/jsr305-license.txt | 15 ----- .../nbproject/project.properties | 2 +- .../javax.annotation.processing.Processor | 2 +- 7 files changed, 66 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a957466/api.annotations.common/apichanges.xml ---------------------------------------------------------------------- diff --git a/api.annotations.common/apichanges.xml b/api.annotations.common/apichanges.xml index 3d6755f..4ac0a1f 100644 --- a/api.annotations.common/apichanges.xml +++ b/api.annotations.common/apichanges.xml @@ -1,48 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Search for CHANGEME in this document when copying and using it: --> <!-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -Contributor(s): - -The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -Microsystems, Inc. All Rights Reserved. - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, 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. + --> <?xml-stylesheet type="text/xml" href="CHANGEME/nbbuild/javadoctools/apichanges.xsl"?> <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../nbbuild/javadoctools/apichanges.dtd"> http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a957466/api.annotations.common/external/binaries-list ---------------------------------------------------------------------- diff --git a/api.annotations.common/external/binaries-list b/api.annotations.common/external/binaries-list index 8298f8f..74f1e37 100644 --- a/api.annotations.common/external/binaries-list +++ b/api.annotations.common/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -5871FB60DC68D67DA54A663C3FD636A10A532948 jsr305.jar +516C03B21D50A644D538DE0F0369C620989CD8F0 com.google.code.findbugs:jsr305:2.0.0 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a957466/api.annotations.common/external/jcip-notice.txt ---------------------------------------------------------------------- diff --git a/api.annotations.common/external/jcip-notice.txt b/api.annotations.common/external/jcip-notice.txt new file mode 100644 index 0000000..a91912e --- /dev/null +++ b/api.annotations.common/external/jcip-notice.txt @@ -0,0 +1,5 @@ +The Java code in the package javax.annotation.concurrent in jsr305-2.0.0.jar +is copyright (c) 2005 Brian Goetz and is released under the Creative Commons +Attribution License (http://creativecommons.org/licenses/by/2.5) + +Official home: http://www.jcip.net \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a957466/api.annotations.common/external/jsr305-2.0.0-license.txt ---------------------------------------------------------------------- diff --git a/api.annotations.common/external/jsr305-2.0.0-license.txt b/api.annotations.common/external/jsr305-2.0.0-license.txt new file mode 100644 index 0000000..53b4a1b --- /dev/null +++ b/api.annotations.common/external/jsr305-2.0.0-license.txt @@ -0,0 +1,42 @@ +Name: jsr305-2.0.0.jar +Version: 2.0.0 +Description: JSR305 Annotations for Findbugs +License: BSD +OSR: N/A +Origin: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar +Comment: Use of JSR 305 is governed by the terms of the license below: +Comment: The JSR-305 reference implementation (lib/jsr305.jar) is distributed +Comment: under the terms of the New BSD license: +Comment: https://opensource.org/licenses/BSD-3-Clause +Comment: See the JSR-305 home page for more information: +Comment: http://code.google.com/p/jsr-305/ + + +Copyright (c) __YEAR__, __OWNER__ + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +2. 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. +3. Neither the name of __COPYRIGHT_OWNER__ nor the names + of __PRONOUN__ 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 OWNER 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. + http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a957466/api.annotations.common/external/jsr305-license.txt ---------------------------------------------------------------------- diff --git a/api.annotations.common/external/jsr305-license.txt b/api.annotations.common/external/jsr305-license.txt deleted file mode 100644 index 6d8929c..0000000 --- a/api.annotations.common/external/jsr305-license.txt +++ /dev/null @@ -1,15 +0,0 @@ -Name: JSR305 -License: New BSD -Origin: http://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar - -Use of JSR 305 is governed by the terms of the license below: - -[TEXT OF THE LICENSE] -The JSR-305 reference implementation (lib/jsr305.jar) is -distributed under the terms of the New BSD license: - - http://www.opensource.org/licenses/bsd-license.php - -See the JSR-305 home page for more information: - - http://code.google.com/p/jsr-305/ http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a957466/api.annotations.common/nbproject/project.properties ---------------------------------------------------------------------- diff --git a/api.annotations.common/nbproject/project.properties b/api.annotations.common/nbproject/project.properties index e17605c..9ff142e 100644 --- a/api.annotations.common/nbproject/project.properties +++ b/api.annotations.common/nbproject/project.properties @@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial javadoc.arch=${basedir}/arch.xml javadoc.apichanges=${basedir}/apichanges.xml -cp.extra=external/jsr305.jar +cp.extra=external/jsr305-2.0.0.jar http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0a957466/api.annotations.common/src/META-INF/services/javax.annotation.processing.Processor ---------------------------------------------------------------------- diff --git a/api.annotations.common/src/META-INF/services/javax.annotation.processing.Processor b/api.annotations.common/src/META-INF/services/javax.annotation.processing.Processor index 2abc416..1a17a02 100644 --- a/api.annotations.common/src/META-INF/services/javax.annotation.processing.Processor +++ b/api.annotations.common/src/META-INF/services/javax.annotation.processing.Processor @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. # -org.netbeans.api.annotations.common.proc.StaticResourceProcessor \ No newline at end of file +org.netbeans.api.annotations.common.proc.StaticResourceProcessor
