Skip to content

Commit 259ef60

Browse files
brendandburnsbrendandburns
authored
Merge pull request #292 from netdava/plugins-update-and-osgi
Added OSGi support and updated plugins #291
2 parents 0d991e1 + 10c02e2 commit 259ef60

File tree

5 files changed

+91
-18
lines changed

5 files changed

+91
-18
lines changed

‎examples/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<groupId>io.kubernetes</groupId>
44
<artifactId>client-java-examples</artifactId>
55
<version>2.0.0-beta2-SNAPSHOT</version>
6-
<packaging>jar</packaging>
6+
<packaging>bundle</packaging>
77
<name>client-java-examples</name>
88
<url>https://github.com/kubernetes-client/java</url>
99
<parent>
@@ -42,6 +42,11 @@
4242
</dependencies>
4343
<build>
4444
<plugins>
45+
<plugin>
46+
<groupId>org.apache.felix</groupId>
47+
<artifactId>maven-bundle-plugin</artifactId>
48+
<extensions>true</extensions>
49+
</plugin>
4550
<plugin>
4651
<groupId>org.apache.maven.plugins</groupId>
4752
<artifactId>maven-deploy-plugin</artifactId>

‎kubernetes/pom.xml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>io.kubernetes</groupId>
44
<artifactId>client-java-api</artifactId>
5-
<packaging>jar</packaging>
5+
<packaging>bundle</packaging>
66
<name>client-java-api</name>
77
<version>2.0.0-beta2-SNAPSHOT</version>
88
<url>https://github.com/kubernetes-client/java</url>
@@ -19,10 +19,14 @@
1919

2020
<build>
2121
<plugins>
22+
<plugin>
23+
<groupId>org.apache.felix</groupId>
24+
<artifactId>maven-bundle-plugin</artifactId>
25+
<extensions>true</extensions>
26+
</plugin>
2227
<plugin>
2328
<groupId>org.apache.maven.plugins</groupId>
2429
<artifactId>maven-surefire-plugin</artifactId>
25-
<version>2.12</version>
2630
<configuration>
2731
<systemProperties>
2832
<property>
@@ -32,7 +36,9 @@
3236
</systemProperties>
3337
<argLine>-Xms512m -Xmx1500m</argLine>
3438
<parallel>methods</parallel>
35-
<forkMode>pertest</forkMode>
39+
<useUnlimitedThreads>true</useUnlimitedThreads>
40+
<forkCount>1</forkCount>
41+
<reuseForks>false</reuseForks>
3642
</configuration>
3743
</plugin>
3844
<plugin>
@@ -54,11 +60,9 @@
5460
<plugin>
5561
<groupId>org.apache.maven.plugins</groupId>
5662
<artifactId>maven-jar-plugin</artifactId>
57-
<version>2.2</version>
5863
<executions>
5964
<execution>
6065
<goals>
61-
<goal>jar</goal>
6266
<goal>test-jar</goal>
6367
</goals>
6468
</execution>
@@ -70,7 +74,6 @@
7074
<plugin>
7175
<groupId>org.codehaus.mojo</groupId>
7276
<artifactId>build-helper-maven-plugin</artifactId>
73-
<version>1.10</version>
7477
<executions>
7578
<execution>
7679
<id>add_sources</id>
@@ -101,7 +104,6 @@
101104
<plugin>
102105
<groupId>org.apache.maven.plugins</groupId>
103106
<artifactId>maven-javadoc-plugin</artifactId>
104-
<version>2.10.4</version>
105107
<executions>
106108
<execution>
107109
<id>attach-javadocs</id>
@@ -114,7 +116,6 @@
114116
<plugin>
115117
<groupId>org.apache.maven.plugins</groupId>
116118
<artifactId>maven-source-plugin</artifactId>
117-
<version>2.2.1</version>
118119
<executions>
119120
<execution>
120121
<id>attach-sources</id>

‎pom.xml‎

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,70 @@
6767
</distributionManagement>
6868

