Skip to content

Commit b36db94

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-client#3133 from kozjan/master
use code generation with jakarta instead of javax
2 parents edd42da + 7fd40d0 commit b36db94

File tree

257 files changed

+33920
-28380
lines changed

Some content is hidden

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

257 files changed

+33920
-28380
lines changed

‎client-java-contrib/Dockerfile‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@ FROM docker:stable
22

33
# install git, bash, kind, kubectl and clone the kubernetes-client/gen code base
44
RUN apk add --no-cache git bash && \
5-
wget -O /usr/bin/kind https://kind.sigs.k8s.io/dl/v0.11.1/kind-linux-amd64 && \
5+
wget -O /usr/bin/kind https://kind.sigs.k8s.io/dl/v0.17.0/kind-linux-amd64 && \
66
chmod +x /usr/bin/kind && \
7-
wget -O /usr/bin/kubectl https://dl.k8s.io/release/v1.26.4/bin/linux/amd64/kubectl && \
7+
wget -O /usr/bin/kubectl https://dl.k8s.io/release/v1.28.2/bin/linux/amd64/kubectl && \
88
chmod +x /usr/bin/kubectl && \
99
git clone https://github.com/kubernetes-client/gen.git && \
1010
cd gen && \
11-
git checkout 729332ad08f0f4d98983b7beb027e2f657236ef9
12-
# 729332ad08f0f4d98983b7beb027e2f657236ef9 is the last commit using python2 interpreter
11+
git checkout 84f2bc9e34129f92606a00fccb8c5c62204012b9
1312

1413

15-
COPY Dockerfile.gen gen/openapi/openapi-generator/Dockerfile
1614
COPY generate.sh generate.sh
1715

1816
RUN chmod +x generate.sh

‎client-java-contrib/Dockerfile.gen‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎client-java-contrib/Dockerfile.gen-base‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@
2929
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
3030
</configuration>
3131
</plugin>
32+
<plugin>
33+
<groupId>com.diffplug.spotless</groupId>
34+
<artifactId>spotless-maven-plugin</artifactId>
35+
<configuration>
36+
<skip>true</skip>
37+
</configuration>
38+
</plugin>
3239
</plugins>
3340
</build>
3441
</project>

0 commit comments

Comments
 (0)