From 2488ae189abc147727010242e6fd4cc3c64cdb4b Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 21 Nov 2022 21:58:14 -0800
Subject: [PATCH] Clean up build

---
 pom.xml                                                   | 8 ++------
 .../windowsazurestorage/helper/AzureUtils.java            | 1 -
 .../windowsazurestorage/helper/CredentialRename.java      | 2 --
 .../windowsazurestorage/Messages.properties               | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index de354946..cfd88987 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.18</version>
+        <version>4.51</version>
     </parent>
 
     <artifactId>windows-azure-storage</artifactId>
@@ -16,11 +16,7 @@
     <properties>
         <changelist>9999-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/azure-storage-plugin</gitHubRepo>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <jenkins.version>2.277.2</jenkins.version>
-        <java.level>8</java.level>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
     </properties>
 
     <licenses>
@@ -118,7 +114,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-2.277.x</artifactId>
-                <version>909.vf028101f1bfa</version>
+                <version>984.vb5eaac999a7e</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureUtils.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureUtils.java
index 2ff7a9f0..15db07c0 100644
--- a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureUtils.java
+++ b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureUtils.java
@@ -166,7 +166,6 @@ public static String generateBlobSASURL(
      * @param fileName
      * @param shareName      container name
      * @return SAS URL
-     * @throws Exception
      */
     public static String generateFileSASURL(
             StorageAccountInfo storageAccount,
diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialRename.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialRename.java
index 2b192f4d..861bce1d 100644
--- a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialRename.java
+++ b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialRename.java
@@ -16,7 +16,6 @@
 
 package com.microsoftopentechnologies.windowsazurestorage.helper;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
@@ -90,7 +89,6 @@ public static void renameStorageConfig() throws IOException {
         removeFile(backUp.getCanonicalPath());
     }
 
-    @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE") // Bug in spotbugs for try-with-resources
     private static boolean renameNotNeededFor(Path path) throws IOException {
         try (Stream<String> stream = Files.lines(path)) {
             boolean needRename = stream.anyMatch(s -> s.contains(SOURCE_CONTENT));
diff --git a/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/Messages.properties b/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/Messages.properties
index d4172f65..1c090663 100644
--- a/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/Messages.properties
+++ b/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/Messages.properties
@@ -3,7 +3,7 @@ WAStoragePublisher_displayName=Upload artifacts to Azure Storage
 WAStoragePublisher_build_failed_err=AzureStorage - Build failed, hence canceling the upload of the artifacts \
   to Azure storage
 WAStoragePublisher_storage_account_err=AzureStorage - Storage account information not found
-WAStoragePublisher_container_name_err=AzureStorage - Container name is mi§ssing or not valid
+WAStoragePublisher_container_name_err=AzureStorage - Container name is missing or not valid
 WAStoragePublisher_filepath_err=AzureStorage - List of files to upload must not be empty
 WAStoragePublisher_container_name=AzureStorage - Container name: {0}
 WAStoragePublisher_share_name=AzureStorage - share name: {0}