Merge remote-tracking branch 'origin/main' into 6.x

# Conflicts: # build.gradle
gitlab4j · Oct 16, 2024 · 184fd89 · 184fd89
2 parents 31f96f7 + 7197da9
commit 184fd89
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -22,11 +22,12 @@ dependencies {
     api 'org.glassfish.jersey.media:jersey-media-multipart:3.1.1'
     api 'org.glassfish.jersey.media:jersey-media-json-jackson:3.1.1'
     api 'jakarta.servlet:jakarta.servlet-api:6.0.0'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
     testImplementation 'org.mockito:mockito-core:5.2.0'
     testImplementation 'org.mockito:mockito-junit-jupiter:5.2.0'
     testImplementation 'org.hamcrest:hamcrest-all:1.3'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.0.2'
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.4"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.4"
 }
 
 signing {
@@ -50,6 +51,10 @@ java {
     }
 }
 
+tasks.named('test') {
+    useJUnitPlatform()
+}
+
 repositories {
     mavenCentral()
 }

diff --git a/src/main/java/org/gitlab4j/api/models/GroupHook.java b/src/main/java/org/gitlab4j/api/models/GroupHook.java
@@ -29,6 +29,8 @@ public class GroupHook implements Serializable {
     private Boolean subgroupEvents;
     private Boolean memberEvents;
     private Boolean enableSslVerification;
+    private String alertStatus;
+    private Date disabledUntil;
     private Boolean repositoryUpdateEvents;
     private Date createdAt;
     private Boolean resourceAccessTokenEvents;
@@ -218,6 +220,22 @@ public void setEnableSslVerification(Boolean enableSslVerification) {
         this.enableSslVerification = enableSslVerification;
     }
 
+    public String getAlertStatus() {
+        return alertStatus;
+    }
+
+    public void setAlertStatus(String alertStatus) {
+        this.alertStatus = alertStatus;
+    }
+
+    public Date getDisabledUntil() {
+        return disabledUntil;
+    }
+
+    public void setDisabledUntil(Date disabledUntil) {
+        this.disabledUntil = disabledUntil;
+    }
+
     public Boolean getRepositoryUpdateEvents() {
         return repositoryUpdateEvents;
     }

diff --git a/src/test/resources/org/gitlab4j/api/group-hook.json b/src/test/resources/org/gitlab4j/api/group-hook.json
@@ -24,9 +24,8 @@
   "enable_ssl_verification": true,
   "repository_update_events": false,
   "alert_status": "executable",
-  "disabled_until": null,
-  "url_variables": [ ],
+  "disabled_until": "2012-10-12T17:04:47Z",
   "created_at": "2012-10-12T17:04:47Z",
   "resource_access_token_events": true,
-  "custom_webhook_template": "{\"event\":\"{{object_kind}}\"}",
+  "custom_webhook_template": "{\"event\":\"{{object_kind}}\"}"
 }