diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-04-05 17:24:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-05 17:24:16 +0200 |
| commit | 31f5f0c310ebedde8d9c2a3ced864146f33e466e (patch) | |
| tree | 76413fc718d90eb83ad356b791f978ce3aaa7b03 | |
| parent | 7cc19acd16eefc3b8843a0b1b8c3e676f68b075a (diff) | |
| parent | cc2cbd588b5ac71cebe20001579892199e71f49e (diff) | |
Merge pull request #21986 from vespa-engine/bjorncs/bundle-plugin
Upgrade dependencies and improve error message on unexpected artifact
| -rw-r--r-- | bundle-plugin/pom.xml | 4 | ||||
| -rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslator.java | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index b1b03b60ce6..d53c2c94d5c 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -21,12 +21,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.5.0</version> + <version>3.8.5</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-archiver</artifactId> - <version>3.5.0</version> + <version>3.5.2</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslator.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslator.java index d922b63c24c..bd6151aea9f 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslator.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslator.java @@ -35,7 +35,10 @@ public class TestBundleDependencyScopeTranslator implements Artifacts.ScopeTrans this.dependencyScopes = dependencyScopes; } - @Override public String scopeOf(Artifact artifact) { return Objects.requireNonNull(dependencyScopes.get(artifact)); } + @Override + public String scopeOf(Artifact artifact) { + return Objects.requireNonNull(dependencyScopes.get(artifact), () -> "Could not lookup scope for " + artifact); + } public static TestBundleDependencyScopeTranslator from(Map<String, Artifact> dependencies, String rawConfig) { List<DependencyOverride> dependencyOverrides = toDependencyOverrides(rawConfig); |