Skip to content

fix: report file name mapping interpolation failures #565

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

Open
efegokdemir wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: report file name mapping interpolation failures #565

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
8 changes: 5 additions & 3 deletions src/main/java/org/apache/maven/plugins/ear/AbstractEarModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.ear.util.ArtifactRepository;
import org.apache.maven.shared.mapping.MappingUtils;
import org.codehaus.plexus.interpolation.InterpolationException;
Expand Down Expand Up @@ -266,9 +267,10 @@ public String getBundleFileName() {
String outputFileNameMapping = earExecutionContext.getOutputFileNameMapping();
bundleFileName = MappingUtils.evaluateFileNameMapping(outputFileNameMapping, artifact);
} catch (InterpolationException e) {
// We currently ignore this here, cause assumption is that
// has already been happened before..
// FIXME: Should be checked first.
Log log = earExecutionContext.getLog();
if (log != null) {
log.warn("Failed to evaluate file name mapping for [" + this + "]", e);
}
}

// bundleFileName = earExecutionContext.getFileNameMapping().mapFileName( artifact );
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
jbossConfiguration,
outputFileNameMapping,
typeMappingService);
earExecutionContext.setLog(getLog());

getLog().debug("Resolving ear modules ...");
List<EarModule> allModules = new ArrayList<>();
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/org/apache/maven/plugins/ear/EarExecutionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.apache.maven.plugins.ear;

import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.ear.util.ArtifactRepository;
import org.apache.maven.plugins.ear.util.ArtifactTypeMappingService;
import org.apache.maven.project.MavenProject;
Expand All @@ -36,6 +37,8 @@ public class EarExecutionContext {

private ArtifactRepository artifactRepository;

private Log log;

/**
* @param project {@link MavenProject}
* @param mainArtifactId the artifactId
Expand All @@ -60,6 +63,14 @@ public EarExecutionContext(
typeMappingService);
}

void setLog(Log log) {
this.log = log;
}

Log getLog() {
return log;
}

/**
* @return {@link #defaultLibBundleDir}
*/
Expand Down