You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hcatalog-commits@incubator.apache.org by tr...@apache.org on 2012/11/01 03:20:49 UTC
svn commit: r1404457 - in /incubator/hcatalog/trunk: CHANGES.txt
ant/deploy.xml build-common.xml build.properties build.xml
ivy/ivysettings.xml storage-handlers/hbase/build.xml
Author: travis
Date: Thu Nov 1 03:20:49 2012
New Revision: 1404457
URL: http://svn.apache.org/viewvc?rev=1404457&view=rev
Log:
HCATALOG-528 ivysettings.xml does not let you override .m2/repository or ivy.cache.dir setting
Modified:
incubator/hcatalog/trunk/CHANGES.txt
incubator/hcatalog/trunk/ant/deploy.xml
incubator/hcatalog/trunk/build-common.xml
incubator/hcatalog/trunk/build.properties
incubator/hcatalog/trunk/build.xml
incubator/hcatalog/trunk/ivy/ivysettings.xml
incubator/hcatalog/trunk/storage-handlers/hbase/build.xml
Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1404457&r1=1404456&r2=1404457&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Thu Nov 1 03:20:49 2012
@@ -44,6 +44,8 @@ Trunk (unreleased changes)
HCAT-427 Document storage-based authorization (lefty via gates)
IMPROVEMENTS
+ HCAT-528 ivysettings.xml does not let you override .m2/repository or ivy.cache.dir setting (raja@cmbasics.com via traviscrawford)
+
HCAT-516 HCOF should use less generic parameters (nitay via traviscrawford)
HCAT-525 Remove dead classes from HCatalog Source Tree (amalakar via traviscrawford)
Modified: incubator/hcatalog/trunk/ant/deploy.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/ant/deploy.xml?rev=1404457&r1=1404456&r2=1404457&view=diff
==============================================================================
--- incubator/hcatalog/trunk/ant/deploy.xml (original)
+++ incubator/hcatalog/trunk/ant/deploy.xml Thu Nov 1 03:20:49 2012
@@ -65,6 +65,7 @@
<echo message="${ant.project.name}"/>
<artifact:dependencies pathId="mvn.compile.classpath" scopes="compile">
+ <localRepository path="${mvn.local.repo}"/>
<pom file="pom.xml"/>
</artifact:dependencies>
<mkdir dir="${build.dir}/lib/compile"/>
@@ -73,6 +74,7 @@
</copy>
<artifact:dependencies pathId="mvn.test.classpath" scopes="compile, test">
+ <localRepository path="${mvn.local.repo}"/>
<pom file="pom.xml"/>
</artifact:dependencies>
<mkdir dir="${build.dir}/lib/test"/>
Modified: incubator/hcatalog/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build-common.xml?rev=1404457&r1=1404456&r2=1404457&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build-common.xml (original)
+++ incubator/hcatalog/trunk/build-common.xml Thu Nov 1 03:20:49 2012
@@ -80,6 +80,7 @@
</jar>
<artifact:install file="${build.dir}/${ant.project.name}-${hcatalog.version}.jar">
<artifact:pom file="${pom.file}"/>
+ <artifact:localRepository path="${mvn.local.repo}"/>
</artifact:install>
</target>
Modified: incubator/hcatalog/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.properties?rev=1404457&r1=1404456&r2=1404457&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.properties (original)
+++ incubator/hcatalog/trunk/build.properties Thu Nov 1 03:20:49 2012
@@ -36,6 +36,7 @@ clover.pdf.report.dir=${build.dir}/test/
ivysettings.xml=${path.to.basedir}/ivy/ivysettings.xml
ivy.xml=${basedir}/ivy.xml
pom.file=${build.dir}/ivy/${ant.project.name}-${hcatalog.version}.pom
+ivy.cache.dir=${user.home}/.ivy2/cache
findbugs.out.dir=${test.dir}/findbugs
findbugs.exclude.file=${basedir}/src/test/findbugsExcludeFile.xml
@@ -80,3 +81,5 @@ shims.23.hadoop.version=${hive.hadoop-0.
mvn.deploy.repo.id=apache.snapshots.https
mvn.deploy.repo.url=https://repository.apache.org/content/repositories/snapshots
+
+mvn.local.repo=${user.home}/.m2/repository
Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1404457&r1=1404456&r2=1404457&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Thu Nov 1 03:20:49 2012
@@ -156,6 +156,7 @@
basedir="${build.classes}"/>
<artifact:install file="${build.dir}/${ant.project.name}/${hcatalog.core.jar}">
<artifact:pom file="${build.ivy.dir}/hcatalog-core-${hcatalog.version}.pom"/>
+ <artifact:localRepository path="${mvn.local.repo}}" />
</artifact:install>
<ant target="jar" dir="hcatalog-pig-adapter" inheritAll="false"/>
Modified: incubator/hcatalog/trunk/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/ivy/ivysettings.xml?rev=1404457&r1=1404456&r2=1404457&view=diff
==============================================================================
--- incubator/hcatalog/trunk/ivy/ivysettings.xml (original)
+++ incubator/hcatalog/trunk/ivy/ivysettings.xml Thu Nov 1 03:20:49 2012
@@ -31,7 +31,6 @@
-->
<property name="repo.maven.org" value="${mvnrepo}" override="true"/>
<property name="repo.apache.snapshots" value="http://repository.apache.org/content/groups/snapshots-group/" override="false"/>
- <property name="repo.dir" value="${user.home}/.m2/repository"/>
<property name="maven2.pattern" value="[organisation]/[module]/[revision]/[module]-[revision](-[classifier])"/>
<property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
<property name="snapshot.pattern" value="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
@@ -39,12 +38,13 @@
<property name="force-resolve" value="false" override="false"/>
<!-- pull in the local repository -->
<include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
+ <caches defaultCacheDir="${ivy.cache.dir}" override="false"/>
<settings defaultResolver="${resolvers}"/>
<resolvers>
<filesystem name="fs" m2compatible="true" checkconsistency="false" force="${force-resolve}"
checkmodified="true" changingPattern=".*-SNAPSHOT">
- <artifact pattern="${repo.dir}/${maven2.pattern.ext}"/>
- <ivy pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
+ <artifact pattern="${mvn.local.repo}/${maven2.pattern.ext}"/>
+ <ivy pattern="${mvn.local.repo}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
</filesystem>
<ibiblio
name="jboss"
Modified: incubator/hcatalog/trunk/storage-handlers/hbase/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/build.xml?rev=1404457&r1=1404456&r2=1404457&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/build.xml (original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/build.xml Thu Nov 1 03:20:49 2012
@@ -102,8 +102,10 @@
<target name="mvn-dependencies" depends="mvn-init">
<artifact:dependencies pathId="mvn.compile.classpath" scopes="compile">
<pom file="pom.xml"/>
+ <localRepository path="${mvn.local.repo}" />
</artifact:dependencies>
<artifact:dependencies pathId="mvn.test.classpath" scopes="compile, test">
+ <localRepository path="${mvn.local.repo}" />
<pom file="pom.xml"/>
</artifact:dependencies>
</target>