Updated Branches: refs/heads/trunk f0453d05d -> 196238b0d
GIRAPH-455: Add meta information to built jars (nitay) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/196238b0 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/196238b0 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/196238b0 Branch: refs/heads/trunk Commit: 196238b0dbec0cacac02c86849731390c3a6adf2 Parents: f0453d0 Author: Nitay Joffe <[email protected]> Authored: Tue Dec 18 12:30:18 2012 -0800 Committer: Nitay Joffe <[email protected]> Committed: Wed Dec 19 15:47:13 2012 -0800 ---------------------------------------------------------------------- CHANGELOG | 2 + giraph-formats-contrib/pom.xml | 1 - giraph/pom.xml | 1 - pom.xml | 49 ++++++++++++++++++++++++++++++---- 4 files changed, 45 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/196238b0/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 256c53a..def8c7b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 0.2.0 - unreleased + GIRAPH-455: Add meta information to built jars (nitay) + GIRAPH-456: Log where master is on every host (nitay) GIRAPH-141: Multigraph support in Giraph (apresta) http://git-wip-us.apache.org/repos/asf/giraph/blob/196238b0/giraph-formats-contrib/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-formats-contrib/pom.xml b/giraph-formats-contrib/pom.xml index 9326c28..f8df115 100644 --- a/giraph-formats-contrib/pom.xml +++ b/giraph-formats-contrib/pom.xml @@ -33,7 +33,6 @@ under the License. <properties> <top.dir>${project.basedir}/..</top.dir> - <lib.dir>${top.dir}/lib</lib.dir> </properties> <build> http://git-wip-us.apache.org/repos/asf/giraph/blob/196238b0/giraph/pom.xml ---------------------------------------------------------------------- diff --git a/giraph/pom.xml b/giraph/pom.xml index 079bde2..2cea51a 100644 --- a/giraph/pom.xml +++ b/giraph/pom.xml @@ -34,7 +34,6 @@ under the License. <properties> <export-target.dir>export/target</export-target.dir> <top.dir>${project.basedir}/..</top.dir> - <lib.dir>${top.dir}/lib</lib.dir> </properties> <build> http://git-wip-us.apache.org/repos/asf/giraph/blob/196238b0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4773635..b9beaf4 100644 --- a/pom.xml +++ b/pom.xml @@ -220,7 +220,8 @@ under the License. </repositories> <properties> - <lib.dir>${project.basedir}/lib</lib.dir> + <top.dir>${project.basedir}</top.dir> + <lib.dir>${top.dir}/lib</lib.dir> <buildtype>test</buildtype> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <formats.module>giraph-formats-contrib</formats.module> @@ -235,9 +236,27 @@ under the License. <pluginManagement> <plugins> <plugin> + <groupId>com.github.koraktor</groupId> + <artifactId>mavanagaiata</artifactId> + <version>0.4.1</version> + <configuration> + <gitDir>${top.dir}/.git</gitDir> + </configuration> + <executions> + <execution> + <id>git-commit</id> + <phase>validate</phase> + <goals> + <goal>branch</goal> + <goal>commit</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.3</version> + <version>2.4</version> <executions> <execution> <id>build-fat-jar</id> @@ -246,11 +265,25 @@ under the License. <!-- append to the packaging phase. --> <configuration> <descriptor>src/main/assembly/compile.xml</descriptor> + <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> <outputDirectory>target</outputDirectory> </configuration> <goals> <goal>single</goal> - <!-- goals == mojos --> </goals> </execution> <execution> @@ -261,14 +294,12 @@ under the License. <configuration> <!-- Specifies the configuration file of the assembly plugin --> <descriptors> - <descriptor>src/main/assembly/assembly.xml - </descriptor> + <descriptor>src/main/assembly/assembly.xml</descriptor> </descriptors> <outputDirectory>target</outputDirectory> </configuration> <goals> <goal>single</goal> - <!-- goals == mojos --> </goals> </execution> </executions> @@ -458,6 +489,12 @@ under the License. </plugin> </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>com.github.koraktor</groupId> + <artifactId>mavanagaiata</artifactId> + </plugin> + </plugins> </build> <profiles>
