Author: edwardyoon
Date: Mon Jul 8 08:01:45 2013
New Revision: 1500598
URL: http://svn.apache.org/r1500598
Log:
HAMA-671: Clean up Maven build scripts
Modified:
hama/trunk/CHANGES.txt
hama/trunk/core/pom.xml
hama/trunk/pom.xml
hama/trunk/yarn/pom.xml
Modified: hama/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hama/trunk/CHANGES.txt?rev=1500598&r1=1500597&r2=1500598&view=diff
==============================================================================
--- hama/trunk/CHANGES.txt (original)
+++ hama/trunk/CHANGES.txt Mon Jul 8 08:01:45 2013
@@ -6,13 +6,14 @@ Release 0.6.3 (unreleased changes)
BUG FIXES
- HAMA-769: Intermediate queue's close method is not called, clean work may be
omitted (kennethxian)
- HAMA-771: Determining the count of active vertices (edwardyoon)
+ HAMA-769: Intermediate queue's close method is not called, clean work may
be omitted (kennethxian)
+ HAMA-771: Determining the count of active vertices (edwardyoon)
IMPROVEMENTS
+ HAMA-671: Clean up Maven build scripts (edwardyoon)
HAMA-765: Add apply method to Vector/Matrix (Yexi Jiang)
- HAMA-773: Matrix/Vector operation does not validate the input argument
(Yexi Jiang)
+ HAMA-773: Matrix/Vector operation does not validate the input argument
(Yexi Jiang)
Release 0.6.2 - June 26, 2013
Modified: hama/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/hama/trunk/core/pom.xml?rev=1500598&r1=1500597&r2=1500598&view=diff
==============================================================================
--- hama/trunk/core/pom.xml (original)
+++ hama/trunk/core/pom.xml Mon Jul 8 08:01:45 2013
@@ -101,14 +101,6 @@
<artifactId>jsp-2.1</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</dependency>
Modified: hama/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/hama/trunk/pom.xml?rev=1500598&r1=1500597&r2=1500598&view=diff
==============================================================================
--- hama/trunk/pom.xml (original)
+++ hama/trunk/pom.xml Mon Jul 8 08:01:45 2013
@@ -101,6 +101,66 @@
<ant.version>1.7.1</ant.version>
</properties>
+ <profiles>
+ <profile>
+ <id>hadoop1</id>
+ <dependencies>
+ <!-- build for Hadoop 1.x -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hadoop2</id>
+ <modules>
+ <module>yarn</module>
+ </modules>
+
+ <dependencies>
+ <!-- build for Hadoop 2.x -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <classifier>tests</classifier>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>2.4.0a</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -179,16 +239,6 @@
<version>${ant.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
@@ -231,7 +281,6 @@
<module>core</module>
<module>graph</module>
<module>examples</module>
- <module>yarn</module>
<module>ml</module>
<module>dist</module>
</modules>
@@ -303,9 +352,11 @@
<excludes>
<exclude>.idea/**</exclude>
<exclude>.git/**</exclude>
- <exclude>.classpath/**</exclude>
- <exclude>.project</exclude>
+ <exclude>**/.classpath/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
<exclude>**/*.asc</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/logs/**</exclude>
<exclude>**/docs/**</exclude>
<exclude>CHANGES.txt</exclude>
Modified: hama/trunk/yarn/pom.xml
URL:
http://svn.apache.org/viewvc/hama/trunk/yarn/pom.xml?rev=1500598&r1=1500597&r2=1500598&view=diff
==============================================================================
--- hama/trunk/yarn/pom.xml (original)
+++ hama/trunk/yarn/pom.xml Mon Jul 8 08:01:45 2013
@@ -46,11 +46,6 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>2.4.0a</version>
- </dependency>
- <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.5.3</version>
@@ -58,28 +53,18 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>0.23.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-api</artifactId>
- <version>0.23.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <version>0.23.1</version>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
- <version>0.23.1</version>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-tests</artifactId>
- <version>0.23.1</version>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
@@ -89,29 +74,14 @@
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>org.apache.hama:*</include>
- </includes>
- </artifactSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
<finalName>hama-yarn-${project.version}</finalName>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
