Skip to content

[MJMOD-32] remove dependency to commons-lang3 #22

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
bmarwell merged 1 commit into from
Mar 3, 2024
Merged

[MJMOD-32] remove dependency to commons-lang3 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.6</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-java</artifactId>
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/org/apache/maven/plugins/jmod/AbstractJModMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
import java.util.Map;
import java.util.Properties;

import org.apache.commons.lang3.SystemUtils;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.utils.Os;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.cli.CommandLineException;
import org.apache.maven.shared.utils.cli.CommandLineUtils;
Expand Down Expand Up @@ -77,7 +77,7 @@ protected String getJModExecutable() throws IOException {
jModExecutable = tc.findTool("jmod");
}

String jModCommand = "jmod" + (SystemUtils.IS_OS_WINDOWS ? ".exe" : "");
String jModCommand = "jmod" + (Os.isFamily(Os.FAMILY_WINDOWS) ? ".exe" : "");

File jModExe;

Expand All @@ -88,7 +88,7 @@ protected String getJModExecutable() throws IOException {
jModExe = new File(jModExe, jModCommand);
}

if (SystemUtils.IS_OS_WINDOWS && jModExe.getName().indexOf('.') < 0) {
if (Os.isFamily(Os.FAMILY_WINDOWS) && jModExe.getName().indexOf('.') < 0) {
jModExe = new File(jModExe.getPath() + ".exe");
}

Expand All @@ -103,7 +103,8 @@ protected String getJModExecutable() throws IOException {
// By default, System.getProperty( "java.home" ) = JRE_HOME and JRE_HOME
// should be in the JDK_HOME
// ----------------------------------------------------------------------
jModExe = new File(SystemUtils.getJavaHome() + File.separator + ".." + File.separator + "bin", jModCommand);
jModExe =
new File(System.getProperty("java.home") + File.separator + ".." + File.separator + "bin", jModCommand);

// ----------------------------------------------------------------------
// Try to find jmod from JAVA_HOME environment variable
Expand Down