Fix/build info (#579)

* fix build info when git in commit * fix build info * change version to 2.0.7-SNAPSHOT Co-authored-by: yuanyuan <[email protected]> Co-authored-by: leo james <[email protected]>
sofastack · Oct 13, 2022 · 8c31e4d · 8c31e4d
1 parent 718629f
commit 8c31e4d
Show file tree

Hide file tree

Showing 24 changed files with 54 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>sofa-ark</artifactId>
-    <version>2.0.6</version>
+    <version>2.0.7-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/sofa-ark-bom/pom.xml b/sofa-ark-bom/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sofa-ark-parent/assembly/pom.xml b/sofa-ark-parent/assembly/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sofa-ark-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-ark-all</artifactId>

diff --git a/sofa-ark-parent/core-impl/archive/pom.xml b/sofa-ark-parent/core-impl/archive/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sofa-ark-core-impl</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-ark-archive</artifactId>

diff --git a/sofa-ark-parent/core-impl/container/pom.xml b/sofa-ark-parent/core-impl/container/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sofa-ark-core-impl</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-ark-container</artifactId>

diff --git a/sofa-ark-parent/core-impl/pom.xml b/sofa-ark-parent/core-impl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sofa-ark-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-ark-core-impl</artifactId>

diff --git a/sofa-ark-parent/core/api/pom.xml b/sofa-ark-parent/core/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark-core</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sofa-ark-parent/core/common/pom.xml b/sofa-ark-parent/core/common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sofa-ark-core</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-ark-common</artifactId>

diff --git a/sofa-ark-parent/core/exception/pom.xml b/sofa-ark-parent/core/exception/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sofa-ark-core</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-ark-exception</artifactId>

diff --git a/sofa-ark-parent/core/pom.xml b/sofa-ark-parent/core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sofa-ark-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-ark-core</artifactId>

diff --git a/sofa-ark-parent/core/spi/pom.xml b/sofa-ark-parent/core/spi/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sofa-ark-core</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-ark-spi</artifactId>

diff --git a/sofa-ark-parent/pom.xml b/sofa-ark-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark-bom</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
         <relativePath>../sofa-ark-bom</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sofa-ark-parent/support/ark-maven-plugin/pom.xml b/sofa-ark-parent/support/ark-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark-support</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>maven-plugin</packaging>

diff --git a/sofa-ark-parent/support/ark-plugin-maven-plugin/pom.xml b/sofa-ark-parent/support/ark-plugin-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark-support</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sofa-ark-parent/support/ark-springboot-integration/ark-common-springboot/pom.xml b/sofa-ark-parent/support/ark-springboot-integration/ark-common-springboot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark-support</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sofa-ark-parent/support/ark-springboot-integration/ark-compatible-springboot1/pom.xml b/sofa-ark-parent/support/ark-springboot-integration/ark-compatible-springboot1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark-support</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sofa-ark-parent/support/ark-springboot-integration/ark-compatible-springboot2/pom.xml b/sofa-ark-parent/support/ark-springboot-integration/ark-compatible-springboot2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark-support</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sofa-ark-parent/support/ark-springboot-integration/ark-springboot-starter/pom.xml b/sofa-ark-parent/support/ark-springboot-integration/ark-springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark-support</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sofa-ark-parent/support/ark-support-starter/pom.xml b/sofa-ark-parent/support/ark-support-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark-support</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sofa-ark-parent/support/ark-tools/pom.xml b/sofa-ark-parent/support/ark-tools/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sofa-ark-support</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-ark-tools</artifactId>

diff --git a/...-ark-parent/support/ark-tools/src/main/java/com/alipay/sofa/ark/tools/git/JGitParser.java b/...-ark-parent/support/ark-tools/src/main/java/com/alipay/sofa/ark/tools/git/JGitParser.java
@@ -16,6 +16,10 @@
  */
 package com.alipay.sofa.ark.tools.git;
 
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.ListBranchCommand;
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.lib.*;
 import org.eclipse.jgit.revwalk.RevCommit;
@@ -26,8 +30,12 @@
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.alipay.sofa.ark.spi.constant.Constants.DATE_FORMAT;
+import static org.eclipse.jgit.lib.Constants.MASTER;
 
 public class JGitParser {
 
@@ -59,6 +67,11 @@ public static GitInfo parse(File gitDirectory) {
                 gitInfo.setLastCommitEmail(lastCommitEmail);
                 gitInfo.setLastCommitTime(lastCommitTime);
                 gitInfo.setLastCommitDateTime(commitDateTime);
+
+                if (lastCommitId.equals(branchName)) {
+                    gitInfo.setBranchName(StringUtils.join(
+                            getBranchsFromCommit(repository, lastCommitId), ","));
+                }
             }
 
             return gitInfo;
@@ -67,6 +80,24 @@ public static GitInfo parse(File gitDirectory) {
         }
     }
 
+    private static List<String> getBranchsFromCommit(FileRepository repository, String lastCommitId) throws GitAPIException {
+        Git git = new Git(repository);
+        List<Ref> refs = Git.wrap(repository).branchList()
+                .setListMode(ListBranchCommand.ListMode.REMOTE)
+                .setContains(lastCommitId)
+                .call();
+        return refs.stream()
+                .filter(ref -> !ref.isSymbolic())
+                .map(Ref::getName)
+                .map(repository::shortenRemoteBranchName)
+                .filter(StringUtils::isNotBlank)
+                .distinct()
+                .sorted(MASTER_FIRST_COMPARATOR)
+                .collect(Collectors.toList());
+    }
+
+    public static final Comparator<String> MASTER_FIRST_COMPARATOR = (o1, o2) -> MASTER.equals(o1) ? -1 : 1;
+
     private static RevCommit getLastCommit(Repository repository) throws Exception {
         RevWalk revWalk = new RevWalk(repository);
         Ref headCommitReference = repository.getRefDatabase().findRef("HEAD");

diff --git a/sofa-ark-parent/support/pom.xml b/sofa-ark-parent/support/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sofa-ark-plugin/config-ark-plugin/pom.xml b/sofa-ark-plugin/config-ark-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark-bom</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
         <relativePath>../../sofa-ark-bom</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sofa-ark-plugin/web-ark-plugin/pom.xml b/sofa-ark-plugin/web-ark-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-ark-bom</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7-SNAPSHOT</version>
         <relativePath>../../sofa-ark-bom</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>