Skip to content

Commit 8dc8659

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-client#1522 from dsyer/modules
Make Maven reactor build work
2 parents 631bf1e + 89afa9e commit 8dc8659

15 files changed

Lines changed: 137 additions & 137 deletions

File tree

‎client-java-contrib/cert-manager/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<groupId>io.kubernetes</groupId>
88
<artifactId>client-java-parent</artifactId>
9-
<version>11.0.1-SNAPSHOT</version>
9+
<version>12.0.0-SNAPSHOT</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212
<!-- the version tracks the release version of the CRDs in the upstream cert-manager project -->
13-
<version>11.0.1-SNAPSHOT</version>
13+
<version>12.0.0-SNAPSHOT</version>
1414
<dependencies>
1515
<dependency>
1616
<groupId>io.kubernetes</groupId>

‎client-java-contrib/prometheus-operator/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<parent>
44
<artifactId>client-java-parent</artifactId>
55
<groupId>io.kubernetes</groupId>
6-
<version>11.0.1-SNAPSHOT</version>
6+
<version>12.0.0-SNAPSHOT</version>
77
<relativePath>../../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

1111
<artifactId>client-java-prometheus-operator-models</artifactId>
12-
<version>11.0.1-SNAPSHOT</version>
12+
<version>12.0.0-SNAPSHOT</version>
1313
<dependencies>
1414
<dependency>
1515
<groupId>io.kubernetes</groupId>

‎e2e/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<artifactId>client-java-parent</artifactId>
1212
<groupId>io.kubernetes</groupId>
13-
<version>11.0.1-SNAPSHOT</version>
13+
<version>12.0.0-SNAPSHOT</version>
1414
<relativePath>../pom.xml</relativePath>
1515
</parent>
1616

‎examples/examples-release-10/pom.xml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22
<modelVersion>4.0.0</modelVersion>
33

4-
<groupId>io.kubernetes</groupId>
4+
<parent>
5+
<groupId>io.kubernetes</groupId>
6+
<artifactId>client-java-examples-parent</artifactId>
7+
<version>12.0.0-SNAPSHOT</version>
8+
<relativePath>..</relativePath>
9+
</parent>
10+
511
<artifactId>client-java-examples-release-10</artifactId>
612
<packaging>bundle</packaging>
713
<name>client-java-examples-release-10</name>
8-
<version>1.0.0</version>
14+
<version>12.0.0-SNAPSHOT</version>
915
<properties>
10-
<kubernetes.client.version>10.0.1</kubernetes.client.version>
1116
<java.version>1.8</java.version>
1217
<maven.compiler.source>${java.version}</maven.compiler.source>
1318
<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -27,27 +32,27 @@
2732
<dependency>
2833
<groupId>io.kubernetes</groupId>
2934
<artifactId>client-java-api</artifactId>
30-
<version>${kubernetes.client.version}</version>
35+
<version>10.0.1</version>
3136
</dependency>
3237
<dependency>
3338
<groupId>io.kubernetes</groupId>
3439
<artifactId>client-java</artifactId>
35-
<version>${kubernetes.client.version}</version>
40+
<version>10.0.1</version>
3641
</dependency>
3742
<dependency>
3843
<groupId>io.kubernetes</groupId>
3944
<artifactId>client-java-extended</artifactId>
40-
<version>${kubernetes.client.version}</version>
45+
<version>10.0.1</version>
4146
</dependency>
4247
<dependency>
4348
<groupId>io.kubernetes</groupId>
4449
<artifactId>client-java-spring-integration</artifactId>
45-
<version>${kubernetes.client.version}</version>
50+
<version>10.0.1</version>
4651
</dependency>
4752
<dependency>
4853
<groupId>io.kubernetes</groupId>
4954
<artifactId>client-java-proto</artifactId>
50-
<version>${kubernetes.client.version}</version>
55+
<version>10.0.1</version>
5156
</dependency>
5257
<dependency>
5358
<groupId>commons-cli</groupId>

‎examples/examples-release-11/pom.xml‎

Lines changed: 78 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
2+
<modelVersion>4.0.0</modelVersion>
33

4-
<groupId>io.kubernetes</groupId>
5-
<artifactId>client-java-examples-release-11</artifactId>
6-
<name>client-java-examples-release-11</name>
7-
<version>1.0.0</version>
4+
<parent>
5+
<groupId>io.kubernetes</groupId>
6+
<artifactId>client-java-examples-parent</artifactId>
7+
<version>12.0.0-SNAPSHOT</version>
8+
<relativePath>..</relativePath>
9+
</parent>
10+
11+
<artifactId>client-java-examples-release-11</artifactId>
12+
<name>client-java-examples-release-11</name>
13+
<version>12.0.0-SNAPSHOT</version>
814
<properties>
9-
<kubernetes.client.version>11.0.0</kubernetes.client.version>
1015
<java.version>1.8</java.version>
1116
<maven.compiler.source>${java.version}</maven.compiler.source>
1217
<maven.compiler.target>${java.version}</maven.compiler.target>
13-
<junit.version>4.13.1</junit.version>
14-
<spring.boot.version>2.4.1</spring.boot.version>
18+
<junit.version>4.13.1</junit.version>
19+
<spring.boot.version>2.4.1</spring.boot.version>
1520
</properties>
1621

