inteligr8/amp-maven-plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into stable

Browse Source
This commit is contained in:
Brian Long
2021-06-02 08:31:04 -04:00
parent 7038122a2c b0baa443ca
commit ad2f0af0a3
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/inteligr8/alfresco/amp/AmpDependencyFilter.java
View File

@@ -6,7 +6,9 @@ import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
@@ -27,6 +29,7 @@ public class AmpDependencyFilter implements DependencyFilter {
private final Log log; private final Log log;
private final Charset charset; private final Charset charset;
private final ArtifactResolutionCallback callback; private final ArtifactResolutionCallback callback;
private Set<String> moduleIds = new HashSet<String>();
public AmpDependencyFilter(Log log, String charsetName, ArtifactResolutionCallback callback) { public AmpDependencyFilter(Log log, String charsetName, ArtifactResolutionCallback callback) {
this.log = log; this.log = log;
@@ -39,6 +42,24 @@ public class AmpDependencyFilter implements DependencyFilter {
Artifact artifact = node.getArtifact(); Artifact artifact = node.getArtifact();
if (this.log.isDebugEnabled()) if (this.log.isDebugEnabled())
this.log.debug("Checking dependency: " + artifact.getArtifactId()); this.log.debug("Checking dependency: " + artifact.getArtifactId());
String moduleId = artifact.getGroupId() + "." + artifact.getArtifactId();
if (this.moduleIds.contains(moduleId)) {
if (this.log.isDebugEnabled())
this.log.debug("Not packaging library; detected as Alfresco Module: " + node.getArtifact().getArtifactId());
return false;
} else if (parents != null) {
for (DependencyNode parent : parents) {
String parentModuleId = parent.getArtifact().getGroupId() + "." + parent.getArtifact().getArtifactId();
if (this.moduleIds.contains(parentModuleId)) {
this.moduleIds.add(moduleId);
if (this.log.isDebugEnabled())
this.log.debug("Not packaging library; detected as dependency to other Alfresco Module: " + node.getArtifact().getArtifactId());
return false;
}
}
}
File file = artifact.getFile(); File file = artifact.getFile();
try { try {
if (file == null) { if (file == null) {
@@ -54,8 +75,9 @@ public class AmpDependencyFilter implements DependencyFilter {
this.log.debug("Checking dependency file: " + file); this.log.debug("Checking dependency file: " + file);
if (this.isAlfrescoModule(file)) { if (this.isAlfrescoModule(file)) {
this.moduleIds.add(moduleId);
if (this.log.isInfoEnabled()) if (this.log.isInfoEnabled())
this.log.info("Not packaging JAR; detected as Alfresco JAR Module: " + node.getArtifact().getArtifactId()); this.log.info("Not packaging library; detected as Alfresco Module: " + node.getArtifact().getArtifactId());
return false; return false;
} }