You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2021/02/24 17:23:54 UTC

[flink] branch master updated: [FLINK-21481][build] Move git-commit-id-plugin execution to flink-runtime

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

chesnay 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 c77672a  [FLINK-21481][build] Move git-commit-id-plugin execution to flink-runtime
c77672a is described below

commit c77672a1ed654902042d0882e46c67b526a7ef5a
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Wed Feb 24 10:48:30 2021 +0100

    [FLINK-21481][build] Move git-commit-id-plugin execution to flink-runtime
---
 flink-runtime/pom.xml                              | 27 ++++++++++++++++++++
 .../streaming/util/PseudoRandomValueSelector.java  |  2 +-
 pom.xml                                            | 29 +---------------------
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index d3c1038..d12e26d 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -350,6 +350,33 @@ under the License.
 
 		<plugins>
 			<plugin>
+				<!-- Description: https://github.com/git-commit-id/git-commit-id-maven-plugin
+					Used to show the git ref when starting the jobManager. -->
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+				<version>4.0.2</version>
+				<executions>
+					<execution>
+						<id>get-the-git-infos</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>revision</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<skipPoms>false</skipPoms>
+					<failOnNoGitDirectory>false</failOnNoGitDirectory>
+					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
+					<gitDescribe>
+						<!-- Don't generate the describe property -->
+						<!-- It is useless due to the way Flink does branches and tags -->
+						<skip>true</skip>
+					</gitDescribe>
+				</configuration>
+			</plugin>
+
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
 				<executions>
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/PseudoRandomValueSelector.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/PseudoRandomValueSelector.java
index 625f713..c765d68 100644
--- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/PseudoRandomValueSelector.java
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/PseudoRandomValueSelector.java
@@ -83,7 +83,7 @@ class PseudoRandomValueSelector {
     private static String getGlobalSeed() {
         // manual seed or set by maven
         final String seed = System.getProperty("test.randomization.seed");
-        if (seed != null) {
+        if (seed != null && !seed.isEmpty()) {
             return seed;
         }
 
diff --git a/pom.xml b/pom.xml
index 8310016..3e5c120 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@ under the License.
 		<spotless.version>2.4.2</spotless.version>
 
 		<!-- Can be set to any value to reproduce a specific build. -->
-		<test.randomization.seed>${git.commit.id}</test.randomization.seed>
+		<test.randomization.seed/>
 		<test.unit.pattern>**/*Test.*</test.unit.pattern>
 	</properties>
 
@@ -1376,33 +1376,6 @@ under the License.
 			</plugin>
 
 			<plugin>
-				<!-- Description: https://github.com/git-commit-id/git-commit-id-maven-plugin
-					Used to show the git ref when starting the jobManager. -->
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-				<version>4.0.2</version>
-				<executions>
-					<execution>
-						<id>get-the-git-infos</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>revision</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<skipPoms>false</skipPoms>
-					<failOnNoGitDirectory>false</failOnNoGitDirectory>
-					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
-					<gitDescribe>
-						<!-- Don't generate the describe property -->
-						<!-- It is useless due to the way Flink does branches and tags -->
-						<skip>true</skip>
-					</gitDescribe>
-				</configuration>
-			</plugin>
-
-			<plugin>
 				<groupId>org.apache.rat</groupId>
 				<artifactId>apache-rat-plugin</artifactId>
 				<version>0.12</version><!--$NO-MVN-MAN-VER$-->