From 7d913a2ba18b1e3d0cfc08f408c81e81c7308481 Mon Sep 17 00:00:00 2001
From: Owen O'Malley <omalley@apache.org>
Date: Fri, 25 Sep 2020 14:00:13 -0700
Subject: [PATCH] Prepraring for release 1.5.12

Signed-off-by: Owen O'Malley <omalley@apache.org>
---
 CMakeLists.txt         |  2 +-
 java/CMakeLists.txt    |  5 ++++-
 java/bench/pom.xml     |  4 ++--
 java/core/pom.xml      |  2 +-
 java/examples/pom.xml  |  2 +-
 java/mapreduce/pom.xml |  2 +-
 java/pom.xml           | 10 +++++-----
 java/shims/pom.xml     |  2 +-
 java/tools/pom.xml     |  2 +-
 9 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a10bbea967..3a49e60d74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ project(ORC)
 # Version number of package
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "5")
-SET(CPACK_PACKAGE_VERSION_PATCH "12-SNAPSHOT")
+SET(CPACK_PACKAGE_VERSION_PATCH "12")
 SET(ORC_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules")
 
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index be48f0ca9b..5e85895164 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -17,9 +17,12 @@ set(NO_DOWNLOAD_MSG
 # set the version in the POM file to match the CMake version string
 execute_process(COMMAND mvn versions:set -DnewVersion=${ORC_VERSION}
                                          -DgenerateBackupPoms=false
-                                         -Pbenchmark
                                          ${NO_DOWNLOAD_MSG}
                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+execute_process(COMMAND mvn versions:set -DnewVersion=${ORC_VERSION}
+                                         -DgenerateBackupPoms=false
+                                         ${NO_DOWNLOAD_MSG}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bench)
 
 set(ORC_JARS
   ${CMAKE_CURRENT_BINARY_DIR}/shims/orc-shims-${ORC_VERSION}.jar
diff --git a/java/bench/pom.xml b/java/bench/pom.xml
index 608f8dc971..47a93ac77a 100644
--- a/java/bench/pom.xml
+++ b/java/bench/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.apache.orc</groupId>
   <artifactId>orc-benchmarks</artifactId>
-  <version>1.5.11</version>
+  <version>1.5.12</version>
   <packaging>jar</packaging>
   <name>ORC Benchmarks</name>
   <description>
@@ -40,7 +40,7 @@
     <hadoop.version>2.7.3</hadoop.version>
     <hive.version>2.3.3</hive.version>
     <jmh.version>1.20</jmh.version>
-    <orc.version>1.5.9</orc.version>
+    <orc.version>${project.version}</orc.version>
     <parquet.version>1.9.0</parquet.version>
     <storage-api.version>2.5.0</storage-api.version>
     <zookeeper.version>3.4.6</zookeeper.version>
diff --git a/java/core/pom.xml b/java/core/pom.xml
index 91bae3b0bf..e0d4e0a324 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.orc</groupId>
     <artifactId>orc</artifactId>
-    <version>1.5.12-SNAPSHOT</version>
+    <version>1.5.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/examples/pom.xml b/java/examples/pom.xml
index 7e1130b243..0cfca6dbc6 100644
--- a/java/examples/pom.xml
+++ b/java/examples/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.orc</groupId>
     <artifactId>orc</artifactId>
-    <version>1.5.12-SNAPSHOT</version>
+    <version>1.5.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/mapreduce/pom.xml b/java/mapreduce/pom.xml
index 8149d4db19..03a54e8bdb 100644
--- a/java/mapreduce/pom.xml
+++ b/java/mapreduce/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.orc</groupId>
     <artifactId>orc</artifactId>
-    <version>1.5.12-SNAPSHOT</version>
+    <version>1.5.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/pom.xml b/java/pom.xml
index 2d59793c36..8ae4f42dd5 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -21,7 +21,7 @@
   </parent>
   <groupId>org.apache.orc</groupId>
   <artifactId>orc</artifactId>
-  <version>1.5.12-SNAPSHOT</version>
+  <version>1.5.12</version>
   <packaging>pom</packaging>
 
   <name>Apache ORC</name>
@@ -352,7 +352,7 @@
       <dependency>
         <groupId>org.apache.orc</groupId>
         <artifactId>orc-shims</artifactId>
-        <version>1.5.12-SNAPSHOT</version>
+        <version>1.5.12</version>
         <exclusions>
           <exclusion>
             <groupId>org.apache.hadoop</groupId>
@@ -367,17 +367,17 @@
       <dependency>
         <groupId>org.apache.orc</groupId>
         <artifactId>orc-core</artifactId>
-        <version>1.5.12-SNAPSHOT</version>
+        <version>1.5.12</version>
       </dependency>
       <dependency>
         <groupId>org.apache.orc</groupId>
         <artifactId>orc-mapreduce</artifactId>
-        <version>1.5.12-SNAPSHOT</version>
+        <version>1.5.12</version>
       </dependency>
       <dependency>
         <groupId>org.apache.orc</groupId>
         <artifactId>orc-tools</artifactId>
-        <version>1.5.12-SNAPSHOT</version>
+        <version>1.5.12</version>
       </dependency>
 
       <!-- inter-project depedencies -->
diff --git a/java/shims/pom.xml b/java/shims/pom.xml
index 33f21e3aaa..7098e9f2bf 100644
--- a/java/shims/pom.xml
+++ b/java/shims/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.orc</groupId>
     <artifactId>orc</artifactId>
-    <version>1.5.12-SNAPSHOT</version>
+    <version>1.5.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index d712cc945d..8fd7f63836 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.orc</groupId>
     <artifactId>orc</artifactId>
-    <version>1.5.12-SNAPSHOT</version>
+    <version>1.5.12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>