[FLINK-21481][build] Move git-commit-id-plugin execution to flink-run…

…time
deepfield · Feb 24, 2021 · c77672a · c77672a
1 parent 3436381
commit c77672a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
@@ -349,6 +349,33 @@ under the License.
  </resources>
 
  <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>

diff --git a/...k-test-utils/src/main/java/org/apache/flink/streaming/util/PseudoRandomValueSelector.java b/...k-test-utils/src/main/java/org/apache/flink/streaming/util/PseudoRandomValueSelector.java
@@ -83,7 +83,7 @@ public static PseudoRandomValueSelector create(Object entryPointSeed) {
  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
@@ -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>
 
@@ -1375,33 +1375,6 @@ under the License.
  </configuration>
  </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>