summaryrefslogtreecommitdiffstats
path: root/bundle-plugin
diff options
context:
space:
mode:
authorArne H Juul <arnej27959@users.noreply.github.com>2020-07-06 14:29:02 +0200
committerGitHub <noreply@github.com>2020-07-06 14:29:02 +0200
commita56e3edad71c5c457cfee6b585be3763759f9ff5 (patch)
tree22729535b03350c190fd406407f700158f02da34 /bundle-plugin
parent50212269c2a455ab603531da113800b82196c988 (diff)
parent7efcbcc31012fd7573f6d0b10a1bd9e8edfaf174 (diff)
Merge pull request #13805 from vespa-engine/arnej/terminology-prototype
Arnej/terminology prototype
Diffstat (limited to 'bundle-plugin')
-rw-r--r--bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/TestProvidedArtifacts.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/TestProvidedArtifacts.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/TestProvidedArtifacts.java
index 6f9e305f8d9..e5a64744860 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/TestProvidedArtifacts.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/TestProvidedArtifacts.java
@@ -38,8 +38,8 @@ class TestProvidedArtifacts {
boolean hasTestProvidedArtifactAsParent =
dependencyTrail(artifact, artifacts)
.anyMatch(parent -> testProvidedArtifactStringIds.contains(toArtifactStringId(parent)));
- boolean isBlacklisted = testProvidedArtifactStringIds.contains(toBlacklistedArtifactStringId(artifact));
- if (hasTestProvidedArtifactAsParent && !isBlacklisted) {
+ boolean isBlocked = testProvidedArtifactStringIds.contains(toBlockedArtifactStringId(artifact));
+ if (hasTestProvidedArtifactAsParent && !isBlocked) {
testProvidedArtifacts.add(artifact);
}
}
@@ -68,6 +68,6 @@ class TestProvidedArtifacts {
private static String toArtifactStringId(Artifact artifact) { return artifact.getGroupId() + ":" + artifact.getArtifactId(); }
- private static String toBlacklistedArtifactStringId(Artifact artifact) { return "!" + toArtifactStringId(artifact); }
+ private static String toBlockedArtifactStringId(Artifact artifact) { return "!" + toArtifactStringId(artifact); }
}