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

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


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

commit 2b1a062a754bd5fa7bb6386a086e1f2d3ec2ae81
Author: zentol <ches...@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 1118d43..a562b4e 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -589,7 +589,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 02135f2..cb9e995 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -465,7 +465,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>
@@ -479,9 +478,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 6521a2b..01f4d82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1450,6 +1450,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>

Reply via email to