This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 226fa44 [NETBEANS-3407] - Updating to jsr305 3.0.2
226fa44 is described below
commit 226fa4411850a0b1ec00c2198039ef51ffb1af76
Author: Jose Contreras <pepnes...@gmail.com>
AuthorDate: Tue Nov 12 17:57:08 2019 -0600
[NETBEANS-3407] - Updating to jsr305 3.0.2
---
.../nbproject/project.properties | 2 +-
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 2 +-
nbbuild/licenses/BSD-jsr305 | 28 ++++++++++++++++++
.../api.annotations.common/external/binaries-list | 2 +-
.../external/jsr305-2.0.0-notice.txt | 5 ----
...-2.0.0-license.txt => jsr305-3.0.2-license.txt} | 34 +++++++++++-----------
.../nbproject/project.properties | 4 +--
7 files changed, 50 insertions(+), 27 deletions(-)
diff --git a/java/findbugs.installer/nbproject/project.properties
b/java/findbugs.installer/nbproject/project.properties
index ab06b41..0f4ec98 100644
--- a/java/findbugs.installer/nbproject/project.properties
+++ b/java/findbugs.installer/nbproject/project.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.7
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index 1c75028..b185428 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -58,7 +58,7 @@ groovy/gradle/external/gradle-4.10.2-bin.zip
ide/c.jcraft.jsch/external/jsch-0.1
groovy/gradle/external/gradle-4.10.2-bin.zip
ide/o.apache.commons.lang/external/commons-lang-2.6.jar
groovy/gradle/external/gradle-4.10.2-bin.zip
java/maven/external/aether-api-1.13.1.jar
groovy/gradle/external/gradle-4.10.2-bin.zip
java/maven.embedder/external/apache-maven-3.3.9-bin.zip
-groovy/gradle/external/gradle-4.10.2-bin.zip
platform/api.annotations.common/external/jsr305-2.0.0.jar
+groovy/gradle/external/gradle-4.10.2-bin.zip
platform/api.annotations.common/external/jsr305-3.0.2.jar
groovy/gradle/external/gradle-4.10.2-bin.zip
platform/libs.junit4/external/hamcrest-core-1.3.jar
groovy/gradle/external/gradle-4.10.2-bin.zip
platform/libs.junit4/external/junit-4.12.jar
diff --git a/nbbuild/licenses/BSD-jsr305 b/nbbuild/licenses/BSD-jsr305
new file mode 100644
index 0000000..cf30ea2
--- /dev/null
+++ b/nbbuild/licenses/BSD-jsr305
@@ -0,0 +1,28 @@
+Copyright (c) 2007-2009, JSR305 expert group
+All rights reserved.
+
+http://www.opensource.org/licenses/bsd-license.php
+
+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 JSR305 expert group 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 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.
diff --git a/platform/api.annotations.common/external/binaries-list
b/platform/api.annotations.common/external/binaries-list
index 74f1e37..78dfe2c 100644
--- a/platform/api.annotations.common/external/binaries-list
+++ b/platform/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.
-516C03B21D50A644D538DE0F0369C620989CD8F0 com.google.code.findbugs:jsr305:2.0.0
\ No newline at end of file
+25EA2E8B0C338A877313BD4672D3FE056EA78F0D com.google.code.findbugs:jsr305:3.0.2
\ No newline at end of file
diff --git a/platform/api.annotations.common/external/jsr305-2.0.0-notice.txt
b/platform/api.annotations.common/external/jsr305-2.0.0-notice.txt
deleted file mode 100644
index a91912e..0000000
--- a/platform/api.annotations.common/external/jsr305-2.0.0-notice.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-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
diff --git a/platform/api.annotations.common/external/jsr305-2.0.0-license.txt
b/platform/api.annotations.common/external/jsr305-3.0.2-license.txt
similarity index 64%
rename from platform/api.annotations.common/external/jsr305-2.0.0-license.txt
rename to platform/api.annotations.common/external/jsr305-3.0.2-license.txt
index 81b5f39..bd9a0e3 100644
--- a/platform/api.annotations.common/external/jsr305-2.0.0-license.txt
+++ b/platform/api.annotations.common/external/jsr305-3.0.2-license.txt
@@ -1,9 +1,9 @@
-Name: jsr305-2.0.0.jar
-Version: 2.0.0
+Name: jsr305-3.0.2.jar
+Version: 3.0.2
Description: JSR305 Annotations for Findbugs
-License: BSD
+License: BSD-jsr305
Origin: FindBugs
-URL:
http://central.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar
+URL:
http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
Type: compile-time
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
@@ -14,25 +14,26 @@ Comment: http://code.google.com/p/jsr-305/
Comment: Allows NetBeans' @NonNull/@NullAllowed/etc. annotations to be
annotated with the JSR-205 meta-annotations, so they are recognizable by
FindBugs.
-Copyright (c) __YEAR__, __OWNER__
-
+Copyright (c) 2007-2009, JSR305 expert group
All rights reserved.
+http://www.opensource.org/licenses/bsd-license.php
+
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.
+ * 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 JSR305 expert group 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
+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
@@ -41,4 +42,3 @@ 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/platform/api.annotations.common/nbproject/project.properties
b/platform/api.annotations.common/nbproject/project.properties
index 9ff142e..c3d99df 100644
--- a/platform/api.annotations.common/nbproject/project.properties
+++ b/platform/api.annotations.common/nbproject/project.properties
@@ -17,9 +17,9 @@
is.autoload=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-cp.extra=external/jsr305-2.0.0.jar
+cp.extra=external/jsr305-3.0.2.jar
---------------------------------------------------------------------
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
