[
https://issues.apache.org/jira/browse/HIVE-5610?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13807162#comment-13807162
]
Brock Noland commented on HIVE-5610:
------------------------------------
OK I have merged in the latest trunk and it looks OK. Please see the
description for details on the three patches I will be uploading.
> 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
> Attachments: HIVE-5610.1-for-commit.patch,
> HIVE-5610.1-for-reading.patch, HIVE-5610.1-maven.patch
>
>
> 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) Apply patch
> 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}
> h3. Notes:
> h4. On this jira I will upload three patches:
> {noformat}
> HIVE-5610.${VERSION}-for-reading.patch
> HIVE-5610.${VERSION}-for-commit.patch
> HIVE-5610.${VERSION}-maven.patch
> {noformat}
> * for-reading has no qfiles updates so it's easier to read
> * for-commit has the qfile updates and is for commit
> * maven is the patch in a "rollfoward" state for testing purposes
> h4. 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)
