This is an automated email from the ASF dual-hosted git repository.

dongjoon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/orc.git


The following commit(s) were added to refs/heads/main by this push:
     new dcb522b  ORC-807: Separate Jackson Versions in benchmark module (#709)
dcb522b is described below

commit dcb522bca0fa08320ce781b800df68bb995f24d6
Author: belugabehr <[email protected]>
AuthorDate: Sat Jun 12 19:30:54 2021 -0400

    ORC-807: Separate Jackson Versions in benchmark module (#709)
    
    ### What changes were proposed in this pull request?
    
    Be explicit about Jackson versioning for the various modules.
    
    ### Why are the changes needed?
    
    Allow main ORC components to use different Jackson version than bench-spark.
    
    ### How was this patch tested?
    
    Manually build and test benchmark module.
---
 java/bench/pom.xml       | 13 ++++++++++++-
 java/bench/spark/pom.xml | 10 ++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/java/bench/pom.xml b/java/bench/pom.xml
index 6c9c525..e8fe329 100644
--- a/java/bench/pom.xml
+++ b/java/bench/pom.xml
@@ -42,6 +42,7 @@
     <orc.version>${project.version}</orc.version>
     <parquet.version>1.12.0</parquet.version>
     <spark.version>3.1.2</spark.version>
+    <jackson.version>2.12.2</jackson.version>
   </properties>
 
   <modules>
@@ -55,7 +56,17 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>2.12.2</version>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+        <version>${jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>com.google.auto.service</groupId>
diff --git a/java/bench/spark/pom.xml b/java/bench/spark/pom.xml
index 8254d88..1ace193 100644
--- a/java/bench/spark/pom.xml
+++ b/java/bench/spark/pom.xml
@@ -36,7 +36,9 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     
<maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation>
-    <jackson.version>2.10.0</jackson.version>
+
+    <!-- Spark Jackson version may not be same as ORC -->
+    <spark.jackson.version>2.10.0</spark.jackson.version>
   </properties>
 
   <dependencies>
@@ -138,17 +140,17 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
+      <version>${spark.jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
+      <version>${spark.jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>${jackson.version}</version>
+      <version>${spark.jackson.version}</version>
     </dependency>
   </dependencies>
 

Reply via email to