Skip to content

Commit 1147e11

Browse files
authored
Merge pull request #3142 from codefromthecrypt/regen
Regenerates proto source
2 parents 59889c2 + be6084c commit 1147e11

Some content is hidden

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

41 files changed

+415096
-453680
lines changed

client-java-contrib/admissionreview/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<plugin>
4545
<groupId>com.diffplug.spotless</groupId>
4646
<artifactId>spotless-maven-plugin</artifactId>
47-
<version>2.43.0</version>
4847
<configuration>
4948
<skip>true</skip>
5049
</configuration>

fluent/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<plugin>
3939
<groupId>com.diffplug.spotless</groupId>
4040
<artifactId>spotless-maven-plugin</artifactId>
41-
<version>2.43.0</version>
4241
<configuration>
4342
<skip>true</skip>
4443
</configuration>

pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,11 @@
360360
<build>
361361
<pluginManagement>
362362
<plugins>
363+
<plugin>
364+
<groupId>com.diffplug.spotless</groupId>
365+
<artifactId>spotless-maven-plugin</artifactId>
366+
<version>2.43.0</version>
367+
</plugin>
363368
<plugin>
364369
<groupId>org.apache.felix</groupId>
365370
<artifactId>maven-bundle-plugin</artifactId>
@@ -477,7 +482,6 @@
477482
<plugin>
478483
<groupId>com.diffplug.spotless</groupId>
479484
<artifactId>spotless-maven-plugin</artifactId>
480-
<version>2.43.0</version>
481485
<configuration>
482486
<formats>
483487
<!-- common settings -->

proto/pom.xml

Lines changed: 46 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,49 @@
1-
<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>
3-
<artifactId>client-java-proto</artifactId>
4-
<packaging>bundle</packaging>
5-
<name>client-java-proto</name>
6-
<url>https://github.com/kubernetes-client/java</url>
1+
<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/maven-v4_0_0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<artifactId>client-java-proto</artifactId>
4+
<packaging>bundle</packaging>
5+
<name>client-java-proto</name>
6+
<url>https://github.com/kubernetes-client/java</url>
77

8-
<parent>
9-
<groupId>io.kubernetes</groupId>
10-
<artifactId>client-java-parent</artifactId>
11-
<version>20.0.0-SNAPSHOT</version>
12-
<relativePath>../pom.xml</relativePath>
13-
</parent>
8+
<parent>
9+
<groupId>io.kubernetes</groupId>
10+
<artifactId>client-java-parent</artifactId>
11+
<version>20.0.0-SNAPSHOT</version>
12+
<relativePath>../pom.xml</relativePath>
13+
</parent>
1414

15-
<dependencies>
16-
<dependency>
17-
<groupId>com.google.protobuf</groupId>
18-
<artifactId>protobuf-java</artifactId>
19-
</dependency>
20-
</dependencies>
21-
<build>
22-
<plugins>
23-
<plugin>
24-
<groupId>org.apache.felix</groupId>
25-
<artifactId>maven-bundle-plugin</artifactId>
26-
<extensions>true</extensions>
27-
<configuration>
28-
<instructions>
29-
<Automatic-Module-Name>io.kubernetes.client.java.proto</Automatic-Module-Name>
30-
</instructions>
31-
</configuration>
32-
</plugin>
33-
<plugin>
34-
<groupId>org.apache.maven.plugins</groupId>
35-
<artifactId>maven-compiler-plugin</artifactId>
36-
<configuration>
37-
<release>${java.version}</release>
38-
</configuration>
39-
</plugin>
40-
</plugins>
41-
</build>
15+
<dependencies>
16+
<dependency>
17+
<groupId>com.google.protobuf</groupId>
18+
<artifactId>protobuf-java</artifactId>
19+
</dependency>
20+
</dependencies>
21+
<build>
22+
<plugins>
23+
<plugin>
24+
<groupId>org.apache.felix</groupId>
25+
<artifactId>maven-bundle-plugin</artifactId>
26+
<extensions>true</extensions>
27+
<configuration>
28+
<instructions>
29+
<Automatic-Module-Name>io.kubernetes.client.java.proto</Automatic-Module-Name>
30+
</instructions>
31+
</configuration>
32+
</plugin>
33+
<plugin>
34+
<groupId>org.apache.maven.plugins</groupId>
35+
<artifactId>maven-compiler-plugin</artifactId>
36+
<configuration>
37+
<release>${java.version}</release>
38+
</configuration>
39+
</plugin>
40+
<plugin>
41+
<groupId>com.diffplug.spotless</groupId>
42+
<artifactId>spotless-maven-plugin</artifactId>
43+
<configuration>
44+
<skip>true</skip>
45+
</configuration>
46+
</plugin>
47+
</plugins>
48+
</build>
4249
</project>

0 commit comments

Comments
 (0)