Skip to content

Commit 065d21a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3259 from kubernetes-client/proto-update
Update protocol buffers and protocol buffer dependency.
2 parents d889d63 + ed14eea commit 065d21a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+97069
-120801
lines changed

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,16 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<parent>
7-
<groupId>io.kubernetes</groupId>
8-
<artifactId>client-java-examples-parent</artifactId>
9-
<version>20.0.0-SNAPSHOT</version>
10-
<relativePath>..</relativePath>
11-
</parent>
12-
136
<artifactId>client-java-examples-release-17</artifactId>
147
<name>client-java-examples-release-17</name>
8+
<groupId>io.kubernetes</groupId>
9+
<version>17.0.0</version>
1510

1611
<dependencies>
1712
<dependency>
1813
<groupId>ch.qos.logback</groupId>
1914
<artifactId>logback-classic</artifactId>
15+
<version>1.5.3</version>
2016
<scope>runtime</scope>
2117
</dependency>
2218
<dependency>
@@ -57,6 +53,7 @@
5753
<dependency>
5854
<groupId>commons-cli</groupId>
5955
<artifactId>commons-cli</artifactId>
56+
<version>1.6.0</version>
6057
</dependency>
6158
<dependency>
6259
<groupId>io.kubernetes</groupId>
@@ -72,11 +69,13 @@
7269
<dependency>
7370
<groupId>org.junit.jupiter</groupId>
7471
<artifactId>junit-jupiter</artifactId>
72+
<version>${junit-jupiter.version}</version>
7573
<scope>test</scope>
7674
</dependency>
7775
<dependency>
7876
<groupId>org.wiremock</groupId>
7977
<artifactId>wiremock</artifactId>
78+
<version>3.4.2</version>
8079
<scope>test</scope>
8180
</dependency>
8281
<!--for
@@ -96,6 +95,11 @@
9695

9796
<build>
9897
<plugins>
98+
<plugin>
99+
<groupId>com.diffplug.spotless</groupId>
100+
<artifactId>spotless-maven-plugin</artifactId>
101+
<version>2.43.0</version>
102+
</plugin>
99103
<plugin>
100104
<groupId>org.sonatype.plugins</groupId>
101105
<artifactId>nexus-staging-maven-plugin</artifactId>
@@ -113,5 +117,8 @@
113117
</plugin>
114118
</plugins>
115119
</build>
116-
120+
<properties>
121+
<junit-jupiter.version>5.10.2</junit-jupiter.version>
122+
<spring.boot.version>3.2.4</spring.boot.version>
123+
</properties>
117124
</project>

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<parent>
7-
<groupId>io.kubernetes</groupId>
8-
<artifactId>client-java-examples-parent</artifactId>
9-
<version>20.0.0-SNAPSHOT</version>
10-
<relativePath>..</relativePath>
11-
</parent>
12-
136
<artifactId>client-java-examples-release-18</artifactId>
147
<name>client-java-examples-release-18</name>
8+
<groupId>io.kubernetes</groupId>
9+
<version>18.0.0</version>
10+
1511

1612
<dependencies>
1713
<dependency>
1814
<groupId>ch.qos.logback</groupId>
1915
<artifactId>logback-classic</artifactId>
16+
<version>1.5.3</version>
2017
<scope>runtime</scope>
2118
</dependency>
2219
<dependency>
@@ -57,6 +54,7 @@
5754
<dependency>
5855
<groupId>commons-cli</groupId>
5956
<artifactId>commons-cli</artifactId>
57+
<version>1.6.0</version>
6058
</dependency>
6159
<dependency>
6260
<groupId>io.kubernetes</groupId>
@@ -72,11 +70,13 @@
7270
<dependency>
7371
<groupId>org.junit.jupiter</groupId>
7472
<artifactId>junit-jupiter</artifactId>
73+
<version>${junit-jupiter.version}</version>
7574
<scope>test</scope>
7675
</dependency>
7776
<dependency>
7877
<groupId>org.wiremock</groupId>
7978
<artifactId>wiremock</artifactId>
79+
<version>3.4.2</version>
8080
<scope>test</scope>
8181
</dependency>
8282
<!--for
@@ -96,6 +96,11 @@
9696

9797
<build>
9898
<plugins>
99+
<plugin>
100+
<groupId>com.diffplug.spotless</groupId>
101+
<artifactId>spotless-maven-plugin</artifactId>
102+
<version>2.43.0</version>
103+
</plugin>
99104
<plugin>
100105
<groupId>org.sonatype.plugins</groupId>
101106
<artifactId>nexus-staging-maven-plugin</artifactId>
@@ -113,5 +118,8 @@
113118
</plugin>
114119
</plugins>
115120
</build>
116-
121+
<properties>
122+
<junit-jupiter.version>5.10.2</junit-jupiter.version>
123+
<spring.boot.version>3.2.4</spring.boot.version>
124+
</properties>
117125
</project>

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,16 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<parent>
7-
<groupId>io.kubernetes</groupId>
8-
<artifactId>client-java-examples-parent</artifactId>
9-
<version>20.0.0-SNAPSHOT</version>
10-
<relativePath>..</relativePath>
11-
</parent>
12-
136
<artifactId>client-java-examples-release-19</artifactId>
147
<name>client-java-examples-release-19</name>
8+
<groupId>io.kubernetes</groupId>
9+
<version>19.0.0</version>
1510

