Skip to content

merge from jenkinsci #1

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

Merged
merged 2 commits into from
Sep 25, 2018
Merged

merge from jenkinsci #1

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
72767c4
fixes #358 by updating to Java8 (#359)
mivola Sep 14, 2018
3a3179f
Fix #118: Avoid the unsafe cast in Build#Stop() (#326)
olivergondza Sep 14, 2018
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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ after_script:
# http://www.webupd8.org/2017/06/why-oracle-java-7-and-6-installers-no.html
# - oraclejdk8 is not supported anymore.
jdk:
- openjdk7
- openjdk8
cache:
directories:
- $HOME/.m2/repository
12 changes: 6 additions & 6 deletions jenkins-client/src/main/java/com/offbytwo/jenkins/model/Build.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ public String Stop() throws HttpResponseException, IOException {
try {

return client.get(url + "stop");
} catch (IOException ex) {
if (((HttpResponseException) ex).getStatusCode() == 405) {
} catch (HttpResponseException ex) {
if (ex.getStatusCode() == 405) {
stopPost();
return "";
}
throw ex;
}
return "";
}

/** Stops the build which is currently in progress. This version takes in
Expand All @@ -163,13 +163,13 @@ public String Stop(boolean crumbFlag) throws HttpResponseException, IOException
try {

return client.get(url + "stop");
} catch (IOException ex) {
if (((HttpResponseException) ex).getStatusCode() == 405) {
} catch (HttpResponseException ex) {
if (ex.getStatusCode() == 405) {
stopPost(crumbFlag);
return "";
}
throw ex;
}
return "";
}

private void stopPost(boolean crumbFlag) throws HttpResponseException, IOException {
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>

Expand Down