diff options
author | gjoranv <gv@verizonmedia.com> | 2022-04-22 21:25:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-22 21:25:06 +0200 |
commit | 42dfc8a672fa4e088246fd8d7430a61b724bcbdf (patch) | |
tree | 066b37ab2d43a6a91732aa8e3109c6f6ff9aca26 | |
parent | a623fb063f36fae897757e110ba428a8cfb30472 (diff) | |
parent | 955e9e6ae24f60a5163df171a448db21f127cb33 (diff) |
Merge pull request #22222 from vespa-engine/upgrade-maven-toolsv7.577.27
Upgrade maven tools [run-systemtest]
-rw-r--r-- | abi-check-plugin/pom.xml | 2 | ||||
-rw-r--r-- | bundle-plugin/pom.xml | 17 | ||||
-rw-r--r-- | config-class-plugin/pom.xml | 8 | ||||
-rw-r--r-- | parent/pom.xml | 22 | ||||
-rw-r--r-- | tenant-base/pom.xml | 2 | ||||
-rw-r--r-- | vespa-application-maven-plugin/pom.xml | 12 |
6 files changed, 42 insertions, 21 deletions
diff --git a/abi-check-plugin/pom.xml b/abi-check-plugin/pom.xml index 03b2e7c8b60..8d782b1d426 100644 --- a/abi-check-plugin/pom.xml +++ b/abi-check-plugin/pom.xml @@ -18,10 +18,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index 8f52187357f..7993dfecafd 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -24,17 +24,30 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.8.5</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-archiver</artifactId> - <version>3.5.2</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> <scope>provided</scope> </dependency> <dependency> diff --git a/config-class-plugin/pom.xml b/config-class-plugin/pom.xml index 0819073e953..50471514cc0 100644 --- a/config-class-plugin/pom.xml +++ b/config-class-plugin/pom.xml @@ -23,6 +23,7 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> <version>3.5.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -48,13 +49,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <doclint>${doclint},-missing</doclint> diff --git a/parent/pom.xml b/parent/pom.xml index ecf257727d1..9372aacc528 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -651,23 +651,28 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-archiver</artifactId> + <version>${maven-archiver.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>3.5.0</version> + <version>${maven-core.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.5.0</version> + <version>${maven-core.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.5.0</version> + <version>${maven-core.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>${maven-plugin-tools.version}</version> + <version>${maven-plugin-api.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -940,16 +945,19 @@ <hdrhistogram.version>2.1.12</hdrhistogram.version> <jna.version>5.9.0</jna.version> <junit.version>5.8.1</junit.version> + <maven-archiver.version>3.5.2</maven-archiver.version> <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version> <maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version> - <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> - <maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version> <!-- NOTE: When upgrading, also update explicit versions in tenant base poms! --> + <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version> + <maven-core.version>3.8.5</maven-core.version> + <maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version> <!-- NOTE: When upgrading, also update explicit versions in tenant base poms! --> <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version> <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version> <maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version> <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version> - <maven-plugin-tools.version>3.6.1</maven-plugin-tools.version> + <maven-plugin-api.version>3.8.5</maven-plugin-api.version> + <maven-plugin-tools.version>3.6.4</maven-plugin-tools.version> <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version> <maven-shade-plugin.version>3.3.0</maven-shade-plugin.version> <maven-site-plugin.version>3.9.1</maven-site-plugin.version> diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml index 19af8305659..3ad52ae1b48 100644 --- a/tenant-base/pom.xml +++ b/tenant-base/pom.xml @@ -144,7 +144,7 @@ <!-- dependencies, see (3) above --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.2.0</version> + <version>3.3.0</version> <executions> <execution> <!-- JAR-like dependencies --> diff --git a/vespa-application-maven-plugin/pom.xml b/vespa-application-maven-plugin/pom.xml index 10c494a7dd4..99248fb0907 100644 --- a/vespa-application-maven-plugin/pom.xml +++ b/vespa-application-maven-plugin/pom.xml @@ -19,7 +19,13 @@ <dependencies> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> @@ -28,10 +34,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -39,10 +47,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.7</version> |