Merge branch 'main' into fix-awaility-breaking-steps-lifecycle

Author: a-simeshin

.github/workflows/build.yml

@@ -1,5 +1,8 @@
 name: Build
 
+permissions:
+  contents: read
+
 on:
   workflow_dispatch:
   pull_request:
@@ -15,10 +18,10 @@ jobs:
     name: "Build"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v5
 
       - name: "Set up JDK"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21

.github/workflows/dependency-submission.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Generate and submit dependency graph
         uses: gradle/actions/dependency-submission@v4
         env:

.github/workflows/labeler.yml

@@ -3,9 +3,14 @@ name: "Set theme labels"
 on:
   - pull_request_target
 
+permissions:
+  contents: read 
+
 jobs:
   triage:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
       - uses: actions/labeler@v4
         with:

.github/workflows/labels-verify.yml

@@ -4,9 +4,14 @@ on:
   pull_request_target:
     types: [opened, labeled, unlabeled, synchronize]
 
+permissions:
+  contents: none 
+
 jobs:
   triage:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
     steps:
       - uses: baev/action-label-verify@main
         with:

.github/workflows/publish.yml

@@ -4,14 +4,17 @@ on:
   release:
     types: [ published ]
 
+permissions:
+  contents: read 
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v5
 
       - name: "Set up JDK"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '21'
@@ -27,7 +30,7 @@ jobs:
 
       - name: "Gradle Publish"
         run: |
-          ./gradlew publishToSonatype -Pversion=${GITHUB_REF:10} \
+          ./gradlew publishToSonatype closeSonatypeStagingRepository -Pversion=${GITHUB_REF:10} \
                     -Psigning.keyId=${GPG_KEY_ID} \
                     -Psigning.password=${GPG_PASSPHRASE} \
                     -Psigning.secretKeyRingFile=${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg

.github/workflows/release.yml

@@ -11,17 +11,22 @@ on:
         description: "The next version in <MAJOR>.<MINOR> format WITHOUT SNAPSHOT SUFFIX"
         required: true
 
+permissions:
+  contents: read 
+
 jobs:
   triage:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: "Check release version"
         run: |
           expr "${{ github.event.inputs.releaseVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
       - name: "Check next version"
         run: |
           expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v5
         with:
           token: ${{ secrets.QAMETA_CI }}
 

allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java

@@ -20,6 +20,7 @@
  *
  * @author charlie (Dmitry Baev).
  */
+@FunctionalInterface
 public interface AttachmentData {
 
     String getName();

allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java

@@ -19,6 +19,7 @@
  * @param <T> the type of attachment data.
  * @author charlie (Dmitry Baev).
  */
+@FunctionalInterface
 public interface AttachmentProcessor<T extends AttachmentData> {
 
     void addAttachment(T attachmentData, AttachmentRenderer<T> renderer);

allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java

@@ -20,6 +20,7 @@
  * @author charlie (Dmitry Baev).
  */
 @SuppressWarnings("PMD.AvoidUncheckedExceptionsInSignatures")
+@FunctionalInterface
 public interface AttachmentRenderer<T extends AttachmentData> {
 
     AttachmentContent render(T attachmentData) throws AttachmentRenderException;

allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java

@@ -112,7 +112,6 @@ public String toString() {
     /**
      * Builder for HttpRequestAttachment.
      */
-    @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName")
     public static final class Builder {
 
         private final String name;