diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-08-28 19:33:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-28 19:33:17 +0200 |
commit | 9baf421a732f3b0662886794e001d1b1e318b1cd (patch) | |
tree | 9cb06bf5bce25261ea5ca9bf93094ca9d9549563 | |
parent | a63212c24c8954d9b6c70b77986d05255988b4ac (diff) | |
parent | 160557661b28777aa37f36af2fe6eeb56a107a6b (diff) |
Merge pull request #28170 from vespa-engine/renovate/org.apache.maven.plugins-maven-jar-plugin-3.x
Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.3.0
-rw-r--r-- | config-model/pom.xml | 2 | ||||
-rw-r--r-- | dependency-versions/pom.xml | 2 | ||||
-rwxr-xr-x | provided-dependencies/pom.xml | 2 | ||||
-rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 27 | ||||
-rw-r--r-- | vespa-maven-plugin/pom.xml | 5 |
5 files changed, 13 insertions, 25 deletions
diff --git a/config-model/pom.xml b/config-model/pom.xml index bfaa82a186f..bd1e068b61a 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -332,7 +332,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.0.2</version> + <version>${maven-jar-plugin.vespa.version}</version> <executions> <!-- for testing --> <execution> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 3618d6a6581..01e52dddf09 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -130,7 +130,7 @@ <maven-enforcer-plugin.vespa.version>3.3.0</maven-enforcer-plugin.vespa.version> <maven-failsafe-plugin.vespa.version>3.1.2</maven-failsafe-plugin.vespa.version> <maven-install-plugin.vespa.version>3.1.1</maven-install-plugin.vespa.version> - <maven-jar-plugin.vespa.version>3.2.0</maven-jar-plugin.vespa.version> + <maven-jar-plugin.vespa.version>3.3.0</maven-jar-plugin.vespa.version> <maven-javadoc-plugin.vespa.version>3.5.0</maven-javadoc-plugin.vespa.version> <maven-plugin-api.vespa.version>${maven-core.vespa.version}</maven-plugin-api.vespa.version> <maven-plugin-tools.vespa.version>3.6.4</maven-plugin-tools.vespa.version> diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index da7cc007053..09d76265466 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -67,7 +67,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> + <version>${maven-jar-plugin.vespa.version}</version> <configuration> <archive> <index>true</index> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 8406ffe4af4..28a67a36527 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -86,6 +86,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.12.2 +junit:junit:4.13.2 net.java.dev.jna:jna:5.11.0 net.openhft:zero-allocation-hashing:0.16 org.antlr:antlr-runtime:3.5.3 @@ -112,28 +113,16 @@ org.apache.lucene:lucene-core:9.7.0 org.apache.maven:maven-archiver:3.6.0 org.apache.maven:maven-artifact:3.8.7 org.apache.maven:maven-artifact-manager:2.2.1 -org.apache.maven:maven-builder-support:3.8.7 -org.apache.maven:maven-compat:3.0 -org.apache.maven:maven-core:3.8.7 org.apache.maven:maven-model:3.8.7 -org.apache.maven:maven-model-builder:3.8.7 org.apache.maven:maven-plugin-api:3.8.7 org.apache.maven:maven-plugin-registry:2.2.1 org.apache.maven:maven-profile:2.2.1 org.apache.maven:maven-project:2.2.1 org.apache.maven:maven-repository-metadata:3.8.7 -org.apache.maven:maven-resolver-provider:3.8.7 org.apache.maven:maven-settings:3.8.7 -org.apache.maven:maven-settings-builder:3.8.7 org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.4 -org.apache.maven.plugins:maven-jar-plugin:3.2.0 -org.apache.maven.resolver:maven-resolver-api:1.6.3 -org.apache.maven.resolver:maven-resolver-impl:1.6.3 -org.apache.maven.resolver:maven-resolver-spi:1.6.3 -org.apache.maven.resolver:maven-resolver-util:1.6.3 -org.apache.maven.shared:file-management:3.0.0 -org.apache.maven.shared:maven-shared-io:3.0.0 -org.apache.maven.shared:maven-shared-utils:3.2.1 +org.apache.maven.plugins:maven-jar-plugin:3.3.0 +org.apache.maven.shared:file-management:3.1.0 org.apache.maven.wagon:wagon-provider-api:2.10 org.apache.opennlp:opennlp-tools:1.9.3 org.apache.velocity:velocity-engine-core:2.3 @@ -146,14 +135,12 @@ org.apiguardian:apiguardian-api:1.1.2 org.bouncycastle:bcpkix-jdk18on:1.74 org.bouncycastle:bcprov-jdk18on:1.74 org.bouncycastle:bcutil-jdk18on:1.74 -org.codehaus.plexus:plexus-archiver:4.2.1 -org.codehaus.plexus:plexus-cipher:2.0 +org.codehaus.plexus:plexus-archiver:4.4.0 org.codehaus.plexus:plexus-classworlds:2.6.0 org.codehaus.plexus:plexus-component-annotations:1.5.5 org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1 org.codehaus.plexus:plexus-interpolation:1.26 org.codehaus.plexus:plexus-io:3.4.0 -org.codehaus.plexus:plexus-sec-dispatcher:2.0 org.codehaus.plexus:plexus-utils:3.3.1 org.eclipse.collections:eclipse-collections:11.0.0 org.eclipse.collections:eclipse-collections-api:11.0.0 @@ -221,10 +208,7 @@ org.slf4j:log4j-over-slf4j:1.7.32 org.slf4j:slf4j-api:1.7.32 org.slf4j:slf4j-jdk14:1.7.32 org.slf4j:slf4j-simple:1.7.32 -org.sonatype.sisu:sisu-guice:2.1.7:noaop -org.sonatype.sisu:sisu-inject-bean:1.4.2 -org.sonatype.sisu:sisu-inject-plexus:1.4.2 -org.tukaani:xz:1.8 +org.tukaani:xz:1.9 org.xerial.snappy:snappy-java:1.1.10.1 software.amazon.ion:ion-java:1.0.2 xerces:xercesImpl:2.12.2 @@ -237,7 +221,6 @@ com.github.tomakehurst:wiremock-jre8-standalone:2.35.0 com.google.guava:guava-testlib:32.1.1-jre com.google.inject:guice:4.2.3 com.google.jimfs:jimfs:1.2 -junit:junit:4.13.2 net.bytebuddy:byte-buddy:1.11.19 net.bytebuddy:byte-buddy-agent:1.11.19 org.apache.curator:curator-test:5.4.0 diff --git a/vespa-maven-plugin/pom.xml b/vespa-maven-plugin/pom.xml index e5b7dec71e4..d4f2e8649af 100644 --- a/vespa-maven-plugin/pom.xml +++ b/vespa-maven-plugin/pom.xml @@ -84,6 +84,11 @@ <artifactId>maven-jar-plugin</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.junit.jupiter</groupId> |