17-
<dependencies>
22+
<dependencies>
1823
<dependency>
1924
<groupId>io.prometheus</groupId>
2025
<artifactId>simpleclient</artifactId>
@@ -25,72 +30,72 @@
2530
<artifactId>simpleclient_httpserver</artifactId>
2631
<version>0.9.0</version>
2732
</dependency>
28-
<dependency>
29-
<groupId>io.kubernetes</groupId>
30-
<artifactId>client-java-api</artifactId>
31-
<version>${kubernetes.client.version}</version>
32-
</dependency>
33-
<dependency>
34-
<groupId>io.kubernetes</groupId>
35-
<artifactId>client-java</artifactId>
36-
<version>${kubernetes.client.version}</version>
37-
</dependency>
38-
<dependency>
39-
<groupId>io.kubernetes</groupId>
40-
<artifactId>client-java-extended</artifactId>
41-
<version>${kubernetes.client.version}</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>io.kubernetes</groupId>
45-
<artifactId>client-java-spring-integration</artifactId>
46-
<version>${kubernetes.client.version}</version>
47-
</dependency>
48-
<dependency>
49-
<groupId>io.kubernetes</groupId>
50-
<artifactId>client-java-proto</artifactId>
51-
<version>${kubernetes.client.version}</version>
52-
</dependency>
53-
<dependency>
54-
<groupId>commons-cli</groupId>
55-
<artifactId>commons-cli</artifactId>
56-
<version>1.4</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>io.kubernetes</groupId>
60-
<artifactId>client-java-cert-manager-models</artifactId>
61-
<version>10.0.1</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>io.kubernetes</groupId>
65-
<artifactId>client-java-prometheus-operator-models</artifactId>
66-
<version>10.0.1</version>
67-
</dependency>
68-
<!-- test dependencies -->
69-
<dependency>
70-
<groupId>junit</groupId>
71-
<artifactId>junit</artifactId>
72-
<version>${junit.version}</version>
73-
<scope>test</scope>
74-
</dependency>
75-
<dependency>
76-
<groupId>com.github.tomakehurst</groupId>
77-
<artifactId>wiremock</artifactId>
33+
<dependency>
34+
<groupId>io.kubernetes</groupId>
35+
<artifactId>client-java-api</artifactId>
36+
<version>11.0.0</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>io.kubernetes</groupId>
40+
<artifactId>client-java</artifactId>
41+
<version>11.0.0</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>io.kubernetes</groupId>
45+
<artifactId>client-java-extended</artifactId>
46+
<version>11.0.0</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>io.kubernetes</groupId>
50+
<artifactId>client-java-spring-integration</artifactId>
51+
<version>11.0.0</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>io.kubernetes</groupId>
55+
<artifactId>client-java-proto</artifactId>
56+
<version>11.0.0</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>commons-cli</groupId>
60+
<artifactId>commons-cli</artifactId>
61+
<version>1.4</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>io.kubernetes</groupId>
65+
<artifactId>client-java-cert-manager-models</artifactId>
66+
<version>10.0.1</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>io.kubernetes</groupId>
70+
<artifactId>client-java-prometheus-operator-models</artifactId>
71+
<version>10.0.1</version>
72+
</dependency>
73+
<!-- test dependencies -->
74+
<dependency>
75+
<groupId>junit</groupId>
76+
<artifactId>junit</artifactId>
77+
<version>${junit.version}</version>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>com.github.tomakehurst</groupId>
82+
<artifactId>wiremock</artifactId>
7883
<version>2.27.2</version>
79-
<scope>test</scope>
80-
</dependency>
81-
<!--for spring controller example-->
82-
<dependency>
83-
<groupId>org.springframework.boot</groupId>
84-
<artifactId>spring-boot-starter-web</artifactId>
85-
<version>${spring.boot.version}</version>
86-
</dependency>
87-
<dependency>
88-
<groupId>org.springframework.boot</groupId>
89-
<artifactId>spring-boot-starter-actuator</artifactId>
90-
<version>${spring.boot.version}</version>
91-
</dependency>
84+
<scope>test</scope>
85+
</dependency>
86+
<!--for spring controller example-->
87+
<dependency>
88+
<groupId>org.springframework.boot</groupId>
89+
<artifactId>spring-boot-starter-web</artifactId>
90+
<version>${spring.boot.version}</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.springframework.boot</groupId>
94+
<artifactId>spring-boot-starter-actuator</artifactId>
95+
<version>${spring.boot.version}</version>
96+
</dependency>
9297

