You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by jg...@apache.org on 2012/08/06 22:38:46 UTC
svn commit: r1369994 - in /giraph/trunk: CHANGELOG pom.xml
Author: jghoman
Date: Mon Aug 6 20:38:45 2012
New Revision: 1369994
URL: http://svn.apache.org/viewvc?rev=1369994&view=rev
Log:
GIRAPH-209. Include munge version in artifact name. Contributed by Eli Reisman.
Modified:
giraph/trunk/CHANGELOG
giraph/trunk/pom.xml
Modified: giraph/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1369994&r1=1369993&r2=1369994&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Mon Aug 6 20:38:45 2012
@@ -2,6 +2,9 @@ Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-209: Include munge version in artifact name.
+ (Eli Reisman via jghoman)
+
GIRAPH-280: Add IntelliJ-generated *.iml and *.ipr files to Apache
Rat's <exclude> list. (ekoontz via aching).
Modified: giraph/trunk/pom.xml
URL: http://svn.apache.org/viewvc/giraph/trunk/pom.xml?rev=1369994&r1=1369993&r2=1369994&view=diff
==============================================================================
--- giraph/trunk/pom.xml (original)
+++ giraph/trunk/pom.xml Mon Aug 6 20:38:45 2012
@@ -163,7 +163,7 @@ under the License.
<properties>
<compileSource>1.6</compileSource>
- <hadoop.version>0.20.203.0</hadoop.version>
+ <forHadoop>for-hadoop-${hadoop.version}</forHadoop>
<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
<maven-javadoc-plugin.version>2.6</maven-javadoc-plugin.version>
<jackson.version>1.8.0</jackson.version>
@@ -173,7 +173,33 @@ under the License.
<munge-maven-plugin.version>1.0</munge-maven-plugin.version>
</properties>
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <id>apache snapshots</id>
+ <name>www.apache.org</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ </repository>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <id>apache releases</id>
+ <name>www.apache.org</name>
+ <url>https://repository.apache.org/content/repositories/releases</url>
+ </repository>
+ </repositories>
+
<build>
+ <finalName>giraph-${project.version}-${forHadoop}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -262,7 +288,7 @@ under the License.
<systemProperties>
<property>
<name>prop.jarLocation</name>
- <value>target/giraph-${project.version}-jar-with-dependencies.jar</value>
+ <value>${basedir}/target/giraph-${project.version}-${forHadoop}-jar-with-dependencies.jar</value>
</property>
</systemProperties>
</configuration>
@@ -468,6 +494,9 @@ under the License.
<activation>
<activeByDefault>true</activeByDefault>
</activation>
+ <properties>
+ <hadoop.version>0.20.203.0</hadoop.version>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -499,6 +528,7 @@ under the License.
</plugins>
</build>
</profile>
+
<profile>
<id>hadoop_1.0</id>
<activation>
@@ -541,6 +571,7 @@ under the License.
</plugins>
</build>
</profile>
+
<profile>
<id>hadoop_non_secure</id>
<activation>
@@ -594,6 +625,7 @@ under the License.
</plugins>
</build>
</profile>
+
<profile>
<id>hadoop_facebook</id>
<activation>
@@ -602,11 +634,14 @@ under the License.
<value>facebook</value>
</property>
</activation>
+ <properties>
+ <hadoop.version>0.20.1</hadoop.version>
+ </properties>
<dependencies>
<dependency>
<groupId>com.facebook.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>0.20.1</version>
+ <version>${hadoop.version}</version>
<type>jar</type>
<scope>system</scope>
<systemPath>${hadoop.jar.path}</systemPath>
@@ -627,7 +662,7 @@ under the License.
<build>
<resources>
<resource>
- <directory>src/main/java/org/apache/giraph/hadoop</directory>
+ <directory>${basedir}/src/main/java/org/apache/giraph/hadoop</directory>
<excludes>
<exclude>BspTokenSelector.java</exclude>
</excludes>
@@ -671,7 +706,7 @@ under the License.
<systemProperties>
<property>
<name>prop.jarLocation</name>
- <value>../target/giraph-${project.version}-jar-with-dependencies.jar</value>
+ <value>${basedir}/target/giraph-${project.version}-${forHadoop}-jar-with-dependencies.jar</value>
</property>
</systemProperties>
</configuration>