fix(changelog): Remove bots in regex search

jreleaser · Oct 27, 2022 · ca6f2ab · ca6f2ab
1 parent 39f7c7b
commit ca6f2ab
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/core/jreleaser-model-impl/src/main/java/org/jreleaser/model/internal/release/Changelog.java b/core/jreleaser-model-impl/src/main/java/org/jreleaser/model/internal/release/Changelog.java
@@ -49,7 +49,6 @@
 import static java.util.stream.Collectors.toSet;
 import static org.jreleaser.util.StringUtils.isBlank;
 import static org.jreleaser.util.StringUtils.isNotBlank;
-import static org.jreleaser.util.StringUtils.toSafeRegexPattern;
 
 /**
  * @author Andres Almiray
@@ -940,7 +939,7 @@ public boolean containsContributor(String name) {
             if (isNotBlank(name)) {
                 String n = name.trim();
                 for (String contributor : contributors) {
-                    if (n.contains(contributor) || n.matches(toSafeRegexPattern(contributor))) {
+                    if (n.contains(contributor) || n.matches(contributor)) {
                         return true;
                     }
                 }

diff --git a/...releaser-git-java-sdk/src/test/java/org/jreleaser/sdk/git/ChangelogGeneratorUnitTest.java b/...releaser-git-java-sdk/src/test/java/org/jreleaser/sdk/git/ChangelogGeneratorUnitTest.java
@@ -52,7 +52,9 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import static java.util.stream.Collectors.toList;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -115,6 +117,27 @@ public void notParsable() throws GitAPIException, IOException {
         verify(logCommand).add(headId);
     }
 
+    @Test
+    @DisplayName("Should exclude bot commits from changelog")
+    public void excludeBots() throws IOException {
+        Changelog.Hide instance = new Changelog.Hide();
+        Set<String> contributors = new HashSet<>();
+        contributors.add("dependabot");
+        contributors.add("liquibot");
+        contributors.add("randombot");
+        contributors.add("aalmiray");
+        contributors.add("sironheart");
+        instance.addContributors(contributors);
+
+        if (instance.containsContributor("depend") ||
+                instance.containsContributor("bot") ||
+                instance.containsContributor("random") ||
+                instance.containsContributor("liqui")
+        ) {
+            throw new IOException("Should exclude bots");
+        }
+    }
+
     @Test
     @DisplayName("When no tag is found that match current configured tag name then all commits from head must be used")
     public void tagThatNoMatches() throws GitAPIException, IOException {