Skip to content

Commit d2f3839

Browse files
authored
Merge branch 'kubernetes-client:master' into feat-java-modules
2 parents a3edf1f + 07e05ac commit d2f3839

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
@@ -39,7 +39,7 @@
3939
<plugin>
4040
<groupId>com.diffplug.spotless</groupId>
4141
<artifactId>spotless-maven-plugin</artifactId>
42-
<version>2.36.0</version>
42+
<version>2.37.0</version>
4343
<configuration>
4444
<skip>true</skip>
4545
</configuration>

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
<dependency>
229229
<groupId>com.google.auth</groupId>
230230
<artifactId>google-auth-library-oauth2-http</artifactId>
231-
<version>1.16.1</version>
231+
<version>1.17.0</version>
232232
<optional>true</optional>
233233
</dependency>
234234

@@ -347,7 +347,7 @@
347347
<plugin>
348348
<groupId>org.apache.maven.plugins</groupId>
349349
<artifactId>maven-source-plugin</artifactId>
350-
<version>3.2.1</version>
350+
<version>3.3.0</version>
351351
</plugin>
352352
<plugin>
353353
<groupId>org.apache.maven.plugins</groupId>
@@ -390,7 +390,7 @@
390390
<plugin>
391391
<groupId>org.codehaus.gmavenplus</groupId>
392392
<artifactId>gmavenplus-plugin</artifactId>
393-
<version>2.1.0</version>
393+
<version>3.0.0</version>
394394
</plugin>
395395
</plugins>
396396
</pluginManagement>
@@ -399,7 +399,7 @@
399399
<plugin>
400400
<groupId>org.apache.maven.plugins</groupId>
401401
<artifactId>maven-source-plugin</artifactId>
402-
<version>3.2.1</version>
402+
<version>3.3.0</version>
403403
<executions>
404404
<execution>
405405
<id>attach-sources</id>
@@ -437,7 +437,7 @@
437437
<plugin>
438438
<groupId>com.diffplug.spotless</groupId>
439439
<artifactId>spotless-maven-plugin</artifactId>
440-
<version>2.36.0</version>
440+
<version>2.37.0</version>
441441
<configuration>
442442
<formats>
443443
<!-- common settings -->

0 commit comments

Comments
 (0)