Skip to content

Commit 8d04127

Browse files
authored
Merge branch 'kubernetes-client:master' into fix-maven-warnings
2 parents f3c4a9e + 07e05ac commit 8d04127

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

client-java-contrib/admissionreview/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<plugin>
3838
<groupId>com.diffplug.spotless</groupId>
3939
<artifactId>spotless-maven-plugin</artifactId>
40-
<version>2.36.0</version>
40+
<version>2.37.0</version>
4141
<configuration>
4242
<skip>true</skip>
4343
</configuration>

client-java-contrib/generate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ kind create cluster
4949
# install CRDs to the KinD cluster and dump the swagger spec
5050
for url in "${CRD_URLS[@]}"; do
5151
if [[ ! -z $url ]]; then
52-
kubectl apply -f "$url"
52+
kubectl create -f "$url"
5353
fi
5454
done
5555

@@ -82,4 +82,4 @@ bash java-crd-cmd.sh -n "${KUBERNETES_CRD_GROUP_PREFIX}" -p "${PACKAGE_NAME}" -l
8282
# only keep the model classes
8383
mkdir -p "${OUTPUT_DIR}/src/main/java/${PACKAGE_NAME//.//}"
8484
cp -r "${OUTPUT_DIR}/gen/src/main/java/${PACKAGE_NAME//.//}/models" "${OUTPUT_DIR}/src/main/java/${PACKAGE_NAME//.//}"
85-
rm -rf "${OUTPUT_DIR}/gen"
85+
rm -rf "${OUTPUT_DIR}/gen"

fluent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<plugin>
4141
<groupId>com.diffplug.spotless</groupId>
4242
<artifactId>spotless-maven-plugin</artifactId>
43-
<version>2.36.0</version>
43+
<version>2.37.0</version>
4444
<configuration>
4545
<skip>true</skip>
4646
</configuration>

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
<dependency>
225225
<groupId>com.google.auth</groupId>
226226
<artifactId>google-auth-library-oauth2-http</artifactId>
227-
<version>1.16.1</version>
227+
<version>1.17.0</version>
228228
<optional>true</optional>
229229
</dependency>
230230

@@ -343,7 +343,7 @@
343343
<plugin>
344344
<groupId>org.apache.maven.plugins</groupId>
345345
<artifactId>maven-source-plugin</artifactId>
346-
<version>3.2.1</version>
346+
<version>3.3.0</version>
347347
</plugin>
348348
<plugin>
349349
<groupId>org.apache.maven.plugins</groupId>
@@ -386,7 +386,7 @@
386386
<plugin>
387387
<groupId>org.codehaus.gmavenplus</groupId>
388388
<artifactId>gmavenplus-plugin</artifactId>
389-
<version>2.1.0</version>
389+
<version>3.0.0</version>
390390
</plugin>
391391
<plugin>
392392
<groupId>org.jacoco</groupId>
@@ -405,7 +405,7 @@
405405
<plugin>
406406
<groupId>org.apache.maven.plugins</groupId>
407407
<artifactId>maven-source-plugin</artifactId>
408-
<version>3.2.1</version>
408+
<version>3.3.0</version>
409409
<executions>
410410
<execution>
411411
<id>attach-sources</id>
@@ -443,7 +443,7 @@
443443
<plugin>
444444
<groupId>com.diffplug.spotless</groupId>
445445
<artifactId>spotless-maven-plugin</artifactId>
446-
<version>2.36.0</version>
446+
<version>2.37.0</version>
447447
<configuration>
448448
<formats>
449449
<!-- common settings -->

0 commit comments

Comments
 (0)