6969
<build>
70+
<pluginManagement>
71+
<plugins>
72+
<plugin>
73+
<groupId>org.apache.felix</groupId>
74+
<artifactId>maven-bundle-plugin</artifactId>
75+
<version>3.5.0</version>
76+
<extensions>true</extensions>
77+
</plugin>
78+
<plugin>
79+
<groupId>org.apache.maven.plugins</groupId>
80+
<artifactId>maven-javadoc-plugin</artifactId>
81+
<version>3.0.1</version>
82+
</plugin>
83+
<plugin>
84+
<groupId>org.apache.maven.plugins</groupId>
85+
<artifactId>maven-source-plugin</artifactId>
86+
<version>3.0.1</version>
87+
</plugin>
88+
<plugin>
89+
<groupId>org.apache.maven.plugins</groupId>
90+
<artifactId>maven-release-plugin</artifactId>
91+
<version>2.5.3</version>
92+
</plugin>
93+
<plugin>
94+
<groupId>org.apache.maven.plugins</groupId>
95+
<artifactId>maven-compiler-plugin</artifactId>
96+
<version>3.7.0</version>
97+
</plugin>
98+
<plugin>
99+
<groupId>org.sonatype.plugins</groupId>
100+
<artifactId>nexus-staging-maven-plugin</artifactId>
101+
<version>1.6.7</version>
102+
</plugin>
103+
<plugin>
104+
<groupId>org.codehaus.mojo</groupId>
105+
<artifactId>build-helper-maven-plugin</artifactId>
106+
<version>3.0.0</version>
107+
</plugin>
108+
<plugin>
109+
<groupId>org.apache.maven.plugins</groupId>
110+
<artifactId>maven-jar-plugin</artifactId>
111+
<version>3.1.0</version>
112+
</plugin>
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-surefire-plugin</artifactId>
116+
<version>2.22.0</version>
117+
</plugin>
118+
<plugin>
119+
<groupId>com.coveo</groupId>
120+
<artifactId>fmt-maven-plugin</artifactId>
121+
<version>2.5.0</version>
122+
</plugin>
123+
<plugin>
124+
<groupId>org.apache.maven.plugins</groupId>
125+
<artifactId>maven-deploy-plugin</artifactId>
126+
<version>2.8.2</version>
127+
</plugin>
128+
</plugins>
129+
</pluginManagement>
70130
<plugins>
71131
<plugin>
72132
<groupId>org.apache.maven.plugins</groupId>
73133
<artifactId>maven-release-plugin</artifactId>
74-
<version>2.5.3</version>
75134
<configuration>
76135
<autoVersionSubmodules>true</autoVersionSubmodules>
77136
<releaseProfiles>release-sign-artifacts</releaseProfiles>
@@ -82,7 +141,6 @@
82141
<plugin>
83142
<groupId>org.sonatype.plugins</groupId>
84143
<artifactId>nexus-staging-maven-plugin</artifactId>
85-
<version>1.6.7</version>
86144
<extensions>true</extensions>
87145
<configuration>
88146
<serverId>ossrh</serverId>

‎proto/pom.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<groupId>io.kubernetes</groupId>
44
<artifactId>client-java-proto</artifactId>
55
<version>2.0.0-beta2-SNAPSHOT</version>
6-
<packaging>jar</packaging>
6+
<packaging>bundle</packaging>
77
<name>client-java-proto</name>
88
<url>https://github.com/kubernetes-client/java</url>
99

@@ -22,10 +22,14 @@
2222
</dependencies>
2323
<build>
2424
<plugins>
25+
<plugin>
26+
<groupId>org.apache.felix</groupId>
27+
<artifactId>maven-bundle-plugin</artifactId>
28+
<extensions>true</extensions>
29+
</plugin>
2530
<plugin>
2631
<groupId>org.apache.maven.plugins</groupId>
2732
<artifactId>maven-deploy-plugin</artifactId>
28-
<version>2.8.2</version>
2933
<configuration>
3034
<skip>true</skip>
3135
</configuration>

‎util/pom.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<groupId>io.kubernetes</groupId>
44
<artifactId>client-java</artifactId>
55
<version>2.0.0-beta2-SNAPSHOT</version>
6-
<packaging>jar</packaging>
6+
<packaging>bundle</packaging>
77
<name>client-java</name>
88
<url>https://github.com/kubernetes-client/java</url>
99
<parent>
@@ -94,10 +94,14 @@
9494
</dependencies>
9595
<build>
9696
<plugins>
97+
<plugin>
98+
<groupId>org.apache.felix</groupId>
99+
<artifactId>maven-bundle-plugin</artifactId>
100+
<extensions>true</extensions>
101+
</plugin>
97102
<plugin>
98103
<groupId>org.apache.maven.plugins</groupId>
99104
<artifactId>maven-compiler-plugin</artifactId>
100-
<version>3.1</version>
101105
<configuration>
102106
<source>1.7</source>
103107
<target>1.7</target>
@@ -106,17 +110,18 @@
106110
<plugin>
107111
<groupId>org.apache.maven.plugins</groupId>
108112
<artifactId>maven-surefire-plugin</artifactId>
109-
<version>2.12</version>
110113
<configuration>
111114
<argLine>-Xms512m -Xmx1500m</argLine>
112115
<parallel>methods</parallel>
113-
<forkMode>pertest</forkMode>
116+
<perCoreThreadCount>false</perCoreThreadCount>
117+
<threadCount>1</threadCount>
118+
<forkCount>1</forkCount>
119+
<reuseForks>false</reuseForks>
114120
</configuration>
115121
</plugin>
116122
<plugin>
117123
<groupId>com.coveo</groupId>
118124
<artifactId>fmt-maven-plugin</artifactId>
119-
<version>2.2.0</version>
120125
<executions>
121126
<execution>
122127
<phase>test</phase>

0 commit comments

Comments
 (0)