Skip to content

Fix mismatching Parameter initial field values #418

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
slawekjaranowski merged 1 commit into from
Jul 2, 2024
Merged

Fix mismatching Parameter initial field values #418

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
2 changes: 1 addition & 1 deletion ...va/org/apache/maven/plugins/dependency/fromDependencies/AbstractFromDependenciesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public abstract class AbstractFromDependenciesMojo extends AbstractDependencyFil
* @since 2.0-alpha-2
*/
@Parameter(property = "mdep.failOnMissingClassifierArtifact", defaultValue = "false")
protected boolean failOnMissingClassifierArtifact = true;
protected boolean failOnMissingClassifierArtifact;

/**
* @return Returns the outputDirectory.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class CopyDependenciesMojo extends AbstractFromDependenciesMojo {
* @since 2.0
*/
@Parameter(property = "mdep.copyPom", defaultValue = "false")
protected boolean copyPom = true;
protected boolean copyPom;

@Component
private CopyUtil copyUtil;
Expand Down
1 change: 1 addition & 0 deletions ...t/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@ public void testArtifactResolutionException() throws MojoFailureException {

public void dotestArtifactExceptions() throws MojoFailureException {
mojo.classifier = "jdk";
mojo.failOnMissingClassifierArtifact = true;
mojo.type = "java-sources";

try {
Expand Down
11 changes: 4 additions & 7 deletions ...java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,16 +491,13 @@ public void dotestClassifierType(String testClassifier, String testType) throws
}
}

public void testArtifactNotFound() throws Exception {
dotestArtifactExceptions(false, true);
public void testArtifactResolutionException() throws MojoFailureException {
dotestArtifactExceptions();
}

public void testArtifactResolutionException() throws Exception {
dotestArtifactExceptions(true, false);
}

public void dotestArtifactExceptions(boolean are, boolean anfe) throws Exception {
Copy link
Contributor Author

@Marcono1234 Marcono1234 Jun 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the parameters from this test method because it looks like they were unused since 809bfe1, so testArtifactNotFound and testArtifactResolutionException were effectively equivalent.

public void dotestArtifactExceptions() throws MojoFailureException {
mojo.classifier = "jdk";
mojo.failOnMissingClassifierArtifact = true;
mojo.type = "java-sources";

try {
Expand Down