Skip to content

Update dependencies including to the Kubernetes Java Client 13 #2466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 19, 2021
Merged

Update dependencies including to the Kubernetes Java Client 13 #2466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e2c59bd
Update dependencies
rjeberhard Jul 16, 2021
6526cf6
Filter Jetbrains libraries
rjeberhard Jul 16, 2021
a94e70e
Restore fluent
rjeberhard Jul 16, 2021
1a04173
Restore kotlin
rjeberhard Jul 19, 2021
f7be096
Merge remote-tracking branch 'origin/main' into apollo-13
rjeberhard Jul 19, 2021
1e9c63f
Use --add-opens
rjeberhard Jul 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-tools/checkstyle/customized_google_checks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
</module>
<module name="JavadocMethod">
<property name="scope" value="public"/>
<property name="accessModifiers" value="public"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="allowedAnnotations" value="Override, Test"/>
Expand Down
12 changes: 2 additions & 10 deletions integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.47.1</version>
<version>2.51.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -70,12 +70,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>
--illegal-access=permit
</argLine>
<encoding>UTF-8</encoding>
<argLine>
--illegal-access=permit
--add-opens java.base/java.time=ALL-UNNAMED
</argLine>
<argLine>${failsafeArgLine}</argLine>
<failIfNoTests>false</failIfNoTests>
Expand Down Expand Up @@ -139,11 +136,6 @@
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>${junit.platform.surefire.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<include>**/*AT.java</include>
</includes>
<argLine>
--illegal-access=permit
--add-opens java.base/java.time=ALL-UNNAMED
</argLine>
</configuration>
<executions>
Expand Down
6 changes: 3 additions & 3 deletions operator-build-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.6.3</version>
<version>3.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand All @@ -43,7 +43,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.1</version>
<version>9.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
10 changes: 8 additions & 2 deletions operator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<includes>
<exclude>**/*Test.java</exclude>
</includes>
<argLine>--illegal-access=permit</argLine>
<argLine>--add-opens java.base/java.time=ALL-UNNAMED</argLine>
</configuration>
</plugin>

Expand Down Expand Up @@ -235,7 +235,8 @@
<configuration>
<executable>java</executable>
<arguments>
<argument>--illegal-access=permit</argument>
<argument>--add-opens</argument>
<argument>java.base/java.time=ALL-UNNAMED</argument>
<argument>-classpath</argument>
<!-- automatically creates the classpath using all project dependencies,
also adding the project build directory -->
Expand Down Expand Up @@ -329,6 +330,11 @@
<artifactId>client-java</artifactId>
</dependency>

<dependency>
<groupId>io.kubernetes</groupId>
<artifactId>client-java-api-fluent</artifactId>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>com.appscode.voyager</groupId>
Expand Down
10 changes: 9 additions & 1 deletion operator/src/main/java/oracle/kubernetes/operator/helpers/CrdHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import oracle.kubernetes.operator.work.Step;
import oracle.kubernetes.weblogic.domain.model.DomainSpec;
import oracle.kubernetes.weblogic.domain.model.DomainStatus;
import org.yaml.snakeyaml.constructor.SafeConstructor;

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

Expand Down Expand Up @@ -205,7 +206,14 @@ static String getVersionFromCrdSchemaFileName(String name) {
}

static V1CustomResourceValidation getValidationFromCrdSchemaFile(String fileContents) {
return Yaml.getSnakeYaml().loadAs(new StringReader(fileContents), V1CustomResourceValidation.class);
return getSnakeYaml(V1CustomResourceValidation.class)
.loadAs(new StringReader(fileContents), V1CustomResourceValidation.class);
}

private static org.yaml.snakeyaml.Yaml getSnakeYaml(Class<?> type) {
return type != null ? new org.yaml.snakeyaml.Yaml(new Yaml.CustomConstructor(type),
new Yaml.CustomRepresenter()) :
new org.yaml.snakeyaml.Yaml(new SafeConstructor(), new Yaml.CustomRepresenter());
}

static V1CustomResourceSubresources createSubresources() {
Expand Down
44 changes: 21 additions & 23 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,6 @@
<version>${maven-surefire-plugin-version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>surefire-logger-api</artifactId>
<version>${surefire-logger-api-version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down Expand Up @@ -441,6 +435,11 @@
<artifactId>client-java-extended</artifactId>
<version>${client-java-version}</version>
</dependency>
<dependency>
<groupId>io.kubernetes</groupId>
<artifactId>client-java-api-fluent</artifactId>
<version>${client-java-version}</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-junit</artifactId>
Expand Down Expand Up @@ -589,45 +588,44 @@
<maven-jar-plugin-version>3.2.0</maven-jar-plugin-version>
<maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
<maven-site-plugin-version>3.9.1</maven-site-plugin-version>
<maven-surefire-plugin-version>2.22.2</maven-surefire-plugin-version>
<surefire-logger-api-version>2.22.2</surefire-logger-api-version>
<maven-surefire-plugin-version>3.0.0-M5</maven-surefire-plugin-version>
<maven-checkstyle-plugin-version>3.1.2</maven-checkstyle-plugin-version>
<maven-release-plugin-version>3.0.0-M1</maven-release-plugin-version>
<maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
<maven-failsafe-plugin-version>3.0.0-M3</maven-failsafe-plugin-version>
<maven-failsafe-plugin-version>3.0.0-M5</maven-failsafe-plugin-version>
<maven-dependency-plugin-version>3.1.2</maven-dependency-plugin-version>
<exec-maven-plugin-version>3.0.0</exec-maven-plugin-version>
<spotbugs-maven-plugin-version>4.2.0</spotbugs-maven-plugin-version>
<spotbugs-version>4.2.1</spotbugs-version>
<checkstyle-version>8.41</checkstyle-version>
<directory-maven-version>0.1</directory-maven-version>
<spotbugs-version>4.3.0</spotbugs-version>
<checkstyle-version>8.44</checkstyle-version>
<directory-maven-version>0.3.1</directory-maven-version>
<maven-jxr-plugin-version>3.0.0</maven-jxr-plugin-version>
<maven-gpg-plugin-version>1.6</maven-gpg-plugin-version>
<hamcrest-junit-version>2.0.0.0</hamcrest-junit-version>
<simplestub-version>1.3.0</simplestub-version>
<jakarta-json-version>2.0.0</jakarta-json-version>
<jakarta-json-version>2.0.1</jakarta-json-version>
<jms-api-version>2.0.1</jms-api-version>
<kjetland-mbknor-jsonschema-version>1.0.39</kjetland-mbknor-jsonschema-version>
<networknt-jsonschmema-validator-version>1.0.49</networknt-jsonschmema-validator-version>
<networknt-jsonschmema-validator-version>1.0.57</networknt-jsonschmema-validator-version>
<commons-exec-version>1.3</commons-exec-version>
<commons-codec-version>1.15</commons-codec-version>
<httpunit-version>1.7.3</httpunit-version>
<voyager-client-version>0.1.0</voyager-client-version>
<jsonpath-version>2.5.0</jsonpath-version>
<jsonpath-version>2.6.0</jsonpath-version>
<mojo-build-helper-version>3.2.0</mojo-build-helper-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<assertj.core.version>3.19.0</assertj.core.version>
<commons.io.version>2.8.0</commons.io.version>
<awaitility-version>4.0.3</awaitility-version>
<client-java-version>12.0.0</client-java-version>
<junit.jupiter.version>5.7.1</junit.jupiter.version>
<assertj.core.version>3.20.2</assertj.core.version>
<commons.io.version>2.11.0</commons.io.version>
<awaitility-version>4.1.0</awaitility-version>
<client-java-version>13.0.0</client-java-version>
<junit.jupiter.version>5.7.2</junit.jupiter.version>
<junit.vintage.version>5.7.1</junit.vintage.version>
<junit.platform.version>1.7.0</junit.platform.version>
<junit.platform.surefire.version>1.3.2</junit.platform.surefire.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey-version>3.0.1</jersey-version>
<jackson-version>2.12.1</jackson-version>
<jackson-databind-version>2.11.4</jackson-databind-version>
<jersey-version>3.0.2</jersey-version>
<jackson-version>2.12.4</jackson-version>
<jackson-databind-version>2.12.4</jackson-databind-version>
<dependency-check-version>6.1.5</dependency-check-version>
<root-generated-swagger>${project.basedir}/src-generated-swagger</root-generated-swagger>
<src-generated-swagger>${root-generated-swagger}/main/java</src-generated-swagger>
Expand Down