summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-08-28 20:54:29 +0200
committerGitHub <noreply@github.com>2023-08-28 20:54:29 +0200
commit65cb67007712581e0ab860b687bfabafe7d7c82b (patch)
tree8938fae92bea89ca3d11e4a56e790b8a84c3f907
parent26be15902c8e171de6b364a618d6beb333ed9497 (diff)
parent09e69372f158b2ed796a9b239e6394c957d9f1d2 (diff)
Merge pull request #28192 from vespa-engine/renovate/maven-shade-plugin.vespa.version
Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.0
-rw-r--r--dependency-versions/pom.xml2
-rw-r--r--maven-plugins/allowed-maven-dependencies.txt8
2 files changed, 4 insertions, 6 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index 3c7c7d22127..6a445dd0741 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -136,7 +136,7 @@
<maven-plugin-api.vespa.version>${maven-core.vespa.version}</maven-plugin-api.vespa.version>
<maven-plugin-tools.vespa.version>3.9.0</maven-plugin-tools.vespa.version>
<maven-resources-plugin.vespa.version>3.3.1</maven-resources-plugin.vespa.version>
- <maven-shade-plugin.vespa.version>3.4.1</maven-shade-plugin.vespa.version>
+ <maven-shade-plugin.vespa.version>3.5.0</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>
diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt
index 93435788c92..55bb50ae666 100644
--- a/maven-plugins/allowed-maven-dependencies.txt
+++ b/maven-plugins/allowed-maven-dependencies.txt
@@ -16,10 +16,9 @@ commons-io:commons-io:2.11.0
javax.annotation:javax.annotation-api:1.2
javax.inject:javax.inject:1
org.apache-extras.beanshell:bsh:2.0b6
-org.apache.commons:commons-collections4:4.2
+org.apache.commons:commons-collections4:4.4
org.apache.commons:commons-compress:1.23.0
org.apache.commons:commons-lang3:3.12.0
-org.apache.maven.enforcer:enforcer-rules:3.3.0
org.apache.maven:maven-archiver:3.6.0
org.apache.maven:maven-artifact:3.8.7
org.apache.maven:maven-builder-support:3.8.7
@@ -32,14 +31,13 @@ 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.3.0
+org.apache.maven.enforcer:enforcer-rules:3.3.0
org.apache.maven.plugin-tools:maven-plugin-annotations:3.9.0
-org.apache.maven.plugins:maven-shade-plugin:3.4.1
+org.apache.maven.plugins:maven-shade-plugin:3.5.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:maven-artifact-transfer:0.13.1
-org.apache.maven.shared:maven-common-artifact-filters:3.1.0
org.apache.maven.shared:maven-dependency-tree:3.2.0
org.apache.maven.shared:maven-shared-utils:3.3.4
org.codehaus.plexus:plexus-archiver:4.4.0