diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-10-05 10:49:33 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-10-05 10:56:49 +0200 |
| commit | 0f95f175b8dbb2956c21b59354f1a379c9203d9d (patch) | |
| tree | 1196a9a68ffe0863ecea38d738e1ae80e9c65754 | |
| parent | f057878742c7cf2ce62546ce6fa47fd3535fb6a9 (diff) | |
Manage Maven resolver
| -rw-r--r-- | dependency-versions/pom.xml | 1 | ||||
| -rw-r--r-- | maven-plugins/allowed-maven-dependencies.txt | 10 | ||||
| -rw-r--r-- | parent/pom.xml | 25 |
3 files changed, 31 insertions, 5 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index d73ce3ea4ed..e8f3d183abd 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -154,6 +154,7 @@ <maven-plugin-api.vespa.version>${maven-core.vespa.version}</maven-plugin-api.vespa.version> <maven-plugin-tools.vespa.version>3.9.0</maven-plugin-tools.vespa.version> <maven-resources-plugin.vespa.version>3.3.1</maven-resources-plugin.vespa.version> + <maven-resolver.vespa.version>1.9.16</maven-resolver.vespa.version> <maven-shade-plugin.vespa.version>3.5.1</maven-shade-plugin.vespa.version> <maven-site-plugin.vespa.version>3.12.1</maven-site-plugin.vespa.version> <maven-source-plugin.vespa.version>3.3.0</maven-source-plugin.vespa.version> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index 06f2f34964b..3ad61c7bc0e 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -26,11 +26,11 @@ org.apache.maven.enforcer:enforcer-api:${maven-enforcer-plugin.vespa.version} org.apache.maven.enforcer:enforcer-rules:${maven-enforcer-plugin.vespa.version} org.apache.maven.plugin-tools:maven-plugin-annotations:${maven-plugin-tools.vespa.version} org.apache.maven.plugins:maven-shade-plugin:${maven-shade-plugin.vespa.version} -org.apache.maven.resolver:maven-resolver-api:1.9.14 -org.apache.maven.resolver:maven-resolver-impl:1.9.14 -org.apache.maven.resolver:maven-resolver-named-locks:1.9.14 -org.apache.maven.resolver:maven-resolver-spi:1.9.14 -org.apache.maven.resolver:maven-resolver-util:1.9.14 +org.apache.maven.resolver:maven-resolver-api:${maven-resolver.vespa.version} +org.apache.maven.resolver:maven-resolver-impl:${maven-resolver.vespa.version} +org.apache.maven.resolver:maven-resolver-named-locks:${maven-resolver.vespa.version} +org.apache.maven.resolver:maven-resolver-spi:${maven-resolver.vespa.version} +org.apache.maven.resolver:maven-resolver-util:${maven-resolver.vespa.version} org.apache.maven.shared:maven-dependency-tree:3.2.1 org.apache.maven.shared:maven-shared-utils:3.3.4 org.apache.maven:maven-archiver:${maven-archiver.vespa.version} diff --git a/parent/pom.xml b/parent/pom.xml index 6b93a67803e..d7d58c609d6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -891,6 +891,31 @@ <version>${maven-wagon.vespa.version}</version> </dependency> <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> + <version>${maven-resolver.vespa.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-impl</artifactId> + <version>${maven-resolver.vespa.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-named-locks</artifactId> + <version>${maven-resolver.vespa.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-spi</artifactId> + <version>${maven-resolver.vespa.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-util</artifactId> + <version>${maven-resolver.vespa.version}</version> + </dependency> + <dependency> <groupId>org.apache.opennlp</groupId> <artifactId>opennlp-tools</artifactId> <version>${opennlp.vespa.version}</version> |