You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2016/06/30 22:00:16 UTC
[3/7] orc git commit: Updating the versions of storage api for
merging changes from Hive.
Updating the versions of storage api for merging changes from Hive.
Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/cbedf88d
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/cbedf88d
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/cbedf88d
Branch: refs/heads/master
Commit: cbedf88d19951f6d93d0edcb333ec79231cd8dc9
Parents: d9d529b
Author: Owen O'Malley <om...@apache.org>
Authored: Thu Jun 30 11:02:06 2016 -0700
Committer: Owen O'Malley <om...@apache.org>
Committed: Thu Jun 30 14:33:57 2016 -0700
----------------------------------------------------------------------
java/CMakeLists.txt | 2 +-
java/pom.xml | 2 +-
java/storage-api/pom.xml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/orc/blob/cbedf88d/java/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index b1be1dc..e8ca7ff 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -15,7 +15,7 @@ execute_process(COMMAND mvn versions:set -DnewVersion=${ORC_VERSION}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
set(ORC_JARS
- ${CMAKE_CURRENT_BINARY_DIR}/storage-api/hive-storage-api-2.1.0-pre-orc.jar
+ ${CMAKE_CURRENT_BINARY_DIR}/storage-api/hive-storage-api-2.1.1-pre-orc.jar
${CMAKE_CURRENT_BINARY_DIR}/core/orc-core-${ORC_VERSION}.jar
${CMAKE_CURRENT_BINARY_DIR}/mapreduce/orc-mapreduce-${ORC_VERSION}.jar
)
http://git-wip-us.apache.org/repos/asf/orc/blob/cbedf88d/java/pom.xml
----------------------------------------------------------------------
diff --git a/java/pom.xml b/java/pom.xml
index f707cb6..01fdf04 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -69,7 +69,7 @@
<test.tmp.dir>${project.build.directory}/testing-tmp</test.tmp.dir>
<hadoop.version>2.6.0</hadoop.version>
- <storage-api.version>2.1.0-pre-orc</storage-api.version>
+ <storage-api.version>2.1.1-pre-orc</storage-api.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/orc/blob/cbedf88d/java/storage-api/pom.xml
----------------------------------------------------------------------
diff --git a/java/storage-api/pom.xml b/java/storage-api/pom.xml
index 86463e6..fae7e9a 100644
--- a/java/storage-api/pom.xml
+++ b/java/storage-api/pom.xml
@@ -25,8 +25,8 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-storage-api</artifactId>
<!-- remove our custom version of storage-api once we get the changes
- released as hive 2.1.0 -->
- <version>2.1.0-pre-orc</version>
+ released as hive 2.1.1 -->
+ <version>2.1.1-pre-orc</version>
<packaging>jar</packaging>
<name>Hive Storage API</name>