You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/08/06 14:49:23 UTC

[flink] branch master updated: [FLINK-10070][build] Downgrade git-commit-id-plugin

This is an automated email from the ASF dual-hosted git repository.

trohrmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new f34f24b  [FLINK-10070][build] Downgrade git-commit-id-plugin
f34f24b is described below

commit f34f24ba0f0b7faf4ffbad4dd4727253328534cf
Author: zentol <ch...@apache.org>
AuthorDate: Mon Aug 6 13:47:44 2018 +0200

    [FLINK-10070][build] Downgrade git-commit-id-plugin
---
 flink-dist/pom.xml    |  1 -
 flink-runtime/pom.xml |  4 ----
 pom.xml               | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 96c9346..d857a30 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -593,7 +593,6 @@ under the License.
 				<!-- Description: https://github.com/ktoso/maven-git-commit-id-plugin -->
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.1.5</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index bc4a3cb..3412fd4 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -471,7 +471,6 @@ under the License.
 					Used to show the git ref when starting the jobManager. -->
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.1.14</version>
 				<executions>
 					<execution>
 						<goals>
@@ -485,9 +484,6 @@ under the License.
 					<skipPoms>false</skipPoms>
 					<failOnNoGitDirectory>false</failOnNoGitDirectory>
 					<generateGitPropertiesFilename>src/main/resources/.version.properties</generateGitPropertiesFilename>
-					<includeOnlyProperties>
-						<includeOnlyProperty>git.commit.*</includeOnlyProperty>
-					</includeOnlyProperties>
 					<gitDescribe>
 						<!-- don't generate the describe property -->
 						<skip>true</skip>
diff --git a/pom.xml b/pom.xml
index 35b57da..293dd3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1432,6 +1432,20 @@ under the License.
 					<version>3.0.0</version>
 				</plugin>
 
+				<plugin>
+					<groupId>pl.project13.maven</groupId>
+					<artifactId>git-commit-id-plugin</artifactId>
+					<!-- Don't use 2.1.14 as it is incompatible with various maven versions --> 
+					<version>2.1.10</version>
+					<configuration>
+						<excludeProperties>
+							<excludeProperty>git.build.*</excludeProperty>
+							<excludeProperty>git.branch.*</excludeProperty>
+							<excludeProperty>git.remote.*</excludeProperty>
+						</excludeProperties>
+					</configuration>
+				</plugin>
+
 				<!-- Disable certain plugins in Eclipse -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>