Skip to content

Commit d2b5536

Browse files
committed
Dependency updates
1 parent fecf068 commit d2b5536

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ private static String getHostAndPortOKE() {
13031303
"Getting Nginx loadbalancer service node port failed");
13041304

13051305
hostAndPort = getServiceExtIPAddrtOke(nginxServiceName, nginxNamespace) != null
1306-
? getServiceExtIPAddrtOke(nginxServiceName, nginxNamespace) : K8S_NODEPORT_HOST + ":" + nginxNodePort;
1306+
? getServiceExtIPAddrtOke(nginxServiceName, nginxNamespace) : K8S_NODEPORT_HOST + ":" + nginxNodePort;
13071307
return hostAndPort;
13081308
}
13091309
}

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,10 @@ void testDomainK8sEventsNonExistingManagedServer() {
265265
timestamp = now();
266266
logger.info("patch the domain resource with non-existing managed server");
267267
patchStr = "[{\"op\": \"add\",\"path\": \""
268-
+ "/spec/managedServers/-\", \"value\": "
269-
+ "{\"serverName\" : \"nonexisting-ms\", "
270-
+ "\"serverStartPolicy\": \"IfNeeded\"}"
271-
+ "}]";
268+
+ "/spec/managedServers/-\", \"value\": "
269+
+ "{\"serverName\" : \"nonexisting-ms\", "
270+
+ "\"serverStartPolicy\": \"IfNeeded\"}"
271+
+ "}]";
272272
logger.info("Updating domain configuration using patch string: {0}\n", patchStr);
273273
patch = new V1Patch(patchStr);
274274
assertTrue(patchDomainCustomResource(domainUid, domainNamespace3, patch, V1Patch.PATCH_FORMAT_JSON_PATCH),

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonLBTestUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -786,12 +786,12 @@ public static void verifyClusterLoadbalancing(String domainUid,
786786
if (hostRouting) {
787787
curlRequest = OKE_CLUSTER_PRIVATEIP ? String.format("curl -g --show-error -ks --noproxy '*' -v "
788788
+ "-H 'host: %s' %s://%s/" + uri, ingressHostName, protocol, host)
789-
: String.format("curl -g --show-error -ks --noproxy '*' "
789+
: String.format("curl -g --show-error -ks --noproxy '*' "
790790
+ "-H 'host: %s' %s://%s/" + uri, ingressHostName, protocol, getHostAndPort(host, lbPort));
791791
} else {
792792
curlRequest = OKE_CLUSTER_PRIVATEIP ? String.format("curl -g --show-error -ks --noproxy '*' -v "
793793
+ "%s://%s" + locationString + "/" + uri, protocol, host)
794-
: String.format("curl -g --show-error -ks --noproxy '*' "
794+
: String.format("curl -g --show-error -ks --noproxy '*' "
795795
+ "%s://%s" + locationString + "/" + uri, protocol, getHostAndPort(host, lbPort));
796796
}
797797

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/MacroSubstitutor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2018, 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2018, 2025, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.kubernetes.operator.wlsconfig;
@@ -116,8 +116,8 @@ private String resolveMacroValue(String macro) {
116116
case "machineName" -> machineName;
117117
case "id" -> "" + id;
118118
default ->
119-
// Look for macro in ConfigurationProperty or as system property
120-
System.getProperty(macro);
119+
// Look for macro in ConfigurationProperty or as system property
120+
System.getProperty(macro);
121121
};
122122
}
123123
}

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@
708708
<maven-dependency-plugin-version>3.8.1</maven-dependency-plugin-version>
709709
<maven-shade-plugin-version>3.6.0</maven-shade-plugin-version>
710710
<exec-maven-plugin-version>3.5.0</exec-maven-plugin-version>
711-
<checkstyle-version>10.23.1</checkstyle-version>
711+
<checkstyle-version>10.24.0</checkstyle-version>
712712
<directory-maven-version>1.0</directory-maven-version>
713713
<maven-jxr-plugin-version>3.6.0</maven-jxr-plugin-version>
714714
<maven-gpg-plugin-version>3.2.7</maven-gpg-plugin-version>
@@ -718,8 +718,8 @@
718718
<jms-api-version>2.0.1</jms-api-version>
719719
<kjetland-mbknor-jsonschema-version>1.0.39</kjetland-mbknor-jsonschema-version>
720720
<commons-cli-version>1.9.0</commons-cli-version>
721-
<networknt-jsonschmema-validator-version>1.5.6</networknt-jsonschmema-validator-version>
722-
<commons-exec-version>1.4.0</commons-exec-version>
721+
<networknt-jsonschmema-validator-version>1.5.7</networknt-jsonschmema-validator-version>
722+
<commons-exec-version>1.5.0</commons-exec-version>
723723
<commons-codec-version>1.18.0</commons-codec-version>
724724
<httpunit-version>1.7.3</httpunit-version>
725725
<voyager-client-version>0.1.0</voyager-client-version>

0 commit comments

Comments
 (0)