Merge pull request #621 from oracle/thirdparty-dependencies

Thirdparty dependencies

Author: rjeberhard

integration-tests/pom.xml

@@ -59,12 +59,12 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>25.1-jre</version>
+			<version>${guava-version}</version>
 		</dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.21</version>            
+            <version>${snakeyaml-version}</version>
         </dependency>
         <dependency>
             <groupId>io.kubernetes</groupId>

kubernetes/pom.xml

@@ -77,13 +77,13 @@
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
-      <version>1.19</version>
+      <version>${snakeyaml-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>22.0</version>
+      <version>${guava-version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

kubernetes/src/test/java/oracle/kubernetes/operator/utils/YamlUtils.java

@@ -48,7 +48,7 @@ private MyRepresenter() {
     }
 
     @Override
-    protected Node representMapping(Tag tag, Map<?, ?> mapping, Boolean flowStyle) {
+    protected Node representMapping(Tag tag, Map<?, ?> mapping, DumperOptions.FlowStyle flowStyle) {
       Map<?, ?> sortedMapping = new TreeMap<>(mapping);
       return super.representMapping(tag, sortedMapping, flowStyle);
     }

model/pom.xml

@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.9.6</version>
+      <version>${jackson-version}</version>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
@@ -129,19 +129,19 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.6</version>
+      <version>${jackson-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
-      <version>1.19</version>
+      <version>${snakeyaml-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
-      <version>2.9.6</version>
+      <version>${jackson-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

operator/pom.xml

@@ -252,7 +252,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.9.2</version>
+            <version>${jackson-version}</version>
             <type>jar</type>
         </dependency>
         <dependency>
@@ -261,12 +261,6 @@
             <version>1.11</version>
             <type>jar</type>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-asl</artifactId>
-            <version>1.9.11</version>
-            <type>jar</type>
-        </dependency>
         <dependency>
             <groupId>io.kubernetes</groupId>
             <artifactId>client-java</artifactId>
@@ -286,7 +280,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>22.0</version>
+            <version>${guava-version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -304,7 +298,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.19</version>
+            <version>${snakeyaml-version}</version>
         </dependency>
 
         <!-- test dependencies -->

operator/src/test/java/oracle/kubernetes/operator/utils/YamlUtils.java

@@ -48,7 +48,7 @@ private MyRepresenter() {
     }
 
     @Override
-    protected Node representMapping(Tag tag, Map<?, ?> mapping, Boolean flowStyle) {
+    protected Node representMapping(Tag tag, Map<?, ?> mapping, DumperOptions.FlowStyle flowStyle) {
       Map<?, ?> sortedMapping = new TreeMap<>(mapping);
       return super.representMapping(tag, sortedMapping, flowStyle);
     }

pom.xml

@@ -300,14 +300,16 @@
     <java.version>1.8</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.15</swagger-core-version>
-    <jodatime-version>2.9.3</jodatime-version>
+    <swagger-core-version>1.5.21</swagger-core-version>
+    <jodatime-version>2.10.1</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.26
     </jersey-version> <!-- switched from 2.23 to 2.26 to get the RestServer to work -->
-    <jackson-version>2.9.6</jackson-version>
+    <jackson-version>2.9.7</jackson-version>
+    <snakeyaml-version>1.23</snakeyaml-version>
+    <guava-version>27.0.1-jre</guava-version>
     <root-generated-swagger>${project.basedir}/src-generated-swagger</root-generated-swagger>
     <src-generated-swagger>${root-generated-swagger}/main/java</src-generated-swagger>
     <domain-swagger-file>${project.basedir}/swagger/domain.json</domain-swagger-file>