diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-02 19:17:48 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-02 19:17:48 +0200 |
commit | 6db245936f339219522406d831048beab31cdc64 (patch) | |
tree | c39ef67c2de66584e45022298150fcb1bbfab521 | |
parent | 88592c698d25e29831a85148f626ac0fa5ffca1d (diff) |
Control plexus-io and plexus-archiver with explicit version tag
-rw-r--r-- | dependency-versions/pom.xml | 2 | ||||
-rw-r--r-- | maven-plugins/allowed-maven-dependencies.txt | 4 | ||||
-rw-r--r-- | parent/pom.xml | 10 | ||||
-rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index c7e2ef15db4..bc5b74bf9d8 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -130,7 +130,9 @@ <org.json.vespa.version>20240303</org.json.vespa.version> <org.lz4.vespa.version>1.8.0</org.lz4.vespa.version> <prometheus.client.vespa.version>0.16.0</prometheus.client.vespa.version> + <plexus-archiver.vespa.version>4.9.2</plexus-archiver.vespa.version> <plexus-interpolation.vespa.version>1.27</plexus-interpolation.vespa.version> + <plexus-io.vespa.version>3.4.2</plexus-io.vespa.version> <plexus-utils.vespa.version>3.5.1</plexus-utils.vespa.version> <plexus-xml.vespa.version>3.0.0</plexus-xml.vespa.version> <protobuf.vespa.version>3.25.3</protobuf.vespa.version> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index e3414b48ee6..bef72f582e4 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -45,12 +45,12 @@ org.apache.maven:maven-resolver-provider:${maven-core.vespa.version} org.apache.maven:maven-settings-builder:${maven-core.vespa.version} org.apache.maven:maven-settings:${maven-core.vespa.version} org.apiguardian:apiguardian-api:${apiguardian.vespa.version} -org.codehaus.plexus:plexus-archiver:4.8.0 +org.codehaus.plexus:plexus-archiver:${plexus-archiver.vespa.version} org.codehaus.plexus:plexus-cipher:2.0 org.codehaus.plexus:plexus-classworlds:2.7.0 org.codehaus.plexus:plexus-component-annotations:2.1.0 org.codehaus.plexus:plexus-interpolation:${plexus-interpolation.vespa.version} -org.codehaus.plexus:plexus-io:${maven-enforcer-plugin.vespa.version} +org.codehaus.plexus:plexus-io:${plexus-io.vespa.version} org.codehaus.plexus:plexus-sec-dispatcher:2.0 org.codehaus.plexus:plexus-utils:${plexus-utils.vespa.version} org.codehaus.plexus:plexus-xml:${plexus-xml.vespa.version} diff --git a/parent/pom.xml b/parent/pom.xml index ca399019aa6..864bff7fe07 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -998,11 +998,21 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-archiver</artifactId> + <version>${plexus-archiver.vespa.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-interpolation</artifactId> <version>${plexus-interpolation.vespa.version}</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-io</artifactId> + <version>${plexus-io.vespa.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>${plexus-utils.vespa.version}</version> </dependency> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 9ffde513481..aaa97604add 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -131,12 +131,12 @@ org.assertj:assertj-core:${assertj.vespa.version} org.bouncycastle:bcpkix-jdk18on:${bouncycastle.vespa.version} org.bouncycastle:bcprov-jdk18on:${bouncycastle.vespa.version} org.bouncycastle:bcutil-jdk18on:${bouncycastle.vespa.version} -org.codehaus.plexus:plexus-archiver:4.8.0 +org.codehaus.plexus:plexus-archiver:${plexus-archiver.vespa.version} org.codehaus.plexus:plexus-classworlds:2.7.0 org.codehaus.plexus:plexus-component-annotations:2.1.0 org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1 org.codehaus.plexus:plexus-interpolation:${plexus-interpolation.vespa.version} -org.codehaus.plexus:plexus-io:${maven-enforcer-plugin.vespa.version} +org.codehaus.plexus:plexus-io:${plexus-io.vespa.version} org.codehaus.plexus:plexus-utils:${plexus-utils.vespa.version} org.eclipse.angus:angus-activation:${eclipse-angus.vespa.version} org.eclipse.collections:eclipse-collections-api:${eclipse-collections.vespa.version} |