Merge branch '6.0.x' into 6.1.x
This commit is contained in:
commit
aa6577da92
|
@ -55,7 +55,7 @@ public class CheckClasspathForProhibitedDependencies extends DefaultTask {
|
||||||
@TaskAction
|
@TaskAction
|
||||||
public void checkForProhibitedDependencies() throws IOException {
|
public void checkForProhibitedDependencies() throws IOException {
|
||||||
ResolvedConfiguration resolvedConfiguration = this.classpath.getResolvedConfiguration();
|
ResolvedConfiguration resolvedConfiguration = this.classpath.getResolvedConfiguration();
|
||||||
TreeSet<String> prohibited = resolvedConfiguration.getResolvedArtifacts().stream()
|
TreeSet<String> prohibited = resolvedConfiguration.getLenientConfiguration().getArtifacts().stream()
|
||||||
.map((artifact) -> artifact.getModuleVersion().getId()).filter(this::prohibited)
|
.map((artifact) -> artifact.getModuleVersion().getId()).filter(this::prohibited)
|
||||||
.map((id) -> id.getGroup() + ":" + id.getName()).collect(Collectors.toCollection(TreeSet::new));
|
.map((id) -> id.getGroup() + ":" + id.getName()).collect(Collectors.toCollection(TreeSet::new));
|
||||||
if (!prohibited.isEmpty()) {
|
if (!prohibited.isEmpty()) {
|
||||||
|
|
Loading…
Reference in New Issue