Merge branch 'main' into reactions-tutorial

yetanalytics · Nov 13, 2024 · 607898a · 607898a
2 parents be3ab9f + d72a019
commit 607898a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
 
   build_jre:
     needs: get_modules
-    uses: yetanalytics/workflow-runtimer/.github/workflows/runtimer.yml@v1
+    uses: yetanalytics/workflow-runtimer/.github/workflows/runtimer.yml@v2
     with:
       java-version: '11'
       java-distribution: 'temurin'
@@ -47,12 +47,12 @@ jobs:
     - name: Download ubuntu-latest Artifact
       uses: actions/download-artifact@v4
       with:
-        name: ubuntu-20.04-jre
+        name: ubuntu-22.04-jre
 
     - name: Download macOS-latest Artifact
       uses: actions/download-artifact@v4
       with:
-        name: macos-12-jre
+        name: macos-14-jre
 
     - name: Download windows-latest Artifact
       uses: actions/download-artifact@v4
@@ -63,10 +63,10 @@ jobs:
     - name: Unzip the runtimes
       run: |
         mkdir -p target/bundle/runtimes
-        unzip ubuntu-20.04-jre.zip -d target/bundle/runtimes
-        mv target/bundle/runtimes/ubuntu-20.04 target/bundle/runtimes/linux
-        unzip macos-12-jre.zip -d target/bundle/runtimes
-        mv target/bundle/runtimes/macos-12 target/bundle/runtimes/macos
+        unzip ubuntu-22.04-jre.zip -d target/bundle/runtimes
+        mv target/bundle/runtimes/ubuntu-22.04 target/bundle/runtimes/linux
+        unzip macos-14-jre.zip -d target/bundle/runtimes
+        mv target/bundle/runtimes/macos-14 target/bundle/runtimes/macos
         unzip windows-2022-jre.zip -d target/bundle/runtimes
         mv target/bundle/runtimes/windows-2022 target/bundle/runtimes/windows
 

diff --git a/.nvd/suppression.xml b/.nvd/suppression.xml
@@ -21,9 +21,9 @@
     <!-- TODO: Remove suppression once we update to Jetty 12 -->
     <suppress>
         <notes><![CDATA[
-        file name: jetty-http-9.4.54.v20240208.jar
+        file names: [jetty-http|http2-common|http2-server|jetty-io|jetty-server|websocket-client|websocket-server]-9.4.54.v20240208.jar
         ]]></notes>
-        <packageUrl regex="true">^pkg:maven/org\.eclipse\.jetty/jetty\-http@.*$</packageUrl>
+        <packageUrl regex="true">^pkg:maven/org\.eclipse\.jetty.*$</packageUrl>
         <vulnerabilityName>CVE-2024-6763</vulnerabilityName>
     </suppress>
 </suppressions>