avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r1691248 - in /avro/trunk: build.sh lang/java/mapred/pom.xml lang/java/trevni/avro/pom.xml
Date Wed, 15 Jul 2015 16:40:52 GMT
Author: tomwhite
Date: Wed Jul 15 16:40:52 2015
New Revision: 1691248

URL: http://svn.apache.org/r1691248
Log:
Build fixes for AVRO-1586 (Build against Hadoop 2).

Modified:
    avro/trunk/build.sh
    avro/trunk/lang/java/mapred/pom.xml
    avro/trunk/lang/java/trevni/avro/pom.xml

Modified: avro/trunk/build.sh
URL: http://svn.apache.org/viewvc/avro/trunk/build.sh?rev=1691248&r1=1691247&r2=1691248&view=diff
==============================================================================
--- avro/trunk/build.sh (original)
+++ avro/trunk/build.sh Wed Jul 15 16:40:52 2015
@@ -96,8 +96,9 @@ case "$target" in
 
 	# build lang-specific artifacts
         
-	(cd lang/java; mvn package -DskipTests -Dhadoop.version=1; rm -rf mapred/target/classes/;
-	  mvn -P dist package -DskipTests -Davro.version=$VERSION javadoc:aggregate) 
+	(cd lang/java; mvn package -DskipTests -Dhadoop.version=1;
+	  rm -rf mapred/target/classes/; rm -rf trevni/avro/target/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/java/mapred/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/pom.xml?rev=1691248&r1=1691247&r2=1691248&view=diff
==============================================================================
--- avro/trunk/lang/java/mapred/pom.xml (original)
+++ avro/trunk/lang/java/mapred/pom.xml Wed Jul 15 16:40:52 2015
@@ -40,7 +40,10 @@
       org.apache.hadoop*,
       *
     </osgi.import>
-    <osgi.export>org.apache.avro.mapred*;version="${project.version}"</osgi.export>
+    <osgi.export>
+      org.apache.avro.mapred*;version="${project.version}",
+      org.apache.avro.hadoop*;version="${project.version}",
+    </osgi.export>
   </properties>
 
   <build>

Modified: avro/trunk/lang/java/trevni/avro/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/trevni/avro/pom.xml?rev=1691248&r1=1691247&r2=1691248&view=diff
==============================================================================
--- avro/trunk/lang/java/trevni/avro/pom.xml (original)
+++ avro/trunk/lang/java/trevni/avro/pom.xml Wed Jul 15 16:40:52 2015
@@ -80,7 +80,7 @@
        <activation>
          <property>
            <name>hadoop.version</name>
-           <value>2</value>
+           <value>1</value>
          </property>
        </activation>
       <properties>



Mime
View raw message