Any chance we can commit this instead of merging? I tried rebasing the branch onto trunk and it seemed pretty straightforward. On Oct 28, 2013 11:22 AM, "Brock Noland (JIRA)" <j...@apache.org> wrote:
> > [ > https://issues.apache.org/jira/browse/HIVE-5610?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel] > > Brock Noland updated HIVE-5610: > ------------------------------- > > Description: > With HIVE-5566 nearing completion we will be nearly ready to merge the > maven branch to trunk. The following tasks will be done post-merge: > > * HIVE-5611 - Add assembly (i.e.) tar creation to pom > > The merge process will be as follows: > > 1) svn merge ^/hive/branches/maven > 2) Commit result > 3) Modify the following line in maven-rollforward.sh: > {noformat} > mv $source $target > {noformat} > to > {noformat} > svn mv $source $target > {noformat} > 4) Execute maven-rollfward.sh and commit result > 5) Modify the following line in maven-delete-ant.sh: > {noformat} > rm -rf "$@" > {noformat} > to > {noformat} > svn rm "$@" > {noformat} > 5) Execute maven-delete-ant.sh and commit result > 6) Update trunk-mr1.properties and trunk-mr2.properties on the ptesting > host, adding the following: > > {noformat} > mavenEnvOpts = -Dhttp.proxyHost=localhost -Dhttp.proxyPort=3128 > testCasePropertyName = test > buildTool = maven > unitTests.directories = ./ > {noformat} > > Notes: > > * To build everything you must: > > {noformat} > $ mvn clean install -DskipTests > $ cd itests > $ mvn clean install -DskipTests > {noformat} > > because itests (any tests that has cyclical dependencies or requires that > the packages be built) is not part of the root reactor build. > > was: > With HIVE-5566 nearing completion we will be nearly ready to merge the > maven branch to trunk. The following tasks will be done post-merge: > > * HIVE-5611 - Add assembly (i.e.) tar creation to pom > * HIVE-5612 - Add ability to re-generate generated code stored in source > control > > The merge process will be as follows: > > 1) svn merge ^/hive/branches/maven > 2) Commit result > 3) Modify the following line in maven-rollforward.sh: > {noformat} > mv $source $target > {noformat} > to > {noformat} > svn mv $source $target > {noformat} > 4) Execute maven-rollfward.sh > 5) Commit result > 6) Update trunk-mr1.properties and trunk-mr2.properties on the ptesting > host, adding the following: > > {noformat} > mavenEnvOpts = -Dhttp.proxyHost=localhost -Dhttp.proxyPort=3128 > testCasePropertyName = test > buildTool = maven > unitTests.directories = ./ > {noformat} > > Notes: > > * To build everything you must: > > {noformat} > $ mvn clean install -DskipTests > $ cd itests > $ mvn clean install -DskipTests > {noformat} > > because itests (any tests that has cyclical dependencies or requires that > the packages be built) is not part of the root reactor build. > > > > Merge maven branch into trunk > > ----------------------------- > > > > Key: HIVE-5610 > > URL: https://issues.apache.org/jira/browse/HIVE-5610 > > Project: Hive > > Issue Type: Sub-task > > Reporter: Brock Noland > > Assignee: Brock Noland > > > > With HIVE-5566 nearing completion we will be nearly ready to merge the > maven branch to trunk. The following tasks will be done post-merge: > > * HIVE-5611 - Add assembly (i.e.) tar creation to pom > > The merge process will be as follows: > > 1) svn merge ^/hive/branches/maven > > 2) Commit result > > 3) Modify the following line in maven-rollforward.sh: > > {noformat} > > mv $source $target > > {noformat} > > to > > {noformat} > > svn mv $source $target > > {noformat} > > 4) Execute maven-rollfward.sh and commit result > > 5) Modify the following line in maven-delete-ant.sh: > > {noformat} > > rm -rf "$@" > > {noformat} > > to > > {noformat} > > svn rm "$@" > > {noformat} > > 5) Execute maven-delete-ant.sh and commit result > > 6) Update trunk-mr1.properties and trunk-mr2.properties on the ptesting > host, adding the following: > > {noformat} > > mavenEnvOpts = -Dhttp.proxyHost=localhost -Dhttp.proxyPort=3128 > > testCasePropertyName = test > > buildTool = maven > > unitTests.directories = ./ > > {noformat} > > Notes: > > * To build everything you must: > > {noformat} > > $ mvn clean install -DskipTests > > $ cd itests > > $ mvn clean install -DskipTests > > {noformat} > > because itests (any tests that has cyclical dependencies or requires > that the packages be built) is not part of the root reactor build. > > > > -- > This message was sent by Atlassian JIRA > (v6.1#6144) >
