Before making a release for the first time, it is good to discuss what you are doing on the dev list. :) Are you trying to make a bug fix 1.5.4 or a new 1.6 release? It looks like you meant to make a bug fix release, so you should have started from branch-1.5 instead of master. I've moved your patch to the branch-1.5, although it looks like there may be problems with the C++ build.
.. Owen On Mon, Dec 17, 2018 at 6:59 AM <vgumas...@apache.org> wrote: > This is an automated email from the ASF dual-hosted git repository. > > vgumashta pushed a commit to branch branch-1.5.4 > in repository https://gitbox.apache.org/repos/asf/orc.git > > commit d8c8637e11904dbc9371c3020a0b8bec151a8cd7 > Author: Vaibhav Gumashta <vgumas...@apache.org> > AuthorDate: Mon Dec 17 06:58:49 2018 -0800 > > Preparing for release 1.5.4 > --- > CMakeLists.txt | 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 +- > 7 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index 7757969..0fd2ab9 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -16,8 +16,8 @@ project(ORC) > > # Version number of package > SET(CPACK_PACKAGE_VERSION_MAJOR "1") > -SET(CPACK_PACKAGE_VERSION_MINOR "6") > -SET(CPACK_PACKAGE_VERSION_PATCH "0-SNAPSHOT") > +SET(CPACK_PACKAGE_VERSION_MINOR "5") > +SET(CPACK_PACKAGE_VERSION_PATCH "4") > 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/core/pom.xml b/java/core/pom.xml > index 9ebb63d..928e082 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.6.0-SNAPSHOT</version> > + <version>1.5.4</version> > <relativePath>../pom.xml</relativePath> > </parent> > > diff --git a/java/examples/pom.xml b/java/examples/pom.xml > index 7f02c7a..c2eb5af 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.6.0-SNAPSHOT</version> > + <version>1.5.4</version> > <relativePath>../pom.xml</relativePath> > </parent> > > diff --git a/java/mapreduce/pom.xml b/java/mapreduce/pom.xml > index 7e581b7..4729093 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.6.0-SNAPSHOT</version> > + <version>1.5.4</version> > <relativePath>../pom.xml</relativePath> > </parent> > > diff --git a/java/pom.xml b/java/pom.xml > index d742088..2d6579d 100644 > --- a/java/pom.xml > +++ b/java/pom.xml > @@ -21,7 +21,7 @@ > </parent> > <groupId>org.apache.orc</groupId> > <artifactId>orc</artifactId> > - <version>1.6.0-SNAPSHOT</version> > + <version>1.5.4</version> > <packaging>pom</packaging> > > <name>Apache ORC</name> > @@ -351,7 +351,7 @@ > <dependency> > <groupId>org.apache.orc</groupId> > <artifactId>orc-shims</artifactId> > - <version>1.6.0-SNAPSHOT</version> > + <version>1.5.4</version> > <exclusions> > <exclusion> > <groupId>org.apache.hadoop</groupId> > @@ -366,17 +366,17 @@ > <dependency> > <groupId>org.apache.orc</groupId> > <artifactId>orc-core</artifactId> > - <version>1.6.0-SNAPSHOT</version> > + <version>1.5.4</version> > </dependency> > <dependency> > <groupId>org.apache.orc</groupId> > <artifactId>orc-mapreduce</artifactId> > - <version>1.6.0-SNAPSHOT</version> > + <version>1.5.4</version> > </dependency> > <dependency> > <groupId>org.apache.orc</groupId> > <artifactId>orc-tools</artifactId> > - <version>1.6.0-SNAPSHOT</version> > + <version>1.5.4</version> > </dependency> > > <!-- inter-project depedencies --> > diff --git a/java/shims/pom.xml b/java/shims/pom.xml > index b6d3b73..e617c21 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.6.0-SNAPSHOT</version> > + <version>1.5.4</version> > <relativePath>../pom.xml</relativePath> > </parent> > > diff --git a/java/tools/pom.xml b/java/tools/pom.xml > index b1b6ede..7ee6e03 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.6.0-SNAPSHOT</version> > + <version>1.5.4</version> > <relativePath>../pom.xml</relativePath> > </parent> > > >
