Merge branch 'master' into ib/remove-a-bit-of-shiro

walmartlabs · May 5, 2024 · b0fc531 · b0fc531
2 parents 57f7593 + 228d9cc
commit b0fc531
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/events/github/Payload.java b/server/impl/src/main/java/com/walmartlabs/concord/server/events/github/Payload.java
@@ -35,7 +35,8 @@ public class Payload {
     /**
      * List of supported repository-level events.
      */
-    private static final Set<String> REPOSITORY_EVENTS = asSet(
+    private static final Set<String> REPOSITORY_EVENTS = Set.of(
+            "check_run",
             "commit_comment",
             "create",
             "delete",
@@ -49,15 +50,18 @@ public class Payload {
             "pull_request_review_comment",
             "push",
             "release",
+            "repository",
+            "status",
             "team",
             "team_add",
-            "repository"
-        );
+            "workflow_job",
+            "workflow_run"
+    );
 
     /**
      * List of supported organization-level events.
      */
-    private static final Set<String> ORGANIZATION_EVENTS = asSet(
+    private static final Set<String> ORGANIZATION_EVENTS = Set.of(
             "membership",
             "organization",
             "org_block"
@@ -227,10 +231,6 @@ private static String getBranchPullRequest(Map<String, Object> event) {
         return MapUtils.getString(base, "ref");
     }
 
-    private static Set<String> asSet(String... as) {
-        return Collections.unmodifiableSet(new HashSet<>(Arrays.asList(as)));
-    }
-
     @Override
     public String toString() {
         return "Payload{" +

diff --git a/.../impl/src/main/java/com/walmartlabs/concord/server/metrics/JettySessionMetricsModule.java b/.../impl/src/main/java/com/walmartlabs/concord/server/metrics/JettySessionMetricsModule.java
@@ -63,7 +63,7 @@ public Gauge<T> gauge() {
     private static Object getAttribute(String attribute) {
         try {
             MBeanServer mBeans = ManagementFactory.getPlatformMBeanServer();
-            return mBeans.getAttribute(new ObjectName("org.eclipse.jetty.server.session:context=ROOT,id=0,type=defaultsessioncache"), attribute);
+            return mBeans.getAttribute(new ObjectName("org.eclipse.jetty.session:context=ROOT,id=0,type=defaultsessioncache"), attribute);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

diff --git a/server/plugins/noderoster/impl/pom.xml b/server/plugins/noderoster/impl/pom.xml
@@ -158,10 +158,6 @@
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-jetty9</artifactId>
-        </dependency>
 
         <!-- immutables -->
         <dependency>

diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
@@ -102,7 +102,7 @@
         <maven.model.builder.version>3.8.4</maven.model.builder.version>
         <maven.resolver.version>1.7.3</maven.resolver.version>
         <maven.resolver.version.concord>0.0.4</maven.resolver.version.concord>
-        <metrics.version>4.2.13</metrics.version>
+        <metrics.version>4.2.25</metrics.version>
         <mockito.version>4.9.0</mockito.version>
         <mustache.version>0.9.10</mustache.version>
         <nimbus.jwt.version>8.8</nimbus.jwt.version>
@@ -118,7 +118,7 @@
         <shiro.version>1.10.1</shiro.version>
         <siesta.version>2.3.2</siesta.version>
         <sisu.version>0.9.0.M2</sisu.version>
-        <slf4j.version>2.0.10</slf4j.version>
+        <slf4j.version>2.0.11</slf4j.version>
         <snakeyaml.version>2.2</snakeyaml.version>
         <sshd.version>2.8.0</sshd.version>
         <sysoutslf4j.version>1.0.2</sysoutslf4j.version>
@@ -455,7 +455,7 @@
             </dependency>
             <dependency>
                 <groupId>io.dropwizard.metrics</groupId>
-                <artifactId>metrics-jetty9</artifactId>
+                <artifactId>metrics-jetty12</artifactId>
                 <version>${metrics.version}</version>
             </dependency>
             <dependency>