X Tutup
Skip to content

Commit fb86cb4

Browse files
authored
Merge pull request kubernetes-client#762 from azzazzel/osgi-workaround
Dedicated OSGi bundle merging both `client-java` and `client-java-api`
2 parents b16b1d1 + 0180e70 commit fb86cb4

File tree

3 files changed

+72
-0
lines changed

3 files changed

+72
-0
lines changed

client-java-osgi/bnd.bnd

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Bundle-SymbolicName: io.kubernetes.client.java.osgi
2+
3+
-includeresource: \
4+
@client-java-api-${project.version}.jar, \
5+
@client-java-${project.version}.jar
6+
7+
Import-Package: \
8+
io.kubernetes.client.proto, \
9+
com.microsoft.aad.adal4j;resolution:=optional, \
10+
*
11+
12+
Export-Package: \
13+
!io.kubernetes.client.informer.impl, \
14+
!io.kubernetes.client.proto, \
15+
io.kubernetes.client.*;-split-package:=merge-first

client-java-osgi/pom.xml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>io.kubernetes</groupId>
7+
<artifactId>client-java-parent</artifactId>
8+
<version>7.0.0-SNAPSHOT</version>
9+
</parent>
10+
11+
<artifactId>client-java-osgi</artifactId>
12+
13+
<properties>
14+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15+
</properties>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>io.kubernetes</groupId>
20+
<artifactId>client-java-api</artifactId>
21+
<version>${project.version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>io.kubernetes</groupId>
25+
<artifactId>client-java</artifactId>
26+
<version>${project.version}</version>
27+
</dependency>
28+
</dependencies>
29+
30+
<build>
31+
<plugins>
32+
<plugin>
33+
<groupId>biz.aQute.bnd</groupId>
34+
<artifactId>bnd-maven-plugin</artifactId>
35+
<version>4.3.0</version>
36+
<executions>
37+
<execution>
38+
<phase>prepare-package</phase>
39+
<goals>
40+
<goal>bnd-process</goal>
41+
</goals>
42+
</execution>
43+
</executions>
44+
</plugin>
45+
<plugin>
46+
<groupId>org.apache.maven.plugins</groupId>
47+
<artifactId>maven-jar-plugin</artifactId>
48+
<configuration>
49+
<archive>
50+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
51+
</archive>
52+
</configuration>
53+
</plugin>
54+
</plugins>
55+
</build>
56+
</project>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<module>kubernetes</module>
1515
<module>proto</module>
1616
<module>extended</module>
17+
<module>client-java-osgi</module>
1718
</modules>
1819

1920
<scm>

0 commit comments

Comments
 (0)
X Tutup