-
Notifications
You must be signed in to change notification settings - Fork 98
Dynamically apply Add-Opens directives from MANIFEST.MF
#322
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
f05dd75
Dynamically apply `Add-Opens` directives from `MANIFEST.MF`
basil ec05ea0
Proper camel case
basil 365c153
Refactor into a method
basil 4150f31
https://github.com/jenkinsci/maven-hpi-plugin/pull/322#discussion_r83…
basil 0e11da2
https://github.com/jenkinsci/maven-hpi-plugin/pull/322#pullrequestrev…
basil 5e6d827
Fixups
basil 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 hidden or 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
44 changes: 44 additions & 0 deletions
44
src/main/java/org/jenkinsci/maven/plugins/hpi/InitializeMojo.java
This file contains hidden or 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,44 @@ | ||
| package org.jenkinsci.maven.plugins.hpi; | ||
|
|
||
| import io.jenkins.lib.versionnumber.JavaSpecificationVersion; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import org.apache.maven.plugin.MojoExecutionException; | ||
| import org.apache.maven.plugins.annotations.LifecyclePhase; | ||
| import org.apache.maven.plugins.annotations.Mojo; | ||
|
|
||
| /** | ||
| * Configure Maven for the desired version of Java. | ||
| * | ||
| * @author Basil Crow | ||
| */ | ||
| @Mojo(name = "initialize", defaultPhase = LifecyclePhase.INITIALIZE) | ||
| public class InitializeMojo extends AbstractJenkinsMojo { | ||
|
|
||
| @Override | ||
| public void execute() throws MojoExecutionException { | ||
| String addOpens = getAddOpens(); | ||
| if (addOpens != null | ||
| && JavaSpecificationVersion.forCurrentJVM().isNewerThanOrEqualTo(new JavaSpecificationVersion("9"))) { | ||
| String argLine = project.getProperties().getProperty("argLine"); | ||
| if (argLine != null) { | ||
| argLine += " " + buildArgLine(addOpens); | ||
| } else { | ||
| argLine = buildArgLine(addOpens); | ||
| } | ||
| getLog().info("Setting argLine to " + argLine); | ||
| project.getProperties().setProperty("argLine", argLine); | ||
| } | ||
| } | ||
|
|
||
| private static String buildArgLine(String addOpens) { | ||
| List<String> arguments = new ArrayList<>(); | ||
| for (String module : addOpens.split("\\s+")) { | ||
| if (!module.isEmpty()) { | ||
| arguments.add("--add-opens"); | ||
| arguments.add(module + "=ALL-UNNAMED"); | ||
| } | ||
| } | ||
| return String.join(" ", arguments); | ||
| } | ||
| } |
This file contains hidden or 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.
Uh oh!
There was an error while loading. Please reload this page.