summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2023-01-27 12:25:46 +0100
committerBjørn Christian Seime <bjorncs@yahooinc.com>2023-01-27 12:49:10 +0100
commit19b33dde61cd74a565f04bb97b9c205243164829 (patch)
tree58979f8b46b65b380344644441ee607b693259c2
parente5d16c448be14fc3266dda9aecb13267e91fffbe (diff)
Upgrade Maven core plugins
-rw-r--r--maven-plugins/allowed-maven-dependencies.txt20
-rw-r--r--parent/pom.xml4
-rw-r--r--vespa-dependencies-enforcer/allowed-maven-dependencies.txt20
3 files changed, 22 insertions, 22 deletions
diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt
index bc93ff58719..c6f41406f4f 100644
--- a/maven-plugins/allowed-maven-dependencies.txt
+++ b/maven-plugins/allowed-maven-dependencies.txt
@@ -18,16 +18,16 @@ org.apache.commons:commons-collections4:4.2
org.apache.commons:commons-compress:1.22
org.apache.commons:commons-lang3:3.12.0
org.apache.maven:maven-archiver:3.6.0
-org.apache.maven:maven-artifact:3.8.6
-org.apache.maven:maven-builder-support:3.8.6
-org.apache.maven:maven-core:3.8.6
-org.apache.maven:maven-model:3.8.6
-org.apache.maven:maven-model-builder:3.8.6
-org.apache.maven:maven-plugin-api:3.8.6
-org.apache.maven:maven-repository-metadata:3.8.6
-org.apache.maven:maven-resolver-provider:3.8.6
-org.apache.maven:maven-settings:3.8.6
-org.apache.maven:maven-settings-builder:3.8.6
+org.apache.maven:maven-artifact:3.8.7
+org.apache.maven:maven-builder-support:3.8.7
+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-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.enforcer:enforcer-api:3.0.0
org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.4
org.apache.maven.plugins:maven-shade-plugin:3.4.1
diff --git a/parent/pom.xml b/parent/pom.xml
index 0f0608f5749..93945575588 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1136,7 +1136,7 @@
<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.10.1</maven-compiler-plugin.version>
- <maven-core.version>3.8.6</maven-core.version>
+ <maven-core.version>3.8.7</maven-core.version>
<maven-dependency-plugin.version>3.5.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>
@@ -1144,7 +1144,7 @@
<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-api.version>3.8.6</maven-plugin-api.version>
+ <maven-plugin-api.version>${maven-core.version}</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.4.1</maven-shade-plugin.version>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index f4db22eeeaa..31d547807d9 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -99,21 +99,21 @@ org.apache.httpcomponents.client5:httpclient5:5.2.1
org.apache.httpcomponents.core5:httpcore5:5.2.1
org.apache.httpcomponents.core5:httpcore5-h2:5.2.1
org.apache.maven:maven-archiver:3.6.0
-org.apache.maven:maven-artifact:3.8.6
+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.6
+org.apache.maven:maven-builder-support:3.8.7
org.apache.maven:maven-compat:3.0
-org.apache.maven:maven-core:3.8.6
-org.apache.maven:maven-model:3.8.6
-org.apache.maven:maven-model-builder:3.8.6
-org.apache.maven:maven-plugin-api:3.8.6
+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.6
-org.apache.maven:maven-resolver-provider:3.8.6
-org.apache.maven:maven-settings:3.8.6
-org.apache.maven:maven-settings-builder:3.8.6
+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