Skip to content

Commit 1b2e487

Browse files
committed
Fix #35395: combine fabric8 service files
1 parent 56dbc11 commit 1b2e487

2 files changed

Lines changed: 28 additions & 4 deletions

File tree

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>eu.openanalytics</groupId>
88
<artifactId>shinyproxy-operator</artifactId>
9-
<version>2.2.0</version>
9+
<version>2.2.1-SNAPSHOT</version>
1010
<inceptionYear>2021</inceptionYear>
1111
<name>ShinyProxy-Operator</name>
1212

@@ -262,9 +262,9 @@
262262
<Multi-Release>true</Multi-Release>
263263
</manifestEntries>
264264
</archive>
265-
<descriptorRefs>
266-
<descriptorRef>jar-with-dependencies</descriptorRef>
267-
</descriptorRefs>
265+
<descriptors>
266+
<descriptor>src/main/assembly/jar-with-dependencies.xml</descriptor>
267+
</descriptors>
268268
<finalName>shinyproxy-operator</finalName>
269269
</configuration>
270270
</execution>
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
4+
<!-- based on https://maven.apache.org/plugins/maven-assembly-plugin/descriptor-refs.html#jar-with-dependencies -->
5+
<!-- https://stackoverflow.com/questions/47310215/merging-meta-inf-services-files-with-maven-assembly-plugin/49689041 -->
6+
<id>jar-with-dependencies</id>
7+
<formats>
8+
<format>jar</format>
9+
</formats>
10+
<includeBaseDirectory>false</includeBaseDirectory>
11+
<dependencySets>
12+
<dependencySet>
13+
<outputDirectory>/</outputDirectory>
14+
<useProjectArtifact>true</useProjectArtifact>
15+
<unpack>true</unpack>
16+
<scope>runtime</scope>
17+
</dependencySet>
18+
</dependencySets>
19+
<containerDescriptorHandlers>
20+
<containerDescriptorHandler>
21+
<handlerName>metaInf-services</handlerName>
22+
</containerDescriptorHandler>
23+
</containerDescriptorHandlers>
24+
</assembly>

0 commit comments

Comments
 (0)