Merge branch 'master' into dependabot/gradle/functionaltest-jenkins-p…

…lugin/org.openapi.generator-7.1.0
stackrox · Dec 15, 2023 · dac00a4 · dac00a4
2 parents f551d5f + 9811159
commit dac00a4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: ahmadnassri/[email protected]
       with:
-        github-token: '${{ secrets.ROBOT_ROX_GITHUB_TOKEN }}'
+        github-token: '${{ secrets.RHACS_BOT_GITHUB_TOKEN }}'
         command: "squash and merge"
         approve: true
         target: minor
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '8'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,13 +21,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          token: ${{ secrets.PAT }}
+          token: ${{ secrets.RHACS_BOT_GITHUB_TOKEN }}
       - uses: chainguard-dev/actions/setup-gitsign@main
       - name: Setup git user
+        env:
+          GITHUB_USERNAME: ${{ secrets.RHACS_BOT_GITHUB_USERNAME }}
+          GITHUB_EMAIL: ${{ secrets.RHACS_BOT_GITHUB_EMAIL }}
         run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "Robot Rox"
-      - uses: actions/setup-java@v3
+          git config --global user.email "${GITHUB_EMAIL}"
+          git config --global user.name "${GITHUB_USERNAME}"
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '8'

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '11'
@@ -27,32 +27,32 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '8'
         cache: 'maven'
 
     - name: Initialize CodeQL
       if: github.event_name == 'push'
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: java, javascript
 
     - name: Build with Maven
       run: cd stackrox-container-image-scanner && ./mvnw -B verify package hpi:hpi cyclonedx:makeAggregateBom
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: stackrox-container-image-scanner.hpi
         path: stackrox-container-image-scanner/target/stackrox-container-image-scanner.hpi
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: stackrox-container-image-scanner.jar
         path: stackrox-container-image-scanner/target/stackrox-container-image-scanner.jar
 
     - name: Perform CodeQL Analysis
       if: github.event_name == 'push'
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
 
   e2e:
     if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork
@@ -65,7 +65,7 @@ jobs:
         repository: stackrox/stackrox
         path: stackrox
     - uses: docker/setup-buildx-action@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '11'
@@ -79,11 +79,11 @@ jobs:
         curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
         sudo apt-get update
         sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: stackrox-container-image-scanner.hpi
         path: jenkins
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: stackrox-container-image-scanner.hpi
         path: stackrox-container-image-scanner/target/

diff --git a/stackrox-container-image-scanner/pom.xml b/stackrox-container-image-scanner/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.1.2-jre</version>
+            <version>32.1.3-jre</version>
         </dependency>
         <dependency>
             <groupId>commons-validator</groupId>