93-
</dependencies>
98+
</dependencies>
9499

95100

96101
</project>

‎examples/examples-release-12/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
<parent>
55
<groupId>io.kubernetes</groupId>
66
<artifactId>client-java-examples-parent</artifactId>
7-
<version>11.0.1-SNAPSHOT</version>
8-
<relativePath>../pom.xml</relativePath>
7+
<version>12.0.0-SNAPSHOT</version>
8+
<relativePath>..</relativePath>
99
</parent>
1010

1111
<artifactId>client-java-examples-release-12</artifactId>
1212
<name>client-java-examples-release-12</name>
1313

1414
<properties>
15-
<kubernetes.prometheus.version>11.0.1-SNAPSHOT</kubernetes.prometheus.version>
16-
<kubernetes.cert-manager.version>11.0.1-SNAPSHOT</kubernetes.cert-manager.version>
15+
<kubernetes.prometheus.version>12.0.0-SNAPSHOT</kubernetes.prometheus.version>
16+
<kubernetes.cert-manager.version>12.0.0-SNAPSHOT</kubernetes.cert-manager.version>
1717
</properties>
1818

1919
<dependencies>
@@ -30,27 +30,27 @@
3030
<dependency>
3131
<groupId>io.kubernetes</groupId>
3232
<artifactId>client-java-api</artifactId>
33-
<version>${kubernetes.client.version}</version>
33+
<version>${project.version}</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>io.kubernetes</groupId>
3737
<artifactId>client-java</artifactId>
38-
<version>${kubernetes.client.version}</version>
38+
<version>${project.version}</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>io.kubernetes</groupId>
4242
<artifactId>client-java-extended</artifactId>
43-
<version>${kubernetes.client.version}</version>
43+
<version>${project.version}</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>io.kubernetes</groupId>
4747
<artifactId>client-java-spring-integration</artifactId>
48-
<version>${kubernetes.client.version}</version>
48+
<version>${project.version}</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>io.kubernetes</groupId>
5252
<artifactId>client-java-proto</artifactId>
53-
<version>${kubernetes.client.version}</version>
53+
<version>${project.version}</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>commons-cli</groupId>

‎examples/examples-release-12/src/main/java/io/kubernetes/client/examples/DynamicClientExample.java‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,31 @@
1212
*/
1313
package io.kubernetes.client.examples;
1414

15-
import java.io.FileReader;
16-
import java.io.IOException;
17-
1815
import io.kubernetes.client.openapi.ApiClient;
1916
import io.kubernetes.client.openapi.ApiException;
2017
import io.kubernetes.client.util.ClientBuilder;
21-
import io.kubernetes.client.util.KubeConfig;
2218
import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesApi;
2319
import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesObject;
20+
import java.io.IOException;
2421

2522
public class DynamicClientExample {
2623

27-
public static void main(String[] args) throws IOException, ApiException {
24+
public static void main(String[] args) throws IOException, ApiException {
2825

29-
ApiClient apiClient = ClientBuilder.standard().build();
26+
ApiClient apiClient = ClientBuilder.standard().build();
3027

31-
// retrieving the latest state of the default namespace
32-
DynamicKubernetesApi dynamicApi = new DynamicKubernetesApi("", "v1", "namespaces", apiClient);
33-
DynamicKubernetesObject defaultNamespace = dynamicApi.get("default")
34-
.throwsApiException()
35-
.getObject();
28+
// retrieving the latest state of the default namespace
29+
DynamicKubernetesApi dynamicApi = new DynamicKubernetesApi("", "v1", "namespaces", apiClient);
30+
DynamicKubernetesObject defaultNamespace =
31+
dynamicApi.get("default").throwsApiException().getObject();
3632

37-
// attaching a "foo=bar" label to the default namespace
38-
defaultNamespace.setMetadata(defaultNamespace.getMetadata().putLabelsItem("foo", "bar"));
39-
DynamicKubernetesObject updatedDefaultNamespace = dynamicApi.update(defaultNamespace)
40-
.throwsApiException()
41-
.getObject();
33+
// attaching a "foo=bar" label to the default namespace
34+
defaultNamespace.setMetadata(defaultNamespace.getMetadata().putLabelsItem("foo", "bar"));
35+
DynamicKubernetesObject updatedDefaultNamespace =
36+
dynamicApi.update(defaultNamespace).throwsApiException().getObject();
4237

43-
System.out.println(updatedDefaultNamespace);
38+
System.out.println(updatedDefaultNamespace);
4439

45-
apiClient.getHttpClient().connectionPool().evictAll();
46-
}
40+
apiClient.getHttpClient().connectionPool().evictAll();
41+
}
4742
}

0 commit comments

Comments
 (0)