Skip to content

Commit 1d9d1e5

Browse files
committed
Dependency updates
1 parent ff314fc commit 1d9d1e5

File tree

6 files changed

+19
-20
lines changed

6 files changed

+19
-20
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
@@ -1243,7 +1243,7 @@ private static String getHostAndPortOKE() {
12431243
"Getting Nginx loadbalancer service node port failed");
12441244

12451245
hostAndPort = getServiceExtIPAddrtOke(nginxServiceName, nginxNamespace) != null
1246-
? getServiceExtIPAddrtOke(nginxServiceName, nginxNamespace) : K8S_NODEPORT_HOST + ":" + nginxNodePort;
1246+
? getServiceExtIPAddrtOke(nginxServiceName, nginxNamespace) : K8S_NODEPORT_HOST + ":" + nginxNodePort;
12471247
return hostAndPort;
12481248
}
12491249
}

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

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

integration-tests/src/test/java/oracle/weblogic/kubernetes/assertions/impl/Kubernetes.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,7 @@ public static V1Service getService(
580580
}
581581
V1ServiceList v1ServiceList = null;
582582
try {
583-
v1ServiceList
584-
= coreV1Api.listServiceForAllNamespaces(
583+
v1ServiceList = coreV1Api.listServiceForAllNamespaces(
585584
Boolean.FALSE, // allowWatchBookmarks requests watch events with type "BOOKMARK".
586585
null, // continue to query when there is more results to return.
587586
null, // selector to restrict the list of returned objects by their fields

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -785,15 +785,15 @@ public static void verifyClusterLoadbalancing(String domainUid,
785785
+ ((host != null) && host.contains(":") ? "&ipv6=true" : "&ipv6=false") + "\"";
786786
if (hostRouting) {
787787
curlRequest = OKE_CLUSTER_PRIVATEIP
788-
? String.format("curl -g --show-error -ks --noproxy '*' -v -H 'host: %s' %s://%s/%s",
789-
ingressHostName, protocol, host, uri)
790-
: String.format("curl -g --show-error -ks --noproxy '*' -H 'host: %s' %s://%s/%s",
791-
ingressHostName, protocol, getHostAndPort(host, lbPort), uri);
788+
? String.format("curl -g --show-error -ks --noproxy '*' -v -H 'host: %s' %s://%s/%s",
789+
ingressHostName, protocol, host, uri)
790+
: String.format("curl -g --show-error -ks --noproxy '*' -H 'host: %s' %s://%s/%s",
791+
ingressHostName, protocol, getHostAndPort(host, lbPort), uri);
792792
} else {
793793
curlRequest = OKE_CLUSTER_PRIVATEIP
794-
? String.format("curl -g --show-error -ks --noproxy '*' -v %s://%s%s/%s", protocol, host, locationString, uri)
795-
: String.format("curl -g --show-error -ks --noproxy '*' %s://%s%s/%s",
796-
protocol, getHostAndPort(host, lbPort),locationString, uri);
794+
? String.format("curl -g --show-error -ks --noproxy '*' -v %s://%s%s/%s", protocol, host, locationString, uri)
795+
: String.format("curl -g --show-error -ks --noproxy '*' %s://%s%s/%s",
796+
protocol, getHostAndPort(host, lbPort),locationString, uri);
797797
}
798798

799799
List<String> managedServers = new ArrayList<>();

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
@@ -710,7 +710,7 @@
710710
<maven-dependency-plugin-version>3.8.1</maven-dependency-plugin-version>
711711
<maven-shade-plugin-version>3.6.0</maven-shade-plugin-version>
712712
<exec-maven-plugin-version>3.5.0</exec-maven-plugin-version>
713-
<checkstyle-version>10.23.1</checkstyle-version>
713+
<checkstyle-version>10.24.0</checkstyle-version>
714714
<directory-maven-version>1.0</directory-maven-version>
715715
<maven-jxr-plugin-version>3.6.0</maven-jxr-plugin-version>
716716
<maven-gpg-plugin-version>3.2.7</maven-gpg-plugin-version>
@@ -720,8 +720,8 @@
720720
<jms-api-version>2.0.1</jms-api-version>
721721
<kjetland-mbknor-jsonschema-version>1.0.39</kjetland-mbknor-jsonschema-version>
722722
<commons-cli-version>1.9.0</commons-cli-version>
723-
<networknt-jsonschmema-validator-version>1.5.6</networknt-jsonschmema-validator-version>
724-
<commons-exec-version>1.4.0</commons-exec-version>
723+
<networknt-jsonschmema-validator-version>1.5.7</networknt-jsonschmema-validator-version>
724+
<commons-exec-version>1.5.0</commons-exec-version>
725725
<commons-codec-version>1.18.0</commons-codec-version>
726726
<httpunit-version>1.7.3</httpunit-version>
727727
<voyager-client-version>0.1.0</voyager-client-version>

0 commit comments

Comments
 (0)