Repository: orc Updated Branches: refs/heads/master f949799c9 -> b0dc08bb1
ORC-59. Change the version of the storage-api to 2.1.0-pre-orc. (omalley reviewed by gates) Fixes #28 Signed-off-by: Owen O'Malley <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/b0dc08bb Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/b0dc08bb Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/b0dc08bb Branch: refs/heads/master Commit: b0dc08bb19842188e5245d1d30b64a32ca955ec3 Parents: f949799 Author: Owen O'Malley <[email protected]> Authored: Wed May 25 16:38:15 2016 -0700 Committer: Owen O'Malley <[email protected]> Committed: Wed May 25 16:48:16 2016 -0700 ---------------------------------------------------------------------- java/CMakeLists.txt | 2 +- java/core/pom.xml | 11 +++++------ java/mapreduce/pom.xml | 5 +++++ java/pom.xml | 1 + java/storage-api/pom.xml | 4 ++-- 5 files changed, 14 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/b0dc08bb/java/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index f0b6eb3..b1be1dc 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.0.2-pre-orc.jar + ${CMAKE_CURRENT_BINARY_DIR}/storage-api/hive-storage-api-2.1.0-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/b0dc08bb/java/core/pom.xml ---------------------------------------------------------------------- diff --git a/java/core/pom.xml b/java/core/pom.xml index fcff5bf..59337ca 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -28,12 +28,6 @@ <name>ORC Core</name> <dependencies> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-storage-api</artifactId> - <version>2.0.2-pre-orc</version> - </dependency> - <!-- inter-project --> <dependency> <groupId>com.google.protobuf</groupId> @@ -95,6 +89,11 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-storage-api</artifactId> + <version>${storage-api.version}</version> + </dependency> + <dependency> <groupId>org.iq80.snappy</groupId> <artifactId>snappy</artifactId> <version>${snappy.version}</version> http://git-wip-us.apache.org/repos/asf/orc/blob/b0dc08bb/java/mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/java/mapreduce/pom.xml b/java/mapreduce/pom.xml index c7ac02d..3b38a40 100644 --- a/java/mapreduce/pom.xml +++ b/java/mapreduce/pom.xml @@ -104,6 +104,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-storage-api</artifactId> + <version>${storage-api.version}</version> + </dependency> <!-- test inter-project --> <dependency> http://git-wip-us.apache.org/repos/asf/orc/blob/b0dc08bb/java/pom.xml ---------------------------------------------------------------------- diff --git a/java/pom.xml b/java/pom.xml index a78a0ec..008c9bf 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -50,6 +50,7 @@ <protobuf.version>2.5.0</protobuf.version> <slf4j.version>1.7.5</slf4j.version> <snappy.version>0.2</snappy.version> + <storage-api.version>2.1.0-pre-orc</storage-api.version> </properties> <build> http://git-wip-us.apache.org/repos/asf/orc/blob/b0dc08bb/java/storage-api/pom.xml ---------------------------------------------------------------------- diff --git a/java/storage-api/pom.xml b/java/storage-api/pom.xml index cb4bf1d..46f534f 100644 --- a/java/storage-api/pom.xml +++ b/java/storage-api/pom.xml @@ -20,8 +20,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.0.2 --> - <version>2.0.2-pre-orc</version> + released as hive 2.1.0 --> + <version>2.1.0-pre-orc</version> <packaging>jar</packaging> <name>Hive Storage API</name>
