Merge pull request #1111 from oracle/dep2.3

rjeberhard · web-flow · commit 11bd9e8174ab · 2019-06-13T09:30:23.000-04:00
Dependency updates
diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml
@@ -1,32 +1,32 @@
 apiVersion: v1
 entries:
   weblogic-operator:
-  - created: 2019-06-06T12:45:16.883338-04:00
+  - created: 2019-06-12T16:35:25.497147-04:00
     description: Helm chart for configuring the WebLogic operator.
-    digest: acda3575da1ff16cfa8e55e40de99ee1b8b185ecac14c78a5229111986c953af
+    digest: 6ec022f8d7f45236f0427e1ad5dd3df90efa8efb768263df8ab539c38546cb43
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.0.tgz
     version: 2.3.0
-  - created: 2019-06-06T12:45:16.880417-04:00
+  - created: 2019-06-12T16:35:25.494982-04:00
     description: Helm chart for configuring the WebLogic operator.
     digest: bba303686cb55d84fe8c0d693a2436e7e686b028085b56e012f6381699a3911f
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.0.tgz
     version: 2.2.0
-  - created: 2019-06-06T12:45:16.874684-04:00
+  - created: 2019-06-12T16:35:25.493716-04:00
     description: Helm chart for configuring the WebLogic operator.
     digest: 391e23c0969ada5f0cd2a088ddc6f11f237f57521801ed3925db2149a8437a0d
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz
     version: "2.1"
-  - created: 2019-06-06T12:45:16.855553-04:00
+  - created: 2019-06-12T16:35:25.491582-04:00
     description: Helm chart for configuring the WebLogic operator.
     digest: 298acda78ab73db6b7ba6f2752311bfa40c65874e03fb196b70976192211c1a5
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.0.1.tgz
     version: 2.0.1
-generated: 2019-06-06T12:45:16.836847-04:00
+generated: 2019-06-12T16:35:25.489647-04:00
diff --git a/docs/charts/weblogic-operator-2.3.0.tgz b/docs/charts/weblogic-operator-2.3.0.tgz
diff --git a/operator/pom.xml b/operator/pom.xml
@@ -261,7 +261,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
+            <version>3.9</version>
         </dependency>
 
         <!-- Grizzly & jersey server side code -->
