You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2014/07/22 12:41:14 UTC

[74/92] [abbrv] git commit: Fix issue with git-commit-id-plugin on Travis

Fix issue with git-commit-id-plugin on Travis


Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/fa9daade
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/fa9daade
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/fa9daade

Branch: refs/heads/travis_test
Commit: fa9daade505e00f55320a2f45a99bbd17c6eca86
Parents: 2f3c0b9
Author: Robert Metzger <rm...@apache.org>
Authored: Sat Jul 12 15:57:28 2014 +0200
Committer: Robert Metzger <rm...@apache.org>
Committed: Sat Jul 12 15:57:28 2014 +0200

----------------------------------------------------------------------
 flink-dist/pom.xml    | 4 ++++
 flink-runtime/pom.xml | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/fa9daade/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index efbff93..ede7350 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -362,6 +362,10 @@
 					<failOnNoGitDirectory>false</failOnNoGitDirectory>
 					<skipPoms>false</skipPoms>
 					<generateGitPropertiesFilename>src/main/flink-bin/.version.properties</generateGitPropertiesFilename>
+					<gitDescribe>
+						<!-- don't generate the describe property -->
+						<skip>true</skip>
+					</gitDescribe>
 				</configuration>
 			</plugin>
 		</plugins>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/fa9daade/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 604be7a..8ddfb33 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -4,7 +4,7 @@
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -131,6 +131,10 @@
 					<skipPoms>false</skipPoms>
 					<failOnNoGitDirectory>false</failOnNoGitDirectory>
 					<generateGitPropertiesFilename>src/main/resources/.version.properties</generateGitPropertiesFilename>
+					<gitDescribe>
+						<!-- don't generate the describe property -->
+						<skip>true</skip>
+					</gitDescribe>
 				</configuration>
 			</plugin>
 			<!-- Add version to jar http://stackoverflow.com/questions/2712970/how-to-get-maven-artifact-version-at-runtime