Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Feb 16, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd7d317
Bump jira-rest-client.version from 5.2.2 to 5.2.4
dependabot[bot] Feb 14, 2022
86cff08
fix compilation
olamy Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
21 changes: 21 additions & 0 deletions src/main/java/hudson/plugins/jira/JiraSite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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();
}
}

//-----------------------------------------------------------------------------------
Expand Down
22 changes: 22 additions & 0 deletions src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
Expand Down