Merge branch 'main' into 01-signed-commits-enum

hub4j · Oct 17, 2023 · 8640a85 · 8640a85
2 parents aedb71f + 1cb9e66
commit 8640a85
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -621,7 +621,7 @@
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-jre8-standalone</artifactId>
-      <version>2.35.0</version>
+      <version>2.35.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/src/main/java/org/kohsuke/github/GHEvent.java b/src/main/java/org/kohsuke/github/GHEvent.java
@@ -102,6 +102,9 @@ public enum GHEvent {
     /** The merge queue entry. */
     MERGE_QUEUE_ENTRY,
 
+    /** The merge group entry. */
+    MERGE_GROUP,
+
     /** The meta. */
     META,
 

diff --git a/src/test/java/org/kohsuke/github/EnumTest.java b/src/test/java/org/kohsuke/github/EnumTest.java
@@ -32,7 +32,7 @@ public void touchEnums() {
 
         assertThat(GHDirection.values().length, equalTo(2));
 
-        assertThat(GHEvent.values().length, equalTo(64));
+        assertThat(GHEvent.values().length, equalTo(65));
         assertThat(GHEvent.ALL.symbol(), equalTo("*"));
         assertThat(GHEvent.PULL_REQUEST.symbol(), equalTo(GHEvent.PULL_REQUEST.toString().toLowerCase()));