From 2ac756d3576fe41ae43505a7d945f6b55d236d7a Mon Sep 17 00:00:00 2001 From: Kengo TODA Date: Sat, 4 Aug 2018 00:35:26 +0800 Subject: [PATCH] Upgrade annotations (#274) * migrate from findbugs annotation to spotbugs annotation http://spotbugs.readthedocs.io/en/stable/migration.html#com-google-code-findbugs-annotations * upgrade jsr305 annotation to 3.0.2 that has better javadoc * add entries to CHANGES.md files --- CHANGES.md | 3 +++ gradle/java-setup.gradle | 6 +++--- plugin-gradle/CHANGES.md | 2 ++ plugin-maven/CHANGES.md | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 340183a63e..9f8b7a56c8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,9 @@ You might be looking for: ### Version 1.15.0-SNAPSHOT - TBD (javadoc [lib](https://diffplug.github.io/spotless/javadoc/spotless-lib/snapshot/) [lib-extra](https://diffplug.github.io/spotless/javadoc/spotless-lib-extra/snapshot/), [snapshot repo](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/)) +* Updated JSR305 annotation from 3.0.0 to 3.0.2 ([#274](https://github.com/diffplug/spotless/pull/274)) +* Migrated from FindBugs annotations 3.0.0 to SpotBugs annotations 3.1.6 ([#274](https://github.com/diffplug/spotless/pull/274)) + ### Version 1.14.0 - July 24th 2018 (javadoc [lib](https://diffplug.github.io/spotless/javadoc/spotless-lib/1.14.0/) [lib-extra](https://diffplug.github.io/spotless/javadoc/spotless-lib-extra/1.14.0/), artifact [lib]([jcenter](https://bintray.com/diffplug/opensource/spotless-lib), [lib-extra]([jcenter](https://bintray.com/diffplug/opensource/spotless-lib-extra))) * Updated default groovy-eclipse from 4.6.3 to 4.8.0 ([#244](https://github.com/diffplug/spotless/pull/244)). New version allows to ignore internal formatter errors/warnings. diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle index ebbc371c3b..3a42f18714 100644 --- a/gradle/java-setup.gradle +++ b/gradle/java-setup.gradle @@ -56,8 +56,8 @@ tasks.withType(com.github.spotbugs.SpotBugsTask) { html.enabled = true } } -// we'll want the findbugs annotations (they don't have a 3.0.1 version) dependencies { - compileOnly 'com.google.code.findbugs:annotations:3.0.0' - compileOnly 'com.google.code.findbugs:jsr305:3.0.0' + compileOnly 'net.jcip:jcip-annotations:1.0' + compileOnly 'com.github.spotbugs:spotbugs-annotations:3.1.6' + compileOnly 'com.google.code.findbugs:jsr305:3.0.2' } diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 9be09df10a..5ee60f6b25 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -3,6 +3,8 @@ ### Version 3.15.0-SNAPSHOT - TBD ([javadoc](https://diffplug.github.io/spotless/javadoc/snapshot/), [snapshot](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/spotless-plugin-gradle/)) * LicenseHeaderStep now wont attempt to add license to `module-info.java` ([#272](https://github.com/diffplug/spotless/pull/272)). +* Updated JSR305 annotation from 3.0.0 to 3.0.2 ([#274](https://github.com/diffplug/spotless/pull/274)) +* Migrated from FindBugs annotations 3.0.0 to SpotBugs annotations 3.1.6 ([#274](https://github.com/diffplug/spotless/pull/274)) ### Version 3.14.0 - July 24th 2018 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-plugin-gradle/3.14.0/), [jcenter](https://bintray.com/diffplug/opensource/spotless-plugin-gradle/3.14.0)) diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 6fd011c458..55dd98bd0e 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -3,6 +3,8 @@ ### Version 1.15.0-SNAPSHOT - TBD ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/snapshot/), [snapshot](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/spotless-maven-plugin/)) * Skip `package-info.java` and `module-info.java` files from license header formatting. ([#273](https://github.com/diffplug/spotless/pull/273)) +* Updated JSR305 annotation from 3.0.0 to 3.0.2 ([#274](https://github.com/diffplug/spotless/pull/274)) +* Migrated from FindBugs annotations 3.0.0 to SpotBugs annotations 3.1.6 ([#274](https://github.com/diffplug/spotless/pull/274)) ### Version 1.14.0 - July 24th 2018 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/1.14.0/), [jcenter](https://bintray.com/diffplug/opensource/spotless-maven-plugin/1.14.0))