31
31
import io .spring .gradle .dependencymanagement .internal .pom .Pom ;
32
32
import io .spring .gradle .dependencymanagement .internal .pom .PomReference ;
33
33
import io .spring .gradle .dependencymanagement .internal .pom .PomResolver ;
34
- import org .gradle .api .artifacts .ModuleVersionIdentifier ;
35
- import org .gradle .api .artifacts .component .ProjectComponentIdentifier ;
34
+ import org .gradle .api .artifacts .component .ModuleComponentIdentifier ;
36
35
import org .gradle .api .artifacts .result .ResolvedComponentResult ;
37
36
38
37
/**
@@ -58,17 +57,16 @@ Map<String, Exclusions> resolveExclusions(Collection<ResolvedComponentResult> re
58
57
List <PomReference > pomReferences = new ArrayList <>();
59
58
Map <String , Exclusions > exclusionsById = new HashMap <>();
60
59
for (ResolvedComponentResult resolvedComponent : resolvedComponents ) {
61
- ModuleVersionIdentifier moduleVersion = resolvedComponent .getModuleVersion ();
62
- if (!(resolvedComponent .getId () instanceof ProjectComponentIdentifier ) && moduleVersion .getGroup () != null
63
- && moduleVersion .getName () != null ) {
64
- String id = moduleVersion .getGroup () + ":" + moduleVersion .getName ();
60
+ if (resolvedComponent .getId () instanceof ModuleComponentIdentifier ) {
61
+ ModuleComponentIdentifier identifier = (ModuleComponentIdentifier ) resolvedComponent .getId ();
62
+ String id = identifier .getGroup () + ":" + identifier .getModule ();
65
63
Exclusions exclusions = this .exclusionsCache .get (id );
66
64
if (exclusions != null ) {
67
65
exclusionsById .put (id , exclusions );
68
66
}
69
67
else {
70
- pomReferences .add (new PomReference (new Coordinates ( moduleVersion . getGroup (),
71
- moduleVersion . getName (), moduleVersion .getVersion ())));
68
+ pomReferences .add (new PomReference (
69
+ new Coordinates ( identifier . getGroup (), identifier . getModule (), identifier .getVersion ())));
72
70
}
73
71
}
74
72
}
0 commit comments