Merge branch 'main' into parallel_execution_custom_executor

Author: phipag

.github/dependabot.yml

@@ -7,16 +7,3 @@ updates:
     labels:
       - "maven"
       - "dependencies"
-    ignore:
-      # Ignore Mockito 5.X.X as it does not support Java 8
-      - dependency-name: "org.mockito:mockito-*"
-        update-types: ["version-update:semver-major"]
-
-  - package-ecosystem: "maven"
-    directory: "/"
-    target-branch: "v2"
-    schedule:
-      interval: "weekly"
-    labels:
-      - "maven"
-      - "dependencies"

.github/workflows/security-scorecard.yml

@@ -0,0 +1,57 @@
+# Runs OSSF
+#
+# Description:
+#   Runs OpenSSF Scorecard scan on the project
+#
+# Triggers:
+#   - branch_protection_rule
+#   - cron: 09:00AM  
+#   - push
+#   - workflow_dispatch
+#
+# Secrets:
+#   - Security.SCORECARD_TOKEN
+
+on:
+  branch_protection_rule:
+  schedule:
+    - cron: "0 9 * * *"
+  push:
+    branches: [main]
+  workflow_dispatch: {}
+
+name: OpenSSF Scorecard
+run-name: OpenSSF Scorecard
+
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    environment: Security
+    permissions:
+      security-events: write  
+      id-token: write
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+      - name: Run Analysis
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          publish_results: true 
+          repo_token: ${{ secrets.SCORECARD_TOKEN }}
+      - name: Upload Results
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+      - name: Upload to Code-Scanning
+        uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
+        with:
+          sarif_file: results.sarif

pom.xml

@@ -374,9 +374,9 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>com.github.tomakehurst</groupId>
-                <artifactId>wiremock-jre8</artifactId>
-                <version>2.35.2</version>
+                <groupId>org.wiremock</groupId>
+                <artifactId>wiremock</artifactId>
+                <version>3.13.1</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>

powertools-cloudformation/pom.xml

@@ -14,8 +14,8 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>powertools-cloudformation</artifactId>
@@ -91,8 +91,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>