diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-12-27 16:32:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-27 16:32:44 +0100 |
| commit | 1b19061858e018056e3a24f268e1739baa1f0a79 (patch) | |
| tree | 332c1145cd00132d9698adec868c38f8f2ddf2e8 | |
| parent | 2bd905f66ba3f2f201cfb186f6156193257a40de (diff) | |
| parent | 75ac892eb356a5742a87956b9b755f228307bed1 (diff) | |
Merge pull request #29746 from vespa-engine/renovate/org.codehaus.plexus-plexus-interpolation-1.x
Update dependency org.codehaus.plexus:plexus-interpolation to v1.27
| -rw-r--r-- | dependency-versions/pom.xml | 1 | ||||
| -rw-r--r-- | maven-plugins/allowed-maven-dependencies.txt | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 2 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index d1e0999d09c..fa8fdf8e3db 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -129,6 +129,7 @@ <org.json.vespa.version>20231013</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-interpolation.vespa.version>1.27</plexus-interpolation.vespa.version> <protobuf.vespa.version>3.25.1</protobuf.vespa.version> <questdb.vespa.version>7.3.7</questdb.vespa.version> <spifly.vespa.version>1.3.7</spifly.vespa.version> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index 1c66b81b448..338006634e7 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -49,7 +49,7 @@ org.codehaus.plexus:plexus-archiver:4.8.0 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:1.26 +org.codehaus.plexus:plexus-interpolation:${plexus-interpolation.vespa.version} org.codehaus.plexus:plexus-io:${maven-enforcer-plugin.vespa.version} org.codehaus.plexus:plexus-sec-dispatcher:2.0 org.codehaus.plexus:plexus-utils:${maven-shade-plugin.vespa.version} diff --git a/parent/pom.xml b/parent/pom.xml index 8de1442b369..5778e2d53f4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -984,7 +984,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-interpolation</artifactId> - <version>1.26</version> + <version>${plexus-interpolation.vespa.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 6c5b82fc735..387f3f28433 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -138,7 +138,7 @@ org.codehaus.plexus:plexus-archiver:4.8.0 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:1.26 +org.codehaus.plexus:plexus-interpolation:${plexus-interpolation.vespa.version} org.codehaus.plexus:plexus-io:${maven-enforcer-plugin.vespa.version} org.codehaus.plexus:plexus-utils:${maven-shade-plugin.vespa.version} org.eclipse.angus:angus-activation:${jakarta.inject.vespa.version} |