You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ni...@apache.org on 2013/01/11 00:09:23 UTC
git commit: GIRAPH-478: Bring back jar-with-deps for giraph-hcatalog
(nitay)
Updated Branches:
refs/heads/trunk 8b7905cd1 -> 9805d231a
GIRAPH-478: Bring back jar-with-deps for giraph-hcatalog (nitay)
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/9805d231
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/9805d231
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/9805d231
Branch: refs/heads/trunk
Commit: 9805d231ae762862912caf73233b34e7efdc41ef
Parents: 8b7905c
Author: Nitay Joffe <ni...@apache.org>
Authored: Thu Jan 10 15:41:23 2013 -0500
Committer: Nitay Joffe <ni...@apache.org>
Committed: Thu Jan 10 18:01:12 2013 -0500
----------------------------------------------------------------------
CHANGELOG | 2 +
giraph-accumulo/pom.xml | 8 +++
giraph-accumulo/src/main/assembly/compile.xml | 2 +-
giraph-core/pom.xml | 18 +++++++
giraph-hbase/pom.xml | 8 +++
giraph-hbase/src/main/assembly/compile.xml | 2 +-
giraph-hcatalog/pom.xml | 8 +++
giraph-hcatalog/src/main/assembly/compile.xml | 2 +-
pom.xml | 54 ++++++++++---------
9 files changed, 75 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/9805d231/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 3446500..6ec0579 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-478: Bring back jar-with-deps for giraph-hcatalog (nitay)
+
GIRAPH-474: Add an oprtion not to use direct byte buffers. (majakabiljo via ereisman)
GIRAPH-476: SequenceFileVertexOutputFormat (nitay)
http://git-wip-us.apache.org/repos/asf/giraph/blob/9805d231/giraph-accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-accumulo/pom.xml b/giraph-accumulo/pom.xml
index d5876c8..4fbb20a 100644
--- a/giraph-accumulo/pom.xml
+++ b/giraph-accumulo/pom.xml
@@ -39,6 +39,10 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9</version>
<configuration>
@@ -59,6 +63,10 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.6</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/giraph/blob/9805d231/giraph-accumulo/src/main/assembly/compile.xml
----------------------------------------------------------------------
diff --git a/giraph-accumulo/src/main/assembly/compile.xml b/giraph-accumulo/src/main/assembly/compile.xml
index 0f7678c..6acf679 100644
--- a/giraph-accumulo/src/main/assembly/compile.xml
+++ b/giraph-accumulo/src/main/assembly/compile.xml
@@ -32,7 +32,7 @@
<exclude>META-INF/LICENSE</exclude>
</excludes>
</unpackOptions>
- <unpack>false</unpack>
+ <unpack>true</unpack>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/giraph/blob/9805d231/giraph-core/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-core/pom.xml b/giraph-core/pom.xml
index cff2b3a..b0c51b5 100644
--- a/giraph-core/pom.xml
+++ b/giraph-core/pom.xml
@@ -42,6 +42,24 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <!-- this is used for inheritance merges -->
+ <phase>package</phase>
+ <!-- append to the packaging phase. -->
+ <configuration>
+ <!-- Specifies the configuration file of the assembly plugin -->
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ <outputDirectory>target</outputDirectory>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/giraph/blob/9805d231/giraph-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-hbase/pom.xml b/giraph-hbase/pom.xml
index 49e41b3..565b505 100644
--- a/giraph-hbase/pom.xml
+++ b/giraph-hbase/pom.xml
@@ -39,6 +39,10 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9</version>
<configuration>
@@ -59,6 +63,10 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.6</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/giraph/blob/9805d231/giraph-hbase/src/main/assembly/compile.xml
----------------------------------------------------------------------
diff --git a/giraph-hbase/src/main/assembly/compile.xml b/giraph-hbase/src/main/assembly/compile.xml
index 0f7678c..6acf679 100644
--- a/giraph-hbase/src/main/assembly/compile.xml
+++ b/giraph-hbase/src/main/assembly/compile.xml
@@ -32,7 +32,7 @@
<exclude>META-INF/LICENSE</exclude>
</excludes>
</unpackOptions>
- <unpack>false</unpack>
+ <unpack>true</unpack>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/giraph/blob/9805d231/giraph-hcatalog/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-hcatalog/pom.xml b/giraph-hcatalog/pom.xml
index 48a5133..4295258 100644
--- a/giraph-hcatalog/pom.xml
+++ b/giraph-hcatalog/pom.xml
@@ -39,6 +39,10 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9</version>
<configuration>
@@ -59,6 +63,10 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.6</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/giraph/blob/9805d231/giraph-hcatalog/src/main/assembly/compile.xml
----------------------------------------------------------------------
diff --git a/giraph-hcatalog/src/main/assembly/compile.xml b/giraph-hcatalog/src/main/assembly/compile.xml
index 0f7678c..6acf679 100644
--- a/giraph-hcatalog/src/main/assembly/compile.xml
+++ b/giraph-hcatalog/src/main/assembly/compile.xml
@@ -32,7 +32,7 @@
<exclude>META-INF/LICENSE</exclude>
</excludes>
</unpackOptions>
- <unpack>false</unpack>
+ <unpack>true</unpack>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/giraph/blob/9805d231/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9f6770e..57c1729 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,22 +285,6 @@ under the License.
<goal>single</goal>
</goals>
</execution>
- <execution>
- <id>make-assembly</id>
- <!-- this is used for inheritance merges -->
- <phase>package</phase>
- <!-- append to the packaging phase. -->
- <configuration>
- <!-- Specifies the configuration file of the assembly plugin -->
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- <outputDirectory>target</outputDirectory>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
</executions>
</plugin>
<plugin>
@@ -333,16 +317,34 @@ under the License.
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ <manifestEntries>
+ <Build-Jdk>${java.version}</Build-Jdk>
+ <Build-Time>${maven.build.timestamp}</Build-Time>
+ <Git-Commit-Branch>${mvngit.branch}</Git-Commit-Branch>
+ <Git-Commit-Hash>${mvngit.commit.id}</Git-Commit-Hash>
+ <Git-Commit-Date>${mvngit.commit.committer.date}</Git-Commit-Date>
+ <Git-Committer-Email>${mvngit.commit.committer.email}</Git-Committer-Email>
+ <Git-Committer-Name>${mvngit.commit.committer.name}</Git-Committer-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>