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 2019/06/21 20:42:14 UTC
[orc] branch branch-1.5 updated (d544eba -> 3eb1506)
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a change to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/orc.git.
from d544eba ORC-511: Fix debian 8 docker file
new 6b22e6b ORC-497 - Fix build failures for maven 3.6.x
new 3eb1506 Preparing for 1.5.6 release.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CMakeLists.txt | 2 +-
java/CMakeLists.txt | 1 +
java/bench/pom.xml | 4 ++--
java/core/pom.xml | 2 +-
java/examples/pom.xml | 2 +-
java/mapreduce/pom.xml | 2 +-
java/pom.xml | 12 ++++++------
java/shims/pom.xml | 2 +-
java/tools/pom.xml | 2 +-
9 files changed, 15 insertions(+), 14 deletions(-)
[orc] 01/02: ORC-497 - Fix build failures for maven 3.6.x
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/orc.git
commit 6b22e6b2e14155fc18a045c601c32d2a0512b88b
Author: Sandeep More <mo...@apache.org>
AuthorDate: Mon Apr 29 12:55:42 2019 -0400
ORC-497 - Fix build failures for maven 3.6.x
Fixes #390
Signed-off-by: Owen O'Malley <om...@apache.org>
---
java/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/pom.xml b/java/pom.xml
index b88d8f0..ea055b9 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -175,7 +175,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.3</version>
+ <version>3.0.5</version>
<configuration>
<effort>Max</effort>
<excludeFilterFile>${basedir}/src/findbugs/exclude.xml</excludeFilterFile>
[orc] 02/02: Preparing for 1.5.6 release.
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/orc.git
commit 3eb150638b3f577cebe9ec652fb7c8b59e79a051
Author: Owen O'Malley <om...@apache.org>
AuthorDate: Fri Jun 21 13:26:28 2019 -0700
Preparing for 1.5.6 release.
Signed-off-by: Owen O'Malley <om...@apache.org>
---
CMakeLists.txt | 2 +-
java/CMakeLists.txt | 1 +
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, 14 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62d6c4d..592abc3 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 "6-SNAPSHOT")
+SET(CPACK_PACKAGE_VERSION_PATCH "6")
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 e82898c..3da23f9 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -13,6 +13,7 @@
# 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
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
set(ORC_JARS
diff --git a/java/bench/pom.xml b/java/bench/pom.xml
index cc726bc..66182e4 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.4-SNAPSHOT</version>
+ <version>1.5.6</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.3</orc.version>
+ <orc.version>1.5.6</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 a8dbb1a..4a1d27d 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.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/java/examples/pom.xml b/java/examples/pom.xml
index 1a7e12d..c1c155d 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.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/java/mapreduce/pom.xml b/java/mapreduce/pom.xml
index d4df6f3..0c69745 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.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/java/pom.xml b/java/pom.xml
index ea055b9..5e1e236 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.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<packaging>pom</packaging>
<name>Apache ORC</name>
@@ -351,7 +351,7 @@
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-shims</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
@@ -366,17 +366,17 @@
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-mapreduce</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-tools</artifactId>
- <version>1.5.6-SNAPSHOT</version>
+ <version>1.5.6</version>
</dependency>
<!-- inter-project depedencies -->
diff --git a/java/shims/pom.xml b/java/shims/pom.xml
index 72619d3..9ed38bb 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.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 0fb5a5d..7df286c 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.6-SNAPSHOT</version>
+ <version>1.5.6</version>
<relativePath>../pom.xml</relativePath>
</parent>