1611
<dependencies>
1712
<dependency>
1813
<groupId>ch.qos.logback</groupId>
1914
<artifactId>logback-classic</artifactId>
15+
<version>1.5.3</version>
2016
<scope>runtime</scope>
2117
</dependency>
2218
<dependency>
@@ -57,6 +53,7 @@
5753
<dependency>
5854
<groupId>commons-cli</groupId>
5955
<artifactId>commons-cli</artifactId>
56+
<version>1.6.0</version>
6057
</dependency>
6158
<dependency>
6259
<groupId>io.kubernetes</groupId>
@@ -72,11 +69,13 @@
7269
<dependency>
7370
<groupId>org.junit.jupiter</groupId>
7471
<artifactId>junit-jupiter</artifactId>
72+
<version>${junit-jupiter.version}</version>
7573
<scope>test</scope>
7674
</dependency>
7775
<dependency>
7876
<groupId>org.wiremock</groupId>
7977
<artifactId>wiremock</artifactId>
78+
<version>3.4.2</version>
8079
<scope>test</scope>
8180
</dependency>
8281
<!--for
@@ -94,12 +93,18 @@
9493
<dependency>
9594
<groupId>com.amazonaws</groupId>
9695
<artifactId>aws-java-sdk-sts</artifactId>
96+
<version>1.12.689</version>
9797
</dependency>
9898

9999
</dependencies>
100100

101101
<build>
102102
<plugins>
103+
<plugin>
104+
<groupId>com.diffplug.spotless</groupId>
105+
<artifactId>spotless-maven-plugin</artifactId>
106+
<version>2.43.0</version>
107+
</plugin>
103108
<plugin>
104109
<groupId>org.sonatype.plugins</groupId>
105110
<artifactId>nexus-staging-maven-plugin</artifactId>
@@ -117,5 +122,8 @@
117122
</plugin>
118123
</plugins>
119124
</build>
120-
125+
<properties>
126+
<junit-jupiter.version>5.10.2</junit-jupiter.version>
127+
<spring.boot.version>3.2.4</spring.boot.version>
128+
</properties>
121129
</project>

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,16 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<parent>
7-
<groupId>io.kubernetes</groupId>
8-
<artifactId>client-java-examples-parent</artifactId>
9-
<version>20.0.0-SNAPSHOT</version>
10-
<relativePath>..</relativePath>
11-
</parent>
12-
136
<artifactId>client-java-examples-release-20</artifactId>
147
<name>client-java-examples-release-20</name>
8+
<groupId>io.kubernetes</groupId>
9+
<version>20.0.0</version>
1510

1611
<dependencies>
1712
<dependency>
1813
<groupId>ch.qos.logback</groupId>
1914
<artifactId>logback-classic</artifactId>
15+
<version>1.5.3</version>
2016
<scope>runtime</scope>
2117
</dependency>
2218
<dependency>
@@ -57,6 +53,7 @@
5753
<dependency>
5854
<groupId>commons-cli</groupId>
5955
<artifactId>commons-cli</artifactId>
56+
<version>1.6.0</version>
6057
</dependency>
6158
<dependency>
6259
<groupId>io.kubernetes</groupId>
@@ -72,11 +69,13 @@
7269
<dependency>
7370
<groupId>org.junit.jupiter</groupId>
7471
<artifactId>junit-jupiter</artifactId>
72+
<version>${junit-jupiter.version}</version>
7573
<scope>test</scope>
7674
</dependency>
7775
<dependency>
7876
<groupId>org.wiremock</groupId>
7977
<artifactId>wiremock</artifactId>
78+
<version>3.4.2</version>
8079
<scope>test</scope>
8180
</dependency>
8281
<!--for
@@ -94,12 +93,18 @@
9493
<dependency>
9594
<groupId>com.amazonaws</groupId>
9695
<artifactId>aws-java-sdk-sts</artifactId>
96+
<version>1.12.689</version>
9797
</dependency>
9898

9999
</dependencies>
100100

101101
<build>
102102
<plugins>
103+
<plugin>
104+
<groupId>com.diffplug.spotless</groupId>
105+
<artifactId>spotless-maven-plugin</artifactId>
106+
<version>2.43.0</version>
107+
</plugin>
103108
<plugin>
104109
<groupId>org.sonatype.plugins</groupId>
105110
<artifactId>nexus-staging-maven-plugin</artifactId>
@@ -117,5 +122,8 @@
117122
</plugin>
118123
</plugins>
119124
</build>
120-
125+
<properties>
126+
<junit-jupiter.version>5.10.2</junit-jupiter.version>
127+
<spring.boot.version>3.2.4</spring.boot.version>
128+
</properties>
121129
</project>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<snakeyaml.version>2.2</snakeyaml.version>
5050
<slf4j.version>2.0.12</slf4j.version>
5151
<caffeine.version>2.9.3</caffeine.version>
52-
<protobuf.version>3.25.3</protobuf.version>
52+
<protobuf.version>4.26.1</protobuf.version>
5353
<junit-jupiter.version>5.10.2</junit-jupiter.version>
5454
<bucket4j.version>7.6.0</bucket4j.version>
5555
<bouncycastle.version>1.77</bouncycastle.version>

0 commit comments

Comments
 (0)