From 43a5ab35b4dfd0f4c5dd2bdbbc241345938d3142 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Tue, 10 Jan 2023 17:35:00 +0100 Subject: Don't embed JARs installed in lib/jars Define installed JARs in vespa-3party-jars. Add bundle-plugin goal wrapping maven-shade-plugin's DefaultShader that excludes installed JARs and lists them in manifest's Class-Path instead. --- maven-plugins/allowed-maven-dependencies.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'maven-plugins/allowed-maven-dependencies.txt') diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index cab4de7817d..bc93ff58719 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -14,6 +14,7 @@ com.google.j2objc:j2objc-annotations:1.1 commons-io:commons-io:2.11.0 javax.annotation:javax.annotation-api:1.2 javax.inject:javax.inject:1 +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 @@ -29,11 +30,15 @@ org.apache.maven:maven-settings:3.8.6 org.apache.maven:maven-settings-builder:3.8.6 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 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.1.1 +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 org.codehaus.plexus:plexus-cipher:2.0 @@ -43,15 +48,22 @@ 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.aether:aether-api:1.0.0.v20140518 +org.eclipse.aether:aether-util:1.0.0.v20140518 org.eclipse.aether:aether-util:1.1.0 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5 org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5 org.iq80.snappy:snappy:0.4 +org.jdom:jdom2:2.0.6.1 org.ow2.asm:asm:9.3 +org.ow2.asm:asm-analysis:9.3 +org.ow2.asm:asm-commons:9.3 +org.ow2.asm:asm-tree:9.3 org.slf4j:slf4j-api:1.7.32 org.slf4j:slf4j-simple:1.7.22 org.tukaani:xz:1.9 org.twdata.maven:mojo-executor:2.3.0 +org.vafer:jdependency:2.8.0 #[test-only] # Contains dependencies that are used exclusively in 'test' scope -- cgit v1.2.3