Update proton-j and jackson lib versions. (#71)

microsoft · May 29, 2019 · 89f1e98 · 89f1e98
1 parent 6eac1d2
commit 89f1e98
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/DataProcessing/Spark.nuspec b/DataProcessing/Spark.nuspec
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Microsoft.DataX.Spark</id>
@@ -26,7 +26,7 @@
 <file src="**\datax-keyvault_2.3_2.11-1.1.0-SNAPSHOT-with-dependencies.jar" target="lib" />
 <file src="**\datax-udf-samples_2.3_2.11-1.1.0-SNAPSHOT.jar" target="lib" />
 <file src="**\java-uuid-generator-3.1.5.jar" target="lib" />
-<file src="**\proton-j-0.27.1.jar" target="lib" />
+<file src="**\proton-j-0.31.0.jar" target="lib" />
 <file src="**\scala-java8-compat_2.11-0.9.0.jar" target="lib" />
 <file src="**\kafka-clients-2.0.0.jar" target="lib" />
 <file src="**\spark-streaming-kafka-0-10_2.11-2.4.0.jar" target="lib" />

diff --git a/DataProcessing/datax-keyvault/pom.xml b/DataProcessing/datax-keyvault/pom.xml
@@ -95,12 +95,12 @@ SOFTWARE
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.9.8</version>
+      <version>2.9.9</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.8</version>
+      <version>2.9.9</version>
     </dependency>
     <!--Testing-->
     <dependency>

diff --git a/DataProcessing/datax-utility/pom.xml b/DataProcessing/datax-utility/pom.xml
@@ -155,7 +155,7 @@ SOFTWARE
         <dependency>
           <groupId>org.apache.qpid</groupId>
           <artifactId>proton-j</artifactId>
-          <version>0.27.1</version>
+          <version>0.31.0</version>
         </dependency>
         <dependency>
           <groupId>org.scala-lang.modules</groupId>

diff --git a/DeploymentCloud/Deployment.Common/CosmosDB/commons.json b/DeploymentCloud/Deployment.Common/CosmosDB/commons.json
@@ -142,7 +142,7 @@
 								"wasbs:///datax/bin/azure-keyvault-webkey-1.1.jar",
 								"wasbs:///datax/bin/datax-keyvault_2.3_2.11-1.1.0-SNAPSHOT-with-dependencies.jar",
 								"wasbs:///datax/bin/java-uuid-generator-3.1.5.jar",
-								"wasbs:///datax/bin/proton-j-0.27.1.jar",
+								"wasbs:///datax/bin/proton-j-0.31.0.jar",
 								"wasbs:///datax/bin/scala-java8-compat_2.11-0.9.0.jar"
 				],
         "driverMemory": "1024m",

diff --git a/Services/DataX.Config/CommonData.Templates/defaultSparkJob.json b/Services/DataX.Config/CommonData.Templates/defaultSparkJob.json
@@ -19,7 +19,7 @@
       "wasbs:///datax/bin/azure-eventhubs-spark_2.11-2.3.6.jar",
       "wasbs:///datax/bin/azure-keyvault-webkey-1.1.jar",
       "wasbs:///datax/bin/java-uuid-generator-3.1.5.jar",
-      "wasbs:///datax/bin/proton-j-0.27.1.jar",
+      "wasbs:///datax/bin/proton-j-0.31.0.jar",
       "wasbs:///datax/bin/scala-java8-compat_2.11-0.9.0.jar"
     ],
     "driverMemory": "6400m",

diff --git a/Services/DataX.Config/DataX.Config.Local.Test/Resource/localSparkJobTemplate.json b/Services/DataX.Config/DataX.Config.Local.Test/Resource/localSparkJobTemplate.json
@@ -16,7 +16,7 @@
       "${localRoot}/bin/azure-eventhubs-1.2.1.jar",
       "${localRoot}/bin/azure-eventhubs-spark_2.11-2.3.6.jar",
       "${localRoot}/bin/hdinsight-keyvault-authenticator-1.0.7-with-dependencies.jar",
-      "${localRoot}/bin/proton-j-0.27.1.jar"
+      "${localRoot}/bin/proton-j-0.31.0.jar"
 
     ],
     "driverMemory": "6400m",

diff --git a/Services/DataX.Config/DataX.Config.Local/Resources/localSparkJobTemplate.json b/Services/DataX.Config/DataX.Config.Local/Resources/localSparkJobTemplate.json
@@ -16,7 +16,7 @@
       "${localRoot}/bin/azure-eventhubs-1.2.1.jar",
       "${localRoot}/bin/azure-eventhubs-spark_2.11-2.3.6.jar",
       "${localRoot}/bin/datax-keyvault_2.3_2.11-1.1.0-SNAPSHOT-with-dependencies.jar",
-      "${localRoot}/bin/proton-j-0.27.1.jar"
+      "${localRoot}/bin/proton-j-0.31.0.jar"
 
     ],
     "driverMemory": "2000m",