fixed true/false flip
This commit is contained in:
parent
41d8067d09
commit
4ba804039d
@ -104,16 +104,16 @@ public class AmpDependencyFilter implements DependencyFilter {
|
||||
|
||||
if (this.moduleExtension.equalsIgnoreCase(artifact.getExtension())) {
|
||||
if (this.log.isDebugEnabled())
|
||||
this.log.debug("Not packaging library; detected as Alfresco Module: " + artifact.getArtifactId());
|
||||
this.log.debug("Detected as Alfresco Module: " + artifact.getArtifactId());
|
||||
this.moduleIds.add(moduleId);
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
File file = artifact.getFile();
|
||||
try {
|
||||
if (file == null) {
|
||||
if (this.log.isDebugEnabled())
|
||||
this.log.debug("Resolving dependency: " + artifact.getArtifactId());
|
||||
this.log.debug("Resolving dependency to get file: " + artifact.getArtifactId());
|
||||
ArtifactResult result = this.callback.resolveArtifact(new ArtifactRequest(moduleNode));
|
||||
if (result.isMissing() || !result.isResolved())
|
||||
throw new ArtifactResolutionException(Arrays.asList(result));
|
||||
@ -126,18 +126,18 @@ public class AmpDependencyFilter implements DependencyFilter {
|
||||
if (this.isAlfrescoModuleJar(file)) {
|
||||
this.moduleIds.add(moduleId);
|
||||
if (this.log.isInfoEnabled())
|
||||
this.log.info("Not packaging library; detected as Alfresco Module: " + artifact.getArtifactId());
|
||||
return false;
|
||||
this.log.info("Detected as Alfresco Module: " + artifact.getArtifactId());
|
||||
return true;
|
||||
}
|
||||
|
||||
this.notModuleIds.add(moduleId);
|
||||
return true;
|
||||
return false;
|
||||
} catch (ArtifactResolutionException are) {
|
||||
this.log.warn("An artifact could not be resolved; assuming it is not an Alfresco module and continuing");
|
||||
return true;
|
||||
return false;
|
||||
} catch (IOException ie) {
|
||||
this.log.warn("An I/O issue occurred while inspecting a JAR to see if it is an Alfresco module; assuming it isn't and continuing");
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user