Skip to content

Commit 222dfdc

Browse files
rjeberhardrjeberhard
authored
Update dependencies including to the Kubernetes Java Client 13 (#2466)
* Update dependencies * Use --add-opens
1 parent 3b7cc49 commit 222dfdc

File tree

7 files changed

+45
-41
lines changed

7 files changed

+45
-41
lines changed

‎build-tools/checkstyle/customized_google_checks.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
293293
</module>
294294
<module name="JavadocMethod">
295-
<property name="scope" value="public"/>
295+
<property name="accessModifiers" value="public"/>
296296
<property name="allowMissingParamTags" value="true"/>
297297
<property name="allowMissingReturnTag" value="true"/>
298298
<property name="allowedAnnotations" value="Override, Test"/>

‎integration-tests/pom.xml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>net.sourceforge.htmlunit</groupId>
6161
<artifactId>htmlunit</artifactId>
62-
<version>2.47.1</version>
62+
<version>2.51.0</version>
6363
<scope>test</scope>
6464
</dependency>
6565
</dependencies>
@@ -70,12 +70,9 @@
7070
<groupId>org.apache.maven.plugins</groupId>
7171
<artifactId>maven-failsafe-plugin</artifactId>
7272
<configuration>
73-
<argLine>
74-
--illegal-access=permit
75-
</argLine>
7673
<encoding>UTF-8</encoding>
7774
<argLine>
78-
--illegal-access=permit
75+
--add-opens java.base/java.time=ALL-UNNAMED
7976
</argLine>
8077
<argLine>${failsafeArgLine}</argLine>
8178
<failIfNoTests>false</failIfNoTests>
@@ -139,11 +136,6 @@
139136
<artifactId>junit-jupiter-engine</artifactId>
140137
<version>${junit.jupiter.version}</version>
141138
</dependency>
142-
<dependency>
143-
<groupId>org.junit.platform</groupId>
144-
<artifactId>junit-platform-surefire-provider</artifactId>
145-
<version>${junit.platform.surefire.version}</version>
146-
</dependency>
147139
</dependencies>
148140
</plugin>
149141
<plugin>

‎kubernetes/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<include>**/*AT.java</include>
121121
</includes>
122122
<argLine>
123-
--illegal-access=permit
123+
--add-opens java.base/java.time=ALL-UNNAMED
124124
</argLine>
125125
</configuration>
126126
<executions>

‎operator-build-maven-plugin/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<dependency>
2424
<groupId>org.apache.maven</groupId>
2525
<artifactId>maven-plugin-api</artifactId>
26-
<version>3.6.3</version>
26+
<version>3.8.1</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.apache.maven.plugin-tools</groupId>
3030
<artifactId>maven-plugin-annotations</artifactId>
31-
<version>3.6.0</version>
31+
<version>3.6.1</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>org.junit.jupiter</groupId>
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>org.ow2.asm</groupId>
4545
<artifactId>asm</artifactId>
46-
<version>9.1</version>
46+
<version>9.2</version>
4747
<scope>test</scope>
4848
</dependency>
4949
</dependencies>

‎operator/pom.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<includes>
9393
<exclude>**/*Test.java</exclude>
9494
</includes>
95-
<argLine>--illegal-access=permit</argLine>
95+
<argLine>--add-opens java.base/java.time=ALL-UNNAMED</argLine>
9696
</configuration>
9797
</plugin>
9898

@@ -235,7 +235,8 @@
235235
<configuration>
236236
<executable>java</executable>
237237
<arguments>
238-
<argument>--illegal-access=permit</argument>
238+
<argument>--add-opens</argument>
239+
<argument>java.base/java.time=ALL-UNNAMED</argument>
239240
<argument>-classpath</argument>
240241
<!-- automatically creates the classpath using all project dependencies,
241242
also adding the project build directory -->
@@ -329,6 +330,11 @@
329330
<artifactId>client-java</artifactId>
330331
</dependency>
331332

333+
<dependency>
334+
<groupId>io.kubernetes</groupId>
335+
<artifactId>client-java-api-fluent</artifactId>
336+
</dependency>
337+
332338
<!-- test dependencies -->
333339
<dependency>
334340
<groupId>com.appscode.voyager</groupId>

‎operator/src/main/java/oracle/kubernetes/operator/helpers/CrdHelper.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import oracle.kubernetes.operator.work.Step;
4646
import oracle.kubernetes.weblogic.domain.model.DomainSpec;
4747
import oracle.kubernetes.weblogic.domain.model.DomainStatus;
48+
import org.yaml.snakeyaml.constructor.SafeConstructor;
4849

4950
import static oracle.kubernetes.weblogic.domain.model.CrdSchemaGenerator.createCrdSchemaGenerator;
5051

@@ -205,7 +206,14 @@ static String getVersionFromCrdSchemaFileName(String name) {
205206
}
206207

207208
static V1CustomResourceValidation getValidationFromCrdSchemaFile(String fileContents) {
208-
return Yaml.getSnakeYaml().loadAs(new StringReader(fileContents), V1CustomResourceValidation.class);
209+
return getSnakeYaml(V1CustomResourceValidation.class)
210+
.loadAs(new StringReader(fileContents), V1CustomResourceValidation.class);
211+
}
212+
213+
private static org.yaml.snakeyaml.Yaml getSnakeYaml(Class<?> type) {
214+
return type != null ? new org.yaml.snakeyaml.Yaml(new Yaml.CustomConstructor(type),
215+
new Yaml.CustomRepresenter()) :
216+
new org.yaml.snakeyaml.Yaml(new SafeConstructor(), new Yaml.CustomRepresenter());
209217
}
210218

211219
static V1CustomResourceSubresources createSubresources() {

‎pom.xml‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,6 @@
170170
<version>${maven-surefire-plugin-version}</version>
171171
</plugin>
172172

173-
<plugin>
174-
<groupId>org.apache.maven.plugins</groupId>
175-
<artifactId>surefire-logger-api</artifactId>
176-
<version>${surefire-logger-api-version}</version>
177-
</plugin>
178-
179173
<plugin>
180174
<groupId>org.apache.maven.plugins</groupId>
181175
<artifactId>maven-dependency-plugin</artifactId>
@@ -441,6 +435,11 @@
441435
<artifactId>client-java-extended</artifactId>
442436
<version>${client-java-version}</version>
443437
</dependency>
438+
<dependency>
439+
<groupId>io.kubernetes</groupId>
440+
<artifactId>client-java-api-fluent</artifactId>
441+
<version>${client-java-version}</version>
442+
</dependency>
444443
<dependency>
445444
<groupId>org.hamcrest</groupId>
446445
<artifactId>hamcrest-junit</artifactId>
@@ -589,45 +588,44 @@
589588
<maven-jar-plugin-version>3.2.0</maven-jar-plugin-version>
590589
<maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
591590
<maven-site-plugin-version>3.9.1</maven-site-plugin-version>
592-
<maven-surefire-plugin-version>2.22.2</maven-surefire-plugin-version>
593-
<surefire-logger-api-version>2.22.2</surefire-logger-api-version>
591+
<maven-surefire-plugin-version>3.0.0-M5</maven-surefire-plugin-version>
594592
<maven-checkstyle-plugin-version>3.1.2</maven-checkstyle-plugin-version>
595593
<maven-release-plugin-version>3.0.0-M1</maven-release-plugin-version>
596594
<maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
597-
<maven-failsafe-plugin-version>3.0.0-M3</maven-failsafe-plugin-version>
595+
<maven-failsafe-plugin-version>3.0.0-M5</maven-failsafe-plugin-version>
598596
<maven-dependency-plugin-version>3.1.2</maven-dependency-plugin-version>
599597
<exec-maven-plugin-version>3.0.0</exec-maven-plugin-version>
600598
<spotbugs-maven-plugin-version>4.2.0</spotbugs-maven-plugin-version>
601-
<spotbugs-version>4.2.1</spotbugs-version>
602-
<checkstyle-version>8.41</checkstyle-version>
603-
<directory-maven-version>0.1</directory-maven-version>
599+
<spotbugs-version>4.3.0</spotbugs-version>
600+
<checkstyle-version>8.44</checkstyle-version>
601+
<directory-maven-version>0.3.1</directory-maven-version>
604602
<maven-jxr-plugin-version>3.0.0</maven-jxr-plugin-version>
605603
<maven-gpg-plugin-version>1.6</maven-gpg-plugin-version>
606604
<hamcrest-junit-version>2.0.0.0</hamcrest-junit-version>
607605
<simplestub-version>1.3.0</simplestub-version>
608-
<jakarta-json-version>2.0.0</jakarta-json-version>
606+
<jakarta-json-version>2.0.1</jakarta-json-version>
609607
<jms-api-version>2.0.1</jms-api-version>
610608
<kjetland-mbknor-jsonschema-version>1.0.39</kjetland-mbknor-jsonschema-version>
611-
<networknt-jsonschmema-validator-version>1.0.49</networknt-jsonschmema-validator-version>
609+
<networknt-jsonschmema-validator-version>1.0.57</networknt-jsonschmema-validator-version>
612610
<commons-exec-version>1.3</commons-exec-version>
613611
<commons-codec-version>1.15</commons-codec-version>
614612
<httpunit-version>1.7.3</httpunit-version>
615613
<voyager-client-version>0.1.0</voyager-client-version>
616-
<jsonpath-version>2.5.0</jsonpath-version>
614+
<jsonpath-version>2.6.0</jsonpath-version>
617615
<mojo-build-helper-version>3.2.0</mojo-build-helper-version>
618616
<maven-plugin-version>1.0.0</maven-plugin-version>
619-
<assertj.core.version>3.19.0</assertj.core.version>
620-
<commons.io.version>2.8.0</commons.io.version>
621-
<awaitility-version>4.0.3</awaitility-version>
622-
<client-java-version>12.0.0</client-java-version>
623-
<junit.jupiter.version>5.7.1</junit.jupiter.version>
617+
<assertj.core.version>3.20.2</assertj.core.version>
618+
<commons.io.version>2.11.0</commons.io.version>
619+
<awaitility-version>4.1.0</awaitility-version>
620+
<client-java-version>13.0.0</client-java-version>
621+
<junit.jupiter.version>5.7.2</junit.jupiter.version>
624622
<junit.vintage.version>5.7.1</junit.vintage.version>
625623
<junit.platform.version>1.7.0</junit.platform.version>
626624
<junit.platform.surefire.version>1.3.2</junit.platform.surefire.version>
627625
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
628-
<jersey-version>3.0.1</jersey-version>
629-
<jackson-version>2.12.1</jackson-version>
630-
<jackson-databind-version>2.11.4</jackson-databind-version>
626+
<jersey-version>3.0.2</jersey-version>
627+
<jackson-version>2.12.4</jackson-version>
628+
<jackson-databind-version>2.12.4</jackson-databind-version>
631629
<dependency-check-version>6.1.5</dependency-check-version>
632630
<root-generated-swagger>${project.basedir}/src-generated-swagger</root-generated-swagger>
633631
<src-generated-swagger>${root-generated-swagger}/main/java</src-generated-swagger>

0 commit comments

Comments
 (0)