[HIVE-5610] Merge maven branch into trunk

• Type: Sub-task
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 0.13.0
• Component/s: Build Infrastructure
• Labels: Maven
• Assignee: Brock Noland
• Reporter: Brock Noland
• Created: 22/Oct/13 19:30
• Updated: 05/Nov/13 22:18
• Resolved: 31/Oct/13 19:08

Description

With HIVE-5566 complete we are 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) Disable the precommit build

2) Apply patch

3) Commit result

svn status
svn add 
..
svn commit -m "HIVE-5610 - Merge maven branch into trunk (patch)"

4) Modify maven-rollforward.sh to use svn mv not mv:

perl -i -pe 's@^  mv @  svn mv @g' maven-rollforward.sh

5) Execute maven-rollforward.sh and commit result

bash ./maven-rollforward.sh
svn status
...
svn commit -m "HIVE-5610 - Merge maven branch into trunk (maven rollforward)"

6) Modify maven-delete-ant.sh to use svn rm as opposed to rm:

perl -i -pe 's@^  rm -rf @  svn rm @g' maven-delete-ant.sh

7) Execute maven-delete-ant.sh and commit result

bash ./maven-delete-ant.sh
svn status
...
svn commit -m "HIVE-5610 - Merge maven branch into trunk (delete ant)"

8) Update trunk-mr1.properties and trunk-mr2.properties on the ptesting host, adding the following:

mavenEnvOpts = -Dhttp.proxyHost=localhost -Dhttp.proxyPort=3128 
testCasePropertyName = test
buildTool = maven
unitTests.directories = ./

9) Enable the precommit build

Notes:

On this jira I will upload three patches:

HIVE-5610.${VERSION}-for-reading.patch
HIVE-5610.${VERSION}-for-commit.patch
HIVE-5610.${VERSION}-maven.patch

• 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

To build everything you must:

$ mvn clean install -DskipTests
$ cd itests
$ mvn clean install -DskipTests

because itests (any tests that has cyclical dependencies or requires that the packages be built) is not part of the root reactor build.

Issue Links

• is related to: HIVE-5676 Cleanup test cases as done during mavenization
• is related to: HIVE-5729 Beeline displays version as ???? after mavenization
• is related to: HIVE-5730 Beeline throws non-terminal NPE upon starting, after mavenization
• is related to: HIVE-5743 Maven pom reverts hadoop 23 version to 2.0.5-alpha
• relates to: HIVE-5711 Fix eclipse:eclipse maven goal
• relates to: HIVE-5611 Add assembly (i.e.) tar creation to pom
• relates to: HIVE-5751 mvn tar creation adds too many libraries
• links to: Review Board