Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d451252f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d451252f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d451252f Branch: refs/heads/master Commit: d451252ff43e86760025e3f684786c9df911d306 Parents: 850bd3e 20cbf24 Author: Josh Elser <els...@apache.org> Authored: Tue Nov 12 14:21:52 2013 -0800 Committer: Josh Elser <els...@apache.org> Committed: Tue Nov 12 14:21:52 2013 -0800 ---------------------------------------------------------------------- pom.xml | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d451252f/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 3e45a81,9a46609..38ba1f9 --- a/pom.xml +++ b/pom.xml @@@ -114,9 -105,11 +114,12 @@@ </site> </distributionManagement> <properties> + <accumulo.it.forkCount>1</accumulo.it.forkCount> <!-- used for filtering the java source with the current version --> <accumulo.release.version>${project.version}</accumulo.release.version> + <!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 --> + <hadoop.version>1.2.1</hadoop.version> + <httpclient.version>3.0.1</httpclient.version> <!-- the maven-release-plugin makes this recommendation, due to plugin bugs --> <maven.min-version>3.0.4</maven.min-version> <powermock.version>1.5</powermock.version>
