Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ public interface CommandLineCallable extends Callable<Integer> {
/**
* {@inheritDoc}
*/
@Override
Integer call() throws CommandLineException;
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.Properties;
import java.util.Vector;

import org.apache.maven.shared.utils.Os;

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-17-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-8-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.cli.shell.BourneShell;
import org.apache.maven.shared.utils.cli.shell.CmdShell;
Expand Down Expand Up @@ -112,7 +112,7 @@
*/
private void setDefaultShell() {
// If this is windows set the shell to command.com or cmd.exe with correct arguments.
if (Os.isFamily(Os.FAMILY_WINDOWS)) {

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-17-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-17-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-8-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-8-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated
setShell(new CmdShell());
} else {
setShell(new BourneShell());
Expand Down Expand Up @@ -190,7 +190,7 @@
public void addSystemEnvironment() {}

private void copySystemEnvironment() {
Properties systemEnvVars = CommandLineUtils.getSystemEnvVars();

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-17-zulu 3.10.1

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 4.0.0-rc-7

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 3.10.1

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 4.0.0-rc-7

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 3.10.1

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 3.10.1

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 4.0.0-rc-7

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-8-zulu 3.10.1

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

for (Object o : systemEnvVars.keySet()) {
String key = (String) o;
Expand Down Expand Up @@ -298,6 +298,7 @@
/**
* {@inheritDoc}
*/
@Override
public String toString() {
return StringUtils.join(getShellCommandline(true), " ");
}
Expand Down Expand Up @@ -418,6 +419,7 @@
/**
* {@inheritDoc}
*/
@Override
public void setValue(String value) {
if (value != null) {
parts = new String[] {value};
Expand All @@ -427,6 +429,7 @@
/**
* {@inheritDoc}
*/
@Override
public void setLine(String line) throws CommandLineException {
if (line == null) {
return;
Expand All @@ -437,13 +440,15 @@
/**
* {@inheritDoc}
*/
@Override
public void setFile(File value) {
parts = new String[] {value.getAbsolutePath()};
}

/**
* {@inheritDoc}
*/
@Override
public void setMask(boolean mask) {
this.mask = mask;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ private StreamPumper(Reader in, StreamConsumer consumer) {
}

/** Run it. */
@Override
public void run() {
try {
for (String line = in.readLine(); line != null; line = in.readLine()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.lang.reflect.Method;
import java.util.Map;

import org.apache.maven.shared.utils.Os;

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-17-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-8-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated
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 @@ -83,20 +83,23 @@
/**
* {@inheritDoc}
*/
@Override
public String getJavaToolName() {
return javaToolName;
}

/**
* {@inheritDoc}
*/
@Override
public void setToolchain(Object toolchain) {
this.toolchain = toolchain;
}

/**
* {@inheritDoc}
*/
@Override
public JavaToolResult execute(Request request) throws JavaToolException {

if (javaToolFile == null) {
Expand Down Expand Up @@ -127,6 +130,7 @@
/**
* {@inheritDoc}
*/
@Override
public int read() {
return -1;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,27 +41,31 @@ public class AbstractJavaToolRequest implements JavaToolRequest {
/**
* {@inheritDoc}
*/
@Override
public StreamConsumer getSystemOutStreamConsumer() {
return systemOutStreamConsumer;
}

/**
* {@inheritDoc}
*/
@Override
public StreamConsumer getSystemErrorStreamConsumer() {
return systemErrorStreamConsumer;
}

/**
* {@inheritDoc}
*/
@Override
public void setSystemOutStreamConsumer(StreamConsumer systemOutStreamConsumer) {
this.systemOutStreamConsumer = systemOutStreamConsumer;
}

/**
* {@inheritDoc}
*/
@Override
public void setSystemErrorStreamConsumer(StreamConsumer systemErrorStreamConsumer) {
this.systemErrorStreamConsumer = systemErrorStreamConsumer;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,15 @@ public WalkCollector() {
/**
* {@inheritDoc}
*/
@Override
public void debug(String message) {
// can be used to set some message
}

/**
* {@inheritDoc}
*/
@Override
public void directoryWalkStarting(File basedir) {
startingDir = basedir;
startCount++;
Expand All @@ -68,6 +70,7 @@ public void directoryWalkStarting(File basedir) {
/**
* {@inheritDoc}
*/
@Override
public void directoryWalkStep(int percentage, File file) {
steps.add(file);
percentageLow = Math.min(percentageLow, percentage);
Expand All @@ -77,6 +80,7 @@ public void directoryWalkStep(int percentage, File file) {
/**
* {@inheritDoc}
*/
@Override
public void directoryWalkFinished() {
finishCount++;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,82 +49,99 @@ class AnsiMessageBuilder implements MessageBuilder, LoggerLevelRenderer {
this.ansi = ansi;
}

@Override
public String debug(String message) {
return Style.DEBUG.apply(ansi).a(message).reset().toString();
}

@Override
public String info(String message) {
return Style.INFO.apply(ansi).a(message).reset().toString();
}

@Override
public String warning(String message) {
return Style.WARNING.apply(ansi).a(message).reset().toString();
}

@Override
public String error(String message) {
return Style.ERROR.apply(ansi).a(message).reset().toString();
}

@Override
public AnsiMessageBuilder success(Object message) {
Style.SUCCESS.apply(ansi).a(message).reset();
return this;
}

@Override
public AnsiMessageBuilder warning(Object message) {
Style.WARNING.apply(ansi).a(message).reset();
return this;
}

@Override
public AnsiMessageBuilder failure(Object message) {
Style.FAILURE.apply(ansi).a(message).reset();
return this;
}

@Override
public AnsiMessageBuilder strong(Object message) {
Style.STRONG.apply(ansi).a(message).reset();
return this;
}

@Override
public AnsiMessageBuilder mojo(Object message) {
Style.MOJO.apply(ansi).a(message).reset();
return this;
}

@Override
public AnsiMessageBuilder project(Object message) {
Style.PROJECT.apply(ansi).a(message).reset();
return this;
}

@Override
public AnsiMessageBuilder a(char[] value, int offset, int len) {
ansi.a(value, offset, len);
return this;
}

@Override
public AnsiMessageBuilder a(char[] value) {
ansi.a(value);
return this;
}

@Override
public AnsiMessageBuilder a(CharSequence value, int start, int end) {
ansi.a(value, start, end);
return this;
}

@Override
public AnsiMessageBuilder a(CharSequence value) {
ansi.a(value);
return this;
}

@Override
public AnsiMessageBuilder a(Object value) {
ansi.a(value);
return this;
}

@Override
public AnsiMessageBuilder newline() {
ansi.newline();
return this;
}

@Override
public AnsiMessageBuilder format(String pattern, Object... args) {
ansi.format(pattern, args);
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,6 @@ public interface MessageBuilder {
* @deprecated Rather use {@link MessageBuilder#build()}
*/
@Deprecated
@Override
String toString();
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,76 +42,93 @@ class PlainMessageBuilder implements MessageBuilder, LoggerLevelRenderer {
buffer = new StringBuilder(size);
}

@Override
public String debug(String message) {
return a(message).toString();
}

@Override
public String info(String message) {
return a(message).toString();
}

@Override
public String warning(String message) {
return a(message).toString();
}

@Override
public String error(String message) {
return a(message).toString();
}

@Override
public PlainMessageBuilder success(Object message) {
return a(message);
}

@Override
public PlainMessageBuilder warning(Object message) {
return a(message);
}

@Override
public PlainMessageBuilder failure(Object message) {
return a(message);
}

@Override
public PlainMessageBuilder strong(Object message) {
return a(message);
}

@Override
public PlainMessageBuilder mojo(Object message) {
return a(message);
}

@Override
public PlainMessageBuilder project(Object message) {
return a(message);
}

@Override
public PlainMessageBuilder a(char[] value, int offset, int len) {
buffer.append(value, offset, len);
return this;
}

@Override
public PlainMessageBuilder a(char[] value) {
buffer.append(value);
return this;
}

@Override
public PlainMessageBuilder a(CharSequence value, int start, int end) {
buffer.append(value, start, end);
return this;
}

@Override
public PlainMessageBuilder a(CharSequence value) {
buffer.append(value);
return this;
}

@Override
public PlainMessageBuilder a(Object value) {
buffer.append(value);
return this;
}

@Override
public PlainMessageBuilder newline() {
buffer.append(System.lineSeparator());
return this;
}

@Override
public PlainMessageBuilder format(String pattern, Object... args) {
buffer.append(String.format(pattern, args));
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,15 @@ public String getEncoding() {
/**
* {@inheritDoc}
*/
@Override
public int read(char[] buf, int offset, int len) throws IOException {
return reader.read(buf, offset, len);
}

/**
* {@inheritDoc}
*/
@Override
public void close() throws IOException {
reader.close();
}
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ public static Xpp3Dom mergeXpp3Dom(Xpp3Dom dominant, Xpp3Dom recessive) {
/**
* {@inheritDoc}
*/
@Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Expand All @@ -336,6 +337,7 @@ public boolean equals(Object obj) {
/**
* {@inheritDoc}
*/
@Override
public int hashCode() {
int result = 17;
result = 37 * result + (name != null ? name.hashCode() : 0);
Expand All @@ -347,6 +349,7 @@ public int hashCode() {
/**
* {@inheritDoc}
*/
@Override
public String toString() {
try {
StringWriter writer = new StringWriter();
Expand Down Expand Up @@ -405,6 +408,7 @@ public static boolean isEmpty(String str) {
/**
* {@inheritDoc}
*/
@Override
public Iterator<Xpp3Dom> iterator() {
return getChildrenList().iterator();
}
Expand Down
Loading
Loading