[bigtop] branch master updated: BIGTOP-3411: Disable unnecessary scm check in Buildnumber-maven-plugin for Mpack

[guyuqi]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new f98d00a  BIGTOP-3411: Disable unnecessary scm check in 
Buildnumber-maven-plugin for Mpack
     new b8ca017  Merge pull request #678 from guyuqi/BIGTOP-3411
f98d00a is described below

commit f98d00ad018dc01545e058e4944f5693a0b55353
Author: Yuqi Gu <yuqi...@arm.com>
AuthorDate: Wed Sep 23 03:19:23 2020 +0000

    BIGTOP-3411: Disable unnecessary scm check in Buildnumber-maven-plugin for 
Mpack
    
    Make it possible to use Buildnumber-maven-plugin to generate build number
    without unnecessary scm check. And fix 'rat' issues.
    
    Change-Id: I1ebc24ad46f8167e75f6a35bb64df27e8184627b
    Signed-off-by: Yuqi Gu <yuqi...@arm.com>
---
 .../src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/pom.xml   | 10 ++++++++--
 build.gradle                                                   |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/pom.xml 
b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/pom.xml
index 1739fa8..00cff8c 100644
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/pom.xml
+++ b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/pom.xml
@@ -102,13 +102,19 @@
       <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>buildnumber-maven-plugin</artifactId>
-          <version>${buildnumber-maven-plugin-version}</version>
+         <version>${buildnumber-maven-plugin-version}</version>
+          <configuration>
+              <revisionOnScmFailure>no.scm.config.in.pom</revisionOnScmFailure>
+          </configuration>
           <executions>
               <execution>
                   <phase>validate</phase>
                   <goals>
-                      <goal>create</goal>
+                      <goal>create-timestamp</goal>
                   </goals>
+                  <configuration>
+                      <timestampFormat>yyyy-MM-dd HH:mm:ss.S</timestampFormat>
+                  </configuration>
               </execution>
           </executions>
       </plugin>
diff --git a/build.gradle b/build.gradle
index 3c8a7c5..65ce3cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -115,6 +115,7 @@ rat {
        "bigtop-packages/src/**/*.diff",
        "bigtop-packages/src/common/*/*.json",
        "bigtop-packages/src/common/**/*.default",
+       
"bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/**",
        "bigtop-repos/apt/distributions",
        /* Juju charm files with rigid structure */
        "bigtop-packages/src/charm/**/wheelhouse.txt",