avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r1695239 - in /avro/trunk: build.sh lang/py/ivysettings.xml
Date Tue, 11 Aug 2015 10:04:20 GMT
Author: tomwhite
Date: Tue Aug 11 10:04:19 2015
New Revision: 1695239

URL: http://svn.apache.org/r1695239
Log:
Build fixes for 1.8.0.

Modified:
    avro/trunk/build.sh
    avro/trunk/lang/py/ivysettings.xml

Modified: avro/trunk/build.sh
URL: http://svn.apache.org/viewvc/avro/trunk/build.sh?rev=1695239&r1=1695238&r2=1695239&view=diff
==============================================================================
--- avro/trunk/build.sh (original)
+++ avro/trunk/build.sh Tue Aug 11 10:04:19 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/trunk/lang/py/ivysettings.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/py/ivysettings.xml?rev=1695239&r1=1695238&r2=1695239&view=diff
==============================================================================
--- avro/trunk/lang/py/ivysettings.xml (original)
+++ avro/trunk/lang/py/ivysettings.xml Tue Aug 11 10:04:19 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>



Mime
View raw message