Skip to content

Commit f8e0e58

Browse files
committed
Dependency updates
1 parent d862369 commit f8e0e58

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

operator-build-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.apache.maven.plugin-tools</groupId>
3232
<artifactId>maven-plugin-annotations</artifactId>
33-
<version>3.15.1</version>
33+
<version>3.15.2</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.junit.jupiter</groupId>

operator/src/test/java/oracle/kubernetes/weblogic/domain/model/CrdSchemaGeneratorTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import java.io.IOException;
88
import java.io.InputStream;
99
import java.util.ArrayList;
10+
import java.util.Collection;
1011
import java.util.List;
1112
import java.util.Map;
12-
import java.util.Set;
1313
import java.util.stream.Collectors;
1414
import java.util.stream.Stream;
1515
import javax.annotation.Nonnull;
@@ -19,10 +19,10 @@
1919
import com.fasterxml.jackson.databind.ObjectMapper;
2020
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
2121
import com.meterware.simplestub.Memento;
22-
import com.networknt.schema.JsonSchema;
23-
import com.networknt.schema.JsonSchemaFactory;
24-
import com.networknt.schema.SpecVersion;
25-
import com.networknt.schema.ValidationMessage;
22+
import com.networknt.schema.Error;
23+
import com.networknt.schema.Schema;
24+
import com.networknt.schema.SchemaRegistry;
25+
import com.networknt.schema.dialect.Dialects;
2626
import oracle.kubernetes.json.Feature;
2727
import oracle.kubernetes.operator.tuning.TuningParameters;
2828
import oracle.kubernetes.operator.tuning.TuningParametersStub;
@@ -62,9 +62,9 @@ void tearDown() {
6262
DOMAIN_V2_SAMPLE_YAML_4, DOMAIN_V2_SAMPLE_YAML_5})
6363
void validateSchemaAgainstSamples(String fileName) throws IOException {
6464
final JsonNode jsonToValidate = convertToJson(fileName);
65-
final JsonSchema schema = createJsonSchema(DomainResource.class);
65+
final Schema schema = createJsonSchema(DomainResource.class);
6666

67-
Set<ValidationMessage> validationResult = schema.validate(jsonToValidate);
67+
Collection<Error> validationResult = schema.validate(jsonToValidate);
6868
if (!validationResult.isEmpty()) {
6969
throw new RuntimeException(toExceptionMessage(fileName, validationResult));
7070
}
@@ -101,7 +101,7 @@ private static class ClassForDisabledFeature {
101101
}
102102

103103
@Nonnull
104-
private String toExceptionMessage(String fileName, Set<ValidationMessage> validationResult) {
104+
private String toExceptionMessage(String fileName, Collection<Error> validationResult) {
105105
return Stream.concat(toPrefixStream(fileName), toFailureStream(validationResult))
106106
.collect(Collectors.joining(System.lineSeparator()));
107107
}
@@ -112,12 +112,12 @@ private Stream<String> toPrefixStream(String fileName) {
112112
}
113113

114114
@Nonnull
115-
private Stream<String> toFailureStream(Set<ValidationMessage> validationResult) {
115+
private Stream<String> toFailureStream(Collection<Error> validationResult) {
116116
return validationResult.stream().map(this::toIndentedString);
117117
}
118118

119119
@Nonnull
120-
private String toIndentedString(ValidationMessage message) {
120+
private String toIndentedString(Error message) {
121121
return " " + message;
122122
}
123123

@@ -126,8 +126,8 @@ private static Map<String, Object> createSchema(Class<?> someClass) {
126126
}
127127

128128
@SuppressWarnings("SameParameterValue")
129-
private static JsonSchema createJsonSchema(Class<?> someClass) throws JsonProcessingException {
130-
final JsonSchemaFactory schemaFactory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909);
129+
private static Schema createJsonSchema(Class<?> someClass) throws JsonProcessingException {
130+
final SchemaRegistry schemaFactory = SchemaRegistry.withDialect(Dialects.getDraft201909());
131131
final Map<String, Object> schema = createSchema(someClass);
132132
return schemaFactory.getSchema(toJsonInputStream(schema));
133133
}

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@
715715
<maven-dependency-plugin-version>3.9.0</maven-dependency-plugin-version>
716716
<maven-shade-plugin-version>3.6.1</maven-shade-plugin-version>
717717
<exec-maven-plugin-version>3.6.2</exec-maven-plugin-version>
718-
<checkstyle-version>12.1.0</checkstyle-version>
718+
<checkstyle-version>12.1.1</checkstyle-version>
719719
<directory-maven-version>1.0</directory-maven-version>
720720
<maven-jxr-plugin-version>3.6.0</maven-jxr-plugin-version>
721721
<maven-gpg-plugin-version>3.2.8</maven-gpg-plugin-version>
@@ -725,7 +725,7 @@
725725
<jms-api-version>2.0.1</jms-api-version>
726726
<kjetland-mbknor-jsonschema-version>1.0.39</kjetland-mbknor-jsonschema-version>
727727
<commons-cli-version>1.10.0</commons-cli-version>
728-
<networknt-jsonschmema-validator-version>1.5.9</networknt-jsonschmema-validator-version>
728+
<networknt-jsonschmema-validator-version>2.0.0</networknt-jsonschmema-validator-version>
729729
<commons-exec-version>1.5.0</commons-exec-version>
730730
<commons-lang3-version>3.19.0</commons-lang3-version>
731731
<commons-codec-version>1.19.0</commons-codec-version>
@@ -740,7 +740,7 @@
740740
<awaitility-version>4.3.0</awaitility-version>
741741
<client-java-version>24.0.0-legacy</client-java-version>
742742
<findbugs-version>3.0.1u2</findbugs-version>
743-
<kotlin-stdlib-version>2.2.20</kotlin-stdlib-version>
743+
<kotlin-stdlib-version>2.2.21</kotlin-stdlib-version>
744744
<okhttp-version>4.12.0</okhttp-version>
745745
<okio-version>3.16.2</okio-version>
746746
<bc-jdk18on-version>1.82</bc-jdk18on-version>

0 commit comments

Comments
 (0)