Bump jira-rest-client.version from 5.2.2 to 5.2.4 (#411)

* Bump jira-rest-client.version from 5.2.2 to 5.2.4 Bumps `jira-rest-client.version` from 5.2.2 to 5.2.4. Updates `jira-rest-java-client-api` from 5.2.2 to 5.2.4 - [Commits](https://bitbucket.org/atlassian/jira-rest-java-client/branches/compare/jira-rest-java-client-parent-5.2.4..jira-rest-java-client-parent-5.2.2) Updates `jira-rest-java-client-core` from 5.2.2 to 5.2.4 - [Commits](https://bitbucket.org/atlassian/jira-rest-java-client/branches/compare/jira-rest-java-client-parent-5.2.4..jira-rest-java-client-parent-5.2.2) --- updated-dependencies: - dependency-name: com.atlassian.jira:jira-rest-java-client-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.atlassian.jira:jira-rest-java-client-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * fix compilation Signed-off-by: Olivier Lamy <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Olivier Lamy <[email protected]>
jenkinsci · Feb 16, 2022 · 6b26be5 · 6b26be5
1 parent d57cb34
commit 6b26be5
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
     <changelist>-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <java.level>8</java.level>
-    <jira-rest-client.version>5.2.2</jira-rest-client.version>
+    <jira-rest-client.version>5.2.4</jira-rest-client.version>
     <fugue.version>3.0.0</fugue.version>
     <!-- jenkins -->
     <jenkins.version>2.277.4</jenkins.version>

diff --git a/src/main/java/hudson/plugins/jira/JiraSite.java b/src/main/java/hudson/plugins/jira/JiraSite.java
@@ -48,6 +48,8 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+
+import javax.annotation.Nonnull;
 import javax.annotation.PreDestroy;
 import javax.servlet.ServletException;
 import java.io.File;
@@ -57,6 +59,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -803,6 +806,24 @@ public File getHomeDirectory() {
         public String getPropertyValue(final String s) {
             throw new UnsupportedOperationException("Not implemented");
         }
+
+        @Nonnull
+        @Override
+        public String getApplicationFileEncoding() {
+            return System.getProperty("file.encoding");
+        }
+
+        @Nonnull
+        @Override
+        public Optional<Path> getLocalHomeDirectory() {
+            return Optional.empty();
+        }
+
+        @Nonnull
+        @Override
+        public Optional<Path> getSharedHomeDirectory() {
+            return Optional.empty();
+        }
     }
 
     //-----------------------------------------------------------------------------------

diff --git a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java
@@ -26,13 +26,17 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+
+import javax.annotation.Nonnull;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
 import java.util.Date;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 public class ApacheAsyncHttpClientTest
@@ -308,6 +312,24 @@ public String getPropertyValue( String s )
             {
                 return null;
             }
+
+            @Nonnull
+            @Override
+            public String getApplicationFileEncoding() {
+                return System.getProperty("file.encoding");
+            }
+
+            @Nonnull
+            @Override
+            public Optional<Path> getLocalHomeDirectory() {
+                return Optional.empty();
+            }
+
+            @Nonnull
+            @Override
+            public Optional<Path> getSharedHomeDirectory() {
+                return Optional.empty();
+            }
         };
         return applicationProperties;
     }