[MSHARED-47] Don't flag xml-apis:xml-apis as undeclared (#135)

* [MSHARED-47] Don't flag xml-apis:xml-apis as undeclared

Author: elharo

src/it/jarWithXmlTransitiveDependency/verify.groovy

@@ -24,8 +24,6 @@ UsedDeclaredArtifacts:
  dom4j:dom4j:jar:1.6.1:compile
 
 UsedUndeclaredArtifactsWithClasses:
- xml-apis:xml-apis:jar:1.0.b2:compile
-  org.xml.sax.Parser
 
 UnusedDeclaredArtifacts:
 

src/it/usedUndeclaredReference/verify.groovy

@@ -23,8 +23,6 @@ def expected = '''
 UsedDeclaredArtifacts:
 
 UsedUndeclaredArtifactsWithClasses:
- xml-apis:xml-apis:jar:1.0.b2:compile
-  org.apache.xmlcommons.Version
 
 UnusedDeclaredArtifacts:
  dom4j:dom4j:jar:1.6.1:compile

src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java

@@ -99,6 +99,7 @@ public ProjectDependencyAnalysis analyze(MavenProject project, Collection<String
             Map<Artifact, Set<DependencyUsage>> usedUndeclaredArtifactsWithClasses = new LinkedHashMap<>(usedArtifacts);
             Set<Artifact> usedUndeclaredArtifacts =
                     removeAll(usedUndeclaredArtifactsWithClasses.keySet(), declaredArtifacts);
+
             usedUndeclaredArtifactsWithClasses.keySet().retainAll(usedUndeclaredArtifacts);
 
             Set<Artifact> unusedDeclaredArtifacts = new LinkedHashSet<>(declaredArtifacts);
@@ -242,7 +243,7 @@ private static Map<Artifact, Set<DependencyUsage>> buildUsedArtifacts(
         for (DependencyUsage classUsage : dependencyClasses) {
             Artifact artifact = findArtifactForClassName(artifactClassMap, classUsage.getDependencyClass());
 
-            if (artifact != null) {
+            if (artifact != null && !includedInJDK(artifact)) {
                 Set<DependencyUsage> classesFromArtifact = usedArtifacts.get(artifact);
                 if (classesFromArtifact == null) {
                     classesFromArtifact = new HashSet<>();
@@ -255,6 +256,21 @@ private static Map<Artifact, Set<DependencyUsage>> buildUsedArtifacts(
         return usedArtifacts;
     }
 
+    // MSHARED-47 an uncommon case where a commonly used
+    // third party dependency was added to the JDK
+    private static boolean includedInJDK(Artifact artifact) {
+        if ("xml-apis".equals(artifact.getGroupId())) {
+            if ("xml-apis".equals(artifact.getArtifactId())) {
+                return true;
+            }
+        } else if ("xerces".equals(artifact.getGroupId())) {
+            if ("xmlParserAPIs".equals(artifact.getArtifactId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private static Artifact findArtifactForClassName(Map<Artifact, Set<String>> artifactClassMap, String className) {
         for (Map.Entry<Artifact, Set<String>> entry : artifactClassMap.entrySet()) {
             if (entry.getValue().contains(className)) {