diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-10-25 23:59:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-25 23:59:27 +0200 |
| commit | 4a81c971976f3b3051d741cc046183bc15910c58 (patch) | |
| tree | 316588fa0ba0b8ccaaa7d4505beb5561db532dd5 | |
| parent | 48799dd912425671ae06e80d30e00523d5477bbb (diff) | |
| parent | 7670d2b3f7789b82ac2b31806acc8419a8342e38 (diff) | |
Merge pull request #29104 from vespa-engine/renovate/properties-maven-plugin.vespa.version
Update dependency org.codehaus.mojo:properties-maven-plugin to v1.2.1
| -rw-r--r-- | dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 947a4c94ee0..f404cc529de 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -164,7 +164,7 @@ <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> - <properties-maven-plugin.vespa.version>1.2.0</properties-maven-plugin.vespa.version> + <properties-maven-plugin.vespa.version>1.2.1</properties-maven-plugin.vespa.version> <versions-maven-plugin.vespa.version>2.16.1</versions-maven-plugin.vespa.version> </properties> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 7f6e29f6957..941f7d78b99 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -33,7 +33,7 @@ com.google.jimfs:jimfs:${jimfs.vespa.version} com.google.protobuf:protobuf-java:${protobuf.vespa.version} com.ibm.icu:icu4j:${icu4j.vespa.version} com.microsoft.onnxruntime:onnxruntime:${onnxruntime.vespa.version} -com.sun.activation:javax.activation:${properties-maven-plugin.vespa.version} +com.sun.activation:javax.activation:1.2.0 com.sun.istack:istack-commons-runtime:4.1.2 com.sun.xml.bind:jaxb-core:${jaxb-core.vespa.version} com.sun.xml.bind:jaxb-impl:${jaxb-impl.vespa.version} @@ -73,7 +73,7 @@ io.prometheus:simpleclient_tracer_common:${prometheus.client.vespa.version} io.prometheus:simpleclient_tracer_otel:${prometheus.client.vespa.version} io.prometheus:simpleclient_tracer_otel_agent:${prometheus.client.vespa.version} jakarta.inject:jakarta.inject-api:${jakarta.inject.vespa.version} -javax.activation:javax.activation-api:${properties-maven-plugin.vespa.version} +javax.activation:javax.activation-api:1.2.0 javax.annotation:javax.annotation-api:${commons-logging.vespa.version} javax.inject:javax.inject:${javax.inject.vespa.version} javax.servlet:javax.servlet-api:${javax.servlet-api.vespa.version} |