[
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 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
{noformat}
svn status
svn add
..
svn commit -m "HIVE-5610 - Merge maven branch into trunk (patch)"
{noformat}
4) Modify maven-rollforward.sh to use svn mv not mv:
{noformat}
perl -i -pe 's@^ mv @ svn mv @g' maven-rollforward.sh
{noformat}
5) Execute maven-rollforward.sh and commit result
{noformat}
bash ./maven-rollforward.sh
svn status
...
svn commit -m "HIVE-5610 - Merge maven branch into trunk (maven rollforward)"
{noformat}
6) Modify maven-delete-ant.sh to use svn rm as opposed to rm:
{noformat}
perl -i -pe 's@^ rm -rf @ svn rm @g' maven-delete-ant.sh
{noformat}
7) Execute maven-delete-ant.sh and commit result
{noformat}
bash ./maven-delete-ant.sh
svn status
...
svn commit -m "HIVE-5610 - Merge maven branch into trunk (delete ant)"
{noformat}
8) 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}
9) Enable the precommit build
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.
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
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.
> 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,
> HIVE-5610.2-for-commit.patch, HIVE-5610.2-for-reading.patch,
> HIVE-5610.2-maven.patch
>
>
> 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
> {noformat}
> svn status
> svn add
> ..
> svn commit -m "HIVE-5610 - Merge maven branch into trunk (patch)"
> {noformat}
> 4) Modify maven-rollforward.sh to use svn mv not mv:
> {noformat}
> perl -i -pe 's@^ mv @ svn mv @g' maven-rollforward.sh
> {noformat}
> 5) Execute maven-rollforward.sh and commit result
> {noformat}
> bash ./maven-rollforward.sh
> svn status
> ...
> svn commit -m "HIVE-5610 - Merge maven branch into trunk (maven rollforward)"
> {noformat}
> 6) Modify maven-delete-ant.sh to use svn rm as opposed to rm:
> {noformat}
> perl -i -pe 's@^ rm -rf @ svn rm @g' maven-delete-ant.sh
> {noformat}
> 7) Execute maven-delete-ant.sh and commit result
> {noformat}
> bash ./maven-delete-ant.sh
> svn status
> ...
> svn commit -m "HIVE-5610 - Merge maven branch into trunk (delete ant)"
> {noformat}
> 8) 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}
> 9) Enable the precommit build
> 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)
