-
Notifications
You must be signed in to change notification settings - Fork 202
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.
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
Add support for a Jenkins version argument (CLI and env var) + Make Jenkins WAR parameter optional in the Plugin Manager Lib API and the implementation #232
Merged
oleg-nenashev
merged 5 commits into
jenkinsci:master
from
oleg-nenashev:version-retrieval
Dec 1, 2020
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b3005df
Add support for a Jenkins version argument (CLI and env var)
oleg-nenashev 9282305
Make Jenkins WAR option in the Plugin Manager Lib API and the impleme…
oleg-nenashev 1626e45
Simplify the version number parser, add test
oleg-nenashev 7b062ba
Rename the argument to follow the naming pattern
oleg-nenashev 66cb632
Remove unused import
oleg-nenashev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
...management-cli/src/main/java/io/jenkins/tools/pluginmanager/cli/VersionNumberHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
package io.jenkins.tools.pluginmanager.cli; | ||
|
||
import hudson.util.VersionNumber; | ||
import org.kohsuke.args4j.CmdLineException; | ||
import org.kohsuke.args4j.CmdLineParser; | ||
import org.kohsuke.args4j.OptionDef; | ||
import org.kohsuke.args4j.spi.OneArgumentOptionHandler; | ||
import org.kohsuke.args4j.spi.Setter; | ||
|
||
// TODO(oleg_nenashev): Move to the VersionNumber lib? | ||
|
||
public class VersionNumberHandler extends OneArgumentOptionHandler<VersionNumber> { | ||
|
||
public VersionNumberHandler(CmdLineParser parser, OptionDef option, Setter<VersionNumber> setter) { | ||
super(parser, option, setter); | ||
} | ||
|
||
@Override | ||
protected VersionNumber parse(String argument) throws NumberFormatException, CmdLineException { | ||
try { | ||
return new VersionNumber(argument); | ||
} catch (Exception ex) { | ||
throw new CmdLineException("Failed to parse the version number", ex); | ||
} | ||
} | ||
|
||
@Override | ||
public String getDefaultMetaVariable() { | ||
return null; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what do you think about moving this to the CLI? so the lib only works with a resolved jenkins version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not think that Jenkins version is always needed for the library's logic. OTOH we could be more opinionated there