tillrohrmann closed pull request #6502: [FLINK-10070][build] Downgrade 
git-commit-id-plugin
URL: https://github.com/apache/flink/pull/6502
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 96c9346bd2a..d857a300411 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 e163881d90b..63f1584bba0 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -464,7 +464,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>
@@ -478,9 +477,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 434f5779f10..b69b3177732 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1426,6 +1426,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>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[email protected]


With regards,
Apache Git Services

Reply via email to