diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-07-06 14:27:56 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-07-06 14:27:56 +0200 |
| commit | 4189ebd6bc49f02e6f73451b1fbebbb889d75f52 (patch) | |
| tree | 493a7ea2ffcef957903e7358276f83a803ba7ca2 /vespa-feed-client-cli | |
| parent | bd7356f18947ba1b08ef43e82e74018e664c0893 (diff) | |
Ensure content of META-INF/services is merged correctly for fatjar
Diffstat (limited to 'vespa-feed-client-cli')
| -rw-r--r-- | vespa-feed-client-cli/pom.xml | 6 | ||||
| -rw-r--r-- | vespa-feed-client-cli/src/maven/create-zip.xml | 4 | ||||
| -rw-r--r-- | vespa-feed-client-cli/src/maven/jar-with-dependencies.xml | 27 |
3 files changed, 32 insertions, 5 deletions
diff --git a/vespa-feed-client-cli/pom.xml b/vespa-feed-client-cli/pom.xml index b917a39b675..406f33ca8d2 100644 --- a/vespa-feed-client-cli/pom.xml +++ b/vespa-feed-client-cli/pom.xml @@ -78,9 +78,9 @@ <mainClass>ai.vespa.feed.client.impl.CliClient</mainClass> </manifest> </archive> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>src/maven/jar-with-dependencies.xml</descriptor> + </descriptors> </configuration> </execution> <execution> diff --git a/vespa-feed-client-cli/src/maven/create-zip.xml b/vespa-feed-client-cli/src/maven/create-zip.xml index df89da0633f..ef5c81ebe15 100644 --- a/vespa-feed-client-cli/src/maven/create-zip.xml +++ b/vespa-feed-client-cli/src/maven/create-zip.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" +<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.1 https://maven.apache.org/xsd/assembly-2.1.1.xsd"> <id>zip</id> <includeBaseDirectory>true</includeBaseDirectory> diff --git a/vespa-feed-client-cli/src/maven/jar-with-dependencies.xml b/vespa-feed-client-cli/src/maven/jar-with-dependencies.xml new file mode 100644 index 00000000000..9696fea89b3 --- /dev/null +++ b/vespa-feed-client-cli/src/maven/jar-with-dependencies.xml @@ -0,0 +1,27 @@ +<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> + +<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.1 https://maven.apache.org/xsd/assembly-2.1.1.xsd"> + <id>jar-with-dependencies</id> + <formats> + <format>jar</format> + </formats> + + <!-- Configure handler that merges content of conflicting files in META-INF/services --> + <containerDescriptorHandlers> + <containerDescriptorHandler> + <handlerName>metaInf-services</handlerName> + </containerDescriptorHandler> + </containerDescriptorHandlers> + + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <outputDirectory>/</outputDirectory> + <useProjectArtifact>true</useProjectArtifact> + <unpack>true</unpack> + <scope>runtime</scope> + </dependencySet> + </dependencySets> +</assembly>
\ No newline at end of file |