Skip to content

Remainder of PR #67#88

Merged
pjdarton merged 4 commits intojenkinsci:masterfrom
pjdarton:pullreq67
Sep 6, 2017
Merged

Remainder of PR #67#88
pjdarton merged 4 commits intojenkinsci:masterfrom
pjdarton:pullreq67

Conversation

@pjdarton
Copy link
Copy Markdown
Member

@pjdarton pjdarton commented Sep 6, 2017

Add the line where it's absent in jelly files.
Some whitespace changes where we previously has inconsistency.
Removed unnecessary cast.
Removed unnecessary import.
Refactored excessively long if/elseif...else clauses as a switch.
Change version of org.jenkins-ci.plugins/plugin from 2.22 to 2.29, which is the last version that works with a Java7 JDK, and brings us almost to the 2.30 specified in PR #67.

Add the line <?jelly escape-by-default='true'?> where it's absent.
Plus some whitespace changes where we had previously a mix of tabs and
spaces.
Removed unnecessary cast.
Removed unnecessary import.
Refactored excessively long if/elseif...else clauses as a switch.
Change version of org.jenkins-ci.plugins/plugin from 2.22 to 2.29, which
is the last version that works with a Java7 JDK.
PR jenkinsci#67 upgraded to 2.30 which is Java8-only, and I'm hoping to avoid
that at present.
@pjdarton pjdarton merged commit d325d0d into jenkinsci:master Sep 6, 2017
@pjdarton pjdarton deleted the pullreq67 branch September 6, 2017 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant