From 963a1222bee93c329878107592712928c6df83a5 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Mon, 8 Feb 2021 14:20:29 -0500 Subject: [PATCH] Update SpotBugs. --- platform-independent/java/algorithm/build.gradle | 2 +- platform-independent/java/gui/build.gradle | 2 +- .../com/lyndir/masterpassword/gui/view/UserContentPanel.java | 3 ++- platform-independent/java/model/build.gradle | 2 +- platform-independent/java/tests/build.gradle | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/platform-independent/java/algorithm/build.gradle b/platform-independent/java/algorithm/build.gradle index 7bb74257..47daf06d 100644 --- a/platform-independent/java/algorithm/build.gradle +++ b/platform-independent/java/algorithm/build.gradle @@ -15,7 +15,7 @@ configurations { dependencies { implementation group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.7-p2' - implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.0.0-beta4' + implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.1' api group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.8' api group: 'org.jetbrains', name: 'annotations', version: '16.0.2' diff --git a/platform-independent/java/gui/build.gradle b/platform-independent/java/gui/build.gradle index 4bfcdd32..722653b8 100644 --- a/platform-independent/java/gui/build.gradle +++ b/platform-independent/java/gui/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2' implementation group: 'com.yuvimasory', name: 'orange-extensions', version: '1.3.0' implementation group: 'com.github.tulskiy', name: 'jkeymaster', version: '1.2' - implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.0.0-beta4' + implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.1' compile project( ':masterpassword-model' ) } diff --git a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java index a9e0d693..72700244 100644 --- a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java +++ b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java @@ -459,7 +459,8 @@ public class UserContentPanel extends JPanel implements State.Listener, MPUser.L char[] masterPassword = masterPasswordField.getPassword(); MPIdenticon identicon = ((masterPassword != null) && (masterPassword.length > 0))? user.getAlgorithm().identicon( user.getFullName(), masterPassword ): null; - Arrays.fill( masterPassword, (char) 0 ); + if (masterPassword != null) + Arrays.fill( masterPassword, (char) 0 ); Res.ui( () -> { if (identicon != null) { diff --git a/platform-independent/java/model/build.gradle b/platform-independent/java/model/build.gradle index e51d95ba..02072203 100644 --- a/platform-independent/java/model/build.gradle +++ b/platform-independent/java/model/build.gradle @@ -7,7 +7,7 @@ description = 'Master Password Site Model' dependencies { implementation group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.7-p2' implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.8' - implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.0.0-beta4' + implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.1' api project( ':masterpassword-algorithm' ) api group: 'joda-time', name: 'joda-time', version: '2.10' diff --git a/platform-independent/java/tests/build.gradle b/platform-independent/java/tests/build.gradle index 2d82d9af..aae7ace2 100644 --- a/platform-independent/java/tests/build.gradle +++ b/platform-independent/java/tests/build.gradle @@ -7,7 +7,7 @@ description = 'Master Password Test Suite' dependencies { implementation group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.7-p2' implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' - implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.0.0-beta4' + implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.1' implementation project( ':masterpassword-algorithm' ) implementation project( ':masterpassword-model' )