summaryrefslogtreecommitdiffstats
path: root/logserver
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2023-01-10 17:35:00 +0100
committerBjørn Christian Seime <bjorncs@yahooinc.com>2023-01-11 16:50:51 +0100
commit43a5ab35b4dfd0f4c5dd2bdbbc241345938d3142 (patch)
treeb6e8244e36b6cd9621b925ff946a6fe64de749c3 /logserver
parentc6191deb7c5fd1501c1d07b3cae0c8e8b9486434 (diff)
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.
Diffstat (limited to 'logserver')
-rw-r--r--logserver/pom.xml26
1 files changed, 8 insertions, 18 deletions
diff --git a/logserver/pom.xml b/logserver/pom.xml
index 68ed459f315..e3ef730bb36 100644
--- a/logserver/pom.xml
+++ b/logserver/pom.xml
@@ -60,30 +60,20 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <configuration>
- <finalName>${project.artifactId}-jar-with-dependencies</finalName>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>com.yahoo.logserver.Server</mainClass>
- </transformer>
- </transformers>
- </configuration>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration><skip>true</skip></configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>bundle-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
+ <goals><goal>assemble-fat-jar</goal></goals>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
<configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
+ <mainClass>com.yahoo.logserver.Server</mainClass>
</configuration>
</plugin>
<plugin>