@@ -284,7 +284,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.11</version>
+            <version>1.12</version>
             <type>jar</type>
         </dependency>
         <dependency>
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/CallBuilder.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/CallBuilder.java
@@ -591,8 +591,8 @@ private com.squareup.okhttp.Call deleteConfigMapAsync(
         .deleteNamespacedConfigMapAsync(
             name,
             namespace,
-            body,
             pretty,
+            body,
             null,
             gracePeriodSeconds,
             orphanDependents,
@@ -764,8 +764,8 @@ private com.squareup.okhttp.Call deletePodAsync(
         .deleteNamespacedPodAsync(
             name,
             namespace,
-            deleteOptions,
             pretty,
+            deleteOptions,
             null,
             gracePeriodSeconds,
             orphanDependents,
@@ -933,8 +933,8 @@ private com.squareup.okhttp.Call deleteJobAsync(
         .deleteNamespacedJobAsync(
             name,
             namespace,
-            body,
             pretty,
+            body,
             null,
             gracePeriodSeconds,
             orphanDependents,
@@ -1120,8 +1120,8 @@ public V1Status deleteService(String name, String namespace, V1DeleteOptions del
           .deleteNamespacedService(
               name,
               namespace,
-              deleteOptions,
               pretty,
+              deleteOptions,
               null,
               gracePeriodSeconds,
               orphanDependents,
@@ -1142,8 +1142,8 @@ private com.squareup.okhttp.Call deleteServiceAsync(
         .deleteNamespacedServiceAsync(
             name,
             namespace,
-            deleteOptions,
             pretty,
+            deleteOptions,
             null,
             gracePeriodSeconds,
             orphanDependents,
@@ -1290,8 +1290,8 @@ public Step createPersistentVolumeAsync(
           new CoreV1Api(client)
               .deletePersistentVolume(
                   requestParams.name,
-                  (V1DeleteOptions) requestParams.body,
                   pretty,
+                  (V1DeleteOptions) requestParams.body,
                   null,
                   gracePeriodSeconds,
                   orphanDependents,
@@ -1310,8 +1310,8 @@ public V1Status deletePersistentVolume(String name, V1DeleteOptions deleteOption
               new CoreV1Api(client)
                   .deletePersistentVolumeAsync(
                       requestParams.name,
-                      (V1DeleteOptions) requestParams.body,
                       pretty,
+                      (V1DeleteOptions) requestParams.body,
                       null,
                       gracePeriodSeconds,
                       orphanDependents,
@@ -1422,8 +1422,8 @@ public Step createPersistentVolumeClaimAsync(
               .deleteNamespacedPersistentVolumeClaim(
                   requestParams.name,
                   requestParams.namespace,
-                  (V1DeleteOptions) requestParams.body,
                   pretty,
+                  (V1DeleteOptions) requestParams.body,
                   null,
                   gracePeriodSeconds,
                   orphanDependents,
@@ -1442,8 +1442,8 @@ public V1Status deletePersistentVolumeClaim(
                   .deleteNamespacedPersistentVolumeClaimAsync(
                       requestParams.name,
                       requestParams.namespace,
-                      (V1DeleteOptions) requestParams.body,
                       pretty,
+                      (V1DeleteOptions) requestParams.body,
                       null,
                       gracePeriodSeconds,
                       orphanDependents,
@@ -1525,8 +1525,8 @@ public V1Status deleteSecret(String name, String namespace, V1DeleteOptions dele
           .deleteNamespacedSecret(
               name,
               namespace,
-              deleteOptions,
               pretty,
+              deleteOptions,
               null,
               gracePeriodSeconds,
               orphanDependents,
diff --git a/pom.xml b/pom.xml
@@ -155,7 +155,7 @@
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>8.19</version>
+            <version>8.21</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -536,7 +536,7 @@
       <dependency>
         <groupId>io.kubernetes</groupId>
         <artifactId>client-java</artifactId>
-        <version>4.0.0</version>
+        <version>5.0.0</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -575,14 +575,14 @@
     <maven.version.range>[3.5.2,)</maven.version.range>
     <maven-enforcer-plugin-version>3.0.0-M2</maven-enforcer-plugin-version>
     <maven-clean-plugin-version>3.1.0</maven-clean-plugin-version>
-    <maven-compiler-plugin-version>3.8.0</maven-compiler-plugin-version>
+    <maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
     <maven-deploy-plugin-version>3.0.0-M1</maven-deploy-plugin-version>
     <maven-install-plugin-version>3.0.0-M1</maven-install-plugin-version>
-    <maven-jar-plugin-version>3.1.1</maven-jar-plugin-version>
+    <maven-jar-plugin-version>3.1.2</maven-jar-plugin-version>
     <maven-resources-plugin-version>3.1.0</maven-resources-plugin-version>
     <maven-site-plugin-version>3.7.1</maven-site-plugin-version>
     <maven-surefire-plugin-version>3.0.0-M3</maven-surefire-plugin-version>
-    <maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>
+    <maven-checkstyle-plugin-version>3.1.0</maven-checkstyle-plugin-version>
     <maven-pmd-plugin-version>3.12.0</maven-pmd-plugin-version>
     <maven-release-plugin-version>2.5.3</maven-release-plugin-version>
     <maven-javadoc-plugin-version>3.1.0</maven-javadoc-plugin-version>
@@ -591,12 +591,12 @@
     <exec-maven-plugin-version>1.6.0</exec-maven-plugin-version>
     <spotbugs-maven-plugin-version>3.1.11</spotbugs-maven-plugin-version>
     <swagger-core-version>1.5.22</swagger-core-version>
-    <jodatime-version>2.10.1</jodatime-version>
+    <jodatime-version>2.10.2</jodatime-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jersey-version>2.28</jersey-version> <!-- switched from 2.23 to 2.26 to get the RestServer to work -->
-    <jackson-version>2.9.8</jackson-version>
+    <jackson-version>2.9.9</jackson-version>
     <snakeyaml-version>1.24</snakeyaml-version>
     <guava-version>27.0.1-jre</guava-version>
     <root-generated-swagger>${project.basedir}/src-generated-swagger</root-generated-swagger>
