Author: tomwhite
Date: Tue Aug 11 09:58:35 2015
New Revision: 1695236
URL: http://svn.apache.org/r1695236
Log:
Build fixes for 1.8.0.
Modified:
avro/branches/branch-1.8/build.sh
avro/branches/branch-1.8/lang/py/ivysettings.xml
Modified: avro/branches/branch-1.8/build.sh
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.8/build.sh?rev=1695236&r1=1695235&r2=1695236&view=diff
==============================================================================
--- avro/branches/branch-1.8/build.sh (original)
+++ avro/branches/branch-1.8/build.sh Tue Aug 11 09:58:35 2015
@@ -97,7 +97,8 @@ case "$target" in
# build lang-specific artifacts
(cd lang/java; mvn package -DskipTests -Dhadoop.version=1;
- rm -rf mapred/target/classes/; rm -rf trevni/avro/target/classes/;
+ rm -rf mapred/target/{classes,test-classes}/;
+ rm -rf trevni/avro/target/{classes,test-classes}/;
mvn -P dist package -DskipTests -Davro.version=$VERSION
javadoc:aggregate)
(cd lang/java/trevni/doc; mvn site)
(mvn -N -P copy-artifacts antrun:run)
Modified: avro/branches/branch-1.8/lang/py/ivysettings.xml
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.8/lang/py/ivysettings.xml?rev=1695236&r1=1695235&r2=1695236&view=diff
==============================================================================
--- avro/branches/branch-1.8/lang/py/ivysettings.xml (original)
+++ avro/branches/branch-1.8/lang/py/ivysettings.xml Tue Aug 11 09:58:35 2015
@@ -16,10 +16,15 @@
-->
<ivysettings>
<settings defaultResolver="repos" />
+ <property name="m2-pattern"
value="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]"
override="false" />
<resolvers>
<chain name="repos">
<ibiblio name="central" m2compatible="true"/>
- <ibiblio name="apache-snapshots" m2compatible="true"
root="https://repository.apache.org/content/groups/snapshots"/>
+ <ibiblio name="apache-snapshots" m2compatible="true"
root="https://repository.apache.org/content/groups/snapshots"/>
+ <filesystem name="local-maven2" m2compatible="true"> <!-- needed when
building non-snapshot version for release -->
+ <artifact pattern="${m2-pattern}"/>
+ <ivy pattern="${m2-pattern}"/>
+ </filesystem>
</chain>
</resolvers>
</ivysettings>
