Skip to content

Commit ac7948d

Browse files
committed
First phase updating of dependencies
1 parent 9da9e6b commit ac7948d

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1646,7 +1646,7 @@ public static void checkServiceDoesNotExist(String serviceName, String namespace
16461646
* @param domainName Name of domain to which cluster belongs
16471647
* @param namespace cluster's namespace
16481648
* @param replicaCount replica count value to match
1649-
* @return
1649+
* @return true, if the cluster replica count is matched
16501650
*/
16511651
public static boolean checkClusterReplicaCountMatches(String clusterName, String domainName,
16521652
String namespace, Integer replicaCount) throws ApiException {

operator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<plugin>
3131
<groupId>pl.project13.maven</groupId>
3232
<artifactId>git-commit-id-plugin</artifactId>
33-
<version>2.2.6</version>
33+
<version>${git-commit-id-plugin-version}</version>
3434
<executions>
3535
<execution>
3636
<id>get-the-git-infos</id>

operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ protected Step patchPod(V1Pod currentPod, Step next) {
370370

371371
return new CallBuilder()
372372
.patchPodAsync(getPodName(), getNamespace(), getDomainUid(),
373-
new V1Patch(patchBuilder.build().toString()), patchResponse(next));
373+
new V1Patch(patchBuilder.build().toString()), patchResponse(next));
374374
}
375375

376376
private Map<String, String> getNonHashedPodLabels() {

operator/src/main/java/oracle/kubernetes/operator/steps/ActionResponseStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public NextAction onSuccess(Packet packet, CallResponse<T> callResponse) {
2727
return callResponse.getResult() == null
2828
? doNext(packet)
2929
: doNext(createSuccessStep(callResponse.getResult(),
30-
new ContinueOrNextStep(callResponse, getNext())), packet);
30+
new ContinueOrNextStep(callResponse, getNext())), packet);
3131
}
3232

3333
private class ContinueOrNextStep extends Step {

pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
1+
<!-- Copyright (c) 2017, 2021, 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
<project xmlns="http://maven.apache.org/POM/4.0.0"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -271,7 +271,7 @@
271271
<author>false</author>
272272
<notimestamp>true</notimestamp>
273273
<bottom>
274-
<![CDATA[<p>Copyright (c) 2018, {currentYear}, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="https://oss.oracle.com/licenses/upl">https://oss.oracle.com/licenses/upl</a>.<p>]]></bottom>
274+
<![CDATA[<p>Copyright (c) 2018, {currentYear}, <a href="http://www.oracle.com">Oracle</a> and/or its affiliates. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="https://oss.oracle.com/licenses/upl">https://oss.oracle.com/licenses/upl</a>.<p>]]></bottom>
275275
<doctitle>Oracle WebLogic Server Kubernetes Operator API</doctitle>
276276
</configuration>
277277
</execution>
@@ -672,8 +672,8 @@
672672
<maven-dependency-plugin-version>3.1.2</maven-dependency-plugin-version>
673673
<exec-maven-plugin-version>3.0.0</exec-maven-plugin-version>
674674
<spotbugs-maven-plugin-version>4.1.4</spotbugs-maven-plugin-version>
675-
<spotbugs-version>4.1.4</spotbugs-version>
676-
<checkstyle-version>8.36.2</checkstyle-version>
675+
<spotbugs-version>4.2.0</spotbugs-version>
676+
<checkstyle-version>8.38</checkstyle-version>
677677
<pmd-java-version>6.21.0</pmd-java-version>
678678
<directory-maven-version>0.1</directory-maven-version>
679679
<maven-jxr-plugin-version>3.0.0</maven-jxr-plugin-version>
@@ -710,7 +710,8 @@
710710
<src-generated-swagger>${root-generated-swagger}/main/java</src-generated-swagger>
711711
<domain-swagger-file>${project.basedir}/swagger/domain.json</domain-swagger-file>
712712
<skip.unit.tests>false</skip.unit.tests>
713-
<jacoco.version>0.8.5</jacoco.version>
713+
<jacoco.version>0.8.6</jacoco.version>
714+
<git-commit-id-plugin-version>4.0.0</git-commit-id-plugin-version>
714715
<aggregate.report.dir>buildtime-reports/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
715716
<checkstyle.config.location>${root.basedir}/build-tools/checkstyle/customized_google_checks.xml</checkstyle.config.location>
716717
</properties>

0 commit comments

Comments
 (0)