Repository: sqoop Updated Branches: refs/heads/trunk d37bd1168 -> 62bf442a8
SQOOP-1297: Parameterize the Accumulo version in the build files (Venkat Ranganathan via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/62bf442a Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/62bf442a Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/62bf442a Branch: refs/heads/trunk Commit: 62bf442a8c417cc39bab04a770370c41cc81c853 Parents: d37bd11 Author: Jarek Jarcec Cecho <[email protected]> Authored: Tue Mar 18 22:09:16 2014 -0700 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Tue Mar 18 22:09:16 2014 -0700 ---------------------------------------------------------------------- build.xml | 15 +++++++++++++++ ivy.xml | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/62bf442a/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 2fdfad0..2dc99a8 100644 --- a/build.xml +++ b/build.xml @@ -44,6 +44,21 @@ </if> <!-- + Set default Accumulo version + + We use 1.5.0 by default if not specified. + --> + <if> + <isset property="accumulo.version" /> + <then> + <echo message="Use Accumulo version ${accumulo.version}" /> + </then> + <else> + <echo message="Using Accumulo profile 1.5.0 by default" /> + <property name="accumulo.version" value="1.5.0" /> + </else> + </if> + <!-- Set default HBase profile if not set HBase 0.95 has broken one big monolithic archive into smaller pieces, so http://git-wip-us.apache.org/repos/asf/sqoop/blob/62bf442a/ivy.xml ---------------------------------------------------------------------- diff --git a/ivy.xml b/ivy.xml index 88e3ee7..65ef089 100644 --- a/ivy.xml +++ b/ivy.xml @@ -207,10 +207,10 @@ under the License. rev="${commons-collections.version}" conf="releaseaudit->default"/> <!-- Accumulo 1.5.0 --> - <dependency org="org.apache.accumulo" name="accumulo-core" rev="1.5.0" + <dependency org="org.apache.accumulo" name="accumulo-core" rev="${accumulo.version}" conf="accumulo->default"> </dependency> - <dependency org="org.apache.accumulo" name="accumulo-minicluster" rev="1.5.0" + <dependency org="org.apache.accumulo" name="accumulo-minicluster" rev="${accumulo.version}" conf="accumulo->default"> </dependency>
