From ed616e25d3077bdb6c70f6762de64291eb0b9bb1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 09:23:44 +0700
Subject: [PATCH 001/233] bump actions/checkout from 3.3.0 to 3.4.0 (via #897)

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/publish.yml | 2 +-
 .github/workflows/release.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 984646994..85fcf7596 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '17.0.x' ]
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.4.0
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v3
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3ccdaa8ea..cc110864d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.4.0
 
       - name: "Set up JDK 17.0.x"
         uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c76e6c1c3..f979969f7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: "Check next version"
         run: |
           expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.4.0
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From aa12687a21162abdf118dc89eb043bd3f194abfb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Mar 2023 19:42:17 +0700
Subject: [PATCH 002/233] bump grpc from 1.51.0 to 1.53.0 (via #885)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 909425d92..95e740dcc 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -8,7 +8,7 @@ description = "Allure gRPC Integration"
 
 val agent: Configuration by configurations.creating
 
-val grpcVersion = "1.51.0"
+val grpcVersion = "1.53.0"
 val protobufVersion = "3.21.11"
 
 dependencies {

From c38165d432e24109fe331945d2a2bb3838fcd74c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 13:20:16 +0700
Subject: [PATCH 003/233] bump actions/checkout from 3.4.0 to 3.5.0 (via #901)

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/publish.yml | 2 +-
 .github/workflows/release.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 85fcf7596..b246f73fc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '17.0.x' ]
     steps:
-      - uses: actions/checkout@v3.4.0
+      - uses: actions/checkout@v3.5.0
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v3
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index cc110864d..a39bb2342 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.4.0
+      - uses: actions/checkout@v3.5.0
 
       - name: "Set up JDK 17.0.x"
         uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f979969f7..65c319419 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: "Check next version"
         run: |
           expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-      - uses: actions/checkout@v3.4.0
+      - uses: actions/checkout@v3.5.0
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From 257e58b701534771434471550f5b06f552d9fff4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 13:20:39 +0700
Subject: [PATCH 004/233] bump com.gradle.enterprise from 3.11.4 to 3.12.5 (via
 #900)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 45f8d4d16..9bd09f36b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -47,7 +47,7 @@ pluginManagement {
     plugins {
         id("com.diffplug.spotless") version "6.11.0"
         id("com.github.johnrengelman.shadow") version "7.1.2"
-        id("com.gradle.enterprise") version "3.11.4"
+        id("com.gradle.enterprise") version "3.12.5"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
         id("io.qameta.allure-adapter") version "2.11.2"
         id("io.qameta.allure-aggregate-report") version "2.11.2"

From 8fe20871f08e23562656e392d78487835114ab0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 13:21:06 +0700
Subject: [PATCH 005/233] bump protobuf from 3.21.11 to 3.22.2 (via #899)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 95e740dcc..f0bed5402 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -9,7 +9,7 @@ description = "Allure gRPC Integration"
 val agent: Configuration by configurations.creating
 
 val grpcVersion = "1.53.0"
-val protobufVersion = "3.21.11"
+val protobufVersion = "3.22.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 90df7680e0fdf0cffb8ed933fafd521dc25dbf7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Mar 2023 14:47:44 +0400
Subject: [PATCH 006/233] bump org.junit:junit-bom from 5.8.2 to 5.9.2 (via
 #902)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a1acd27c6..2bcec2774 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -135,7 +135,7 @@ configure(libs) {
     dependencyManagement {
         imports {
             mavenBom("com.fasterxml.jackson:jackson-bom:2.14.1")
-            mavenBom("org.junit:junit-bom:5.8.2")
+            mavenBom("org.junit:junit-bom:5.9.2")
         }
         dependencies {
             dependency("com.github.spotbugs:spotbugs:4.7.3")

From 7cdc159583f6cb80fdcce7c8f79891b45b3eb6f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Apr 2023 11:41:04 +0100
Subject: [PATCH 007/233] bump actions/checkout from 3.5.0 to 3.5.2 (via #909)

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/publish.yml | 2 +-
 .github/workflows/release.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b246f73fc..71ee8b12e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '17.0.x' ]
     steps:
-      - uses: actions/checkout@v3.5.0
+      - uses: actions/checkout@v3.5.2
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v3
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index a39bb2342..f630c357f 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.5.0
+      - uses: actions/checkout@v3.5.2
 
       - name: "Set up JDK 17.0.x"
         uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 65c319419..5bda188d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: "Check next version"
         run: |
           expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-      - uses: actions/checkout@v3.5.0
+      - uses: actions/checkout@v3.5.2
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From 34b4f8098fd6e8a75d2ee7680ce52b40d2280030 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Apr 2023 11:41:32 +0100
Subject: [PATCH 008/233] bump org.mockito:mockito-core from 5.1.1 to 5.3.0
 (via #907)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2bcec2774..ffd686fc1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -159,7 +159,7 @@ configure(libs) {
             dependency("org.hamcrest:hamcrest:2.2")
             dependency("org.jboss.resteasy:resteasy-client:6.2.1.Final")
             dependency("org.mock-server:mockserver-netty:5.14.0")
-            dependency("org.mockito:mockito-core:5.1.1")
+            dependency("org.mockito:mockito-core:5.3.0")
             dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")
             dependency("org.slf4j:slf4j-nop:${orgSlf4jVersion}")
             dependency("org.slf4j:slf4j-simple:${orgSlf4jVersion}")

From 808c39a866b3059f3b20be57eefa8ea7c0e8ba94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 14:52:49 +0100
Subject: [PATCH 009/233] bump org.mock-server:mockserver-netty from 5.14.0 to
 5.15.0 (via #911)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ffd686fc1..04c4bdaef 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -158,7 +158,7 @@ configure(libs) {
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.hamcrest:hamcrest:2.2")
             dependency("org.jboss.resteasy:resteasy-client:6.2.1.Final")
-            dependency("org.mock-server:mockserver-netty:5.14.0")
+            dependency("org.mock-server:mockserver-netty:5.15.0")
             dependency("org.mockito:mockito-core:5.3.0")
             dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")
             dependency("org.slf4j:slf4j-nop:${orgSlf4jVersion}")

From ec0e9bcf0b7364c1f6021b19738bbaa4bdc25feb Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 28 Apr 2023 11:56:36 +0100
Subject: [PATCH 010/233] add karate integration (via #548)

---
 allure-karate/build.gradle.kts                |  55 +++
 .../io/qameta/allure/karate/AllureKarate.java | 356 ++++++++++++++++++
 .../allure/karate/AllureKarateTest.java       | 322 ++++++++++++++++
 .../io/qameta/allure/karate/TestRunner.java   |  94 +++++
 .../src/test/resources/testdata/api.feature   |  16 +
 .../resources/testdata/apiResponse.feature    |  13 +
 .../testdata/description-and-name.feature     |  10 +
 .../test/resources/testdata/greeting.feature  |  19 +
 .../src/test/resources/testdata/links.feature |   8 +
 .../testdata/parametrized-test.feature        |  13 +
 .../resources/testdata/screenshot.feature     |  12 +
 .../src/test/resources/testdata/steps.feature |  16 +
 .../src/test/resources/testdata/tags.feature  |  21 ++
 .../src/test/resources/testdata/web.feature   |  20 +
 settings.gradle.kts                           |   1 +
 15 files changed, 976 insertions(+)
 create mode 100644 allure-karate/build.gradle.kts
 create mode 100644 allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
 create mode 100644 allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
 create mode 100644 allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
 create mode 100644 allure-karate/src/test/resources/testdata/api.feature
 create mode 100644 allure-karate/src/test/resources/testdata/apiResponse.feature
 create mode 100644 allure-karate/src/test/resources/testdata/description-and-name.feature
 create mode 100644 allure-karate/src/test/resources/testdata/greeting.feature
 create mode 100644 allure-karate/src/test/resources/testdata/links.feature
 create mode 100644 allure-karate/src/test/resources/testdata/parametrized-test.feature
 create mode 100644 allure-karate/src/test/resources/testdata/screenshot.feature
 create mode 100644 allure-karate/src/test/resources/testdata/steps.feature
 create mode 100644 allure-karate/src/test/resources/testdata/tags.feature
 create mode 100644 allure-karate/src/test/resources/testdata/web.feature

diff --git a/allure-karate/build.gradle.kts b/allure-karate/build.gradle.kts
new file mode 100644
index 000000000..fb7aef326
--- /dev/null
+++ b/allure-karate/build.gradle.kts
@@ -0,0 +1,55 @@
+description = "Allure Karate Integration"
+
+val karateVersion = "1.3.1"
+
+configurations {
+    testImplementation {
+        exclude(group="ch.qos.logback", module = "logback-classic")
+    }
+}
+
+dependencies {
+    api(project(":allure-java-commons"))
+    implementation("com.intuit.karate:karate-core:${karateVersion}")
+    implementation(project(":allure-test-filter"))
+    testAnnotationProcessor("org.slf4j:slf4j-simple")
+    testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    testImplementation("io.github.glytching:junit-extensions")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-java-commons-test"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testImplementation("org.mock-server:mockserver-netty:5.14.0")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.karate"
+        ))
+    }
+    from("src/main/services") {
+        into("META-INF/services")
+    }
+}
+
+tasks.test {
+    systemProperty("junit.jupiter.execution.parallel.enabled", "false")
+    useJUnitPlatform()
+    exclude("**/features/*")
+}
+
+val spiOffJar: Jar by tasks.creating(Jar::class) {
+    from(sourceSets.getByName("main").output)
+    archiveClassifier.set("spi-off")
+}
+
+publishing {
+    publications {
+        named<MavenPublication>("maven") {
+            artifact(spiOffJar)
+        }
+    }
+}
\ No newline at end of file
diff --git a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
new file mode 100644
index 000000000..9629018e3
--- /dev/null
+++ b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
@@ -0,0 +1,356 @@
+/*
+ *  Copyright 2021 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.karate;
+
+import com.intuit.karate.RuntimeHook;
+import com.intuit.karate.core.Feature;
+import com.intuit.karate.core.FeatureRuntime;
+import com.intuit.karate.core.Result;
+import com.intuit.karate.core.Scenario;
+import com.intuit.karate.core.ScenarioResult;
+import com.intuit.karate.core.ScenarioRuntime;
+import com.intuit.karate.core.Step;
+import com.intuit.karate.core.StepResult;
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Link;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.util.ResultsUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
+
+import static io.qameta.allure.util.ResultsUtils.createLabel;
+import static io.qameta.allure.util.ResultsUtils.createLink;
+import static io.qameta.allure.util.ResultsUtils.createParameter;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@SuppressWarnings("MultipleStringLiterals")
+public class AllureKarate implements RuntimeHook {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AllureKarate.class);
+
+    private static final String ALLURE_UUID = "ALLURE_UUID";
+
+    private final AllureLifecycle lifecycle;
+
+    private final ReadWriteLock lock = new ReentrantReadWriteLock();
+
+    private final Map<String, String> stepsAndTcUuids = new HashMap<>();
+    private final Map<String, Step> stepAndUuids = new HashMap<>();
+
+    private final List<String> tcUuids = new ArrayList<>();
+
+    public AllureKarate() {
+        this(Allure.getLifecycle());
+    }
+
+    public AllureKarate(final AllureLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    @Override
+    public boolean beforeScenario(final ScenarioRuntime sr) {
+        final Feature feature = sr.featureRuntime.result.getFeature();
+        final String featureName = feature.getName();
+        final String featureNameQualified = feature.getPackageQualifiedName();
+        final Scenario scenario = sr.scenario;
+        final String scenarioName = scenario.getName();
+
+        final String uuid = UUID.randomUUID().toString();
+        sr.magicVariables.put(ALLURE_UUID, uuid);
+
+        final TestResult result = new TestResult()
+                .setUuid(uuid)
+                .setFullName(String.format("%s | %s", featureNameQualified, scenarioName))
+                .setName(scenarioName)
+                .setDescription(scenario.getDescription())
+                .setTestCaseId(scenario.getUniqueId())
+                .setStage(Stage.RUNNING);
+
+        final List<String> labels = sr.tags.getTags();
+        final List<Label> allLabels = getLabels(labels);
+        allLabels.add(ResultsUtils.createFeatureLabel(featureName));
+        result.setLabels(allLabels);
+
+        final List<Link> links = getLinks(labels);
+        if (!links.isEmpty()) {
+            result.setLinks(links);
+        }
+
+        lifecycle.scheduleTestCase(result);
+        lifecycle.startTestCase(uuid);
+        return true;
+    }
+
+    @Override
+    public void afterScenario(final ScenarioRuntime sr) {
+        final String uuid = (String) sr.magicVariables.get(ALLURE_UUID);
+        if (Objects.isNull(uuid)) {
+            return;
+        }
+        final Optional<ScenarioResult> maybeResult = Optional.of(sr)
+                .map(s -> s.result);
+
+        final Status status = !sr.isFailed()
+                ? Status.PASSED
+                : maybeResult
+                .map(ScenarioResult::getError)
+                .flatMap(ResultsUtils::getStatus)
+                .orElse(null);
+
+        final StatusDetails statusDetails = maybeResult
+                .map(ScenarioResult::getError)
+                .flatMap(ResultsUtils::getStatusDetails)
+                .orElse(null);
+
+        final List<Parameter> list = new ArrayList<>();
+        if (sr.result != null && sr.result.getScenario().getExampleIndex() > -1) {
+            final Map<String, Object> data = sr.result.getScenario().getExampleData();
+            final Set<String> keys = data.keySet();
+            for (String key : keys) {
+                list.add(createParameter(key, sr.result.getScenario().getExampleData().get(key)));
+            }
+        }
+
+        lifecycle.updateTestCase(uuid, tr -> {
+            tr.setStage(Stage.FINISHED);
+            tr.setStatus(status);
+            tr.setStatusDetails(statusDetails);
+            tr.setParameters(list);
+        });
+
+        lifecycle.stopTestCase(uuid);
+        tcUuids.add(uuid);
+    }
+
+    @Override
+    public boolean beforeStep(final Step step,
+                              final ScenarioRuntime sr) {
+        final String parentUuid = (String) sr.magicVariables.get(ALLURE_UUID);
+        if (Objects.isNull(parentUuid)) {
+            return true;
+        }
+
+        final String uuid = parentUuid + "-" + step.getIndex();
+        final io.qameta.allure.model.StepResult stepResult = new io.qameta.allure.model.StepResult()
+                .setName(step.getText());
+
+        lifecycle.startStep(parentUuid, uuid, stepResult);
+
+        return true;
+    }
+
+    @Override
+    public void afterStep(final StepResult result,
+                          final ScenarioRuntime sr) {
+        final String parentUuid = (String) sr.magicVariables.get(ALLURE_UUID);
+        if (Objects.isNull(parentUuid)) {
+            return;
+        }
+
+        final Step step = result.getStep();
+        final String uuid = parentUuid + "-" + step.getIndex();
+
+        final Result stepResult = result.getResult();
+
+        final Status status = !stepResult.isFailed()
+                ? Status.PASSED
+                : Optional.of(stepResult)
+                .map(Result::getError)
+                .flatMap(ResultsUtils::getStatus)
+                .orElse(null);
+
+        final StatusDetails statusDetails = Optional.of(stepResult)
+                .map(Result::getError)
+                .flatMap(ResultsUtils::getStatusDetails)
+                .orElse(null);
+
+        lifecycle.updateStep(uuid, s -> {
+            s.setStatus(status);
+            s.setStatusDetails(statusDetails);
+        });
+        lifecycle.stopStep(uuid);
+
+        if (stepResult.isFailed()
+                && sr.engine.getConfig().getDriverOptions() != null
+                && (Boolean) sr.engine.getConfig().getDriverOptions().get("screenshotOnFailure")
+        ) {
+            addToStepsAndTcUuids(uuid, lifecycle.getCurrentTestCase().get());
+            addToStepAndUuids(uuid, step);
+        }
+
+        if (Objects.nonNull(result.getEmbeds())) {
+            result.getEmbeds().forEach(embed -> {
+                try (InputStream is = new BufferedInputStream(Files.newInputStream(embed.getFile().toPath()))) {
+                    lifecycle.addAttachment(
+                            embed.getFile().getName(),
+                            embed.getResourceType().contentType,
+                            embed.getResourceType().getExtension(),
+                            is
+                    );
+                } catch (IOException e) {
+                    LOGGER.warn("could not save embedding", e);
+                }
+            });
+        }
+
+    }
+
+    @Override
+    public void afterFeature(final FeatureRuntime fr) {
+
+        if (!stepsAndTcUuids.isEmpty()) {
+            fr.result.getScenarioResults()
+                    .forEach(sc -> {
+                        if (Objects.nonNull(sc.getFailedStep())) {
+                            getKeySetFromStepAndUuids().forEach(uuid -> {
+                                if (getValueFromStepAndUuids(uuid) == sc.getFailedStep().getStep()) {
+                                    final List<Attachment> attachments = new ArrayList<>();
+                                    sc.getFailedStep().getEmbeds().forEach(e -> attachments.add(
+                                                    new Attachment()
+                                                            .setSource(e.getFile().getPath())
+                                                            .setType(e.getResourceType().contentType)
+                                                            .setName(e.getFile().getName())
+                                            )
+                                    );
+                                    lifecycle.updateTestCase(getValueFromStepsAndTcUuids(uuid), result ->
+                                            result.setAttachments(attachments)
+                                    );
+                                }
+                            });
+                        }
+                    });
+        }
+
+        tcUuids.forEach(lifecycle::writeTestCase);
+    }
+
+    private List<Label> getLabels(final List<String> labels) {
+        final Map<String, String> allureLabels = new HashMap<>();
+        final List<Label> allLabels = new ArrayList<>();
+        for (String tag : labels.stream()
+                .filter(l -> l.contains("allure")).collect(Collectors.toList())) {
+            final String tagName = tag.substring(0, tag.indexOf(':'));
+            final String tagValue = tag.substring(tag.indexOf(':') + 1);
+            if (tagName.contains("allure.label")) {
+                allureLabels.put(
+                        tagName.substring("allure.label.".length()),
+                        tagValue
+                );
+            }
+            if (tagName.contains("allure.id")) {
+                allureLabels.put("AS_ID", tagValue);
+            }
+            if (tagName.contains("allure.severity")) {
+                allureLabels.put("severity", tagValue);
+            }
+        }
+        allureLabels.keySet().forEach(key -> allLabels.add(createLabel(key, allureLabels.get(key))));
+        return allLabels;
+    }
+
+    private List<Link> getLinks(final List<String> labels) {
+        final List<Link> allureLinks = new ArrayList<>();
+        for (String tag : labels.stream()
+                .filter(l -> l.contains("allure.link")).collect(Collectors.toList())) {
+            final String tagName = tag.substring(0, tag.indexOf(':'));
+            final String tagValue = tag.substring(tag.indexOf(':') + 1);
+            switch (tagName.substring("allure.link".length())) {
+                case "":
+                    allureLinks.add(createLink(tagValue, "", "", "custom"));
+                    break;
+                case ".tms":
+                    allureLinks.add(createLink(tagValue, "", "", "tms"));
+                    break;
+                case ".issue":
+                    allureLinks.add(createLink(tagValue, "", "", "issue"));
+                    break;
+                default:
+                    break;
+            }
+        }
+        return allureLinks;
+    }
+
+    private void addToStepsAndTcUuids(final String stepUuid, final String tcUuid) {
+        lock.writeLock().lock();
+        try {
+            stepsAndTcUuids.put(stepUuid, tcUuid);
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+
+    private void addToStepAndUuids(final String stepUuid, final Step step) {
+        lock.writeLock().lock();
+        try {
+            stepAndUuids.put(stepUuid, step);
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+
+    private String getValueFromStepsAndTcUuids(final String stepUuid) {
+        lock.readLock().lock();
+        try {
+            return stepsAndTcUuids.get(stepUuid);
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    private Step getValueFromStepAndUuids(final String stepUuid) {
+        lock.readLock().lock();
+        try {
+            return stepAndUuids.get(stepUuid);
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    private Set<String> getKeySetFromStepAndUuids() {
+        lock.readLock().lock();
+        try {
+            return stepAndUuids.keySet();
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+}
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
new file mode 100644
index 000000000..782e6478b
--- /dev/null
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
@@ -0,0 +1,322 @@
+/*
+ *  Copyright 2021 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.karate;
+
+import com.intuit.karate.Runner;
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Link;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.test.AllureResults;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static io.qameta.allure.model.Status.BROKEN;
+import static io.qameta.allure.model.Status.PASSED;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@SuppressWarnings({"MultipleStringLiterals", "PMD.AvoidDuplicateLiterals"})
+class AllureKarateTest extends TestRunner {
+
+    @Test
+    void shouldCreateNameAndFullName() {
+        final AllureResults results = run("classpath:testdata/description-and-name.feature");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getFullName)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Some api* request # comment 1",
+                                "testdata.description-and-name | Some api* request # comment 1"
+                        ),
+                        tuple(
+                                "",
+                                "testdata.description-and-name | "
+                        )
+                );
+    }
+
+    @Test
+    void shouldCreateDescription() {
+        final AllureResults results = run("classpath:testdata/description-and-name.feature");
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getDescription, TestResult::getDescriptionHtml)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Request '//user' & get 20* code, ...",
+                                null
+                        ),
+                        tuple(
+                                "",
+                                null
+                        )
+                );
+    }
+
+    @Test
+    void shouldCreateStartAndStopTimeslots() {
+        final AllureResults results = runApi("classpath:testdata/api.feature");
+
+        final TestResult tr1 = results.getTestResults().get(0);
+        final TestResult tr2 = results.getTestResults().get(1);
+
+        assertThat(tr2.getStop())
+                .isGreaterThan(tr2.getStart())
+                .isGreaterThan(tr1.getStop());
+    }
+
+    @Test
+    void shouldCreateStatusAndStage() {
+        final AllureResults results = run("classpath:testdata/api.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Simple post request")
+                .extracting(TestResult::getStatus, TestResult::getStage)
+                .containsExactlyInAnyOrder(
+                        tuple(BROKEN, Stage.FINISHED)
+                );
+    }
+
+    @Test
+    void shouldNotCreateStatusDetailsIfTestPassed() {
+        final AllureResults results = runApi("classpath:testdata/api.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Simple get request")
+                .extracting(TestResult::getStatus, TestResult::getStatusDetails)
+                .containsExactlyInAnyOrder(
+                        tuple(PASSED, null)
+                );
+    }
+
+    @Test
+    void shouldCreateStatusDetailsIfTestFailed() {
+        final AllureResults results = runApi("classpath:testdata/api.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Simple post request")
+                .extracting(
+                        TestResult::getStatus,
+                        result -> result.getStatusDetails().getMessage().substring(0, 35),
+                        result -> result.getStatusDetails().getTrace().substring(0, 70)
+                )
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                BROKEN,
+                                "status code was: 401, expected: 200",
+                                "com.intuit.karate.KarateException: status code was: 401, expected: 200"
+                        )
+                );
+    }
+
+    @Test
+    void shouldCreateTestCaseIdAndName() {
+        final AllureResults results = run("classpath:testdata/description-and-name.feature");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getTestCaseId, TestResult::getTestCaseName)
+                .containsExactlyInAnyOrder(
+                        tuple("testdata.description-and-name_1", null),
+                        tuple("testdata.description-and-name_2", null)
+                );
+    }
+
+    @Test
+    void shouldCreateTestCaseIdAndNamesOfParametrizedTest() {
+        final AllureResults results = runApi("classpath:testdata/parametrized-test.feature");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple("/login should return 200", "testdata.parametrized-test_1_1"),
+                        tuple("/user should return 301", "testdata.parametrized-test_1_2"),
+                        tuple("/pages should return 404", "testdata.parametrized-test_1_3")
+                );
+    }
+
+    @Test
+    void shouldCreateParamsForParametrizedTest() {
+        final AllureResults results = runApi("classpath:testdata/parametrized-test.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "/login should return 200")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("path", "login"),
+                        tuple("status", "200")
+        );
+    }
+
+    @Test
+    void shouldCreateLabels() {
+        final AllureResults results = run("classpath:testdata/tags.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Test with labels")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("feature", "labels"),
+                        tuple("epic", "epic1"),
+                        tuple("story", "story1"),
+                        tuple("tag", "some_tag")
+                );
+    }
+
+    @Test
+    void shouldCreateSpecialLabels() {
+        final AllureResults results = run("classpath:testdata/tags.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Test with owner, id and layer")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("feature", "labels"),
+                        tuple("AS_ID", "141413"),
+                        tuple("owner", "npolly"),
+                        tuple("layer", "unit_tests"),
+                        tuple("severity", "blocker")
+                );
+    }
+
+    @Test
+    void shouldNotCreateTagLabel() {
+        final AllureResults results = run("classpath:testdata/tags.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Test without allure labels")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .containsExactly(
+                        tuple("feature", "labels")
+                );
+    }
+
+    @Test
+    void shouldCreateLinks() {
+        final AllureResults results = run("classpath:testdata/links.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Test with links")
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName, Link::getType)
+                .containsExactlyInAnyOrder(
+                        tuple("http://localhost:8080", "custom"),
+                        tuple("http://localhost:8080", "tms"),
+                        tuple("http://localhost:8080", "issue")
+                );
+    }
+
+    @Test
+    void shouldCreateApiTestSteps() {
+        final AllureResults results = runApi("classpath:testdata/steps.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "f1 - s1")
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactlyInAnyOrder(
+                        "print 'first feature:@smoke, first scenario'",
+                        "url 'http://localhost:8081'",
+                        "path '/login'",
+                        "method get",
+                        "status 200"
+                );
+    }
+
+    @Test
+    void shouldCreateResultWithEmptySteps() {
+        final AllureResults results = runApi("classpath:testdata/steps.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "f1 - s2")
+                .flatExtracting(TestResult::getSteps)
+                .isEmpty();
+    }
+
+    @Test
+    void shouldCreateStepsStatuses() {
+        final AllureResults results = run("classpath:testdata/steps.feature");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "f1 - s1")
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getStatus)
+                .containsExactly(
+                        PASSED,
+                        PASSED,
+                        PASSED,
+                        BROKEN
+                );
+    }
+
+    @Test
+    @Disabled
+    @SuppressWarnings("PMD.JUnitTestContainsTooManyAsserts")
+    void shouldCreateAttachmentForFailedStep() {
+        final AllureResults results = run("classpath:testdata/screenshot.feature");
+
+        assertThat(results.getTestResults().get(0).getAttachments().get(0).getName()).contains("screenshot_1");
+        assertThat(results.getTestResults().get(1).getAttachments().get(0).getName()).contains("screenshot_2");
+    }
+
+    @Test
+    @Disabled
+    @SuppressWarnings("PMD.JUnitTestContainsTooManyAsserts")
+    void shouldCreateAttachments() {
+        final AllureResults results = run("classpath:testdata/web.feature");
+
+        assertThat(results.getTestResults().get(0).getAttachments().size()).isEqualTo(2);
+
+        final String firstAttachment = results.getTestResults().get(0).getAttachments().get(0).getName();
+        final String secondAttachment = results.getTestResults().get(0).getAttachments().get(1).getName();
+
+        assertThat(firstAttachment).contains("web_1");
+        assertThat(secondAttachment).contains("web_1");
+
+        final String firstAttachmentDateCreated = firstAttachment.substring(
+                firstAttachment.lastIndexOf('_') + 1,
+                firstAttachment.lastIndexOf('.')
+        );
+        final String secondAttachmentDateCreated = secondAttachment.substring(
+                secondAttachment.lastIndexOf('_') + 1,
+                secondAttachment.lastIndexOf('.')
+        );
+
+        assertThat(Long.parseLong(secondAttachmentDateCreated))
+                .isGreaterThan(Long.parseLong(firstAttachmentDateCreated));
+    }
+
+    @Test
+    void buildTest() {
+        Runner.builder()
+                .path("classpath:testdata/greeting.feature")
+                .hook(new AllureKarate())
+                .backupReportDir(false)
+                .outputJunitXml(false)
+                .outputCucumberJson(false)
+                .outputHtmlReport(false)
+                .parallel(1);
+    }
+}
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java b/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
new file mode 100644
index 000000000..099ef0a25
--- /dev/null
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
@@ -0,0 +1,94 @@
+/*
+ *  Copyright 2022 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.karate;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.aspects.AttachmentsAspects;
+import io.qameta.allure.aspects.StepsAspects;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.AllureResultsWriterStub;
+import org.mockserver.client.MockServerClient;
+import org.mockserver.model.HttpRequest;
+import org.mockserver.model.HttpResponse;
+import org.mockserver.netty.MockServer;
+
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+
+@SuppressWarnings("MultipleStringLiterals")
+public class TestRunner {
+
+    private MockServer server;
+    private MockServerClient client;
+
+    AllureResults runApi(final String... featurePath) {
+        server = new MockServer(8081);
+        client = new MockServerClient("localhost", server.getLocalPort());
+
+        final HttpRequest interceptReq1 = request("/login").withMethod("GET");
+        final HttpResponse mockResponse1 = response().withStatusCode(200);
+        client.when(interceptReq1).respond(mockResponse1);
+
+        final HttpRequest interceptReq2 = request("/login").withMethod("POST");
+        final HttpResponse mockResponse2 = response().withStatusCode(401).withBody("[{\"message\": \"No access\"}]");
+        client.when(interceptReq2).respond(mockResponse2);
+
+        final HttpRequest interceptReq3 = request("/user").withMethod("GET");
+        final HttpResponse mockResponse3 = response().withStatusCode(301);
+        client.when(interceptReq3).respond(mockResponse3);
+
+        final HttpRequest interceptReq4 = request("/pages").withMethod("GET");
+        final HttpResponse mockResponse4 = response().withStatusCode(404);
+        client.when(interceptReq4).respond(mockResponse4);
+
+        return run(featurePath);
+    }
+
+    AllureResults run(final String... path) {
+        final AllureResultsWriterStub writerStub = new AllureResultsWriterStub();
+        final AllureLifecycle lifecycle = new AllureLifecycle(writerStub);
+        final AllureKarate allureKarate = new AllureKarate(lifecycle);
+
+        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
+        try {
+            Allure.setLifecycle(lifecycle);
+            StepsAspects.setLifecycle(lifecycle);
+            AttachmentsAspects.setLifecycle(lifecycle);
+
+            com.intuit.karate.Runner.builder()
+                    .path(path)
+                    .hook(allureKarate)
+                    .backupReportDir(false)
+                    .outputJunitXml(false)
+                    .outputCucumberJson(false)
+                    .outputHtmlReport(false)
+                    .parallel(1);
+
+            return writerStub;
+        } finally {
+            Allure.setLifecycle(defaultLifecycle);
+            StepsAspects.setLifecycle(defaultLifecycle);
+            AttachmentsAspects.setLifecycle(defaultLifecycle);
+            if (server != null && server.isRunning()) {
+                server.stop();
+            }
+            if (client != null && !client.hasStopped()) {
+                client.stop();
+            }
+        }
+    }
+}
diff --git a/allure-karate/src/test/resources/testdata/api.feature b/allure-karate/src/test/resources/testdata/api.feature
new file mode 100644
index 000000000..52e5808ef
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/api.feature
@@ -0,0 +1,16 @@
+Feature: Simple API tests
+
+#  Background:
+#    * url 'https://qameta.testops.cloud/api/login/props'
+
+  Scenario: Simple get request
+    * url 'http://localhost:8081'
+    * path '/login'
+    When method get
+    Then status 200
+
+  Scenario: Simple post request
+    * url 'http://localhost:8081'
+    * path '/login'
+    When method post
+    Then status 200
\ No newline at end of file
diff --git a/allure-karate/src/test/resources/testdata/apiResponse.feature b/allure-karate/src/test/resources/testdata/apiResponse.feature
new file mode 100644
index 000000000..74577f639
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/apiResponse.feature
@@ -0,0 +1,13 @@
+Feature: API tests
+
+  Scenario: Get request with response body
+    Given path 'https://mysite.example.api.com/users'
+    When method get
+    Then status 200
+    And match response == [{ id: '1', name: 'Soul' }, { id: '2', name: 'Kate' }]
+
+  Scenario: Post request with response body
+    Given path 'https://mysite.example.api.com/users/login'
+    When method post
+    Then status 200
+    And match response == { message: 'User logged in', error: null }
\ No newline at end of file
diff --git a/allure-karate/src/test/resources/testdata/description-and-name.feature b/allure-karate/src/test/resources/testdata/description-and-name.feature
new file mode 100644
index 000000000..6dafde360
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/description-and-name.feature
@@ -0,0 +1,10 @@
+Feature: API tests for AT
+
+  Scenario: Some api* request # comment 1
+  Request '//user' & get 20* code, ...
+  # comment 2
+    * print 'First step'
+
+  Scenario:
+    # comment 3
+    * print 'Second step'
diff --git a/allure-karate/src/test/resources/testdata/greeting.feature b/allure-karate/src/test/resources/testdata/greeting.feature
new file mode 100644
index 000000000..0cf1943ac
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/greeting.feature
@@ -0,0 +1,19 @@
+Feature: greeting end-point
+
+Background:
+* url demoBaseUrl
+
+Scenario: get default greeting
+
+    Given path 'greeting'
+    When method get
+    Then status 200
+    And match response == { id: '#number', content: 'Hello World!' }
+
+Scenario: get custom greeting
+
+    Given path 'greeting'
+    And param name = 'Billie'
+    When method get
+    Then status 200
+    And match response == { id: '#number', content: 'Hello Billie!' }
diff --git a/allure-karate/src/test/resources/testdata/links.feature b/allure-karate/src/test/resources/testdata/links.feature
new file mode 100644
index 000000000..b1014595a
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/links.feature
@@ -0,0 +1,8 @@
+Feature: links
+
+  @allure.link:http://localhost:8080
+  @allure.link.tms:http://localhost:8080
+  @allure.link.issue:http://localhost:8080
+  Scenario: Test with links
+    * print 'First step'
+    * print 'Second step'
\ No newline at end of file
diff --git a/allure-karate/src/test/resources/testdata/parametrized-test.feature b/allure-karate/src/test/resources/testdata/parametrized-test.feature
new file mode 100644
index 000000000..884647a73
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/parametrized-test.feature
@@ -0,0 +1,13 @@
+Feature: Parameterized tests
+
+  Scenario Outline: /<path> should return <status>
+    * url 'http://localhost:8081'
+    Given path '/<path>'
+    When method get
+    Then status <status>
+
+    Examples:
+      | path   | status  |
+      | login  | 200     |
+      | user   | 301     |
+      | pages  | 404     |
\ No newline at end of file
diff --git a/allure-karate/src/test/resources/testdata/screenshot.feature b/allure-karate/src/test/resources/testdata/screenshot.feature
new file mode 100644
index 000000000..b105e2726
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/screenshot.feature
@@ -0,0 +1,12 @@
+Feature: attachments
+
+  Background:
+    * configure driver = { type: 'chrome', timeout: 5000, screenshotOnFailure: true, showDriverLog: true }
+
+  Scenario: Screenshot attachment
+    Given driver 'https://docs.qameta.io/allure-testops/'
+    Then match true == false
+
+  Scenario: Screenshot attachment
+    Given driver 'https://docs.qameta.io/allure-testops/'
+    Then match false == true
\ No newline at end of file
diff --git a/allure-karate/src/test/resources/testdata/steps.feature b/allure-karate/src/test/resources/testdata/steps.feature
new file mode 100644
index 000000000..6be111586
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/steps.feature
@@ -0,0 +1,16 @@
+@smoke
+Feature: tags demo - first
+    run the following example from the command line:
+    mvn test -Dcucumber.options="--tags @smoke" -Dtest=TagsRunner
+
+Scenario: f1 - s1
+    * print 'first feature:@smoke, first scenario'
+    * url 'http://localhost:8081'
+    * path '/login'
+    When method get
+    # comment
+    Then status 200
+
+@fire
+Scenario: f1 - s2
+    #* print 'first feature:@smoke, second scenario:@fire'
diff --git a/allure-karate/src/test/resources/testdata/tags.feature b/allure-karate/src/test/resources/testdata/tags.feature
new file mode 100644
index 000000000..726a00773
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/tags.feature
@@ -0,0 +1,21 @@
+Feature: labels
+
+  @allure.label.epic:epic1
+  @allure.label.story:story1
+  @allure.label.tag:some_tag
+  Scenario: Test with labels
+    * print 'First step'
+    * print 'Second step'
+
+  @allure.id:141413
+  @allure.label.owner:npolly
+  @allure.label.layer:unit_tests
+  @allure.severity:blocker
+  Scenario: Test with owner, id and layer
+    * print 'First step'
+    * print 'Second step'
+
+  @Karate_tag:1
+  Scenario: Test without allure labels
+    * print 'First step'
+    * print 'Second step'
diff --git a/allure-karate/src/test/resources/testdata/web.feature b/allure-karate/src/test/resources/testdata/web.feature
new file mode 100644
index 000000000..1a4737b68
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/web.feature
@@ -0,0 +1,20 @@
+Feature: browser automation 1
+
+  Background:
+   * configure driver = { type: 'chrome' }
+  # * configure driverTarget = { docker: 'justinribeiro/chrome-headless', showDriverLog: true }
+  # * configure driverTarget = { docker: 'ptrthomas/karate-chrome', showDriverLog: true }
+  # * configure driver = { type: 'chromedriver', showDriverLog: true }
+  # * configure driver = { type: 'geckodriver', showDriverLog: true }
+  # * configure driver = { type: 'safaridriver', showDriverLog: true }
+  # * configure driver = { type: 'iedriver', showDriverLog: true, httpConfig: { readTimeout: 120000 } }
+
+  Scenario: try to login to github
+
+    Given driver 'https://github.com/login'
+    And screenshot()
+    And input('#login_field', 'dummy')
+    And input('#password', 'world')
+    And screenshot()
+    When submit().click("input[name=commit]")
+    Then match html('#js-flash-container') contains 'Incorrect username or password.'
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9bd09f36b..58c61da5f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,6 +26,7 @@ include("allure-junit4")
 include("allure-junit4-aspect")
 include("allure-junit5")
 include("allure-junit5-assert")
+include("allure-karate")
 include("allure-model")
 include("allure-okhttp")
 include("allure-okhttp3")

From 462d7cbe3db3d6e25c5766c09142a3d8da6e09a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Apr 2023 11:59:18 +0100
Subject: [PATCH 011/233] bump protobufVersion from 3.22.2 to 3.22.3 (via #913)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index f0bed5402..2556fe959 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -9,7 +9,7 @@ description = "Allure gRPC Integration"
 val agent: Configuration by configurations.creating
 
 val grpcVersion = "1.53.0"
-val protobufVersion = "3.22.2"
+val protobufVersion = "3.22.3"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 7bc78ffb8af61d0f53f6bc0939425cae530c6574 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Fri, 28 Apr 2023 14:16:27 +0000
Subject: [PATCH 012/233] release 2.22.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 3f1553a46..66f8687b0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.22-SNAPSHOT
+version=2.22.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 67542e7ce0dbd7193b75d282a63de5f8078c5d8b Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Fri, 28 Apr 2023 14:16:28 +0000
Subject: [PATCH 013/233] set next development version 2.23

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 66f8687b0..d10e2f6aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.22.0
+version=2.23-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From bf0eec7804e38d22c3cb948ed3e5a65eadec7e3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 May 2023 10:11:44 +0100
Subject: [PATCH 014/233] bump com.intuit.karate:karate-core from 1.3.1 to
 1.4.0 (via #915)

---
 allure-karate/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-karate/build.gradle.kts b/allure-karate/build.gradle.kts
index fb7aef326..914f29c08 100644
--- a/allure-karate/build.gradle.kts
+++ b/allure-karate/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Karate Integration"
 
-val karateVersion = "1.3.1"
+val karateVersion = "1.4.0"
 
 configurations {
     testImplementation {

From 343d0b8357eab2c6b08e6db3100c3cc9a0de422e Mon Sep 17 00:00:00 2001
From: Mirek <1536554+shalak@users.noreply.github.com>
Date: Tue, 23 May 2023 17:01:48 +0200
Subject: [PATCH 015/233] make AllureRestTemplate more configurable (via #873)

---
 .../allure/springweb/AllureRestTemplate.java  | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
index 5474a8137..012ceb974 100644
--- a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
+++ b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
@@ -17,6 +17,7 @@
 
 import io.qameta.allure.attachment.AttachmentData;
 import io.qameta.allure.attachment.AttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
 import io.qameta.allure.attachment.DefaultAttachmentProcessor;
 import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
 import io.qameta.allure.attachment.http.HttpRequestAttachment;
@@ -42,6 +43,14 @@ public class AllureRestTemplate implements ClientHttpRequestInterceptor {
     private String requestTemplatePath = "http-request.ftl";
     private String responseTemplatePath = "http-response.ftl";
 
+    public String getRequestTemplatePath() {
+        return requestTemplatePath;
+    }
+
+    public String getResponseTemplatePath() {
+        return responseTemplatePath;
+    }
+
     public AllureRestTemplate setRequestTemplate(final String templatePath) {
         this.requestTemplatePath = templatePath;
         return this;
@@ -52,11 +61,23 @@ public AllureRestTemplate setResponseTemplate(final String templatePath) {
         return this;
     }
 
+    protected AttachmentRenderer<AttachmentData> getRequestRenderer() {
+        return new FreemarkerAttachmentRenderer(getRequestTemplatePath());
+    }
+
+    protected AttachmentRenderer<AttachmentData> getResponseRenderer() {
+        return new FreemarkerAttachmentRenderer(getResponseTemplatePath());
+    }
+
+    protected AttachmentProcessor<AttachmentData> getAttachmentProcessor() {
+        return new DefaultAttachmentProcessor();
+    }
+
     @SuppressWarnings("NullableProblems")
     @Override
     public ClientHttpResponse intercept(@NonNull final HttpRequest request, final byte[] body,
                                         @NonNull final ClientHttpRequestExecution execution) throws IOException {
-        final AttachmentProcessor<AttachmentData> processor = new DefaultAttachmentProcessor();
+        final AttachmentProcessor<AttachmentData> processor = getAttachmentProcessor();
 
         final HttpRequestAttachment.Builder requestAttachmentBuilder = HttpRequestAttachment.Builder
                 .create("Request", request.getURI().toString())
@@ -67,7 +88,7 @@ public ClientHttpResponse intercept(@NonNull final HttpRequest request, final by
         }
 
         final HttpRequestAttachment requestAttachment = requestAttachmentBuilder.build();
-        processor.addAttachment(requestAttachment, new FreemarkerAttachmentRenderer(requestTemplatePath));
+        processor.addAttachment(requestAttachment, getRequestRenderer());
 
         final ClientHttpResponse clientHttpResponse = execution.execute(request, body);
 
@@ -77,12 +98,12 @@ public ClientHttpResponse intercept(@NonNull final HttpRequest request, final by
                 .setHeaders(toMapConverter(clientHttpResponse.getHeaders()))
                 .setBody(StreamUtils.copyToString(clientHttpResponse.getBody(), StandardCharsets.UTF_8))
                 .build();
-        processor.addAttachment(responseAttachment, new FreemarkerAttachmentRenderer(responseTemplatePath));
+        processor.addAttachment(responseAttachment, getResponseRenderer());
 
         return clientHttpResponse;
     }
 
-    private static Map<String, String> toMapConverter(final Map<String, List<String>> items) {
+    protected static Map<String, String> toMapConverter(final Map<String, List<String>> items) {
         final Map<String, String> result = new HashMap<>();
         items.forEach((key, value) -> result.put(key, String.join("; ", value)));
         return result;

From 1b6ccc1069ba618de727be2a4337f9f3d9c516ab Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Tue, 23 May 2023 15:04:24 +0000
Subject: [PATCH 016/233] release 2.22.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index d10e2f6aa..589e3cb69 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.23-SNAPSHOT
+version=2.22.1
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From cca8aa9ac4db1981f990cbdcbe2a34780eafa11c Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Tue, 23 May 2023 15:04:25 +0000
Subject: [PATCH 017/233] set next development version 2.23

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 589e3cb69..d10e2f6aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.22.1
+version=2.23-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From b7136b2044adffdfbd10b9b418e07b87f477069d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jun 2023 09:40:22 +0100
Subject: [PATCH 018/233] bump protobufVersion from 3.22.3 to 3.22.4 (via #916)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 2556fe959..2da30e57d 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -9,7 +9,7 @@ description = "Allure gRPC Integration"
 val agent: Configuration by configurations.creating
 
 val grpcVersion = "1.53.0"
-val protobufVersion = "3.22.3"
+val protobufVersion = "3.22.4"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 72dbe04f098ed9f5bb0300d028c4c733232c9110 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 11:28:04 +0100
Subject: [PATCH 019/233] bump actions/checkout from 3.5.2 to 3.5.3 (via #925)

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/publish.yml | 2 +-
 .github/workflows/release.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 71ee8b12e..e6d1241d1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '17.0.x' ]
     steps:
-      - uses: actions/checkout@v3.5.2
+      - uses: actions/checkout@v3.5.3
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v3
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f630c357f..1588f1359 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.5.2
+      - uses: actions/checkout@v3.5.3
 
       - name: "Set up JDK 17.0.x"
         uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5bda188d3..21fe7321b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: "Check next version"
         run: |
           expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-      - uses: actions/checkout@v3.5.2
+      - uses: actions/checkout@v3.5.3
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From a0787612dc7a9abe2c58152f9711fe16c2f62128 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Tue, 13 Jun 2023 16:44:05 +0000
Subject: [PATCH 020/233] release 2.22.2

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index d10e2f6aa..28e648b3e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.23-SNAPSHOT
+version=2.22.2
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From a5fd988eeb842ab6489d528ddca13d6d4a7f08cc Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Tue, 13 Jun 2023 16:44:06 +0000
Subject: [PATCH 021/233] set next development version 2.23

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 28e648b3e..d10e2f6aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.22.2
+version=2.23-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 16e9b599a209b8edd8f9d54207a0ff5bc3d01d93 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Wed, 14 Jun 2023 15:48:47 +0100
Subject: [PATCH 022/233] fix issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 38 ----------
 .github/ISSUE_TEMPLATE/bug_report.yml     | 84 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml         | 11 +++
 .github/ISSUE_TEMPLATE/feature_request.md | 20 ------
 4 files changed, 95 insertions(+), 58 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index dd84ea782..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..0e015e905
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,84 @@
+name: 🐞 Bug Report
+description: File a Bug report in Java Integration
+title: "🐞: "
+labels: [ "type:bug", "triage" ]
+assignees:
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: dropdown
+    id: integration
+    attributes:
+      label: What Allure Integration are you using?
+      multiple: true
+      description: Please select the Allure integration you
+      options:
+        - allure-assertj
+        - allure-attachments
+        - allure-awaitility
+        - allure-citrus
+        - allure-cucumber2-jvm
+        - allure-cucumber3-jvm
+        - allure-cucumber4-jvm
+        - allure-cucumber5-jvm
+        - allure-cucumber6-jvm
+        - allure-cucumber7-jvm
+        - allure-descriptions-javadoc
+        - allure-grpc
+        - allure-hamcrest
+        - allure-httpclient
+        - allure-java-commons
+        - allure-jax-rs
+        - allure-jbehave
+        - allure-jsonunit
+        - allure-junit-platform
+        - allure-junit4
+        - allure-junit5
+        - allure-karate
+        - allure-okhttp
+        - allure-okhttp3
+        - allure-reader
+        - allure-rest-assured
+        - allure-scalatest
+        - allure-selenide
+        - allure-servlet-api
+        - allure-spock
+        - allure-spock2
+        - allure-spring-web
+        - allure-test-filter
+        - allure-testng
+    validations:
+      required: true
+  - type: input
+    id: integration_version
+    attributes:
+      label: What version of Allure Integration you are using?
+      placeholder: 2.22.3
+    validations:
+      required: true
+  - type: input
+    id: allure_report_version
+    attributes:
+      label: What version of Allure Report you are using?
+      placeholder: 2.22.3
+    validations:
+      required: true
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/allure-framework/allure-java/blob/master/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..e3df72087
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 🐞 Issue with html report
+    url: https://github.com/allure-framework/allure2/issues/new/choose
+    about: For Allure Report related issues.
+  - name: 💬 Allure Report Community
+    url: https://github.com/orgs/allure-framework/discussions
+    about: Please ask and answer questions here.
+  - name: 🥇 Allure TestOps Support
+    url: https://help.qameta.io/support/home
+    about: Please report Allure TestOps issues here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bbcbbe7d6..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

From 19f9a03f3439d85b141f08f9d7d159a7d571b918 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Wed, 14 Jun 2023 15:49:36 +0100
Subject: [PATCH 023/233] fix issue tempalte

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 0e015e905..5fddcebc4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -2,7 +2,7 @@ name: 🐞 Bug Report
 description: File a Bug report in Java Integration
 title: "🐞: "
 labels: [ "type:bug", "triage" ]
-assignees:
+assignees: []
 body:
   - type: markdown
     attributes:

From 515e46e261baeda7c889070724d7a4fc01312ec8 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 15 Jun 2023 15:00:10 +0100
Subject: [PATCH 024/233] update config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index e3df72087..953cc0228 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 🐞 Issue with html report
-    url: https://github.com/allure-framework/allure2/issues/new/choose
-    about: For Allure Report related issues.
-  - name: 💬 Allure Report Community
+  - name: ⭐️ Allure Report | main repository | give us a ⭐️
+    url: https://github.com/allure-framework/allure2
+    about: For Allure Report related issues. If you not sure what 
+  - name: 💬 Allure Report Community - for bugs, issues, dedicated support and more!
     url: https://github.com/orgs/allure-framework/discussions
     about: Please ask and answer questions here.
-  - name: 🥇 Allure TestOps Support
+  - name: 💚 Allure TestOps Support
     url: https://help.qameta.io/support/home
     about: Please report Allure TestOps issues here.

From 513b4c1717141866241c80ae7fa676d64b180299 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 15 Jun 2023 16:10:45 +0100
Subject: [PATCH 025/233] update config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 953cc0228..fb81bedae 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,7 +2,7 @@ blank_issues_enabled: false
 contact_links:
   - name: ⭐️ Allure Report | main repository | give us a ⭐️
     url: https://github.com/allure-framework/allure2
-    about: For Allure Report related issues. If you not sure what 
+    about: For Allure Report related issues.
   - name: 💬 Allure Report Community - for bugs, issues, dedicated support and more!
     url: https://github.com/orgs/allure-framework/discussions
     about: Please ask and answer questions here.

From f9dab790de56a0471a9b1da777255490fd637ae8 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Wed, 28 Jun 2023 11:55:00 +0200
Subject: [PATCH 026/233] allure-description-javadoc: mark all java versions as
 supported (fixes #929, via #930)

---
 .../allure/description/JavaDocDescriptionsProcessor.java   | 7 +++++--
 .../qameta/allure/description/ProcessDescriptionsTest.java | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
index 6efbe2fe9..1ee9c5209 100644
--- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
@@ -23,7 +23,6 @@
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
@@ -45,7 +44,6 @@
  * @author Egor Borisov ehborisov@gmail.com
  */
 @SupportedAnnotationTypes("io.qameta.allure.Description")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
 public class JavaDocDescriptionsProcessor extends AbstractProcessor {
 
     private Filer filer;
@@ -61,6 +59,11 @@ public synchronized void init(final ProcessingEnvironment env) {
         messager = env.getMessager();
     }
 
+    @Override
+    public SourceVersion getSupportedSourceVersion() {
+        return SourceVersion.latest();
+    }
+
     @Override
     public boolean process(final Set<? extends TypeElement> annotations, final RoundEnvironment env) {
         final Set<? extends Element> elements = env.getElementsAnnotatedWith(Description.class);
diff --git a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
index 868004f6f..d285ea178 100644
--- a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
+++ b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
@@ -53,7 +53,8 @@ void captureDescriptionTest() {
                 "}"
         );
 
-        Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
+        Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor())
+                .withOptions("-Werror");
         Compilation compilation = compiler.compile(source);
         assertThat(compilation).generatedFile(
                 StandardLocation.CLASS_OUTPUT,

From 3e3f17371a8bbf00cd4565c8b284fcea130abba6 Mon Sep 17 00:00:00 2001
From: Max B <brecheisen.a.max@gmail.com>
Date: Wed, 28 Jun 2023 04:58:47 -0500
Subject: [PATCH 027/233] allure-testng: add property to disable configuration
 failures logging (fixes #356, via #920)

---
 .../io/qameta/allure/testng/AllureTestNg.java | 19 ++++++-
 .../testng/config/AllureTestNgConfig.java     | 14 +++++
 .../allure/testng/AllureTestNgTest.java       | 57 +++++++++++++++----
 3 files changed, 77 insertions(+), 13 deletions(-)

diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
index 5c5e974ae..4cb9afa0d 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
@@ -101,7 +101,8 @@
  */
 @SuppressWarnings({
         "PMD.ExcessiveImports", "PMD.TooManyMethods", "PMD.GodClass", "PMD.CyclomaticComplexity",
-        "ClassFanOutComplexity", "ClassDataAbstractionCoupling", "PMD.ExcessiveClassLength"
+        "ClassFanOutComplexity", "ClassDataAbstractionCoupling", "PMD.ExcessiveClassLength",
+        "PMD.NcssCount"
 })
 public class AllureTestNg implements
         ISuiteListener,
@@ -141,6 +142,17 @@ public class AllureTestNg implements
 
     private final AllureTestNgConfig config;
 
+    /**
+     * Package private constructor to allow custom configurations for unit tests.
+     */
+    AllureTestNg(final AllureLifecycle lifecycle,
+                 final AllureTestNgTestFilter testFilter,
+                 final AllureTestNgConfig config) {
+        this.lifecycle = lifecycle;
+        this.testFilter = testFilter;
+        this.config = config;
+    }
+
     public AllureTestNg(final AllureLifecycle lifecycle,
                         final AllureTestNgTestFilter testFilter) {
         this.lifecycle = lifecycle;
@@ -537,6 +549,10 @@ public void onConfigurationSuccess(final ITestResult itr) {
 
     @Override
     public void onConfigurationFailure(final ITestResult itr) {
+        if (config.isHideConfigurationFailures()) {
+            return; //do nothing
+        }
+
         final String uuid = UUID.randomUUID().toString();
         final String parentUuid = UUID.randomUUID().toString();
 
@@ -554,7 +570,6 @@ public void onConfigurationFailure(final ITestResult itr) {
         );
 
         stopTestCase(uuid, itr.getThrowable(), getStatus(itr.getThrowable()));
-        //do nothing
     }
 
     @Override
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java b/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
index d4ab05e74..f35fdea72 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
@@ -24,10 +24,15 @@
 public class AllureTestNgConfig {
 
     public static final String ALLURE_TESTNG_HIDE_DISABLED_TESTS = "allure.testng.hide.disabled.tests";
+    public static final String ALLURE_TESTNG_HIDE_CONFIGURATION_FAILURES = "allure.testng.hide.configuration.failures";
     private boolean hideDisabledTests;
+    private boolean hideConfigurationFailures;
 
     public AllureTestNgConfig(final Properties properties) {
         this.hideDisabledTests = parseBoolean(properties.getProperty(ALLURE_TESTNG_HIDE_DISABLED_TESTS));
+        this.hideConfigurationFailures = parseBoolean(
+            properties.getProperty(ALLURE_TESTNG_HIDE_CONFIGURATION_FAILURES)
+        );
     }
 
     public boolean isHideDisabledTests() {
@@ -39,6 +44,15 @@ public AllureTestNgConfig setHideDisabledTests(final boolean hide) {
         return this;
     }
 
+    public boolean isHideConfigurationFailures() {
+        return hideConfigurationFailures;
+    }
+
+    public AllureTestNgConfig setHideConfigurationFailures(final boolean hideConfigurationFailure) {
+        this.hideConfigurationFailures = hideConfigurationFailure;
+        return this;
+    }
+
     public static AllureTestNgConfig loadConfigProperties() {
         final Properties properties = PropertiesUtils.loadAllureProperties();
         return new AllureTestNgConfig(properties);
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
index e3bda742b..69ce4f043 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -60,7 +60,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static io.qameta.allure.testng.config.AllureTestNgConfig.ALLURE_TESTNG_HIDE_DISABLED_TESTS;
 import static io.qameta.allure.util.ResultsUtils.ALLURE_SEPARATE_LINES_SYSPROP;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
@@ -109,6 +108,28 @@ public static Object[][] parallelConfiguration() {
         };
     }
 
+    @AllureFeatures.Fixtures
+    @Issue("356")
+    @Test
+    public void shouldSetHideConfigFailProperty() {
+        AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
+        assertThat(allureTestNgConfig.isHideConfigurationFailures()).isFalse();
+        allureTestNgConfig.setHideConfigurationFailures(true);
+        assertThat(allureTestNgConfig.isHideConfigurationFailures()).isTrue();
+    }
+
+    @AllureFeatures.Fixtures
+    @Issue("356")
+    @Test
+    public void shouldNotDisplayConfigurationFailsAsTests() {
+        AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
+        allureTestNgConfig.setHideConfigurationFailures(true);
+        final AllureResults results = runTestNgSuites(allureTestNgConfig, "suites/gh-135.xml");
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsOnly(tuple("someTest", Status.SKIPPED));
+    }
+
     @Test
     public void shouldSetConfigurationProperty() {
         AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
@@ -1083,12 +1104,12 @@ public void shouldDisplayDisabledTests() {
     @Issue("369")
     @Test
     public void shouldNotDisplayDisabledTests() {
-        System.setProperty(ALLURE_TESTNG_HIDE_DISABLED_TESTS, "true");
-        final AllureResults results = runTestNgSuites("suites/gh-369.xml");
+        AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
+        allureTestNgConfig.setHideDisabledTests(true);
+        final AllureResults results = runTestNgSuites(allureTestNgConfig,"suites/gh-369.xml");
         assertThat(results.getTestResults())
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsOnly(tuple("enabled", Status.PASSED));
-        System.setProperty(ALLURE_TESTNG_HIDE_DISABLED_TESTS, "false");
     }
 
     @SuppressWarnings("unchecked")
@@ -1164,12 +1185,6 @@ public void shouldOverrideParameters() {
                 );
     }
 
-    private AllureResults runTestNgSuites(final String... suites) {
-        final Consumer<TestNG> emptyConfigurer = testNg -> {
-        };
-        return runTestNgSuites(emptyConfigurer, suites);
-    }
-
     @SuppressWarnings("unchecked")
     @AllureFeatures.Parameters
     @Issue("141")
@@ -1225,8 +1240,26 @@ public void shouldOrderTests() {
                 .containsExactly("zTest", "yTest", "xTest", "wTest", "vTest", "vTest");
     }
 
+    private AllureResults runTestNgSuites(final String... suites) {
+        final Consumer<TestNG> emptyConfigurer = testNg -> {
+        };
+        return runTestNgSuites(emptyConfigurer, suites);
+    }
+
+    private AllureResults runTestNgSuites(AllureTestNgConfig config, final String... suites) {
+        final Consumer<TestNG> emptyConfigurer = testNg -> {
+        };
+        return runTestNgSuites(emptyConfigurer, config, suites);
+    }
+
+    private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
+                                          final String... suites) {;
+        return runTestNgSuites(configurer, AllureTestNgConfig.loadConfigProperties(), suites);
+    }
+
     @Step("Run testng suites {suites}")
     private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
+                                          final AllureTestNgConfig config,
                                           final String... suites) {
         final ClassLoader classLoader = getClass().getClassLoader();
         List<String> suiteFiles = Arrays.stream(suites)
@@ -1241,7 +1274,9 @@ private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
 
         final AllureResultsWriterStub results = new AllureResultsWriterStub();
         final AllureLifecycle lifecycle = new AllureLifecycle(results);
-        final AllureTestNg adapter = new AllureTestNg(lifecycle);
+        final AllureTestNg adapter = new AllureTestNg(lifecycle,
+            new AllureTestNgTestFilter(),
+            config);
         final TestNG testNg = new TestNG(false);
         testNg.addListener((ITestNGListener) adapter);
         testNg.setTestSuites(suiteFiles);

From a2915595b45d75cf35f94f48abf91537d894b32c Mon Sep 17 00:00:00 2001
From: a-simeshin <89605031+a-simeshin@users.noreply.github.com>
Date: Wed, 28 Jun 2023 13:18:23 +0300
Subject: [PATCH 028/233] add more info on failures in
 FreemarkerAttachmentRenderer (via #921)

---
 .../FreemarkerAttachmentRenderer.java         |  7 ++
 .../http/HttpRequestAttachment.java           | 12 +++
 .../http/HttpResponseAttachment.java          | 20 +++++
 .../FreemarkerAttachmentRendererTest.java     | 23 +++--
 ...ativeFreemarkerAttachmentRendererTest.java | 87 +++++++++++++++++++
 .../allure/attachment/testdata/TestData.java  | 13 +++
 .../tpl/body-npe-non-safe-attachment.ftl      | 36 ++++++++
 .../io/qameta/allure/util/ObjectUtils.java    | 12 +++
 8 files changed, 203 insertions(+), 7 deletions(-)
 create mode 100644 allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java
 create mode 100644 allure-attachments/src/test/resources/tpl/body-npe-non-safe-attachment.ftl

diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java
index 9179f3ed7..244230d25 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java
@@ -17,6 +17,9 @@
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;
+import freemarker.template.TemplateExceptionHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.StringWriter;
 import java.io.Writer;
@@ -27,6 +30,8 @@
  */
 public class FreemarkerAttachmentRenderer implements AttachmentRenderer<AttachmentData> {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(FreemarkerAttachmentRenderer.class);
+
     private final Configuration configuration;
 
     private final String templateName;
@@ -36,6 +41,7 @@ public FreemarkerAttachmentRenderer(final String templateName) {
         this.configuration = new Configuration(Configuration.VERSION_2_3_23);
         this.configuration.setLocalizedLookup(false);
         this.configuration.setTemplateUpdateDelayMilliseconds(0);
+        this.configuration.setTemplateExceptionHandler(TemplateExceptionHandler.HTML_DEBUG_HANDLER);
         this.configuration.setClassLoaderForTemplateLoading(getClass().getClassLoader(), "tpl");
     }
 
@@ -46,6 +52,7 @@ public DefaultAttachmentContent render(final AttachmentData data) {
             template.process(Collections.singletonMap("data", data), writer);
             return new DefaultAttachmentContent(writer.toString(), "text/html", ".html");
         } catch (Exception e) {
+            LOGGER.debug(data.toString());
             throw new AttachmentRenderException("Could't render http attachment file", e);
         }
     }
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
index 831b2a5da..47493fc46 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
@@ -16,6 +16,7 @@
 package io.qameta.allure.attachment.http;
 
 import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.util.ObjectUtils;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -81,6 +82,17 @@ public String getName() {
         return name;
     }
 
+    @Override
+    public String toString() {
+        return "HttpRequestAttachment("
+                + "\n\tname=" + this.name
+                + ",\n\turl=" + this.url
+                + ",\n\tbody=" + this.body
+                + ",\n\theaders=" + ObjectUtils.mapToString(this.headers)
+                + ",\n\tcookies=" + ObjectUtils.mapToString(this.cookies)
+                + "\n)";
+    }
+
     /**
      * Builder for HttpRequestAttachment.
      */
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
index 0b5ef9841..ee79d0ba5 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
@@ -16,6 +16,7 @@
 package io.qameta.allure.attachment.http;
 
 import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.util.ObjectUtils;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -74,6 +75,18 @@ public Map<String, String> getCookies() {
         return cookies;
     }
 
+    @Override
+    public String toString() {
+        return "HttpResponseAttachment("
+                + "\n\tname=" + this.name
+                + ",\n\turl=" + this.url
+                + ",\n\tbody=" + this.body
+                + ",\n\tresponseCode=" + this.responseCode
+                + ",\n\theaders=" + ObjectUtils.mapToString(this.headers)
+                + ",\n\tcookies=" + ObjectUtils.mapToString(this.cookies)
+                + "\n)";
+    }
+
     /**
      * Builder for HttpRequestAttachment.
      */
@@ -146,6 +159,7 @@ public Builder setBody(final String body) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
@@ -155,6 +169,7 @@ public Builder withUrl(final String url) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
@@ -164,6 +179,7 @@ public Builder withResponseCode(final int responseCode) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
@@ -173,6 +189,7 @@ public Builder withHeader(final String name, final String value) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
@@ -182,6 +199,7 @@ public Builder withHeaders(final Map<String, String> headers) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
@@ -191,6 +209,7 @@ public Builder withCookie(final String name, final String value) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
@@ -200,6 +219,7 @@ public Builder withCookies(final Map<String, String> cookies) {
 
         /**
          * Use setter method instead.
+         *
          * @deprecated scheduled for removal in 3.0 release
          */
         @Deprecated
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
index 75ddac32d..0dabc89d2 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
@@ -16,10 +16,12 @@
 package io.qameta.allure.attachment;
 
 import io.qameta.allure.attachment.http.HttpRequestAttachment;
+import io.qameta.allure.attachment.http.HttpResponseAttachment;
 import io.qameta.allure.test.AllureFeatures;
 import org.junit.jupiter.api.Test;
 
 import static io.qameta.allure.attachment.testdata.TestData.randomHttpRequestAttachment;
+import static io.qameta.allure.attachment.testdata.TestData.randomHttpResponseAttachment;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -27,6 +29,13 @@
  */
 class FreemarkerAttachmentRendererTest {
 
+    private static final String CONTENT = "content";
+    private static final String CONTENT_TYPE = "contentType";
+    private static final String TEXT_HTML = "text/html";
+    private static final String FILE_EXTENSION = "fileExtension";
+    private static final String HTML = ".html";
+
+
     @AllureFeatures.Attachments
     @Test
     void shouldRenderRequestAttachment() {
@@ -35,21 +44,21 @@ void shouldRenderRequestAttachment() {
                 .render(data);
 
         assertThat(content)
-                .hasFieldOrPropertyWithValue("contentType", "text/html")
-                .hasFieldOrPropertyWithValue("fileExtension", ".html")
-                .hasFieldOrProperty("content");
+                .hasFieldOrPropertyWithValue(CONTENT_TYPE, TEXT_HTML)
+                .hasFieldOrPropertyWithValue(FILE_EXTENSION, HTML)
+                .hasFieldOrProperty(CONTENT);
     }
 
     @AllureFeatures.Attachments
     @Test
     void shouldRenderResponseAttachment() {
-        final HttpRequestAttachment data = randomHttpRequestAttachment();
+        final HttpResponseAttachment data = randomHttpResponseAttachment();
         final DefaultAttachmentContent content = new FreemarkerAttachmentRenderer("http-response.ftl")
                 .render(data);
 
         assertThat(content)
-                .hasFieldOrPropertyWithValue("contentType", "text/html")
-                .hasFieldOrPropertyWithValue("fileExtension", ".html")
-                .hasFieldOrProperty("content");
+                .hasFieldOrPropertyWithValue(CONTENT_TYPE, TEXT_HTML)
+                .hasFieldOrPropertyWithValue(FILE_EXTENSION, HTML)
+                .hasFieldOrProperty(CONTENT);
     }
 }
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java
new file mode 100644
index 000000000..865eb5e48
--- /dev/null
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java
@@ -0,0 +1,87 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.attachment;
+
+import io.qameta.allure.attachment.http.HttpRequestAttachment;
+import io.qameta.allure.test.AllureFeatures;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+
+import static io.qameta.allure.attachment.testdata.TestData.negativeHttpRequestAttachment;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author a-simeshin (Simeshin Artem).
+ */
+class NegativeFreemarkerAttachmentRendererTest {
+
+    private static final String TEMPLATE_FOR_EXCEPTION = "body-npe-non-safe-attachment.ftl";
+
+    private PrintStream realSysOut;
+    private ByteArrayOutputStream sysOutBuffer;
+
+    @BeforeEach
+    void setUpSysOut() throws UnsupportedEncodingException {
+        realSysOut = System.err;
+        sysOutBuffer = new ByteArrayOutputStream();
+        System.setErr(new PrintStream(sysOutBuffer, false, StandardCharsets.UTF_8.toString()));
+    }
+
+    @AfterEach
+    void rollBackSysOut() {
+        System.setErr(realSysOut);
+    }
+
+    @AllureFeatures.Attachments
+    @Test
+    void shouldThrowExceptionalSituationsForFreeMarketRendererWithIncorrectAttachmentData() {
+        assertThrows(AttachmentRenderException.class, () -> {
+            final HttpRequestAttachment data = negativeHttpRequestAttachment();
+            new FreemarkerAttachmentRenderer(TEMPLATE_FOR_EXCEPTION).render(data);
+        });
+    }
+
+    @AllureFeatures.Attachments
+    @Test
+    void shouldExplainExceptionalSituationsForFreeMarketRenderer() throws UnsupportedEncodingException {
+        try {
+            final HttpRequestAttachment data = negativeHttpRequestAttachment();
+            new FreemarkerAttachmentRenderer(TEMPLATE_FOR_EXCEPTION).render(data);
+        } catch (Exception ignored) {
+            // for test purposes
+        }
+        assertThat(sysOutBuffer.toString(StandardCharsets.UTF_8.toString()))
+                .contains("SEVERE: Error executing FreeMarker template")
+                .contains("FreeMarker template error:")
+                .contains("The following has evaluated to null or missing:")
+                .contains("==> data.body")
+                .contains("[in template \"body-npe-non-safe-attachment.ftl\" at line 8, column 11]")
+                .contains("\t- Failed at: ${data.body.size}")
+                .contains("io.qameta.allure.attachment.FreemarkerAttachmentRenderer - HttpRequestAttachment")
+                .contains("\tname=null,")
+                .contains("\turl=null,")
+                .contains("\tbody=null,")
+                .contains("\theaders={},")
+                .contains("\tcookies={}");
+    }
+}
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
index 306f27b63..60903f8c1 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
@@ -72,4 +72,17 @@ public static Map<String, String> randomMap() {
         map.put(randomString(), null);
         return map;
     }
+
+    public static HttpRequestAttachment negativeHttpRequestAttachment() {
+        return new HttpRequestAttachment(
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null
+        );
+    }
+
 }
diff --git a/allure-attachments/src/test/resources/tpl/body-npe-non-safe-attachment.ftl b/allure-attachments/src/test/resources/tpl/body-npe-non-safe-attachment.ftl
new file mode 100644
index 000000000..813425567
--- /dev/null
+++ b/allure-attachments/src/test/resources/tpl/body-npe-non-safe-attachment.ftl
@@ -0,0 +1,36 @@
+<#ftl output_format="HTML">
+<#-- @ftlvariable name="data" type="io.qameta.allure.attachment.http.HttpRequestAttachment" -->
+<div><#if data.method??>${data.method}<#else>GET</#if> to <#if data.url??>${data.url}<#else>Unknown</#if></div>
+
+<h4>Body</h4>
+<div>
+    <pre class="preformatted-text">
+    <#t>${data.body.size}
+    </pre>
+</div>
+
+<#if (data.headers)?has_content>
+    <h4>Headers</h4>
+    <div>
+        <#list data.headers as name, value>
+            <div>${name}: ${value!"null"}</div>
+        </#list>
+    </div>
+</#if>
+
+
+<#if (data.cookies)?has_content>
+    <h4>Cookies</h4>
+    <div>
+        <#list data.cookies as name, value>
+            <div>${name}: ${value!"null"}</div>
+        </#list>
+    </div>
+</#if>
+
+<#if data.curl??>
+    <h4>Curl</h4>
+    <div>
+        ${data.curl}
+    </div>
+</#if>
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
index 6f8de03b9..5c7eccf0b 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
@@ -19,7 +19,9 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
+import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -76,4 +78,14 @@ public static String toString(final Object object) {
             return "<NPE>";
         }
     }
+
+    public static String mapToString(final Map<String, String> map) {
+        if (map == null || map.isEmpty()) {
+            return "{}";
+        }
+        return map.keySet()
+                .stream()
+                .map(key -> key + "=" + map.get(key))
+                .collect(Collectors.joining(",", "{", "}"));
+    }
 }

From b42482356c096d9570c129f642e7c90ea262e03b Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 28 Jun 2023 13:16:29 +0100
Subject: [PATCH 029/233] add jooq integration (via #931)

---
 allure-jooq/build.gradle.kts                  |  37 +++++
 .../io/qameta/allure/jooq/AllureJooq.java     | 142 ++++++++++++++++++
 .../io/qameta/allure/jooq/AllureJooqTest.java | 136 +++++++++++++++++
 .../test/resources/simplelogger.properties    |   2 +
 settings.gradle.kts                           |   1 +
 5 files changed, 318 insertions(+)
 create mode 100644 allure-jooq/build.gradle.kts
 create mode 100644 allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
 create mode 100644 allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
 create mode 100644 allure-jooq/src/test/resources/simplelogger.properties

diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
new file mode 100644
index 000000000..a0f29febe
--- /dev/null
+++ b/allure-jooq/build.gradle.kts
@@ -0,0 +1,37 @@
+description = "Allure JOOQ Integration"
+
+val jooqVersion = "3.18.4"
+
+dependencies {
+    api(project(":allure-java-commons"))
+    implementation("org.jooq:jooq:${jooqVersion}")
+    testImplementation("io.zonky.test:embedded-postgres:2.0.4")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(platform("io.zonky.test.postgres:embedded-postgres-binaries-bom:15.3.0"))
+    testImplementation(project(":allure-assertj"))
+    testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testRuntimeOnly("org.postgresql:postgresql:42.6.0")
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.jooq"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
diff --git a/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
new file mode 100644
index 000000000..79c976ae7
--- /dev/null
+++ b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
@@ -0,0 +1,142 @@
+/*
+ *  Copyright 2016-2022 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jooq;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import org.jooq.ExecuteContext;
+import org.jooq.ExecuteListener;
+import org.jooq.Formattable;
+import org.jooq.Query;
+import org.jooq.Record;
+import org.jooq.Routine;
+
+import java.util.Objects;
+import java.util.UUID;
+
+import static java.lang.Boolean.FALSE;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AllureJooq implements ExecuteListener {
+
+    private static final String STEP_UUID
+            = "io.qameta.allure.jooq.AllureJooq.STEP_UUID";
+    private static final String DO_BUFFER
+            = "io.qameta.allure.jooq.AllureJooq.DO_BUFFER";
+
+    private final AllureLifecycle lifecycle;
+
+    public AllureJooq() {
+        this(Allure.getLifecycle());
+    }
+
+    public AllureJooq(final AllureLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    @Override
+    public void renderEnd(final ExecuteContext ctx) {
+        if (!lifecycle.getCurrentTestCaseOrStep().isPresent()) {
+            return;
+        }
+
+        final String stepName = stepName(ctx);
+        final String uuid = UUID.randomUUID().toString();
+        ctx.data(STEP_UUID, uuid);
+        lifecycle.startStep(uuid, new StepResult()
+                .setName(stepName)
+        );
+    }
+
+    private String stepName(final ExecuteContext ctx) {
+        final Query query = ctx.query();
+        if (query != null) {
+            return ctx.dsl().renderInlined(query);
+        }
+
+        final Routine<?> routine = ctx.routine();
+        if (ctx.routine() != null) {
+            return ctx.dsl().renderInlined(routine);
+        }
+
+        final String sql = ctx.sql();
+        if (Objects.nonNull(sql) && !sql.isEmpty()) {
+            return sql;
+        }
+
+        final String[] batchSQL = ctx.batchSQL();
+        if (batchSQL.length > 0 && batchSQL[batchSQL.length - 1] != null) {
+            return String.join("\n", batchSQL);
+        }
+        return "UNKNOWN";
+    }
+
+    @Override
+    public void recordEnd(final ExecuteContext ctx) {
+        if (ctx.recordLevel() > 0) {
+            return;
+        }
+
+        if (!lifecycle.getCurrentTestCaseOrStep().isPresent()) {
+            return;
+        }
+
+        final Record record = ctx.record();
+        if (record != null && !FALSE.equals(ctx.data(DO_BUFFER))) {
+            attachResultSet(record);
+        }
+    }
+
+    @Override
+    public void resultStart(final ExecuteContext ctx) {
+        ctx.data(DO_BUFFER, false);
+    }
+
+    @Override
+    public void resultEnd(final ExecuteContext ctx) {
+        if (!lifecycle.getCurrentTestCaseOrStep().isPresent()) {
+            return;
+        }
+
+        attachResultSet(ctx.result());
+    }
+
+    @Override
+    public void end(final ExecuteContext ctx) {
+        if (!lifecycle.getCurrentTestCaseOrStep().isPresent()) {
+            return;
+        }
+
+        final String stepUuid = (String) ctx.data(STEP_UUID);
+        if (Objects.isNull(stepUuid)) {
+            return;
+        }
+
+        lifecycle.updateStep(stepUuid, sr -> sr.setStatus(Status.PASSED));
+        lifecycle.stopStep(stepUuid);
+    }
+
+    private void attachResultSet(final Formattable formattable) {
+        if (Objects.nonNull(formattable)) {
+            Allure.addAttachment("ResultSet", "text/csv", formattable.formatCSV());
+        }
+    }
+
+}
diff --git a/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java b/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
new file mode 100644
index 000000000..b1804ff82
--- /dev/null
+++ b/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
@@ -0,0 +1,136 @@
+/*
+ *  Copyright 2023 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jooq;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.test.AllureResults;
+import io.zonky.test.db.postgres.embedded.EmbeddedPostgres;
+import org.jooq.DSLContext;
+import org.jooq.Field;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.SQLDialect;
+import org.jooq.Table;
+import org.jooq.impl.DSL;
+import org.jooq.impl.DataSourceConnectionProvider;
+import org.jooq.impl.DefaultConfiguration;
+import org.jooq.impl.DefaultDSLContext;
+import org.jooq.impl.SQLDataType;
+import org.junit.jupiter.api.Test;
+
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.util.function.Consumer;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class AllureJooqTest {
+
+    @Test
+    void shouldSupportFetchSqlStatements() {
+        final AllureResults results = execute(dsl -> dsl.fetchSingle("select 1"));
+
+        final TestResult result = results.getTestResults().get(0);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(
+                        tuple("select 1", Status.PASSED)
+                );
+    }
+
+    @Test
+    void shouldAddResultSetsAsAttachments() {
+        final AllureResults results = execute(dsl -> dsl.fetchSingle("select 1 as one, 2 as two"));
+        final TestResult result = results.getTestResults().get(0);
+        final StepResult step = result.getSteps().get(0);
+        assertThat(step.getAttachments())
+                .extracting(Attachment::getName, Attachment::getType)
+                .containsExactly(
+                        tuple("ResultSet", "text/csv")
+                );
+
+        final Attachment attachment = step.getAttachments().get(0);
+
+        final byte[] content = results.getAttachments().get(attachment.getSource());
+
+        assertThat(new String(content, StandardCharsets.UTF_8))
+                .contains("one,two\n1,2\n");
+
+    }
+
+    @Test
+    void shouldSupportCreateTableStatements() {
+        final AllureResults results = execute(dsl -> {
+            final Name tableName = DSL.name("first_table");
+            final Field<Long> id = DSL.field("id", SQLDataType.BIGINT);
+            final Field<String> name = DSL.field("name", SQLDataType.VARCHAR);
+            dsl.createTable(tableName)
+                    .column(id)
+                    .column(name)
+                    .primaryKey(id)
+                    .execute();
+
+            final Table<Record> table = DSL.table(tableName);
+
+            dsl.insertInto(table, id, name)
+                    .values(1L, "first")
+                    .values(2L, "second")
+                    .execute();
+        });
+
+        final TestResult result = results.getTestResults().get(0);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(
+                        tuple("create table \"first_table\" (id bigint, name varchar, primary key (id))", Status.PASSED),
+                        tuple("insert into \"first_table\" (id, name) values (1, 'first'), (2, 'second')", Status.PASSED)
+                );
+    }
+
+    private static AllureResults execute(final Consumer<DSLContext> dslContextConsumer) {
+        final EmbeddedPostgres.Builder builder = EmbeddedPostgres.builder();
+        try (EmbeddedPostgres postgres = builder.start()) {
+            final DataSource dataSource = postgres.getPostgresDatabase();
+
+            final DataSourceConnectionProvider connectionProvider = new DataSourceConnectionProvider(dataSource);
+            final DefaultConfiguration configuration = new DefaultConfiguration();
+            configuration.set(SQLDialect.POSTGRES);
+            configuration.set(connectionProvider);
+
+            return runWithinTestContext(
+                    () -> {
+                        final DefaultDSLContext dsl = new DefaultDSLContext(configuration);
+                        dslContextConsumer.accept(dsl);
+                    },
+                    Allure::setLifecycle,
+                    allureLifecycle -> configuration.setExecuteListener(new AllureJooq(allureLifecycle))
+            );
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+}
diff --git a/allure-jooq/src/test/resources/simplelogger.properties b/allure-jooq/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..3ae9a5745
--- /dev/null
+++ b/allure-jooq/src/test/resources/simplelogger.properties
@@ -0,0 +1,2 @@
+org.slf4j.simpleLogger.log.org.jooq.Constants=warn
+org.slf4j.simpleLogger.log.org.jooq.tools.LoggerListener=info
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 58c61da5f..5aa1340d2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -20,6 +20,7 @@ include("allure-java-commons-test")
 include("allure-java-migration")
 include("allure-jax-rs")
 include("allure-jbehave")
+include("allure-jooq")
 include("allure-jsonunit")
 include("allure-junit-platform")
 include("allure-junit4")

From f8d2f52a1ce60c76196e50127d892b10bb3a6721 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Wed, 28 Jun 2023 12:17:23 +0000
Subject: [PATCH 030/233] release 2.23.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index d10e2f6aa..b1d69a20f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.23-SNAPSHOT
+version=2.23.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 2cdc7ae59e499324a26cca4efefd229f303601a0 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Wed, 28 Jun 2023 12:17:24 +0000
Subject: [PATCH 031/233] set next development version 2.24

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index b1d69a20f..de2753ed4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.23.0
+version=2.24-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 10b1bcc4a102b6c1cd42914c928d1d50cd430199 Mon Sep 17 00:00:00 2001
From: Valery Yatsynovich <valery_yatsynovich@epam.com>
Date: Mon, 10 Jul 2023 16:16:09 +0300
Subject: [PATCH 032/233] fix target maven repository url in readme (via #934)

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 567df89e6..920687399 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 
 The repository contains new versions of adaptors for JVM-based test frameworks.
 
-All the artifacts are deployed to `https://dl.bintray.com/qameta/maven`.
+All the artifacts are deployed to `https://repo1.maven.org/maven2/io/qameta/allure/`.
 
 ## TestNG
 
@@ -219,4 +219,4 @@ more usage example look into module `allure-awaitility`
 Usage example:
 ```
 Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
-```
\ No newline at end of file
+```

From 466aa0bbce60b52fdba4c736028c3aecdb0c91b2 Mon Sep 17 00:00:00 2001
From: a-simeshin <89605031+a-simeshin@users.noreply.github.com>
Date: Mon, 10 Jul 2023 16:17:38 +0300
Subject: [PATCH 033/233] add interceptors for httpclient5 (via #935)

---
 README.md                                     |  19 ++
 allure-httpclient5/build.gradle.kts           |  27 +++
 allure-httpclient5/readme.md                  |  56 ++++++
 .../httpclient5/AllureHttpClient5Request.java |  83 ++++++++
 .../AllureHttpClient5Response.java            | 100 ++++++++++
 .../httpclient5/AllureHttpEntityUtils.java    |  96 +++++++++
 .../AllureHttpClient5DeleteTest.java          | 140 +++++++++++++
 .../httpclient5/AllureHttpClient5GetTest.java | 176 +++++++++++++++++
 .../AllureHttpClient5PostTest.java            | 187 ++++++++++++++++++
 .../src/test/resources/allure.properties      |   2 +
 build.gradle.kts                              |   1 +
 settings.gradle.kts                           |   1 +
 12 files changed, 888 insertions(+)
 create mode 100644 allure-httpclient5/build.gradle.kts
 create mode 100644 allure-httpclient5/readme.md
 create mode 100644 allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
 create mode 100644 allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
 create mode 100644 allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
 create mode 100644 allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
 create mode 100644 allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
 create mode 100644 allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
 create mode 100644 allure-httpclient5/src/test/resources/allure.properties

diff --git a/README.md b/README.md
index 920687399..668eac198 100644
--- a/README.md
+++ b/README.md
@@ -176,6 +176,25 @@ Usage example:
 .addInterceptorLast(new AllureHttpClientResponse());
 ```
 
+## Http client 5
+Interceptors for Apache [httpclient5](https://hc.apache.org/httpcomponents-client-5.2.x/index.html). 
+Additional info can be found in module `allure-httpclient5`
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-httpclient5</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```java
+final HttpClientBuilder builder = HttpClientBuilder.create()
+        .addRequestInterceptorFirst(new AllureHttpClient5Request("your-request-template-attachment.ftl"))
+        .addResponseInterceptorLast(new AllureHttpClient5Response("your-response-template-attachment.ftl"));
+```
+
 ## JAX-RS Filter
 
 Filter that can be used with JAX-RS compliant clients such as RESTeasy and Jersey
diff --git a/allure-httpclient5/build.gradle.kts b/allure-httpclient5/build.gradle.kts
new file mode 100644
index 000000000..eb42ad2da
--- /dev/null
+++ b/allure-httpclient5/build.gradle.kts
@@ -0,0 +1,27 @@
+description = "Allure Apache HttpClient5 Integration"
+
+dependencies {
+    api(project(":allure-attachments"))
+    implementation("org.apache.httpcomponents.client5:httpclient5")
+    testImplementation("com.github.tomakehurst:wiremock")
+    testImplementation("io.github.glytching:junit-extensions")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.httpclient5"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
\ No newline at end of file
diff --git a/allure-httpclient5/readme.md b/allure-httpclient5/readme.md
new file mode 100644
index 000000000..b307e4e4f
--- /dev/null
+++ b/allure-httpclient5/readme.md
@@ -0,0 +1,56 @@
+## Allure-httpclient5
+Extended logging for requests and responses with [httpclient5](https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5)
+This library does not support `httpclient` due to package and API changes between `httpclient` and `httpclient5`.
+To work with `httpclient`, it is recommended to use the `allure-httpclient` library.
+
+## Wiki
+https://hc.apache.org/httpcomponents-client-5.2.x/
+https://hc.apache.org/httpcomponents-client-5.2.x/quickstart.html
+https://hc.apache.org/httpcomponents-client-5.2.x/migration-guide/index.html
+https://hc.apache.org/httpcomponents-client-5.2.x/examples.html
+
+## Additional features
+Implemented:
+- The `httpclient5` library uses `gzip` compression by default. Interceptors attach message bodies in decompressed form
+- `HttpEntityEnclosingRequest` is removed from `httpclient5`. Request interceptor works wo `HttpEntityEnclosingRequest`
+
+Not tested:
+- The httpclient5 library support Async interactions (Not tested)
+
+## Examples
+
+```java
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import io.qameta.allure.httpclient5.AllureHttpClient5Request;
+import io.qameta.allure.httpclient5.AllureHttpClient5Response;
+
+class Test {
+    
+    @Test
+    void smokeGetShouldNotThrowThenReturnCorrectResponseMessage() throws IOException {
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request())
+                .addResponseInterceptorLast(new AllureHttpClient5Response());
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpGet httpGet = new HttpGet("/hello");
+            httpClient.execute(httpGet, response -> {
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                return response;
+            });
+        }
+    }
+}
+```
+
+In addition to using standard templates for formatting, you can use your custom `ftl` templates along the path 
+`/resources/tpl/...`. For examples, you can use templates from the `allure-attachments` module.
+
+```java
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request("your-request-template-attachment.ftl"))
+                .addResponseInterceptorLast(new AllureHttpClient5Response("your-response-template-attachment.ftl"));
+```
\ No newline at end of file
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
new file mode 100644
index 000000000..d593c4576
--- /dev/null
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.httpclient5;
+
+import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.attachment.AttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
+import io.qameta.allure.attachment.DefaultAttachmentProcessor;
+import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
+import io.qameta.allure.attachment.http.HttpRequestAttachment;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.protocol.HttpContext;
+
+import java.util.stream.Stream;
+
+import static io.qameta.allure.attachment.http.HttpRequestAttachment.Builder.create;
+
+/**
+ * @author a-simeshin (Simeshin Artem)
+ */
+@SuppressWarnings("PMD.MethodArgumentCouldBeFinal")
+public class AllureHttpClient5Request implements HttpRequestInterceptor {
+
+    private final AttachmentRenderer<AttachmentData> renderer;
+    private final AttachmentProcessor<AttachmentData> processor;
+
+    public AllureHttpClient5Request() {
+        this("http-request.ftl");
+    }
+
+    public AllureHttpClient5Request(final String templateName) {
+        this(new FreemarkerAttachmentRenderer(templateName), new DefaultAttachmentProcessor());
+    }
+
+    public AllureHttpClient5Request(final AttachmentRenderer<AttachmentData> renderer,
+                                    final AttachmentProcessor<AttachmentData> processor) {
+        this.renderer = renderer;
+        this.processor = processor;
+    }
+
+    /**
+     * Processes the HTTP request and adds an attachment to the Allure Attachment processor.
+     *
+     * @param request the HTTP request
+     * @param entity  the entity details
+     * @param context the HTTP context
+     */
+    @Override
+    public void process(HttpRequest request, EntityDetails entity, HttpContext context) {
+        final String attachmentName = getAttachmentName(request);
+        final HttpRequestAttachment.Builder builder = create(attachmentName, request.getRequestUri());
+        builder.setMethod(request.getMethod());
+
+        Stream.of(request.getHeaders()).forEach(header -> builder.setHeader(header.getName(), header.getValue()));
+
+        if (entity instanceof HttpEntity && ((HttpEntity) entity).isRepeatable() && entity.getContentLength() != 0) {
+            builder.setBody(AllureHttpEntityUtils.getBody((HttpEntity) entity));
+        }
+
+        processor.addAttachment(builder.build(), renderer);
+    }
+
+    private String getAttachmentName(final HttpRequest request) {
+        return String.format("Request_%s_%s", request.getMethod(), request.getRequestUri());
+    }
+
+}
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
new file mode 100644
index 000000000..97e6c1c86
--- /dev/null
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
@@ -0,0 +1,100 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.httpclient5;
+
+import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.attachment.AttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
+import io.qameta.allure.attachment.DefaultAttachmentProcessor;
+import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
+import io.qameta.allure.attachment.http.HttpResponseAttachment;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpResponseInterceptor;
+import org.apache.hc.core5.http.io.entity.BufferedHttpEntity;
+import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
+import org.apache.hc.core5.http.protocol.HttpContext;
+
+import java.io.IOException;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.attachment.http.HttpResponseAttachment.Builder.create;
+
+/**
+ * @author a-simeshin (Simeshin Artem)
+ */
+@SuppressWarnings({
+        "checkstyle:ParameterAssignment",
+        "PMD.MethodArgumentCouldBeFinal",
+        "PMD.AvoidReassigningParameters"})
+public class AllureHttpClient5Response implements HttpResponseInterceptor {
+    private final AttachmentRenderer<AttachmentData> renderer;
+    private final AttachmentProcessor<AttachmentData> processor;
+    private static final String NO_BODY = "No body present";
+
+    public AllureHttpClient5Response() {
+        this("http-response.ftl");
+    }
+
+    public AllureHttpClient5Response(final String templateName) {
+        this(new FreemarkerAttachmentRenderer(templateName), new DefaultAttachmentProcessor());
+    }
+
+    public AllureHttpClient5Response(final AttachmentRenderer<AttachmentData> renderer,
+                                     final AttachmentProcessor<AttachmentData> processor) {
+        this.renderer = renderer;
+        this.processor = processor;
+    }
+
+    /**
+     * Processes the HTTP response and adds an attachment to the Allure Attachment processor.
+     *
+     * @param response the HTTP response
+     * @param entity   the entity details, may be null for no response body responses
+     * @param context  the HTTP context
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    public void process(HttpResponse response, EntityDetails entity, HttpContext context) throws IOException {
+        final HttpResponseAttachment.Builder builder = create("Response");
+        builder.setResponseCode(response.getCode());
+
+        Stream.of(response.getHeaders()).forEach(header -> builder.setHeader(header.getName(), header.getValue()));
+
+        final HttpEntity originalHttpEntity = (HttpEntity) entity;
+        if (originalHttpEntity != null && !originalHttpEntity.isRepeatable()) {
+            // Looks like a bug or completely new logic. It's not enough to replace chaining EntityDetails entity.
+            // To read the response body twice, It needs to put in the context also
+            entity = new BufferedHttpEntity(originalHttpEntity);
+            final BasicClassicHttpResponse responseEntity =
+                    (BasicClassicHttpResponse) context.getAttribute("http.response");
+            responseEntity.setEntity((HttpEntity) entity);
+
+            final String responseBody = AllureHttpEntityUtils.getBody((HttpEntity) entity);
+            if (responseBody == null || responseBody.isEmpty()) {
+                builder.setBody(NO_BODY);
+            } else {
+                builder.setBody(responseBody);
+            }
+        } else {
+            builder.setBody(NO_BODY);
+        }
+
+        processor.addAttachment(builder.build(), renderer);
+    }
+
+}
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
new file mode 100644
index 000000000..342093031
--- /dev/null
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
@@ -0,0 +1,96 @@
+/*
+ *  Copyright 2023 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.httpclient5;
+
+import io.qameta.allure.AllureResultsWriteException;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.zip.GZIPInputStream;
+
+/**
+ * Utility class for working with HTTP entity in Allure framework.
+ */
+@SuppressWarnings({"checkstyle:ParameterAssignment", "PMD.AssignmentInOperand"})
+public final class AllureHttpEntityUtils {
+
+    private AllureHttpEntityUtils() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+
+    /**
+     * Retrieves the body of the HTTP entity as a string.
+     *
+     * @param httpEntity the HTTP entity
+     * @return the body of the HTTP entity as a string
+     * @throws AllureResultsWriteException if an error occurs while reading the entity body
+     */
+    static String getBody(final HttpEntity httpEntity) {
+        try {
+            final String contentEncoding = httpEntity.getContentEncoding();
+            if (contentEncoding != null && contentEncoding.contains("gzip")) {
+                return unpackGzipEntityString(httpEntity);
+            } else {
+                return EntityUtils.toString(httpEntity, getContentEncoding(httpEntity.getContentEncoding()));
+            }
+        } catch (IOException | ParseException e) {
+            throw new AllureResultsWriteException("Can't read request message body to String", e);
+        }
+    }
+
+    /**
+     * Retrieves the content encoding of the HTTP entity.
+     *
+     * @param contentEncoding the content encoding value
+     * @return the charset corresponding to the content encoding, or UTF-8 if the encoding is invalid
+     */
+    static Charset getContentEncoding(final String contentEncoding) {
+        try {
+            return Charset.forName(contentEncoding);
+        } catch (IllegalArgumentException ignored) {
+            return StandardCharsets.UTF_8;
+        }
+    }
+
+    /**
+     * Unpacks the GZIP-encoded entity string.
+     *
+     * @param entity the GZIP-encoded HTTP entity
+     * @return the unpacked entity string
+     * @throws IOException if an error occurs while unpacking the entity
+     */
+    static String unpackGzipEntityString(final HttpEntity entity) throws IOException {
+        final GZIPInputStream gis = new GZIPInputStream(entity.getContent());
+        final Charset contentEncoding = getContentEncoding(entity.getContentEncoding());
+        try (InputStreamReader inputStreamReader = new InputStreamReader(gis, contentEncoding)) {
+            try (BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
+                final StringBuilder outStr = new StringBuilder();
+                String line;
+                while ((line = bufferedReader.readLine()) != null) {
+                    outStr.append(line);
+                }
+                return outStr.toString();
+            }
+        }
+    }
+
+}
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
new file mode 100644
index 000000000..453b57bc4
--- /dev/null
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
@@ -0,0 +1,140 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.httpclient5;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.attachment.AttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
+import org.apache.hc.client5.http.classic.methods.HttpDelete;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.Objects;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * @author a-simeshin (Simeshin Artem).
+ */
+@SuppressWarnings({"unchecked", "PMD.JUnitTestContainsTooManyAsserts"})
+class AllureHttpClient5DeleteTest {
+
+    private static final String DELETE_URL = "http://localhost:%d/delete";
+    private static final String HELLO_RESOURCE_PATH = "/delete";
+
+    private WireMockServer server;
+
+    @BeforeEach
+    void setUp() {
+        server = new WireMockServer(options().dynamicPort());
+        server.start();
+        configureFor(server.port());
+
+        stubFor(delete(HELLO_RESOURCE_PATH).willReturn(
+                aResponse()
+                        .withStatus(204))
+        );
+    }
+
+    @AfterEach
+    void tearDown() {
+        if (Objects.nonNull(server)) {
+            server.stop();
+        }
+    }
+
+    @Test
+    void smokeDeleteShouldNotThrowThenReturnCorrectCode() {
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request())
+                .addResponseInterceptorLast(new AllureHttpClient5Response());
+
+        assertDoesNotThrow(() -> {
+            try (CloseableHttpClient httpClient = builder.build()) {
+                final HttpDelete httpDelete = new HttpDelete(String.format(DELETE_URL, server.port()));
+                httpClient.execute(httpDelete, response -> {
+                    assertThat(response.getCode()).isEqualTo(204);
+                    return response;
+                });
+            }
+        });
+    }
+
+    @Test
+    void shouldCreateDeleteRequestAttachment() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpDelete httpDelete = new HttpDelete(String.format(DELETE_URL, server.port()));
+            httpClient.execute(httpDelete, response -> {
+                assertThat(response.getCode()).isEqualTo(204);
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+
+        verify(processor, times(1)).addAttachment(captor.capture(), eq(renderer));
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("url")
+                .containsExactly(HELLO_RESOURCE_PATH);
+    }
+    @Test
+    void shouldCreateDeleteResponseAttachmentWithEmptyBody() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addResponseInterceptorLast(new AllureHttpClient5Response(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpDelete httpDelete = new HttpDelete(String.format(DELETE_URL, server.port()));
+            httpClient.execute(httpDelete, response -> {
+                assertThat(response.getCode()).isEqualTo(204);
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+        verify(processor, times(1))
+                .addAttachment(captor.capture(), eq(renderer));
+
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("body")
+                .containsExactly("No body present");
+    }
+}
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
new file mode 100644
index 000000000..4453f2e49
--- /dev/null
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
@@ -0,0 +1,176 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.httpclient5;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.attachment.AttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.Objects;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * @author a-simeshin (Simeshin Artem).
+ */
+@SuppressWarnings({"unchecked", "PMD.JUnitTestContainsTooManyAsserts"})
+class AllureHttpClient5GetTest {
+
+    private static final String BODY_STRING = "Hello world!";
+    private static final String HELLO_RESOURCE_PATH = "/hello";
+    private static final String HELLO_GET_RETURN_BODY = "http://localhost:%d/hello";
+    private static final String HELLO_GET_201_NO_BODY = "http://localhost:%d/empty";
+
+
+    private WireMockServer server;
+
+    @BeforeEach
+    void setUp() {
+        server = new WireMockServer(options().dynamicPort());
+        server.start();
+        configureFor(server.port());
+
+        stubFor(get(HELLO_RESOURCE_PATH).willReturn(
+                aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(BODY_STRING)
+        ));
+        stubFor(get("/empty").willReturn(
+                aResponse()
+                        .withStatus(200))
+        );
+    }
+
+    @AfterEach
+    void tearDown() {
+        if (Objects.nonNull(server)) {
+            server.stop();
+        }
+    }
+
+    @Test
+    void smokeGetShouldNotThrowThenReturnCorrectResponseMessage() {
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request())
+                .addResponseInterceptorLast(new AllureHttpClient5Response());
+
+        assertDoesNotThrow(() -> {
+            try (CloseableHttpClient httpClient = builder.build()) {
+                final HttpGet httpGet = new HttpGet(String.format(HELLO_GET_RETURN_BODY, server.port()));
+                httpClient.execute(httpGet, response -> {
+                    assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                    return response;
+                });
+            }
+        });
+    }
+
+    @Test
+    void shouldCreateGetRequestAttachment() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorLast(new AllureHttpClient5Request(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpGet httpGet = new HttpGet(String.format(HELLO_GET_RETURN_BODY, server.port()));
+            httpClient.execute(httpGet, response -> {
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+
+        verify(processor, times(1)).addAttachment(captor.capture(), eq(renderer));
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("url")
+                .containsExactly(HELLO_RESOURCE_PATH);
+    }
+
+    @Test
+    void shouldCreateGetResponseAttachment() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addResponseInterceptorLast(new AllureHttpClient5Response(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpGet httpGet = new HttpGet(String.format(HELLO_GET_RETURN_BODY, server.port()));
+            httpClient.execute(httpGet, response -> {
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+        verify(processor, times(1))
+                .addAttachment(captor.capture(), eq(renderer));
+
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("responseCode")
+                .containsExactly(200);
+    }
+
+    @Test
+    void shouldCreateGetResponseAttachmentWithEmptyBody() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addResponseInterceptorLast(new AllureHttpClient5Response(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpGet httpGet = new HttpGet(String.format(HELLO_GET_201_NO_BODY, server.port()));
+            httpClient.execute(httpGet, response -> {
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo("");
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+        verify(processor, times(1))
+                .addAttachment(captor.capture(), eq(renderer));
+
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("body")
+                .containsExactly("No body present");
+    }
+}
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
new file mode 100644
index 000000000..7220171dc
--- /dev/null
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
@@ -0,0 +1,187 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.httpclient5;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import io.qameta.allure.attachment.AttachmentData;
+import io.qameta.allure.attachment.AttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.Objects;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * @author a-simeshin (Simeshin Artem).
+ */
+@SuppressWarnings({"unchecked", "PMD.JUnitTestContainsTooManyAsserts"})
+class AllureHttpClient5PostTest {
+
+    private static final String BODY_STRING = "Hello world!";
+    private static final String POST_REQUEST_BODY = "hello post request body";
+    private static final String HELLO_RESOURCE_PATH = "/hello";
+    private static final String HELLO_POST_RETURN_BODY = "http://localhost:%d/hello";
+    private static final String HELLO_POST_201_NO_BODY = "http://localhost:%d/empty";
+
+
+    private WireMockServer server;
+
+    @BeforeEach
+    void setUp() {
+        server = new WireMockServer(options().dynamicPort());
+        server.start();
+        configureFor(server.port());
+
+        stubFor(post(HELLO_RESOURCE_PATH).willReturn(
+                aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(BODY_STRING)
+        ));
+        stubFor(post("/empty").willReturn(
+                aResponse()
+                        .withStatus(201))
+        );
+    }
+
+    @AfterEach
+    void tearDown() {
+        if (Objects.nonNull(server)) {
+            server.stop();
+        }
+    }
+
+    @Test
+    void smokePostShouldNotThrowThenReturnCorrectResponseMessage() {
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request())
+                .addResponseInterceptorLast(new AllureHttpClient5Response());
+
+        assertDoesNotThrow(() -> {
+            try (CloseableHttpClient httpClient = builder.build()) {
+                final HttpPost httpPost = new HttpPost(String.format(HELLO_POST_RETURN_BODY, server.port()));
+                httpPost.setEntity(new StringEntity(POST_REQUEST_BODY, ContentType.APPLICATION_JSON));
+                httpClient.execute(httpPost, response -> {
+                    response.getCode();
+                    assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                    return response;
+                });
+            }
+        });
+    }
+
+    @Test
+    void shouldCreatePostRequestAttachment() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addRequestInterceptorFirst(new AllureHttpClient5Request(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpPost httpPost = new HttpPost(String.format(HELLO_POST_RETURN_BODY, server.port()));
+            httpPost.setEntity(new StringEntity(POST_REQUEST_BODY, ContentType.APPLICATION_JSON));
+            httpClient.execute(httpPost, response -> {
+                response.getCode();
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+
+        verify(processor, times(1)).addAttachment(captor.capture(), eq(renderer));
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("url")
+                .containsExactly(HELLO_RESOURCE_PATH);
+    }
+
+    @Test
+    void shouldCreatePostResponseAttachment() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addResponseInterceptorLast(new AllureHttpClient5Response(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpPost httpPost = new HttpPost(String.format(HELLO_POST_RETURN_BODY, server.port()));
+            httpPost.setEntity(new StringEntity(POST_REQUEST_BODY, ContentType.APPLICATION_JSON));
+            httpClient.execute(httpPost, response -> {
+                response.getCode();
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo(BODY_STRING);
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+        verify(processor, times(1))
+                .addAttachment(captor.capture(), eq(renderer));
+
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("responseCode")
+                .containsExactly(200);
+    }
+
+    @Test
+    void shouldCreatePostResponseAttachmentWithEmptyBody() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                .addResponseInterceptorLast(new AllureHttpClient5Response(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpPost httpPost = new HttpPost(String.format(HELLO_POST_201_NO_BODY, server.port()));
+            httpPost.setEntity(new StringEntity(POST_REQUEST_BODY, ContentType.APPLICATION_JSON));
+            httpClient.execute(httpPost, response -> {
+                response.getCode();
+                assertThat(EntityUtils.toString(response.getEntity())).isEqualTo("");
+                return response;
+            });
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+        verify(processor, times(1))
+                .addAttachment(captor.capture(), eq(renderer));
+
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("body")
+                .containsExactly("No body present");
+    }
+}
diff --git a/allure-httpclient5/src/test/resources/allure.properties b/allure-httpclient5/src/test/resources/allure.properties
new file mode 100644
index 000000000..9c0b0a2d7
--- /dev/null
+++ b/allure-httpclient5/src/test/resources/allure.properties
@@ -0,0 +1,2 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
diff --git a/build.gradle.kts b/build.gradle.kts
index 04c4bdaef..6a04155e1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -151,6 +151,7 @@ configure(libs) {
             dependency("net.sourceforge.pmd:pmd-java:6.46.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
+            dependency("org.apache.httpcomponents.client5:httpclient5:5.2.1")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")
             dependency("org.assertj:assertj-core:3.23.1")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5aa1340d2..0c027ef82 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,6 +15,7 @@ include("allure-descriptions-javadoc")
 include("allure-grpc")
 include("allure-hamcrest")
 include("allure-httpclient")
+include("allure-httpclient5")
 include("allure-java-commons")
 include("allure-java-commons-test")
 include("allure-java-migration")

From caf0c4b14facfc04ef82d2d2515694dfb44c24e5 Mon Sep 17 00:00:00 2001
From: Valery Yatsynovich <valery_yatsynovich@epam.com>
Date: Thu, 3 Aug 2023 14:14:44 +0300
Subject: [PATCH 034/233] introduce adaptor for jbehave 5 (via #937)

---
 .github/ISSUE_TEMPLATE/bug_report.yml         |   1 +
 .github/labeler.yml                           |   2 +-
 allure-jbehave5/build.gradle.kts              |  27 ++
 .../allure/jbehave5/AllureJbehave5.java       | 298 +++++++++++++++++
 .../allure/jbehave5/AllureJbehave5Test.java   | 316 ++++++++++++++++++
 .../allure/jbehave5/LoggingReporter.java      |  93 ++++++
 .../jbehave5/samples/BrokenStorySteps.java    |  27 ++
 .../jbehave5/samples/SimpleStorySteps.java    |  50 +++
 .../src/test/resources/allure.properties      |   2 +
 .../test/resources/simplelogger.properties    |   3 +
 .../src/test/resources/stories/broken.story   |   2 +
 .../src/test/resources/stories/comment.story  |   7 +
 .../test/resources/stories/description.story  |  17 +
 .../src/test/resources/stories/examples.story |  11 +
 .../src/test/resources/stories/failed.story   |   6 +
 .../src/test/resources/stories/given.story    |   5 +
 .../src/test/resources/stories/long.story     |  14 +
 .../src/test/resources/stories/multiply.story |  20 ++
 .../resources/stories/precondition-a.story    |   3 +
 .../resources/stories/precondition-b.story    |   3 +
 .../src/test/resources/stories/simple.story   |   6 +
 .../test/resources/stories/undefined.story    |   2 +
 settings.gradle.kts                           |   1 +
 23 files changed, 915 insertions(+), 1 deletion(-)
 create mode 100644 allure-jbehave5/build.gradle.kts
 create mode 100644 allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
 create mode 100644 allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
 create mode 100644 allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java
 create mode 100644 allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java
 create mode 100644 allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java
 create mode 100644 allure-jbehave5/src/test/resources/allure.properties
 create mode 100644 allure-jbehave5/src/test/resources/simplelogger.properties
 create mode 100644 allure-jbehave5/src/test/resources/stories/broken.story
 create mode 100644 allure-jbehave5/src/test/resources/stories/comment.story
 create mode 100644 allure-jbehave5/src/test/resources/stories/description.story
 create mode 100644 allure-jbehave5/src/test/resources/stories/examples.story
 create mode 100644 allure-jbehave5/src/test/resources/stories/failed.story
 create mode 100644 allure-jbehave5/src/test/resources/stories/given.story
 create mode 100644 allure-jbehave5/src/test/resources/stories/long.story
 create mode 100644 allure-jbehave5/src/test/resources/stories/multiply.story
 create mode 100644 allure-jbehave5/src/test/resources/stories/precondition-a.story
 create mode 100644 allure-jbehave5/src/test/resources/stories/precondition-b.story
 create mode 100644 allure-jbehave5/src/test/resources/stories/simple.story
 create mode 100644 allure-jbehave5/src/test/resources/stories/undefined.story

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 5fddcebc4..fb19a1b5d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -41,6 +41,7 @@ body:
         - allure-java-commons
         - allure-jax-rs
         - allure-jbehave
+        - allure-jbehave5
         - allure-jsonunit
         - allure-junit-platform
         - allure-junit4
diff --git a/.github/labeler.yml b/.github/labeler.yml
index c22e48e72..a419c97f9 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -38,7 +38,7 @@
   - "allure-jax-rs/**"
 
 "theme:jbehave":
-  - "allure-jbehave/**"
+  - "allure-jbehave*/**"
 
 "theme:jsonunit":
   - "allure-jsonunit/**"
diff --git a/allure-jbehave5/build.gradle.kts b/allure-jbehave5/build.gradle.kts
new file mode 100644
index 000000000..256e5af6d
--- /dev/null
+++ b/allure-jbehave5/build.gradle.kts
@@ -0,0 +1,27 @@
+description = "Allure JBehave 5 Integration"
+
+val jbehaveVersion = "5.1.1"
+
+dependencies {
+    api(project(":allure-java-commons"))
+    implementation("org.jbehave:jbehave-core:$jbehaveVersion")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.jbehave5"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
diff --git a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
new file mode 100644
index 000000000..3c38c214c
--- /dev/null
+++ b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
@@ -0,0 +1,298 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jbehave5;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import org.jbehave.core.failures.UUIDExceptionWrapper;
+import org.jbehave.core.model.ExamplesTable;
+import org.jbehave.core.model.Scenario;
+import org.jbehave.core.model.Step;
+import org.jbehave.core.model.Story;
+import org.jbehave.core.reporters.NullStoryReporter;
+import org.jbehave.core.steps.StepCreator;
+import org.jbehave.core.steps.Timing;
+
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
+
+import static io.qameta.allure.util.ResultsUtils.bytesToHex;
+import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
+import static io.qameta.allure.util.ResultsUtils.createHostLabel;
+import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
+import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
+import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+import static io.qameta.allure.util.ResultsUtils.getMd5Digest;
+import static io.qameta.allure.util.ResultsUtils.getStatus;
+import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonList;
+import static java.util.Comparator.comparing;
+
+public class AllureJbehave5 extends NullStoryReporter {
+
+    private final AllureLifecycle lifecycle;
+
+    private final ThreadLocal<Story> currentStory = new InheritableThreadLocal<>();
+
+    private final ThreadLocal<Scenario> currentScenario = new InheritableThreadLocal<>();
+
+    private final Map<Scenario, List<String>> scenarioUuids = new ConcurrentHashMap<>();
+
+    private final ThreadLocal<Deque<Story>> givenStories = ThreadLocal.withInitial(LinkedList::new);
+
+    private final ReadWriteLock lock = new ReentrantReadWriteLock();
+
+    @SuppressWarnings("unused")
+    public AllureJbehave5() {
+        this(Allure.getLifecycle());
+    }
+
+    public AllureJbehave5(final AllureLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    @Override
+    public void beforeStory(final Story story, final boolean givenStory) {
+        if (givenStory) {
+            givenStories.get().push(story);
+        } else {
+            currentStory.set(story);
+        }
+    }
+
+    @Override
+    public void afterStory(final boolean givenStory) {
+        if (givenStory) {
+            givenStories.get().pop();
+        } else {
+            currentStory.remove();
+        }
+    }
+
+    @Override
+    public void beforeScenario(final Scenario scenario) {
+        if (isGivenStory()) {
+            return;
+        }
+        currentScenario.set(scenario);
+
+        if (notParameterised(scenario)) {
+            final String uuid = UUID.randomUUID().toString();
+            usingWriteLock(() -> scenarioUuids.put(scenario, new ArrayList<>(singletonList(uuid))));
+            startTestCase(uuid, scenario, emptyMap());
+        } else {
+            usingWriteLock(() -> scenarioUuids.put(scenario, new ArrayList<>()));
+        }
+    }
+
+    @Override
+    public void beforeExamples(final List<String> steps, final ExamplesTable table) {
+        if (isGivenStory()) {
+            return;
+        }
+        final Scenario scenario = currentScenario.get();
+        lock.writeLock().lock();
+        try {
+            scenarioUuids.put(scenario, new ArrayList<>());
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+
+    @Override
+    public void example(final Map<String, String> tableRow, final int exampleIndex) {
+        if (isGivenStory()) {
+            return;
+        }
+        final Scenario scenario = currentScenario.get();
+        final String uuid = UUID.randomUUID().toString();
+        usingWriteLock(() -> scenarioUuids.getOrDefault(scenario, new ArrayList<>()).add(uuid));
+        startTestCase(uuid, scenario, tableRow);
+    }
+
+    @Override
+    public void afterScenario(final Timing timing) {
+        if (isGivenStory()) {
+            return;
+        }
+        final Scenario scenario = currentScenario.get();
+        usingReadLock(() -> {
+            final List<String> uuids = scenarioUuids.getOrDefault(scenario, emptyList());
+            uuids.forEach(this::stopTestCase);
+        });
+        currentScenario.remove();
+        usingWriteLock(() -> scenarioUuids.remove(scenario));
+    }
+
+    @Override
+    public void beforeStep(final Step step) {
+        final String stepUuid = UUID.randomUUID().toString();
+        getLifecycle().startStep(stepUuid, new StepResult().setName(step.getStepAsString()));
+    }
+
+    @Override
+    public void successful(final String step) {
+        getLifecycle().updateTestCase(result -> result.setStatus(Status.PASSED));
+        getLifecycle().updateStep(result -> result.setStatus(Status.PASSED));
+        getLifecycle().stopStep();
+    }
+
+    @Override
+    public void ignorable(final String step) {
+        getLifecycle().stopStep();
+    }
+
+    @Override
+    public void pending(final StepCreator.PendingStep step) {
+        getLifecycle().updateStep(result -> result.setStatus(Status.SKIPPED));
+        getLifecycle().stopStep();
+    }
+
+    @Override
+    public void notPerformed(final String step) {
+        getLifecycle().stopStep();
+    }
+
+    @Override
+    public void failed(final String step, final Throwable cause) {
+        final Throwable unwrapped = cause instanceof UUIDExceptionWrapper
+                ? cause.getCause()
+                : cause;
+
+
+        final Status status = getStatus(unwrapped).orElse(Status.FAILED);
+        final StatusDetails statusDetails = getStatusDetails(unwrapped).orElseGet(StatusDetails::new);
+
+        getLifecycle().updateStep(result -> {
+            result.setStatus(status);
+            result.setStatusDetails(statusDetails);
+        });
+
+        getLifecycle().updateTestCase(result -> {
+            result.setStatus(status);
+            result.setStatusDetails(statusDetails);
+        });
+
+        getLifecycle().stopStep();
+    }
+
+
+    public AllureLifecycle getLifecycle() {
+        return lifecycle;
+    }
+
+    protected void startTestCase(final String uuid,
+                                 final Scenario scenario,
+                                 final Map<String, String> tableRow) {
+        final Story story = currentStory.get();
+
+        final String name = scenario.getTitle();
+        final String fullName = String.format("%s: %s", story.getName(), name);
+
+        final List<Parameter> parameters = tableRow.entrySet().stream()
+                .map(entry -> createParameter(entry.getKey(), entry.getValue()))
+                .collect(Collectors.toList());
+
+        final List<Label> labels = Arrays.asList(
+                createStoryLabel(story.getName()),
+                createHostLabel(),
+                createThreadLabel(),
+                createFrameworkLabel("jbehave"),
+                createLanguageLabel("java")
+        );
+
+        final String historyId = getHistoryId(fullName, parameters);
+
+        final TestResult result = new TestResult()
+                .setUuid(uuid)
+                .setName(name)
+                .setFullName(fullName)
+                .setStage(Stage.SCHEDULED)
+                .setLabels(labels)
+                .setParameters(parameters)
+                .setDescription(story.getDescription().asString())
+                .setHistoryId(historyId);
+
+        getLifecycle().scheduleTestCase(result);
+        getLifecycle().startTestCase(result.getUuid());
+    }
+
+    protected void stopTestCase(final String uuid) {
+        getLifecycle().stopTestCase(uuid);
+        getLifecycle().writeTestCase(uuid);
+    }
+
+    protected boolean notParameterised(final Scenario scenario) {
+        return scenario.getExamplesTable().getRowCount() == 0;
+    }
+
+    protected String getHistoryId(final String fullName, final List<Parameter> parameters) {
+        final MessageDigest digest = getMd5Digest();
+        digest.update(fullName.getBytes(UTF_8));
+        parameters.stream()
+                .sorted(comparing(Parameter::getName).thenComparing(Parameter::getValue))
+                .forEachOrdered(parameter -> {
+                    digest.update(parameter.getName().getBytes(UTF_8));
+                    digest.update(parameter.getValue().getBytes(UTF_8));
+                });
+        final byte[] bytes = digest.digest();
+        return bytesToHex(bytes);
+    }
+
+    private boolean isGivenStory() {
+        return !givenStories.get().isEmpty();
+    }
+
+    private void usingReadLock(final Runnable runnable) {
+        lock.readLock().lock();
+        try {
+            runnable.run();
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    private void usingWriteLock(final Runnable runnable) {
+        lock.writeLock().lock();
+        try {
+            runnable.run();
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+
+}
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
new file mode 100644
index 000000000..3b15aeaca
--- /dev/null
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
@@ -0,0 +1,316 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jbehave5;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.Issue;
+import io.qameta.allure.jbehave5.samples.BrokenStorySteps;
+import io.qameta.allure.jbehave5.samples.SimpleStorySteps;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.AllureResultsWriterStub;
+import org.jbehave.core.configuration.MostUsefulConfiguration;
+import org.jbehave.core.embedder.Embedder;
+import org.jbehave.core.embedder.EmbedderControls;
+import org.jbehave.core.embedder.NullEmbedderMonitor;
+import org.jbehave.core.io.LoadFromClasspath;
+import org.jbehave.core.reporters.NullStoryReporter;
+import org.jbehave.core.reporters.StoryReporterBuilder;
+import org.jbehave.core.steps.InjectableStepsFactory;
+import org.jbehave.core.steps.InstanceStepsFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+class AllureJbehave5Test {
+
+    @TempDir
+    Path temp;
+
+    @Test
+    void shouldSetName() {
+        final AllureResults results = runStories("stories/simple.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName)
+                .containsExactlyInAnyOrder("Add a to b");
+
+    }
+
+    @Test
+    void shouldAddNotPerformedSteps() {
+        final AllureResults results = runStories("stories/long.story");
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("And b is 10", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 20", Status.FAILED),
+                        tuple("Then result is 21", null),
+                        tuple("Then result is 22", null),
+                        tuple("Then result is 23", null),
+                        tuple("When I add a to b", null),
+                        tuple("Then result is 25", null)
+                );
+
+    }
+
+    @Test
+    void shouldSetStatus() {
+        final AllureResults results = runStories("stories/simple.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.PASSED);
+    }
+
+
+    @Test
+    void shouldSetFailedStatus() {
+        final AllureResults results = runStories("stories/failed.story");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.FAILED);
+    }
+
+    @Test
+    void shouldSetStatusDetails() {
+        final AllureResults results = runStories("stories/failed.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStatusDetails)
+                .extracting(StatusDetails::getMessage)
+                .containsExactlyInAnyOrder("expected: <15> but was: <123>");
+    }
+
+    @Test
+    void shouldSetBrokenStatus() {
+        final AllureResults results = runStories("stories/broken.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.BROKEN);
+    }
+
+    @Test
+    void shouldSetStage() {
+        final AllureResults results = runStories("stories/simple.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStage)
+                .containsExactlyInAnyOrder(Stage.FINISHED);
+    }
+
+    @Test
+    void shouldSetStart() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResults results = runStories("stories/simple.story");
+        final long after = Instant.now().toEpochMilli();
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStart)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @Test
+    void shouldSetStop() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResults results = runStories("stories/simple.story");
+        final long after = Instant.now().toEpochMilli();
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStop)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @Test
+    void shouldSetFullName() {
+        final AllureResults results = runStories("stories/simple.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getFullName)
+                .containsExactlyInAnyOrder("simple.story: Add a to b");
+    }
+
+    @Test
+    void shouldSetDescription() {
+        final AllureResults results = runStories("stories/description.story");
+
+        final String expected = "This is description for current story.\n"
+                + "It should appear on each scenario in report";
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        expected,
+                        expected
+                );
+    }
+
+    @Issue("238")
+    @Test
+    void shouldNotFailOnComments() {
+        final AllureResults results = runStories("stories/comment.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
+
+    }
+
+    @Test
+    void shouldProcessNotImplementedScenario() {
+        final AllureResults results = runStories("stories/undefined.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Step is not implemented", null)
+                );
+    }
+
+    @Issue("145")
+    @Test
+    void shouldAddParametersFromExamples() {
+        final AllureResults results = runStories("stories/examples.story");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2);
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
+                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
+                );
+
+    }
+
+    @Test
+    void shouldRunMultiplyScenarios() {
+        final AllureResults results = runStories("stories/multiply.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("First", Status.PASSED),
+                        tuple("Second", Status.PASSED),
+                        tuple("Third", Status.PASSED)
+                );
+
+    }
+
+    @Issue("163")
+    @Test
+    void shouldNotFailIfGivenStoriesSpecified() {
+        final AllureResults results = runStories("stories/given.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactly(tuple("Add a to b", Status.PASSED));
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "Given a is 5",
+                        "Given b is 10",
+                        "When I add a to b",
+                        "Then result is 15"
+                );
+
+    }
+
+    private AllureResults runStories(final String... storyResources) {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
+
+        final Embedder embedder = new Embedder();
+        embedder.useEmbedderMonitor(new NullEmbedderMonitor());
+        embedder.useEmbedderControls(new EmbedderControls()
+                .doGenerateViewAfterStories(false)
+                .doFailOnStoryTimeout(false)
+                .doBatch(false)
+                .doIgnoreFailureInStories(true)
+                .doIgnoreFailureInView(true)
+                .doVerboseFailures(false)
+                .doVerboseFiltering(false)
+        );
+        final AllureJbehave5 allureJbehave5 = new AllureJbehave5(lifecycle);
+        embedder.useConfiguration(new MostUsefulConfiguration()
+                .useStoryLoader(new LoadFromClasspath(this.getClass()))
+                .useStoryReporterBuilder(new ReportlessStoryReporterBuilder(temp.toFile())
+                        .withReporters(allureJbehave5)
+                )
+                .useDefaultStoryReporter(new NullStoryReporter())
+        );
+        final InjectableStepsFactory stepsFactory = new InstanceStepsFactory(
+                embedder.configuration(),
+                new SimpleStorySteps(),
+                new BrokenStorySteps()
+        );
+        embedder.useStepsFactory(stepsFactory);
+        final AllureLifecycle cached = Allure.getLifecycle();
+        try {
+            Allure.setLifecycle(lifecycle);
+            embedder.runStoriesAsPaths(Arrays.asList(storyResources));
+        } finally {
+            Allure.setLifecycle(cached);
+        }
+        return writer;
+    }
+
+    static class ReportlessStoryReporterBuilder extends StoryReporterBuilder {
+
+        private final File outputDirectory;
+
+        ReportlessStoryReporterBuilder(final File outputDirectory) {
+            this.outputDirectory = outputDirectory;
+        }
+
+        @Override
+        public File outputDirectory() {
+            return outputDirectory;
+        }
+    }
+}
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java
new file mode 100644
index 000000000..44a416927
--- /dev/null
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java
@@ -0,0 +1,93 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jbehave5;
+
+import org.jbehave.core.model.GivenStories;
+import org.jbehave.core.model.Scenario;
+import org.jbehave.core.model.Step;
+import org.jbehave.core.model.Story;
+import org.jbehave.core.reporters.NullStoryReporter;
+import org.jbehave.core.steps.Timing;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+@SuppressWarnings("unused")
+class LoggingReporter extends NullStoryReporter {
+
+    private final AtomicInteger indentSize = new AtomicInteger(0);
+
+    @Override
+    public void beforeStory(final Story story, final boolean givenStory) {
+        log("beforeStory", story.getName(), givenStory);
+    }
+
+    @Override
+    public void beforeGivenStories() {
+        log("beforeGivenStories");
+    }
+
+    @Override
+    public void givenStories(final GivenStories givenStories) {
+        log("givenStories", givenStories.asString());
+    }
+
+    @Override
+    public void afterGivenStories() {
+        log("afterGivenStories");
+    }
+
+    @Override
+    public void beforeScenario(final Scenario scenario) {
+        log("beforeScenario", scenario.getTitle());
+        indentSize.incrementAndGet();
+    }
+
+    @Override
+    public void afterScenario(final Timing timing) {
+        log("afterScenario");
+        indentSize.decrementAndGet();
+    }
+
+    @Override
+    public void beforeStep(final Step step) {
+        log("step", step);
+    }
+
+    @Override
+    public void example(final Map<String, String> tableRow, final int exampleIndex) {
+        log("example", tableRow);
+    }
+
+    private void log(final Object... objects) {
+        final int value = indentSize.get();
+        final String string = Stream.concat(
+                Stream.of(indent(value)),
+                Stream.of(objects).map(Objects::toString)
+        ).collect(Collectors.joining(" "));
+        System.out.println(string);
+    }
+
+    private static String indent(final int count) {
+        return IntStream.range(0, count)
+                .mapToObj(i -> "    ")
+                .collect(Collectors.joining());
+    }
+}
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java
new file mode 100644
index 000000000..a96a97a0c
--- /dev/null
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java
@@ -0,0 +1,27 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jbehave5.samples;
+
+import org.jbehave.core.annotations.Given;
+
+public class BrokenStorySteps {
+
+    @Given("everything is broken")
+    public void everythingIsBroken() {
+        throw new RuntimeException("Oops");
+    }
+
+}
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java
new file mode 100644
index 000000000..883199e9e
--- /dev/null
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java
@@ -0,0 +1,50 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jbehave5.samples;
+
+import org.jbehave.core.annotations.Given;
+import org.jbehave.core.annotations.Then;
+import org.jbehave.core.annotations.When;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SimpleStorySteps {
+
+    private int a;
+    private int b;
+    private int c;
+
+    @Given("a is $number")
+    public void a_is(int arg1) {
+        this.a = arg1;
+    }
+
+    @Given("b is $number")
+    public void b_is(int arg1) {
+        this.b = arg1;
+    }
+
+    @When("I add a to b")
+    public void i_add_a_to_b() {
+        this.c = this.a + this.b;
+    }
+
+    @Then("result is $number")
+    public void result_is(int arg1) {
+        assertEquals(this.c, arg1);
+    }
+
+}
diff --git a/allure-jbehave5/src/test/resources/allure.properties b/allure-jbehave5/src/test/resources/allure.properties
new file mode 100644
index 000000000..9c0b0a2d7
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/allure.properties
@@ -0,0 +1,2 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
diff --git a/allure-jbehave5/src/test/resources/simplelogger.properties b/allure-jbehave5/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..7580c4f07
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/simplelogger.properties
@@ -0,0 +1,3 @@
+org.slf4j.simpleLogger.log.org.reflections=off
+org.slf4j.simpleLogger.showLogName=false
+org.slf4j.simpleLogger.showThreadName=false
\ No newline at end of file
diff --git a/allure-jbehave5/src/test/resources/stories/broken.story b/allure-jbehave5/src/test/resources/stories/broken.story
new file mode 100644
index 000000000..e263312db
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/broken.story
@@ -0,0 +1,2 @@
+Scenario: Exception during step
+Given everything is broken
diff --git a/allure-jbehave5/src/test/resources/stories/comment.story b/allure-jbehave5/src/test/resources/stories/comment.story
new file mode 100644
index 000000000..0674d5c1e
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/comment.story
@@ -0,0 +1,7 @@
+Scenario: Add a to b
+
+Given a is 5
+And b is 10
+When I add a to b
+!-- When I add a to b
+Then result is 15
diff --git a/allure-jbehave5/src/test/resources/stories/description.story b/allure-jbehave5/src/test/resources/stories/description.story
new file mode 100644
index 000000000..3b04280a6
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/description.story
@@ -0,0 +1,17 @@
+This is description for current story.
+It should appear on each scenario in report
+
+Scenario: Add a to b (1)
+
+Given a is 5
+And b is 10
+When I add a to b
+Then result is 15
+
+Scenario: Add a to b (2)
+
+Given a is 1
+And b is 2
+When I add a to b
+Then result is 3
+
diff --git a/allure-jbehave5/src/test/resources/stories/examples.story b/allure-jbehave5/src/test/resources/stories/examples.story
new file mode 100644
index 000000000..22a4f9b96
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/examples.story
@@ -0,0 +1,11 @@
+Scenario: Scenario with Positive Examples
+
+Given a is <a>
+And b is <b>
+When I add a to b
+Then result is <result>
+
+Examples:
+| a | b | result |
+| 1 | 3 | 4      |
+| 2 | 4 | 6      |
diff --git a/allure-jbehave5/src/test/resources/stories/failed.story b/allure-jbehave5/src/test/resources/stories/failed.story
new file mode 100644
index 000000000..5b33b75d7
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/failed.story
@@ -0,0 +1,6 @@
+Scenario: Add a to b
+
+Given a is 5
+And b is 10
+When I add a to b
+Then result is 123
diff --git a/allure-jbehave5/src/test/resources/stories/given.story b/allure-jbehave5/src/test/resources/stories/given.story
new file mode 100644
index 000000000..2fc2feb0c
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/given.story
@@ -0,0 +1,5 @@
+Scenario: Add a to b
+GivenStories:stories/precondition-a.story,stories/precondition-b.story
+
+When I add a to b
+Then result is 15
diff --git a/allure-jbehave5/src/test/resources/stories/long.story b/allure-jbehave5/src/test/resources/stories/long.story
new file mode 100644
index 000000000..88f529253
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/long.story
@@ -0,0 +1,14 @@
+Scenario: Add a to b
+
+Given a is 5
+And b is 10
+When I add a to b
+Then result is 15
+Then result is 15
+When I add a to b
+Then result is 20
+Then result is 21
+Then result is 22
+Then result is 23
+When I add a to b
+Then result is 25
diff --git a/allure-jbehave5/src/test/resources/stories/multiply.story b/allure-jbehave5/src/test/resources/stories/multiply.story
new file mode 100644
index 000000000..4aecb435b
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/multiply.story
@@ -0,0 +1,20 @@
+Scenario: First
+
+Given a is 2
+And b is 2
+When I add a to b
+Then result is 4
+
+Scenario: Second
+
+Given a is 3
+And b is 7
+When I add a to b
+Then result is 10
+
+Scenario: Third
+
+Given a is 5
+And b is -5
+When I add a to b
+Then result is 0
diff --git a/allure-jbehave5/src/test/resources/stories/precondition-a.story b/allure-jbehave5/src/test/resources/stories/precondition-a.story
new file mode 100644
index 000000000..9defc653a
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/precondition-a.story
@@ -0,0 +1,3 @@
+Scenario: Init a
+
+Given a is 5
diff --git a/allure-jbehave5/src/test/resources/stories/precondition-b.story b/allure-jbehave5/src/test/resources/stories/precondition-b.story
new file mode 100644
index 000000000..30af31190
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/precondition-b.story
@@ -0,0 +1,3 @@
+Scenario: Init b
+
+Given b is 10
diff --git a/allure-jbehave5/src/test/resources/stories/simple.story b/allure-jbehave5/src/test/resources/stories/simple.story
new file mode 100644
index 000000000..b76d831aa
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/simple.story
@@ -0,0 +1,6 @@
+Scenario: Add a to b
+
+Given a is 5
+And b is 10
+When I add a to b
+Then result is 15
diff --git a/allure-jbehave5/src/test/resources/stories/undefined.story b/allure-jbehave5/src/test/resources/stories/undefined.story
new file mode 100644
index 000000000..5a193a746
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/undefined.story
@@ -0,0 +1,2 @@
+Scenario: Step is not implemented
+Given hello my friend
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0c027ef82..156f0d60e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -21,6 +21,7 @@ include("allure-java-commons-test")
 include("allure-java-migration")
 include("allure-jax-rs")
 include("allure-jbehave")
+include("allure-jbehave5")
 include("allure-jooq")
 include("allure-jsonunit")
 include("allure-junit-platform")

From 5bf8793f9a4369e8328fb65faf7cebebefee7a00 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 4 Aug 2023 14:07:43 +0100
Subject: [PATCH 035/233] enable step & attachment aspects for cucumber-jvm
 (fixes #923, via #940)

---
 .../src/main/resources/META-INF/aop-ajc.xml                | 7 +++++++
 .../src/main/resources/META-INF/aop-ajc.xml                | 7 +++++++
 .../src/main/resources/META-INF/aop-ajc.xml                | 7 +++++++
 .../src/main/resources/META-INF/aop-ajc.xml                | 7 +++++++
 4 files changed, 28 insertions(+)
 create mode 100644 allure-cucumber4-jvm/src/main/resources/META-INF/aop-ajc.xml
 create mode 100644 allure-cucumber5-jvm/src/main/resources/META-INF/aop-ajc.xml
 create mode 100644 allure-cucumber6-jvm/src/main/resources/META-INF/aop-ajc.xml
 create mode 100644 allure-cucumber7-jvm/src/main/resources/META-INF/aop-ajc.xml

diff --git a/allure-cucumber4-jvm/src/main/resources/META-INF/aop-ajc.xml b/allure-cucumber4-jvm/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 000000000..09e38300c
--- /dev/null
+++ b/allure-cucumber4-jvm/src/main/resources/META-INF/aop-ajc.xml
@@ -0,0 +1,7 @@
+<aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
+    <aspects>
+        <aspect name="io.qameta.allure.aspects.StepsAspects"/>
+        <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
+    </aspects>
+</aspectj>
diff --git a/allure-cucumber5-jvm/src/main/resources/META-INF/aop-ajc.xml b/allure-cucumber5-jvm/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 000000000..09e38300c
--- /dev/null
+++ b/allure-cucumber5-jvm/src/main/resources/META-INF/aop-ajc.xml
@@ -0,0 +1,7 @@
+<aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
+    <aspects>
+        <aspect name="io.qameta.allure.aspects.StepsAspects"/>
+        <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
+    </aspects>
+</aspectj>
diff --git a/allure-cucumber6-jvm/src/main/resources/META-INF/aop-ajc.xml b/allure-cucumber6-jvm/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 000000000..09e38300c
--- /dev/null
+++ b/allure-cucumber6-jvm/src/main/resources/META-INF/aop-ajc.xml
@@ -0,0 +1,7 @@
+<aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
+    <aspects>
+        <aspect name="io.qameta.allure.aspects.StepsAspects"/>
+        <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
+    </aspects>
+</aspectj>
diff --git a/allure-cucumber7-jvm/src/main/resources/META-INF/aop-ajc.xml b/allure-cucumber7-jvm/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 000000000..09e38300c
--- /dev/null
+++ b/allure-cucumber7-jvm/src/main/resources/META-INF/aop-ajc.xml
@@ -0,0 +1,7 @@
+<aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
+    <aspects>
+        <aspect name="io.qameta.allure.aspects.StepsAspects"/>
+        <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
+    </aspects>
+</aspectj>

From 47af6f61a602f934c76ffae112b6e0a2c70652ee Mon Sep 17 00:00:00 2001
From: Dmitry Piskunov <34338773+dm-test@users.noreply.github.com>
Date: Thu, 17 Aug 2023 16:57:38 +0200
Subject: [PATCH 036/233] fix(allure-scalatest): fix missing test results in
 case of test parallel execution (fixes #945, via #946)

---
 .../allure/scalatest/AllureScalatest.scala    | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala b/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
index bc4244db0..defd7019c 100644
--- a/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
+++ b/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
@@ -16,7 +16,7 @@
 package io.qameta.allure.scalatest
 
 import java.lang.annotation.Annotation
-import java.util.UUID
+import java.util.{Objects, UUID}
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.locks.ReentrantReadWriteLock
 
@@ -162,7 +162,7 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
       event.suiteClassName,
       event.location,
       event.testName,
-      None
+      Some(event.threadName)
     )
     stopTest(
       None,
@@ -180,7 +180,7 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
     val uuid = UUID.randomUUID().toString
     var labels = mutable.ListBuffer(
       createSuiteLabel(suiteName),
-      createThreadLabel(),
+      createLabel(THREAD_LABEL_NAME, getScalaTestThreadName(threadId)),
       createHostLabel(),
       createLanguageLabel("scala"),
       createFrameworkLabel("scalatest")
@@ -227,15 +227,21 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
   private def stopTest(status: Option[Status],
                        statusDetails: Option[StatusDetails],
                        threadName: Option[String]): Unit = {
-    threadName.fold {} { thread => AllureScalatestContextHolder.remove(thread) }
-    lifecycle.getCurrentTestCase.ifPresent(uuid => {
-      lifecycle.updateTestCase(uuid, (result: TestResult) => {
-        status.fold {} { st => result.setStatus(st) }
-        statusDetails.fold {} { details => result.setStatusDetails(details) }
-      }: Unit)
-      lifecycle.stopTestCase(uuid)
-      lifecycle.writeTestCase(uuid)
-    })
+    threadName.fold {} {
+      thread => {
+        AllureScalatestContextHolder.get(thread).fold {} {
+          uuid => {
+            lifecycle.updateTestCase(uuid, (result: TestResult) => {
+              status.fold {} { st => result.setStatus(st) }
+              statusDetails.fold {} { details => result.setStatusDetails(details) }
+            }: Unit)
+            lifecycle.stopTestCase(uuid)
+            lifecycle.writeTestCase(uuid)
+          }
+            AllureScalatestContextHolder.remove(thread)
+        }
+      }
+    }
   }
 
   private def getAnnotations(location: Option[Location]): List[Annotation] = location match {
@@ -273,4 +279,11 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
     }
   }
 
+  private def getScalaTestThreadName(threadId: Option[String]): String = {
+    val fromProperty = System.getProperty(ALLURE_THREAD_NAME_SYSPROP)
+    val fromEnv = System.getenv(ALLURE_THREAD_NAME_ENV)
+    val realThreadName = threadId.getOrElse {getThreadName}
+    Seq(fromProperty, fromEnv).find(el => Objects.nonNull(el)).getOrElse {realThreadName}
+  }
+
 }

From 6c34a983e17355144abd2119af65f858892f4482 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Aug 2023 15:58:27 +0100
Subject: [PATCH 037/233] bump grpcVersion from 1.53.0 to 1.57.1 (via #942)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 2da30e57d..fa09af0d7 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -8,7 +8,7 @@ description = "Allure gRPC Integration"
 
 val agent: Configuration by configurations.creating
 
-val grpcVersion = "1.53.0"
+val grpcVersion = "1.57.1"
 val protobufVersion = "3.22.4"
 
 dependencies {

From 155df5d90b08e6c6dfa473b3866dfcde98088a47 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 21 Aug 2023 15:00:57 +0100
Subject: [PATCH 038/233] impr(cucumberjvm): support selective runs and more
 (via #947)

---
 allure-cucumber2-jvm/build.gradle.kts         |  29 -
 .../cucumber2jvm/AllureCucumber2Jvm.java      | 408 ------------
 .../cucumber2jvm/CucumberSourceUtils.java     | 196 ------
 .../allure/cucumber2jvm/LabelBuilder.java     | 161 -----
 .../qameta/allure/cucumber2jvm/TagParser.java |  72 ---
 .../src/main/resources/META-INF/aop-ajc.xml   |   7 -
 .../cucumber2jvm/AllureCucumber2JvmTest.java  | 584 -----------------
 .../cucumber2jvm/samples/AttachmentSteps.java |  43 --
 .../samples/BackgroundFeatureSteps.java       |  43 --
 .../samples/BrokenFeatureSteps.java           |  30 -
 .../allure/cucumber2jvm/samples/Hooks.java    |  40 --
 .../samples/SimpleFeatureSteps.java           |  53 --
 .../src/test/resources/allure.properties      |   2 -
 .../resources/features/attachments.feature    |   8 -
 .../resources/features/background.feature     |   9 -
 .../test/resources/features/broken.feature    |   4 -
 .../test/resources/features/datatable.feature |   8 -
 .../resources/features/description.feature    |  17 -
 .../test/resources/features/examples.feature  |  11 -
 .../test/resources/features/failed.feature    |   7 -
 .../src/test/resources/features/hooks.feature |  77 ---
 .../features/multipleExamples.feature         |  15 -
 .../src/test/resources/features/tags.feature  |  13 -
 .../test/resources/features/undefined.feature |   4 -
 allure-cucumber3-jvm/build.gradle.kts         |  29 -
 .../cucumber3jvm/AllureCucumber3Jvm.java      | 410 ------------
 .../cucumber3jvm/CucumberSourceUtils.java     | 196 ------
 .../allure/cucumber3jvm/LabelBuilder.java     | 161 -----
 .../qameta/allure/cucumber3jvm/TagParser.java |  72 ---
 .../src/main/resources/META-INF/aop-ajc.xml   |   7 -
 .../cucumber3jvm/AllureCucumber3JvmTest.java  | 597 ------------------
 .../cucumber3jvm/samples/AttachmentSteps.java |  43 --
 .../samples/BackgroundFeatureSteps.java       |  43 --
 .../samples/BrokenFeatureSteps.java           |  30 -
 .../samples/DatatableFeatureSteps.java        |  31 -
 .../allure/cucumber3jvm/samples/Hooks.java    |  40 --
 .../samples/SimpleFeatureSteps.java           |  53 --
 .../src/test/resources/allure.properties      |   3 -
 .../resources/features/attachments.feature    |   8 -
 .../resources/features/background.feature     |   9 -
 .../test/resources/features/broken.feature    |   4 -
 .../test/resources/features/datatable.feature |   8 -
 .../resources/features/description.feature    |  17 -
 .../test/resources/features/examples.feature  |  12 -
 .../test/resources/features/failed.feature    |   7 -
 .../src/test/resources/features/hooks.feature |  77 ---
 .../resources/features/multi-examples.feature |  17 -
 .../test/resources/features/simple.feature    |   7 -
 .../src/test/resources/features/tags.feature  |  13 -
 .../test/resources/features/undefined.feature |   4 -
 .../cucumber4jvm/AllureCucumber4Jvm.java      |  61 +-
 .../cucumber4jvm/AllureCucumber4JvmTest.java  | 327 ++++------
 .../resources/features/same}/simple.feature   |   0
 .../cucumber5jvm/AllureCucumber5Jvm.java      |  40 +-
 .../cucumber5jvm/AllureCucumber5JvmTest.java  | 255 ++++----
 allure-cucumber6-jvm/build.gradle.kts         |   6 +-
 .../cucumber6jvm/AllureCucumber6Jvm.java      |  50 +-
 .../cucumber6jvm/AllureCucumber6JvmTest.java  | 246 ++++----
 allure-cucumber7-jvm/build.gradle.kts         |  16 +-
 .../cucumber7jvm/AllureCucumber7Jvm.java      |  49 +-
 .../cucumber7jvm/AllureCucumber7JvmTest.java  | 249 ++++----
 allure-java-commons-test/build.gradle.kts     |   1 +
 .../allure/test/AllureTestCommonsUtils.java   |  80 +++
 .../io/qameta/allure/util/ResultsUtils.java   |   1 -
 .../junitplatform/AllureJunitPlatform.java    |  63 +-
 .../AllureJunitPlatformUtils.java             |   9 +
 .../AllurePostDiscoveryFilter.java            |   1 -
 .../aspect/AllureJunit4FilterAspect.java      |  46 ++
 .../src/main/resources/META-INF/aop.xml       |   1 +
 allure-junit4/build.gradle.kts                |   1 +
 .../io/qameta/allure/junit4/AllureJunit4.java |  46 +-
 .../allure/junit4/AllureJunit4Filter.java     |  95 +++
 .../allure/junit4/AllureJunit4Utils.java      | 115 ++++
 .../allure/junit4/AllureJunit4Test.java       |  57 +-
 .../junit4/samples/FilterSimpleTests.java     |  23 +-
 .../io/qameta/allure/testng/AllureTestNg.java |  78 ++-
 .../allure/testng/AllureTestNgTestFilter.java |   3 +-
 gradle/quality-configs/pmd/pmd.xml            |   2 +
 gradle/quality-configs/spotbugs/exclude.xml   |   8 +-
 settings.gradle.kts                           |   2 -
 80 files changed, 1214 insertions(+), 4456 deletions(-)
 delete mode 100644 allure-cucumber2-jvm/build.gradle.kts
 delete mode 100644 allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java
 delete mode 100644 allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/CucumberSourceUtils.java
 delete mode 100644 allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java
 delete mode 100644 allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/TagParser.java
 delete mode 100644 allure-cucumber2-jvm/src/main/resources/META-INF/aop-ajc.xml
 delete mode 100644 allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java
 delete mode 100644 allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/AttachmentSteps.java
 delete mode 100644 allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BackgroundFeatureSteps.java
 delete mode 100644 allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BrokenFeatureSteps.java
 delete mode 100644 allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/Hooks.java
 delete mode 100644 allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/SimpleFeatureSteps.java
 delete mode 100644 allure-cucumber2-jvm/src/test/resources/allure.properties
 delete mode 100644 allure-cucumber2-jvm/src/test/resources/features/attachments.feature
 delete mode 100644 allure-cucumber2-jvm/src/test/resources/features/background.feature
 delete mode 100644 allure-cucumber2-jvm/src/test/resources/features/broken.feature
 delete mode 100644 allure-cucumber2-jvm/src/test/resources/features/datatable.feature
 delete mode 100644 allure-cucumber2-jvm/src/test/resources/features/description.feature
 delete mode 100644 allure-cucumber2-jvm/src/test/resources/features/examples.feature
 delete mode 100644 allure-cucumber2-jvm/src/test/resources/features/failed.feature
 delete mode 100644 allure-cucumber2-jvm/src/test/resources/features/hooks.feature
 delete mode 100644 allure-cucumber2-jvm/src/test/resources/features/multipleExamples.feature
 delete mode 100644 allure-cucumber2-jvm/src/test/resources/features/tags.feature
 delete mode 100644 allure-cucumber2-jvm/src/test/resources/features/undefined.feature
 delete mode 100644 allure-cucumber3-jvm/build.gradle.kts
 delete mode 100644 allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/AllureCucumber3Jvm.java
 delete mode 100644 allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/CucumberSourceUtils.java
 delete mode 100644 allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java
 delete mode 100644 allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/TagParser.java
 delete mode 100644 allure-cucumber3-jvm/src/main/resources/META-INF/aop-ajc.xml
 delete mode 100644 allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java
 delete mode 100644 allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/AttachmentSteps.java
 delete mode 100644 allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BackgroundFeatureSteps.java
 delete mode 100644 allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BrokenFeatureSteps.java
 delete mode 100644 allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/DatatableFeatureSteps.java
 delete mode 100644 allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/Hooks.java
 delete mode 100644 allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/SimpleFeatureSteps.java
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/allure.properties
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/features/attachments.feature
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/features/background.feature
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/features/broken.feature
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/features/datatable.feature
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/features/description.feature
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/features/examples.feature
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/features/failed.feature
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/features/hooks.feature
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/features/multi-examples.feature
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/features/simple.feature
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/features/tags.feature
 delete mode 100644 allure-cucumber3-jvm/src/test/resources/features/undefined.feature
 rename {allure-cucumber2-jvm/src/test/resources/features => allure-cucumber4-jvm/src/test/resources/features/same}/simple.feature (100%)
 create mode 100644 allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
 create mode 100644 allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
 create mode 100644 allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
 create mode 100644 allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
 rename allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/DatatableFeatureSteps.java => allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java (66%)

diff --git a/allure-cucumber2-jvm/build.gradle.kts b/allure-cucumber2-jvm/build.gradle.kts
deleted file mode 100644
index 1ce0094c1..000000000
--- a/allure-cucumber2-jvm/build.gradle.kts
+++ /dev/null
@@ -1,29 +0,0 @@
-description = "Allure CucumberJVM 2.0 Integration"
-
-val cucumberVersion = "2.4.0"
-
-dependencies {
-    api(project(":allure-java-commons"))
-    implementation("io.cucumber:cucumber-core:$cucumberVersion")
-    implementation("io.cucumber:cucumber-java:$cucumberVersion")
-    testImplementation("commons-io:commons-io")
-    testImplementation("io.github.glytching:junit-extensions")
-    testImplementation("org.assertj:assertj-core")
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("org.slf4j:slf4j-simple")
-    testImplementation(project(":allure-java-commons-test"))
-    testImplementation(project(":allure-junit-platform"))
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-}
-
-tasks.jar {
-    manifest {
-        attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.cucumber2jvm"
-        ))
-    }
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
diff --git a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java b/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java
deleted file mode 100644
index 0dd1a38bf..000000000
--- a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm;
-
-import cucumber.api.HookType;
-import cucumber.api.PendingException;
-import cucumber.api.Result;
-import cucumber.api.TestCase;
-import cucumber.api.TestStep;
-import cucumber.api.event.EmbedEvent;
-import cucumber.api.event.EventHandler;
-import cucumber.api.event.EventPublisher;
-import cucumber.api.event.TestCaseFinished;
-import cucumber.api.event.TestCaseStarted;
-import cucumber.api.event.TestSourceRead;
-import cucumber.api.event.TestStepFinished;
-import cucumber.api.event.TestStepStarted;
-import cucumber.api.event.WriteEvent;
-import cucumber.api.formatter.Formatter;
-import cucumber.runner.UnskipableStep;
-import gherkin.ast.Examples;
-import gherkin.ast.Feature;
-import gherkin.ast.ScenarioDefinition;
-import gherkin.ast.ScenarioOutline;
-import gherkin.ast.TableCell;
-import gherkin.pickles.PickleCell;
-import gherkin.pickles.PickleRow;
-import gherkin.pickles.PickleTable;
-import gherkin.pickles.PickleTag;
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.FixtureResult;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.model.TestResultContainer;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static io.qameta.allure.util.ResultsUtils.getStatus;
-import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
-import static io.qameta.allure.util.ResultsUtils.md5;
-
-/**
- * Allure plugin for Cucumber JVM 2.0.
- */
-@SuppressWarnings({
-        "PMD.ExcessiveImports",
-        "ClassFanOutComplexity", "ClassDataAbstractionCoupling"
-})
-public class AllureCucumber2Jvm implements Formatter {
-
-    private final AllureLifecycle lifecycle;
-
-    private final Map<String, String> scenarioUuids = new HashMap<>();
-
-    private final CucumberSourceUtils cucumberSourceUtils = new CucumberSourceUtils();
-    private Feature currentFeature;
-    private String currentFeatureFile;
-    private TestCase currentTestCase;
-    private String currentContainer;
-    private boolean forbidTestCaseStatusChange;
-
-    private final EventHandler<TestSourceRead> featureStartedHandler = this::handleFeatureStartedHandler;
-    private final EventHandler<TestCaseStarted> caseStartedHandler = this::handleTestCaseStarted;
-    private final EventHandler<TestCaseFinished> caseFinishedHandler = this::handleTestCaseFinished;
-    private final EventHandler<TestStepStarted> stepStartedHandler = this::handleTestStepStarted;
-    private final EventHandler<TestStepFinished> stepFinishedHandler = this::handleTestStepFinished;
-    private final EventHandler<WriteEvent> writeEventHandler = this::handleWriteEvent;
-    private final EventHandler<EmbedEvent> embedEventHandler = this::handleEmbedEvent;
-
-    private static final String TXT_EXTENSION = ".txt";
-    private static final String TEXT_PLAIN = "text/plain";
-
-    @SuppressWarnings("unused")
-    public AllureCucumber2Jvm() {
-        this(Allure.getLifecycle());
-    }
-
-    public AllureCucumber2Jvm(final AllureLifecycle lifecycle) {
-        this.lifecycle = lifecycle;
-    }
-
-    @Override
-    public void setEventPublisher(final EventPublisher publisher) {
-        publisher.registerHandlerFor(TestSourceRead.class, featureStartedHandler);
-
-        publisher.registerHandlerFor(TestCaseStarted.class, caseStartedHandler);
-        publisher.registerHandlerFor(TestCaseFinished.class, caseFinishedHandler);
-
-        publisher.registerHandlerFor(TestStepStarted.class, stepStartedHandler);
-        publisher.registerHandlerFor(TestStepFinished.class, stepFinishedHandler);
-
-        publisher.registerHandlerFor(WriteEvent.class, writeEventHandler);
-        publisher.registerHandlerFor(EmbedEvent.class, embedEventHandler);
-    }
-
-    /*
-    Event Handlers
-     */
-
-    private void handleFeatureStartedHandler(final TestSourceRead event) {
-        cucumberSourceUtils.addTestSourceReadEvent(event.uri, event);
-    }
-
-    private void handleTestCaseStarted(final TestCaseStarted event) {
-        currentTestCase = event.testCase;
-        currentFeatureFile = currentTestCase.getUri();
-        currentFeature = cucumberSourceUtils.getFeature(currentFeatureFile);
-        currentContainer = UUID.randomUUID().toString();
-        forbidTestCaseStatusChange = false;
-
-
-        final Deque<PickleTag> tags = new LinkedList<>(currentTestCase.getTags());
-
-        final LabelBuilder labelBuilder = new LabelBuilder(currentFeature, currentTestCase, tags);
-
-        final String name = currentTestCase.getName();
-        final String featureName = currentFeature.getName();
-
-        final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(currentTestCase))
-                .setHistoryId(getHistoryId(currentTestCase))
-                .setFullName(featureName + ": " + name)
-                .setName(name)
-                .setLabels(labelBuilder.getScenarioLabels())
-                .setLinks(labelBuilder.getScenarioLinks());
-
-        final ScenarioDefinition scenarioDefinition =
-                cucumberSourceUtils.getScenarioDefinition(currentFeatureFile, currentTestCase.getLine());
-        if (scenarioDefinition instanceof ScenarioOutline) {
-            result.setParameters(
-                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition)
-            );
-        }
-
-        if (currentFeature.getDescription() != null && !currentFeature.getDescription().isEmpty()) {
-            result.setDescription(currentFeature.getDescription());
-        }
-
-        final TestResultContainer resultContainer = new TestResultContainer()
-                .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
-                .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase)));
-
-        lifecycle.scheduleTestCase(result);
-        lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(currentTestCase));
-    }
-
-    private void handleTestCaseFinished(final TestCaseFinished event) {
-
-        final String uuid = getTestCaseUuid(event.testCase);
-        final Optional<StatusDetails> details = getStatusDetails(event.result.getError());
-        details.ifPresent(statusDetails -> lifecycle.updateTestCase(
-                uuid,
-                testResult -> testResult.setStatusDetails(statusDetails)
-        ));
-        lifecycle.stopTestCase(uuid);
-        lifecycle.stopTestContainer(getTestContainerUuid());
-        lifecycle.writeTestCase(uuid);
-        lifecycle.writeTestContainer(getTestContainerUuid());
-    }
-
-    private void handleTestStepStarted(final TestStepStarted event) {
-        if (!event.testStep.isHook()) {
-            final String stepKeyword = Optional.ofNullable(
-                    cucumberSourceUtils.getKeywordFromSource(currentFeatureFile, event.testStep.getStepLine())
-            ).orElse("UNDEFINED");
-
-            final StepResult stepResult = new StepResult()
-                    .setName(String.format("%s %s", stepKeyword, event.testStep.getPickleStep().getText()))
-                    .setStart(System.currentTimeMillis());
-
-            lifecycle.startStep(getTestCaseUuid(currentTestCase), getStepUuid(event.testStep), stepResult);
-
-            event.testStep.getStepArgument().stream()
-                    .filter(PickleTable.class::isInstance)
-                    .findFirst()
-                    .ifPresent(table -> createDataTableAttachment((PickleTable) table));
-        } else if (event.testStep instanceof UnskipableStep) {
-            initHook((UnskipableStep) event.testStep);
-        }
-    }
-
-    private void initHook(final UnskipableStep hook) {
-
-        final FixtureResult hookResult = new FixtureResult()
-                .setName(hook.getCodeLocation())
-                .setStart(System.currentTimeMillis());
-
-        if (hook.getHookType() == HookType.Before) {
-            lifecycle.startPrepareFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
-        } else {
-            lifecycle.startTearDownFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
-        }
-
-    }
-
-    private void handleTestStepFinished(final TestStepFinished event) {
-        if (event.testStep.isHook() && event.testStep instanceof UnskipableStep) {
-            handleHookStep(event);
-        } else {
-            handlePickleStep(event);
-        }
-    }
-
-    private void handleWriteEvent(final WriteEvent event) {
-        lifecycle.addAttachment(
-                "Text output",
-                TEXT_PLAIN,
-                TXT_EXTENSION,
-                Objects.toString(event.text).getBytes(StandardCharsets.UTF_8)
-        );
-    }
-
-    private void handleEmbedEvent(final EmbedEvent event) {
-        lifecycle.addAttachment("Screenshot", null, null, new ByteArrayInputStream(event.data));
-    }
-
-    /*
-    Utility Methods
-     */
-
-    private String getTestContainerUuid() {
-        return currentContainer;
-    }
-
-    private String getTestCaseUuid(final TestCase testCase) {
-        return scenarioUuids.computeIfAbsent(getHistoryId(testCase), it -> UUID.randomUUID().toString());
-    }
-
-    private String getStepUuid(final TestStep step) {
-        return currentFeature.getName() + getTestCaseUuid(currentTestCase)
-                + step.getPickleStep().getText() + step.getStepLine();
-    }
-
-    private String getHookStepUuid(final TestStep step) {
-        return currentFeature.getName() + getTestCaseUuid(currentTestCase)
-                + step.getHookType().toString() + step.getCodeLocation();
-    }
-
-    private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = testCase.getUri() + ":" + testCase.getLine();
-        return md5(testCaseLocation);
-    }
-
-    private Status translateTestCaseStatus(final Result testCaseResult) {
-        switch (testCaseResult.getStatus()) {
-            case FAILED:
-                return getStatus(testCaseResult.getError())
-                        .orElse(Status.FAILED);
-            case PASSED:
-                return Status.PASSED;
-            case SKIPPED:
-            case PENDING:
-                return Status.SKIPPED;
-            case AMBIGUOUS:
-            case UNDEFINED:
-            default:
-                return null;
-        }
-    }
-
-    private List<Parameter> getExamplesAsParameters(final ScenarioOutline scenarioOutline) {
-        final int gap = 2;
-        final Optional<Examples> examplesBlock = scenarioOutline.getExamples().stream()
-                .filter(e -> currentTestCase.getLine() >= e.getLocation().getLine() + gap)
-                .filter(e -> currentTestCase.getLine() < e.getLocation().getLine() + e.getTableBody().size() + gap)
-                .findFirst();
-
-        if (examplesBlock.isPresent()) {
-            final Examples examples = examplesBlock.get();
-            final int rowIndex = currentTestCase.getLine() - examples.getLocation().getLine() - gap;
-            final List<TableCell> names = examples.getTableHeader().getCells();
-            final List<TableCell> values = examples.getTableBody().get(rowIndex).getCells();
-            return IntStream.range(0, examplesBlock.get().getTableHeader().getCells().size()).mapToObj(index -> {
-                final String name = names.get(index).getValue();
-                final String value = values.get(index).getValue();
-                return new Parameter().setName(name).setValue(value);
-            }).collect(Collectors.toList());
-        }
-        return Collections.emptyList();
-    }
-
-    private void createDataTableAttachment(final PickleTable pickleTable) {
-        final List<PickleRow> rows = pickleTable.getRows();
-
-        final StringBuilder dataTableCsv = new StringBuilder();
-        if (!rows.isEmpty()) {
-            rows.forEach(dataTableRow -> {
-                dataTableCsv.append(
-                        dataTableRow.getCells().stream()
-                                .map(PickleCell::getValue)
-                                .collect(Collectors.joining("\t"))
-                );
-                dataTableCsv.append('\n');
-            });
-
-            final String attachmentSource = lifecycle
-                    .prepareAttachment("Data table", "text/tab-separated-values", "csv");
-            lifecycle.writeAttachment(attachmentSource,
-                    new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
-        }
-    }
-
-    private void handleHookStep(final TestStepFinished event) {
-        final String uuid = getHookStepUuid(event.testStep);
-        final FixtureResult fixtureResult = new FixtureResult().setStatus(translateTestCaseStatus(event.result));
-
-        if (!Status.PASSED.equals(fixtureResult.getStatus())) {
-            final TestResult testResult = new TestResult().setStatus(translateTestCaseStatus(event.result));
-            final StatusDetails statusDetails = getStatusDetails(event.result.getError()).get();
-
-            statusDetails.setMessage(event.testStep.getHookType()
-                    .name() + " is failed: " + event.result.getError().getLocalizedMessage());
-
-            if (event.testStep.getHookType() == HookType.Before) {
-                final TagParser tagParser = new TagParser(currentFeature, currentTestCase);
-                statusDetails
-                        .setFlaky(tagParser.isFlaky())
-                        .setMuted(tagParser.isMuted())
-                        .setKnown(tagParser.isKnown());
-                testResult.setStatus(Status.SKIPPED);
-                updateTestCaseStatus(testResult.getStatus());
-                forbidTestCaseStatusChange = true;
-            } else {
-                testResult.setStatus(Status.BROKEN);
-                updateTestCaseStatus(testResult.getStatus());
-            }
-            fixtureResult.setStatusDetails(statusDetails);
-        }
-
-        lifecycle.updateFixture(uuid, result -> result.setStatus(fixtureResult.getStatus())
-                .setStatusDetails(fixtureResult.getStatusDetails()));
-        lifecycle.stopFixture(uuid);
-    }
-
-    private void handlePickleStep(final TestStepFinished event) {
-
-        final Status stepStatus = translateTestCaseStatus(event.result);
-        final StatusDetails statusDetails;
-        if (event.result.getStatus() == Result.Type.UNDEFINED) {
-            updateTestCaseStatus(Status.PASSED);
-
-            statusDetails =
-                    getStatusDetails(new PendingException("TODO: implement me"))
-                            .orElse(new StatusDetails());
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase), scenarioResult ->
-                    scenarioResult
-                            .setStatusDetails(statusDetails));
-        } else {
-            statusDetails =
-                    getStatusDetails(event.result.getError())
-                            .orElse(new StatusDetails());
-            updateTestCaseStatus(stepStatus);
-        }
-
-
-        if (!Status.PASSED.equals(stepStatus) && stepStatus != null) {
-            forbidTestCaseStatusChange = true;
-        }
-
-        final TagParser tagParser = new TagParser(currentFeature, currentTestCase);
-        statusDetails
-                .setFlaky(tagParser.isFlaky())
-                .setMuted(tagParser.isMuted())
-                .setKnown(tagParser.isKnown());
-
-        lifecycle.updateStep(getStepUuid(event.testStep),
-                stepResult -> stepResult.setStatus(stepStatus).setStatusDetails(statusDetails));
-        lifecycle.stopStep(getStepUuid(event.testStep));
-    }
-
-    private void updateTestCaseStatus(final Status status) {
-        if (!forbidTestCaseStatusChange) {
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase),
-                    result -> result.setStatus(status));
-        }
-    }
-}
diff --git a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/CucumberSourceUtils.java b/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/CucumberSourceUtils.java
deleted file mode 100644
index 519db53f6..000000000
--- a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/CucumberSourceUtils.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm;
-
-import cucumber.api.event.TestSourceRead;
-
-import gherkin.Parser;
-import gherkin.AstBuilder;
-import gherkin.TokenMatcher;
-import gherkin.ParserException;
-import gherkin.GherkinDialect;
-import gherkin.GherkinDialectProvider;
-
-import gherkin.ast.GherkinDocument;
-import gherkin.ast.Feature;
-import gherkin.ast.ScenarioDefinition;
-import gherkin.ast.Node;
-import gherkin.ast.ScenarioOutline;
-import gherkin.ast.TableRow;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-/**
- * Parts of package-private cucumber.runtime.formatter.TestSourcesModel needed for Allure 2 adapter.
- */
-public final class CucumberSourceUtils {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CucumberSourceUtils.class);
-
-    private final Map<String, TestSourceRead> pathToReadEventMap = new HashMap<>();
-    private final Map<String, GherkinDocument> pathToAstMap = new HashMap<>();
-    private final Map<String, Map<Integer, AstNode>> pathToNodeMap = new HashMap<>();
-
-    public void addTestSourceReadEvent(final String path, final TestSourceRead event) {
-        pathToReadEventMap.put(path, event);
-    }
-
-    public Feature getFeature(final String path) {
-        if (!pathToAstMap.containsKey(path)) {
-            parseGherkinSource(path);
-        }
-        if (pathToAstMap.containsKey(path)) {
-            return pathToAstMap.get(path).getFeature();
-        }
-        return null;
-    }
-
-    private void parseGherkinSource(final String path) {
-        if (!pathToReadEventMap.containsKey(path)) {
-            return;
-        }
-        final Parser<GherkinDocument> parser = new Parser<>(new AstBuilder());
-        final TokenMatcher matcher = new TokenMatcher();
-        try {
-            final GherkinDocument gherkinDocument = parser.parse(pathToReadEventMap.get(path).source, matcher);
-            pathToAstMap.put(path, gherkinDocument);
-            final Map<Integer, AstNode> nodeMap = new HashMap<>();
-            final AstNode currentParent = new AstNode(gherkinDocument.getFeature(), null);
-            for (ScenarioDefinition child : gherkinDocument.getFeature().getChildren()) {
-                processScenarioDefinition(nodeMap, child, currentParent);
-            }
-            pathToNodeMap.put(path, nodeMap);
-        } catch (ParserException e) {
-            LOGGER.trace(e.getMessage(), e);
-        }
-    }
-
-    private void processScenarioDefinition(
-            final Map<Integer, AstNode> nodeMap, final ScenarioDefinition child, final AstNode currentParent
-    ) {
-        final AstNode childNode = new AstNode(child, currentParent);
-        nodeMap.put(child.getLocation().getLine(), childNode);
-
-        child.getSteps().forEach(
-            step -> nodeMap.put(step.getLocation().getLine(), new AstNode(step, childNode))
-        );
-
-        if (child instanceof ScenarioOutline) {
-            processScenarioOutlineExamples(nodeMap, (ScenarioOutline) child, childNode);
-        }
-    }
-
-    private void processScenarioOutlineExamples(
-            final Map<Integer, AstNode> nodeMap, final ScenarioOutline scenarioOutline, final AstNode childNode
-    ) {
-        scenarioOutline.getExamples().forEach(examples -> {
-            final AstNode examplesNode = new AstNode(examples, childNode);
-            final TableRow headerRow = examples.getTableHeader();
-            final AstNode headerNode = new AstNode(headerRow, examplesNode);
-            nodeMap.put(headerRow.getLocation().getLine(), headerNode);
-            IntStream.range(0, examples.getTableBody().size()).forEach(i -> {
-                final TableRow examplesRow = examples.getTableBody().get(i);
-                final Node rowNode = new CucumberSourceUtils.ExamplesRowWrapperNode(examplesRow, i);
-                final AstNode expandedScenarioNode = new AstNode(rowNode, examplesNode);
-                nodeMap.put(examplesRow.getLocation().getLine(), expandedScenarioNode);
-            });
-        });
-    }
-
-    private AstNode getAstNode(final String path, final int line) {
-        if (!pathToNodeMap.containsKey(path)) {
-            parseGherkinSource(path);
-        }
-        if (pathToNodeMap.containsKey(path)) {
-            return pathToNodeMap.get(path).get(line);
-        }
-        return null;
-    }
-
-    public ScenarioDefinition getScenarioDefinition(final String path, final int line) {
-        return getScenarioDefinition(getAstNode(path, line));
-    }
-
-    private ScenarioDefinition getScenarioDefinition(final AstNode astNode) {
-        return astNode.getNode() instanceof ScenarioDefinition
-                ? (ScenarioDefinition) astNode.getNode()
-                : (ScenarioDefinition) astNode.getParent().getParent().getNode();
-    }
-
-    public String getKeywordFromSource(final String uri, final int stepLine) {
-        final Feature feature = getFeature(uri);
-        if (feature != null) {
-            final TestSourceRead event = getTestSourceReadEvent(uri);
-            final String trimmedSourceLine = event.source.split("\n")[stepLine - 1].trim();
-            final GherkinDialect dialect = new GherkinDialectProvider(feature.getLanguage()).getDefaultDialect();
-            for (String keyword : dialect.getStepKeywords()) {
-                if (trimmedSourceLine.startsWith(keyword)) {
-                    return keyword;
-                }
-            }
-        }
-        return "";
-    }
-
-    private TestSourceRead getTestSourceReadEvent(final String uri) {
-        if (pathToReadEventMap.containsKey(uri)) {
-            return pathToReadEventMap.get(uri);
-        }
-        return null;
-    }
-
-    /**
-     * Representation of Examples row.
-     */
-    private static class ExamplesRowWrapperNode extends Node {
-        private final int bodyRowIndex;
-
-        ExamplesRowWrapperNode(final Node examplesRow, final int bodyRowIndex) {
-            super(examplesRow.getLocation());
-            this.bodyRowIndex = bodyRowIndex;
-        }
-
-        public int getBodyRowIndex() {
-            return bodyRowIndex;
-        }
-    }
-
-    /**
-     * Representation of leaf node.
-     */
-    private static class AstNode {
-        private final Node node;
-        private final AstNode parent;
-
-        AstNode(final Node node, final AstNode parent) {
-            this.node = node;
-            this.parent = parent;
-        }
-
-        public Node getNode() {
-            return node;
-        }
-
-        public AstNode getParent() {
-            return parent;
-        }
-    }
-}
diff --git a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java b/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java
deleted file mode 100644
index 18b36ae0a..000000000
--- a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm;
-
-import cucumber.api.TestCase;
-import gherkin.ast.Feature;
-import gherkin.pickles.PickleTag;
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.util.ResultsUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Pattern;
-
-import static io.qameta.allure.util.ResultsUtils.createFeatureLabel;
-import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
-import static io.qameta.allure.util.ResultsUtils.createHostLabel;
-import static io.qameta.allure.util.ResultsUtils.createIssueLink;
-import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
-import static io.qameta.allure.util.ResultsUtils.createLink;
-import static io.qameta.allure.util.ResultsUtils.createPackageLabel;
-import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
-import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
-import static io.qameta.allure.util.ResultsUtils.createSuiteLabel;
-import static io.qameta.allure.util.ResultsUtils.createTagLabel;
-import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
-import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
-import static io.qameta.allure.util.ResultsUtils.createTmsLink;
-
-/**
- * Scenario labels and links builder.
- */
-@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount"})
-class LabelBuilder {
-    private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
-    private static final String COMPOSITE_TAG_DELIMITER = "=";
-
-    private static final String SEVERITY = "@SEVERITY";
-    private static final String ISSUE_LINK = "@ISSUE";
-    private static final String TMS_LINK = "@TMSLINK";
-    private static final String PLAIN_LINK = "@LINK";
-
-    private final List<Label> scenarioLabels = new ArrayList<>();
-    private final List<Link> scenarioLinks = new ArrayList<>();
-
-    LabelBuilder(final Feature feature, final TestCase scenario, final Deque<PickleTag> tags) {
-        final TagParser tagParser = new TagParser(feature, scenario);
-
-        getScenarioLabels().add(createFeatureLabel(feature.getName()));
-        getScenarioLabels().add(createStoryLabel(scenario.getName()));
-
-        while (tags.peek() != null) {
-            final PickleTag tag = tags.remove();
-
-            final String tagString = tag.getName();
-
-            if (tagString.contains(COMPOSITE_TAG_DELIMITER)) {
-
-                final String[] tagParts = tagString.split(COMPOSITE_TAG_DELIMITER, 2);
-                if (tagParts.length < 2 || Objects.isNull(tagParts[1]) || tagParts[1].isEmpty()) {
-                    // skip empty tags, e.g. '@tmsLink=', to avoid formatter errors
-                    continue;
-                }
-
-                final String tagKey = tagParts[0].toUpperCase();
-                final String tagValue = tagParts[1];
-
-                // Handle composite named links
-                if (tagKey.startsWith(PLAIN_LINK + ".")) {
-                    tryHandleNamedLink(tagString);
-                    continue;
-                }
-
-                switch (tagKey) {
-                    case SEVERITY:
-                        getScenarioLabels().add(createSeverityLabel(tagValue.toLowerCase()));
-                        break;
-                    case TMS_LINK:
-                        getScenarioLinks().add(createTmsLink(tagValue));
-                        break;
-                    case ISSUE_LINK:
-                        getScenarioLinks().add(createIssueLink(tagValue));
-                        break;
-                    case PLAIN_LINK:
-                        getScenarioLinks().add(createLink(null, tagValue, tagValue, null));
-                        break;
-                    default:
-                        LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey);
-                        getScenarioLabels().add(getTagLabel(tag));
-                        break;
-                }
-            } else if (tagParser.isPureSeverityTag(tag)) {
-                getScenarioLabels().add(createSeverityLabel(tagString.substring(1)));
-            } else if (!tagParser.isResultTag(tag)) {
-                getScenarioLabels().add(getTagLabel(tag));
-            }
-        }
-
-        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
-        getScenarioLabels().addAll(Arrays.asList(
-                createHostLabel(),
-                createThreadLabel(),
-                createPackageLabel(feature.getName()),
-                createSuiteLabel(feature.getName()),
-                createTestClassLabel(scenario.getName()),
-                createFrameworkLabel("cucumber2jvm"),
-                createLanguageLabel("java")
-        ));
-    }
-
-    public List<Label> getScenarioLabels() {
-        return scenarioLabels;
-    }
-
-    public List<Link> getScenarioLinks() {
-        return scenarioLinks;
-    }
-
-    private Label getTagLabel(final PickleTag tag) {
-        return createTagLabel(tag.getName().substring(1));
-    }
-
-    /**
-     * Handle composite named links.
-     *
-     * @param tagString Full tag name and value
-     */
-    private void tryHandleNamedLink(final String tagString) {
-        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+(-|_)?)+";
-        final Pattern namedLinkPattern = Pattern.compile(namedLinkPatternString, Pattern.CASE_INSENSITIVE);
-
-        if (namedLinkPattern.matcher(tagString).matches()) {
-            final String type = tagString.split(COMPOSITE_TAG_DELIMITER)[0].split("[.]")[1];
-            final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
-            getScenarioLinks().add(createLink(null, name, null, type));
-        } else {
-            LOGGER.warn("Composite named tag {} is not matches regex {}. skipping", tagString,
-                    namedLinkPatternString);
-        }
-    }
-
-}
diff --git a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/TagParser.java b/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/TagParser.java
deleted file mode 100644
index e20fdb21e..000000000
--- a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/TagParser.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm;
-
-import cucumber.api.TestCase;
-import gherkin.ast.Feature;
-import gherkin.pickles.PickleTag;
-import io.qameta.allure.SeverityLevel;
-
-import java.util.Arrays;
-
-/**
- * Parser for tags.
- */
-class TagParser {
-    private static final String FLAKY = "@FLAKY";
-    private static final String KNOWN = "@KNOWN";
-    private static final String MUTED = "@MUTED";
-
-    private final Feature feature;
-    private final TestCase scenario;
-
-    TagParser(final Feature feature, final TestCase scenario) {
-        this.feature = feature;
-        this.scenario = scenario;
-    }
-
-    protected boolean isFlaky() {
-        return getStatusDetailByTag(FLAKY);
-    }
-
-    protected boolean isMuted() {
-        return getStatusDetailByTag(MUTED);
-    }
-
-    protected boolean isKnown() {
-        return getStatusDetailByTag(KNOWN);
-    }
-
-    protected boolean getStatusDetailByTag(final String tagName) {
-        return scenario.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName))
-                || feature.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
-    }
-
-    protected boolean isResultTag(final PickleTag tag) {
-        return Arrays.asList(new String[]{FLAKY, KNOWN, MUTED})
-                .contains(tag.getName().toUpperCase());
-    }
-
-    protected boolean isPureSeverityTag(final PickleTag tag) {
-        return Arrays.stream(SeverityLevel.values())
-                .map(SeverityLevel::value)
-                .map(value -> "@" + value)
-                .anyMatch(value -> value.equalsIgnoreCase(tag.getName()));
-    }
-
-}
diff --git a/allure-cucumber2-jvm/src/main/resources/META-INF/aop-ajc.xml b/allure-cucumber2-jvm/src/main/resources/META-INF/aop-ajc.xml
deleted file mode 100644
index 09e38300c..000000000
--- a/allure-cucumber2-jvm/src/main/resources/META-INF/aop-ajc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<aspectj>
-    <weaver options="-warn:none -Xlint:ignore"/>
-    <aspects>
-        <aspect name="io.qameta.allure.aspects.StepsAspects"/>
-        <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
-    </aspects>
-</aspectj>
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java b/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java
deleted file mode 100644
index 55c217cb5..000000000
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java
+++ /dev/null
@@ -1,584 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm;
-
-import cucumber.runtime.ClassFinder;
-import cucumber.runtime.Runtime;
-import cucumber.runtime.RuntimeOptions;
-import cucumber.runtime.io.MultiLoader;
-import cucumber.runtime.io.ResourceLoader;
-import cucumber.runtime.io.ResourceLoaderClassFinder;
-import cucumber.runtime.model.CucumberFeature;
-import gherkin.AstBuilder;
-import gherkin.Parser;
-import gherkin.TokenMatcher;
-import gherkin.ast.GherkinDocument;
-import io.github.glytching.junit.extension.system.SystemProperty;
-import io.github.glytching.junit.extension.system.SystemPropertyExtension;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.Issue;
-import io.qameta.allure.model.Attachment;
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.Stage;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.test.AllureFeatures;
-import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
-import org.apache.commons.io.IOUtils;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.parallel.ResourceLock;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static java.lang.Thread.currentThread;
-import static java.util.Objects.nonNull;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
-import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-@SuppressWarnings("unchecked")
-class AllureCucumber2JvmTest {
-
-    @AllureFeatures.Base
-    @Test
-    void shouldSetName() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName)
-                .containsExactlyInAnyOrder("Add a to b");
-
-    }
-
-    @AllureFeatures.PassedTests
-    @Test
-    void shouldSetStatus() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.FailedTests
-    @Test
-    void shouldSetFailedStatus() {
-        final AllureResults results = runFeature("features/failed.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-    @AllureFeatures.FailedTests
-    @Test
-    void shouldSetStatusDetails() {
-        final AllureResults results = runFeature("features/failed.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatusDetails)
-                .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("expected: <15> but was: <123>");
-    }
-
-    @AllureFeatures.BrokenTests
-    @Test
-    void shouldSetBrokenStatus() {
-        final AllureResults results = runFeature("features/broken.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-    @AllureFeatures.Stages
-    @Test
-    void shouldSetStage() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStage)
-                .containsExactlyInAnyOrder(Stage.FINISHED);
-    }
-
-    @AllureFeatures.Timeline
-    @Test
-    void shouldSetStart() {
-        final long before = Instant.now().toEpochMilli();
-        final AllureResults results = runFeature("features/simple.feature");
-        final long after = Instant.now().toEpochMilli();
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStart)
-                .allMatch(v -> v >= before && v <= after);
-    }
-
-    @AllureFeatures.Timings
-    @Test
-    void shouldSetStop() {
-        final long before = Instant.now().toEpochMilli();
-        final AllureResults results = runFeature("features/simple.feature");
-        final long after = Instant.now().toEpochMilli();
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStop)
-                .allMatch(v -> v >= before && v <= after);
-    }
-
-    @AllureFeatures.FullName
-    @Test
-    void shouldSetFullName() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getFullName)
-                .containsExactlyInAnyOrder("Simple feature: Add a to b");
-    }
-
-    @AllureFeatures.Descriptions
-    @Test
-    void shouldSetDescription() {
-        final AllureResults results = runFeature("features/description.feature");
-
-        final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getDescription)
-                .containsExactlyInAnyOrder(
-                        expected,
-                        expected
-                );
-    }
-
-    @AllureFeatures.Attachments
-    @Test
-    void shouldAddDataTableAttachment() {
-        final AllureResults results = runFeature("features/datatable.feature");
-
-        final List<Attachment> attachments = results.getTestResults().stream()
-                .map(TestResult::getSteps)
-                .flatMap(Collection::stream)
-                .map(StepResult::getAttachments)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-
-        assertThat(attachments)
-                .extracting(Attachment::getName, Attachment::getType)
-                .containsExactlyInAnyOrder(
-                        tuple("Data table", "text/tab-separated-values")
-                );
-
-        final Attachment dataTableAttachment = attachments.iterator().next();
-        final Map<String, byte[]> attachmentFiles = results.getAttachments();
-        assertThat(attachmentFiles)
-                .containsKeys(dataTableAttachment.getSource());
-
-        final byte[] bytes = attachmentFiles.get(dataTableAttachment.getSource());
-        final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
-
-        assertThat(attachmentContent)
-                .isEqualTo("name\tlogin\temail\n" +
-                        "Viktor\tclicman\tclicman@ya.ru\n" +
-                        "Viktor2\tclicman2\tclicman2@ya.ru\n"
-                );
-
-    }
-
-    @AllureFeatures.Attachments
-    @Test
-    void shouldAddAttachments() {
-        final AllureResults results = runFeature("features/attachments.feature");
-
-        final List<Attachment> attachments = results.getTestResults().stream()
-                .map(TestResult::getSteps)
-                .flatMap(Collection::stream)
-                .map(StepResult::getAttachments)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-
-        assertThat(attachments)
-                .extracting(Attachment::getName, Attachment::getType)
-                .containsExactlyInAnyOrder(
-                        tuple("Text output", "text/plain"),
-                        tuple("Screenshot", null)
-                );
-
-        final List<String> attachmentContents = results.getAttachments().values().stream()
-                .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
-                .collect(Collectors.toList());
-
-        assertThat(attachmentContents)
-                .containsExactlyInAnyOrder("text attachment", "image attachment");
-    }
-
-    @AllureFeatures.Steps
-    @Test
-    void shouldAddBackgroundSteps() {
-        final AllureResults results = runFeature("features/background.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(1)
-                .flatExtracting(TestResult::getSteps)
-                .extracting(StepResult::getName)
-                .containsExactly(
-                        "Given  cat is sad",
-                        "And  cat is murmur",
-                        "When  Pet the cat",
-                        "Then  Cat is happy"
-                );
-    }
-
-    @AllureFeatures.Parameters
-    @Test
-    void shouldAddParametersFromExamples() {
-        final AllureResults results = runFeature("features/examples.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(2);
-
-        assertThat(testResults.get(0).getParameters())
-                .hasSize(3);
-
-        assertThat(testResults.get(1).getParameters())
-                .hasSize(3);
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getParameters)
-                .extracting(Parameter::getName, Parameter::getValue)
-                .containsExactlyInAnyOrder(
-                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
-                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
-                );
-    }
-
-    @AllureFeatures.Parameters
-    @Test
-    void shouldHandleMultipleExampleTables() {
-        final AllureResults results = runFeature("features/multipleExamples.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(2);
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldAddTags() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("tag", "FeatureTag"),
-                        tuple("tag", "good")
-                );
-    }
-
-    @AllureFeatures.Links
-    @ExtendWith(SystemPropertyExtension.class)
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
-    @Test
-    void shouldAddLinks() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLinks)
-                .extracting(Link::getName, Link::getType, Link::getUrl)
-                .contains(
-                        tuple("OAT-4444", "tms", "https://example.org/tms/OAT-4444"),
-                        tuple("BUG-22400", "issue", "https://example.org/issue/BUG-22400")
-                );
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldAddBddLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("feature", "Test Simple Scenarios"),
-                        tuple("story", "Add a to b")
-                );
-    }
-
-    @AllureFeatures.Timeline
-    @Test
-    void shouldThreadHostLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName)
-                .contains("host", "thread");
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldCommonLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("package", "Test Simple Scenarios"),
-                        tuple("suite", "Test Simple Scenarios"),
-                        tuple("testClass", "Add a to b")
-                );
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldProcessNotImplementedScenario() {
-        final AllureResults results = runFeature("features/undefined.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.Base
-    @Test
-    void shouldSupportDryRun() {
-        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactlyInAnyOrder(
-                        tuple("Add a to b", Status.SKIPPED)
-                );
-    }
-
-    @AllureFeatures.Base
-    @Issue("173")
-    @Issue("164")
-    @Test
-    void shouldUseUuid() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getUuid)
-                .allMatch(uuid -> nonNull(uuid) && uuid.matches("[\\-a-z0-9]+"), "UUID");
-    }
-
-    private AllureResults runFeature(final String featureResource,
-                                     final String... moreOptions) {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumber2Jvm cucumber2Jvm = new AllureCucumber2Jvm(lifecycle);
-        final ClassLoader classLoader = currentThread().getContextClassLoader();
-        final ResourceLoader resourceLoader = new MultiLoader(classLoader);
-        final ClassFinder classFinder = new ResourceLoaderClassFinder(resourceLoader, classLoader);
-        final List<String> opts = new ArrayList<>(Arrays.asList(
-                "--glue", "io.qameta.allure.cucumber2jvm.samples",
-                "--plugin", "null"
-        ));
-        opts.addAll(Arrays.asList(moreOptions));
-        final RuntimeOptions options = new RuntimeOptions(opts);
-        final Runtime runtime = new Runtime(resourceLoader, classFinder, classLoader, options);
-
-        options.addPlugin(cucumber2Jvm);
-
-        final String gherkin = readResource(featureResource);
-        Parser<GherkinDocument> parser = new Parser<>(new AstBuilder());
-        TokenMatcher matcher = new TokenMatcher();
-        GherkinDocument gherkinDocument = parser.parse(gherkin, matcher);
-        CucumberFeature feature = new CucumberFeature(gherkinDocument, featureResource, gherkin);
-
-        feature.sendTestSourceRead(runtime.getEventBus());
-        runtime.runFeature(feature);
-        return writer;
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusFailedOnBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_sf_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusSkippedOnBadBefore() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bf_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusSkippedOnBadBeforeAndBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bf_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusBrokenOnBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusFailedOnBadSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_sf_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusBrokenOnUndefinedStepsAndBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_su_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusPassedOnUndefinedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_su_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusSkippedOnUndefinedAndFailedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_suf_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
-    }
-
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusPassedOnPassedAndUndefinedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_spu_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusFailedOnFailedAndUndefinedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_sfu_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm2-test-provided")
-    @Test
-    void shouldSupportProvidedLabels() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .hasSize(1)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("x-provided", "cucumberjvm2-test-provided")
-                );
-    }
-
-    private String readResource(final String resourceName) {
-        try (InputStream is = currentThread().getContextClassLoader().getResourceAsStream(resourceName)) {
-            return IOUtils.toString(is, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            throw new RuntimeException("Feature file not found " + resourceName);
-        }
-    }
-}
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/AttachmentSteps.java b/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/AttachmentSteps.java
deleted file mode 100644
index 1e583cc25..000000000
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/AttachmentSteps.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm.samples;
-
-import cucumber.api.Scenario;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
-
-public class AttachmentSteps
-{
-    private Scenario scenario;
-
-    @Before("@attachments")
-    public void setup(Scenario scenario)
-    {
-        this.scenario = scenario;
-    }
-
-    @Given("step with scenario write")
-    public void stepWithScenarioWrite()
-    {
-        scenario.write("text attachment");
-    }
-
-    @Given("step with scenario embed")
-    public void stepWithScenarioEmbed()
-    {
-        scenario.embed("image attachment".getBytes(), "image/png");
-    }
-}
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BackgroundFeatureSteps.java
deleted file mode 100644
index a5f7236a5..000000000
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BackgroundFeatureSteps.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm.samples;
-
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-public class BackgroundFeatureSteps {
-
-    @Given("^cat is sad$")
-    public void catIsSad() {
-    }
-
-    @Given("^cat is murmur$")
-    public void catIsMurMur() {
-    }
-
-    @When("^pet the cat$")
-    public void petTheCat() {
-    }
-
-    @Then("^cat is happy$")
-    public void catIsHappy() {
-    }
-
-}
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BrokenFeatureSteps.java b/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BrokenFeatureSteps.java
deleted file mode 100644
index 7b0bade00..000000000
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/BrokenFeatureSteps.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm.samples;
-
-import cucumber.api.java.en.Given;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-public class BrokenFeatureSteps {
-
-    @Given("^everything is broken$")
-    public void everythingIsBroken() {
-        throw new RuntimeException("Oops");
-    }
-
-}
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/Hooks.java b/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/Hooks.java
deleted file mode 100644
index c47628cba..000000000
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/Hooks.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm.samples;
-
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
-
-public class Hooks {
-
-    @Before("@bp")
-    public void beforePassed() {
-    }
-
-    @Before("@bf")
-    public void beforeFailed() {
-        throw new AssertionError("This hook should fail");
-    }
-
-    @After("@ap")
-    public void afterPassed() {
-    }
-
-    @After("@af")
-    public void afterFailed() {
-        throw new AssertionError("This hook should fail");
-    }
-}
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/SimpleFeatureSteps.java b/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/SimpleFeatureSteps.java
deleted file mode 100644
index 894d6a852..000000000
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/SimpleFeatureSteps.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber2jvm.samples;
-
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-public class SimpleFeatureSteps {
-
-    private int a;
-    private int b;
-    private int c;
-
-    @Given("^a is (\\d+)$")
-    public void a_is(int arg1) {
-        this.a = arg1;
-    }
-
-    @Given("^b is (\\d+)$")
-    public void b_is(int arg1) {
-        this.b = arg1;
-    }
-
-    @When("^I add a to b$")
-    public void i_add_a_to_b() {
-        this.c = this.a + this.b;
-    }
-
-    @Then("^result is (\\d+)$")
-    public void result_is(int arg1) {
-        assertEquals(this.c, arg1);
-    }
-
-}
diff --git a/allure-cucumber2-jvm/src/test/resources/allure.properties b/allure-cucumber2-jvm/src/test/resources/allure.properties
deleted file mode 100644
index 9c0b0a2d7..000000000
--- a/allure-cucumber2-jvm/src/test/resources/allure.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-allure.results.directory=build/allure-results
-allure.label.epic=#project.description#
diff --git a/allure-cucumber2-jvm/src/test/resources/features/attachments.feature b/allure-cucumber2-jvm/src/test/resources/features/attachments.feature
deleted file mode 100644
index 1585fbe81..000000000
--- a/allure-cucumber2-jvm/src/test/resources/features/attachments.feature
+++ /dev/null
@@ -1,8 +0,0 @@
-@attachments
-Feature: Feature with attachments
-
-  Scenario: Simple scenario with a text attachment
-    Given step with scenario write
-
-  Scenario: Simple scenario with an image attachment
-    Given step with scenario embed
\ No newline at end of file
diff --git a/allure-cucumber2-jvm/src/test/resources/features/background.feature b/allure-cucumber2-jvm/src/test/resources/features/background.feature
deleted file mode 100644
index 307f10267..000000000
--- a/allure-cucumber2-jvm/src/test/resources/features/background.feature
+++ /dev/null
@@ -1,9 +0,0 @@
-Feature: Test Scenarios with backgrounds
-
-  Background:
-    Given cat is sad
-    And cat is murmur
-
-  Scenario: Scenario with background
-    When Pet the cat
-    Then Cat is happy
diff --git a/allure-cucumber2-jvm/src/test/resources/features/broken.feature b/allure-cucumber2-jvm/src/test/resources/features/broken.feature
deleted file mode 100644
index 42bd7ba4f..000000000
--- a/allure-cucumber2-jvm/src/test/resources/features/broken.feature
+++ /dev/null
@@ -1,4 +0,0 @@
-Feature: Simple feature
-
-  Scenario: Exception during step
-    Given everything is broken
diff --git a/allure-cucumber2-jvm/src/test/resources/features/datatable.feature b/allure-cucumber2-jvm/src/test/resources/features/datatable.feature
deleted file mode 100644
index ea5e94d3b..000000000
--- a/allure-cucumber2-jvm/src/test/resources/features/datatable.feature
+++ /dev/null
@@ -1,8 +0,0 @@
-Feature: Test Scenarios with Data Tables
-
-  Scenario: Simple data table
-    Given users are:
-      | name    | login    | email          |
-      | Viktor  | clicman  | clicman@ya.ru  |
-      | Viktor2 | clicman2 | clicman2@ya.ru |
-
diff --git a/allure-cucumber2-jvm/src/test/resources/features/description.feature b/allure-cucumber2-jvm/src/test/resources/features/description.feature
deleted file mode 100644
index 935b6731a..000000000
--- a/allure-cucumber2-jvm/src/test/resources/features/description.feature
+++ /dev/null
@@ -1,17 +0,0 @@
-Feature: Descriptions feature
-
-This is description for current feature.
-It should appear on each scenario in report
-
-  Scenario: Add a to b (1)
-    Given a is 5
-    And b is 10
-    When I add a to b
-    Then result is 15
-
-  Scenario: Add a to b (2)
-    Given a is 1
-    And b is 2
-    When I add a to b
-    Then result is 3
-
diff --git a/allure-cucumber2-jvm/src/test/resources/features/examples.feature b/allure-cucumber2-jvm/src/test/resources/features/examples.feature
deleted file mode 100644
index ecba7b79e..000000000
--- a/allure-cucumber2-jvm/src/test/resources/features/examples.feature
+++ /dev/null
@@ -1,11 +0,0 @@
-Feature: Test Scenarios with Examples
-
-  Scenario Outline: Scenario with Positive Examples
-    Given a is <a>
-    And b is <b>
-    When I add a to b
-    Then result is <result>
-    Examples:
-      | a | b | result |
-      | 1 | 3 | 4      |
-      | 2 | 4 | 6      |
diff --git a/allure-cucumber2-jvm/src/test/resources/features/failed.feature b/allure-cucumber2-jvm/src/test/resources/features/failed.feature
deleted file mode 100644
index a70f8ec79..000000000
--- a/allure-cucumber2-jvm/src/test/resources/features/failed.feature
+++ /dev/null
@@ -1,7 +0,0 @@
-Feature: Simple feature
-
-  Scenario: Add a to b
-    Given a is 5
-    And b is 10
-    When I add a to b
-    Then result is 123
diff --git a/allure-cucumber2-jvm/src/test/resources/features/hooks.feature b/allure-cucumber2-jvm/src/test/resources/features/hooks.feature
deleted file mode 100644
index 7f8fdf16e..000000000
--- a/allure-cucumber2-jvm/src/test/resources/features/hooks.feature
+++ /dev/null
@@ -1,77 +0,0 @@
-Feature: Hooks variations
-
-  @bp @af @bp_sf_af
-  Scenario: Scenario with good before and bad after but failed
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 3
-
-
-  @bf @ap @bf_ap
-  Scenario: Scenario with bad before and good after
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 2
-
-
-  @bf @af @bf_af
-  Scenario: Scenario with bad before and bad after
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 2
-
-
-  @bp @af @bp_af
-  Scenario: Scenario with bad after
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 2
-
-
-  @bp @ap @bp_sf_ap
-  Scenario: Scenario with good before and good after but failed
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 3
-
-
-  @bp @af @bp_su_af
-  Scenario: Step is not implemented with bad after
-    Given hello my friend
-
-
-  @bp @ap @bp_su_ap
-  Scenario: Step is not implemented
-    Given hello my friend
-
-
-  @bp @ap @bp_suf_ap
-  Scenario: Step is not implemented
-    Given hello my friend
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 3
-
-
-  @bp @ap @bp_spu_ap
-  Scenario: Step is not implemented
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 2
-    Given hello my friend
-
-
-  @bp @ap @bp_sfu_ap
-  Scenario: Step is not implemented
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 3
-    Given hello my friend
diff --git a/allure-cucumber2-jvm/src/test/resources/features/multipleExamples.feature b/allure-cucumber2-jvm/src/test/resources/features/multipleExamples.feature
deleted file mode 100644
index a083f7502..000000000
--- a/allure-cucumber2-jvm/src/test/resources/features/multipleExamples.feature
+++ /dev/null
@@ -1,15 +0,0 @@
-Feature: Test Scenarios with multiple examples
-
-  Scenario Outline: Scenario with Positive Examples
-    Given a is <a>
-    And b is <b>
-    When I add a to b
-    Then result is <result>
-
-    Examples:
-      | a | b | result |
-      | 1 | 3 | 4      |
-
-    Examples:
-      | a | b | result |
-      | 2 | 8 | 10     |
\ No newline at end of file
diff --git a/allure-cucumber2-jvm/src/test/resources/features/tags.feature b/allure-cucumber2-jvm/src/test/resources/features/tags.feature
deleted file mode 100644
index 2632623ee..000000000
--- a/allure-cucumber2-jvm/src/test/resources/features/tags.feature
+++ /dev/null
@@ -1,13 +0,0 @@
-@FeatureTag
-@tmsLink=OAT-4444
-@flaky
-@issue=BUG-22400
-Feature: Test Simple Scenarios
-
-  @good
-  Scenario: Add a to b
-    Given a is 5
-    And b is 10
-    When I add a to b
-    Then result is 15
-
diff --git a/allure-cucumber2-jvm/src/test/resources/features/undefined.feature b/allure-cucumber2-jvm/src/test/resources/features/undefined.feature
deleted file mode 100644
index caa0b507b..000000000
--- a/allure-cucumber2-jvm/src/test/resources/features/undefined.feature
+++ /dev/null
@@ -1,4 +0,0 @@
-Feature: Simple feature
-
-  Scenario: Step is not implemented
-    Given hello my friend
diff --git a/allure-cucumber3-jvm/build.gradle.kts b/allure-cucumber3-jvm/build.gradle.kts
deleted file mode 100644
index 0bc20295e..000000000
--- a/allure-cucumber3-jvm/build.gradle.kts
+++ /dev/null
@@ -1,29 +0,0 @@
-description = "Allure CucumberJVM 3.0 Integration"
-
-val cucumberVersion = "3.0.2"
-
-dependencies {
-    api(project(":allure-java-commons"))
-    implementation("io.cucumber:cucumber-core:$cucumberVersion")
-    implementation("io.cucumber:cucumber-java:$cucumberVersion")
-    testImplementation("commons-io:commons-io")
-    testImplementation("io.github.glytching:junit-extensions")
-    testImplementation("org.assertj:assertj-core")
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("org.slf4j:slf4j-simple")
-    testImplementation(project(":allure-java-commons-test"))
-    testImplementation(project(":allure-junit-platform"))
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-}
-
-tasks.jar {
-    manifest {
-        attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.cucumber3jvm"
-        ))
-    }
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
diff --git a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/AllureCucumber3Jvm.java b/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/AllureCucumber3Jvm.java
deleted file mode 100644
index 531bf58dc..000000000
--- a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/AllureCucumber3Jvm.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm;
-
-import cucumber.api.HookTestStep;
-import cucumber.api.HookType;
-import cucumber.api.PendingException;
-import cucumber.api.PickleStepTestStep;
-import cucumber.api.Result;
-import cucumber.api.TestCase;
-import cucumber.api.event.EmbedEvent;
-import cucumber.api.event.EventHandler;
-import cucumber.api.event.EventPublisher;
-import cucumber.api.event.TestCaseFinished;
-import cucumber.api.event.TestCaseStarted;
-import cucumber.api.event.TestSourceRead;
-import cucumber.api.event.TestStepFinished;
-import cucumber.api.event.TestStepStarted;
-import cucumber.api.event.WriteEvent;
-import cucumber.api.formatter.Formatter;
-import gherkin.ast.Examples;
-import gherkin.ast.Feature;
-import gherkin.ast.ScenarioDefinition;
-import gherkin.ast.ScenarioOutline;
-import gherkin.ast.TableRow;
-import gherkin.pickles.PickleCell;
-import gherkin.pickles.PickleRow;
-import gherkin.pickles.PickleTable;
-import gherkin.pickles.PickleTag;
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.FixtureResult;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.model.TestResultContainer;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static io.qameta.allure.util.ResultsUtils.createParameter;
-import static io.qameta.allure.util.ResultsUtils.getStatus;
-import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
-import static io.qameta.allure.util.ResultsUtils.md5;
-
-/**
- * Allure plugin for Cucumber JVM 3.0.
- */
-@SuppressWarnings({
-        "PMD.ExcessiveImports",
-        "ClassFanOutComplexity", "ClassDataAbstractionCoupling"
-})
-public class AllureCucumber3Jvm implements Formatter {
-
-    private final AllureLifecycle lifecycle;
-
-    private final Map<String, String> scenarioUuids = new HashMap<>();
-
-    private final CucumberSourceUtils cucumberSourceUtils = new CucumberSourceUtils();
-    private Feature currentFeature;
-    private String currentFeatureFile;
-    private TestCase currentTestCase;
-    private String currentContainer;
-    private boolean forbidTestCaseStatusChange;
-
-    private final EventHandler<TestSourceRead> featureStartedHandler = this::handleFeatureStartedHandler;
-    private final EventHandler<TestCaseStarted> caseStartedHandler = this::handleTestCaseStarted;
-    private final EventHandler<TestCaseFinished> caseFinishedHandler = this::handleTestCaseFinished;
-    private final EventHandler<TestStepStarted> stepStartedHandler = this::handleTestStepStarted;
-    private final EventHandler<TestStepFinished> stepFinishedHandler = this::handleTestStepFinished;
-    private final EventHandler<WriteEvent> writeEventHandler = this::handleWriteEvent;
-    private final EventHandler<EmbedEvent> embedEventHandler = this::handleEmbedEvent;
-
-    private static final String TXT_EXTENSION = ".txt";
-    private static final String TEXT_PLAIN = "text/plain";
-
-    @SuppressWarnings("unused")
-    public AllureCucumber3Jvm() {
-        this(Allure.getLifecycle());
-    }
-
-    public AllureCucumber3Jvm(final AllureLifecycle lifecycle) {
-        this.lifecycle = lifecycle;
-    }
-
-    @Override
-    public void setEventPublisher(final EventPublisher publisher) {
-        publisher.registerHandlerFor(TestSourceRead.class, featureStartedHandler);
-
-        publisher.registerHandlerFor(TestCaseStarted.class, caseStartedHandler);
-        publisher.registerHandlerFor(TestCaseFinished.class, caseFinishedHandler);
-
-        publisher.registerHandlerFor(TestStepStarted.class, stepStartedHandler);
-        publisher.registerHandlerFor(TestStepFinished.class, stepFinishedHandler);
-
-        publisher.registerHandlerFor(WriteEvent.class, writeEventHandler);
-        publisher.registerHandlerFor(EmbedEvent.class, embedEventHandler);
-    }
-
-    /*
-    Event Handlers
-     */
-
-    private void handleFeatureStartedHandler(final TestSourceRead event) {
-        cucumberSourceUtils.addTestSourceReadEvent(event.uri, event);
-    }
-
-    private void handleTestCaseStarted(final TestCaseStarted event) {
-        currentTestCase = event.testCase;
-        currentFeatureFile = currentTestCase.getUri();
-        currentFeature = cucumberSourceUtils.getFeature(currentFeatureFile);
-        currentContainer = UUID.randomUUID().toString();
-        forbidTestCaseStatusChange = false;
-
-
-        final Deque<PickleTag> tags = new LinkedList<>(currentTestCase.getTags());
-
-        final LabelBuilder labelBuilder = new LabelBuilder(currentFeature, currentTestCase, tags);
-
-        final String name = currentTestCase.getName();
-        final String featureName = currentFeature.getName();
-
-        final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(currentTestCase))
-                .setHistoryId(getHistoryId(currentTestCase))
-                .setFullName(featureName + ": " + name)
-                .setName(name)
-                .setLabels(labelBuilder.getScenarioLabels())
-                .setLinks(labelBuilder.getScenarioLinks());
-
-        final ScenarioDefinition scenarioDefinition =
-                cucumberSourceUtils.getScenarioDefinition(currentFeatureFile, currentTestCase.getLine());
-        if (scenarioDefinition instanceof ScenarioOutline) {
-            result.setParameters(
-                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition)
-            );
-        }
-
-        if (currentFeature.getDescription() != null && !currentFeature.getDescription().isEmpty()) {
-            result.setDescription(currentFeature.getDescription());
-        }
-
-        final TestResultContainer resultContainer = new TestResultContainer()
-                .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
-                .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase)));
-
-        lifecycle.scheduleTestCase(result);
-        lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(currentTestCase));
-    }
-
-    private void handleTestCaseFinished(final TestCaseFinished event) {
-
-        final String uuid = getTestCaseUuid(event.testCase);
-        final Optional<StatusDetails> details = getStatusDetails(event.result.getError());
-        details.ifPresent(statusDetails -> lifecycle.updateTestCase(
-                uuid,
-                testResult -> testResult.setStatusDetails(statusDetails)
-        ));
-        lifecycle.stopTestCase(uuid);
-        lifecycle.stopTestContainer(getTestContainerUuid());
-        lifecycle.writeTestCase(uuid);
-        lifecycle.writeTestContainer(getTestContainerUuid());
-    }
-
-    private void handleTestStepStarted(final TestStepStarted event) {
-        if (event.testStep instanceof PickleStepTestStep) {
-            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.testStep;
-            final String stepKeyword = Optional.ofNullable(
-                    cucumberSourceUtils.getKeywordFromSource(currentFeatureFile, pickleStep.getStepLine())
-            ).orElse("UNDEFINED");
-
-            final StepResult stepResult = new StepResult()
-                    .setName(String.format("%s %s", stepKeyword, pickleStep.getPickleStep().getText()))
-                    .setStart(System.currentTimeMillis());
-
-            lifecycle.startStep(getTestCaseUuid(currentTestCase), getStepUuid(pickleStep), stepResult);
-
-            pickleStep.getStepArgument().stream()
-                    .filter(PickleTable.class::isInstance)
-                    .findFirst()
-                    .ifPresent(table -> createDataTableAttachment((PickleTable) table));
-        } else if (event.testStep instanceof HookTestStep) {
-            initHook((HookTestStep) event.testStep);
-        }
-    }
-
-    private void initHook(final HookTestStep hook) {
-
-        final FixtureResult hookResult = new FixtureResult()
-                .setName(hook.getCodeLocation())
-                .setStart(System.currentTimeMillis());
-
-        if (hook.getHookType() == HookType.Before) {
-            lifecycle.startPrepareFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
-        } else {
-            lifecycle.startTearDownFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
-        }
-
-    }
-
-    private void handleTestStepFinished(final TestStepFinished event) {
-        if (event.testStep instanceof HookTestStep) {
-            handleHookStep(event);
-        } else {
-            handlePickleStep(event);
-        }
-    }
-
-    private void handleWriteEvent(final WriteEvent event) {
-        lifecycle.addAttachment(
-                "Text output",
-                TEXT_PLAIN,
-                TXT_EXTENSION,
-                Objects.toString(event.text).getBytes(StandardCharsets.UTF_8)
-        );
-    }
-
-    private void handleEmbedEvent(final EmbedEvent event) {
-        lifecycle.addAttachment("Screenshot", null, null, new ByteArrayInputStream(event.data));
-    }
-
-    /*
-    Utility Methods
-     */
-
-    private String getTestContainerUuid() {
-        return currentContainer;
-    }
-
-    private String getTestCaseUuid(final TestCase testCase) {
-        return scenarioUuids.computeIfAbsent(getHistoryId(testCase), it -> UUID.randomUUID().toString());
-    }
-
-    private String getStepUuid(final PickleStepTestStep step) {
-        return currentFeature.getName() + getTestCaseUuid(currentTestCase)
-                + step.getPickleStep().getText() + step.getStepLine();
-    }
-
-    private String getHookStepUuid(final HookTestStep step) {
-        return currentFeature.getName() + getTestCaseUuid(currentTestCase)
-                + step.getHookType().toString() + step.getCodeLocation();
-    }
-
-    private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = testCase.getUri() + ":" + testCase.getLine();
-        return md5(testCaseLocation);
-    }
-
-    private Status translateTestCaseStatus(final Result testCaseResult) {
-        switch (testCaseResult.getStatus()) {
-            case FAILED:
-                return getStatus(testCaseResult.getError())
-                        .orElse(Status.FAILED);
-            case PASSED:
-                return Status.PASSED;
-            case SKIPPED:
-            case PENDING:
-                return Status.SKIPPED;
-            case AMBIGUOUS:
-            case UNDEFINED:
-            default:
-                return null;
-        }
-    }
-
-    private List<Parameter> getExamplesAsParameters(final ScenarioOutline scenarioOutline) {
-        final Optional<Examples> examplesBlock =
-                scenarioOutline.getExamples().stream()
-                        .filter(example -> example.getTableBody().stream()
-                                .anyMatch(row -> row.getLocation().getLine() == currentTestCase.getLine())
-                        ).findFirst();
-
-        if (examplesBlock.isPresent()) {
-            final TableRow row = examplesBlock.get().getTableBody().stream()
-                    .filter(example -> example.getLocation().getLine() == currentTestCase.getLine())
-                    .findFirst().get();
-            return IntStream.range(0, examplesBlock.get().getTableHeader().getCells().size()).mapToObj(index -> {
-                final String name = examplesBlock.get().getTableHeader().getCells().get(index).getValue();
-                final String value = row.getCells().get(index).getValue();
-                return createParameter(name, value);
-            }).collect(Collectors.toList());
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    private void createDataTableAttachment(final PickleTable pickleTable) {
-        final List<PickleRow> rows = pickleTable.getRows();
-
-        final StringBuilder dataTableCsv = new StringBuilder();
-        if (!rows.isEmpty()) {
-            rows.forEach(dataTableRow -> {
-                dataTableCsv.append(
-                        dataTableRow.getCells().stream()
-                                .map(PickleCell::getValue)
-                                .collect(Collectors.joining("\t"))
-                );
-                dataTableCsv.append('\n');
-            });
-
-            final String attachmentSource = lifecycle
-                    .prepareAttachment("Data table", "text/tab-separated-values", "csv");
-            lifecycle.writeAttachment(attachmentSource,
-                    new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
-        }
-    }
-
-    private void handleHookStep(final TestStepFinished event) {
-        final HookTestStep hookStep = (HookTestStep) event.testStep;
-        final String uuid = getHookStepUuid(hookStep);
-        final FixtureResult fixtureResult = new FixtureResult().setStatus(translateTestCaseStatus(event.result));
-
-        if (!Status.PASSED.equals(fixtureResult.getStatus())) {
-            final TestResult testResult = new TestResult().setStatus(translateTestCaseStatus(event.result));
-            final StatusDetails statusDetails = getStatusDetails(event.result.getError()).get();
-
-            statusDetails.setMessage(hookStep.getHookType()
-                    .name() + " is failed: " + event.result.getError().getLocalizedMessage());
-
-            if (hookStep.getHookType() == HookType.Before) {
-                final TagParser tagParser = new TagParser(currentFeature, currentTestCase);
-                statusDetails
-                        .setFlaky(tagParser.isFlaky())
-                        .setMuted(tagParser.isMuted())
-                        .setKnown(tagParser.isKnown());
-                testResult.setStatus(Status.SKIPPED);
-                updateTestCaseStatus(testResult.getStatus());
-                forbidTestCaseStatusChange = true;
-            } else {
-                testResult.setStatus(Status.BROKEN);
-                updateTestCaseStatus(testResult.getStatus());
-            }
-            fixtureResult.setStatusDetails(statusDetails);
-        }
-
-        lifecycle.updateFixture(uuid, result -> result.setStatus(fixtureResult.getStatus())
-                .setStatusDetails(fixtureResult.getStatusDetails()));
-        lifecycle.stopFixture(uuid);
-    }
-
-    private void handlePickleStep(final TestStepFinished event) {
-
-        final Status stepStatus = translateTestCaseStatus(event.result);
-        final StatusDetails statusDetails;
-        if (event.result.getStatus() == Result.Type.UNDEFINED) {
-            updateTestCaseStatus(Status.PASSED);
-
-            statusDetails =
-                    getStatusDetails(new PendingException("TODO: implement me"))
-                            .orElse(new StatusDetails());
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase), scenarioResult ->
-                    scenarioResult
-                            .setStatusDetails(statusDetails));
-        } else {
-            statusDetails =
-                    getStatusDetails(event.result.getError())
-                            .orElse(new StatusDetails());
-            updateTestCaseStatus(stepStatus);
-        }
-
-        if (!Status.PASSED.equals(stepStatus) && stepStatus != null) {
-            forbidTestCaseStatusChange = true;
-        }
-
-        final TagParser tagParser = new TagParser(currentFeature, currentTestCase);
-        statusDetails
-                .setFlaky(tagParser.isFlaky())
-                .setMuted(tagParser.isMuted())
-                .setKnown(tagParser.isKnown());
-
-        lifecycle.updateStep(getStepUuid((PickleStepTestStep) event.testStep),
-                stepResult -> stepResult.setStatus(stepStatus).setStatusDetails(statusDetails));
-        lifecycle.stopStep(getStepUuid((PickleStepTestStep) event.testStep));
-    }
-
-    private void updateTestCaseStatus(final Status status) {
-        if (!forbidTestCaseStatusChange) {
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase),
-                    result -> result.setStatus(status));
-        }
-    }
-}
diff --git a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/CucumberSourceUtils.java b/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/CucumberSourceUtils.java
deleted file mode 100644
index 2f2ed0f37..000000000
--- a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/CucumberSourceUtils.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm;
-
-import cucumber.api.event.TestSourceRead;
-
-import gherkin.Parser;
-import gherkin.AstBuilder;
-import gherkin.TokenMatcher;
-import gherkin.ParserException;
-import gherkin.GherkinDialect;
-import gherkin.GherkinDialectProvider;
-
-import gherkin.ast.GherkinDocument;
-import gherkin.ast.Feature;
-import gherkin.ast.ScenarioDefinition;
-import gherkin.ast.Node;
-import gherkin.ast.ScenarioOutline;
-import gherkin.ast.TableRow;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-/**
- * Parts of package-private cucumber.runtime.formatter.TestSourcesModel needed for Allure 2 adapter.
- */
-final class CucumberSourceUtils {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CucumberSourceUtils.class);
-
-    private final Map<String, TestSourceRead> pathToReadEventMap = new HashMap<>();
-    private final Map<String, GherkinDocument> pathToAstMap = new HashMap<>();
-    private final Map<String, Map<Integer, AstNode>> pathToNodeMap = new HashMap<>();
-
-    public void addTestSourceReadEvent(final String path, final TestSourceRead event) {
-        pathToReadEventMap.put(path, event);
-    }
-
-    public Feature getFeature(final String path) {
-        if (!pathToAstMap.containsKey(path)) {
-            parseGherkinSource(path);
-        }
-        if (pathToAstMap.containsKey(path)) {
-            return pathToAstMap.get(path).getFeature();
-        }
-        return null;
-    }
-
-    private void parseGherkinSource(final String path) {
-        if (!pathToReadEventMap.containsKey(path)) {
-            return;
-        }
-        final Parser<GherkinDocument> parser = new Parser<>(new AstBuilder());
-        final TokenMatcher matcher = new TokenMatcher();
-        try {
-            final GherkinDocument gherkinDocument = parser.parse(pathToReadEventMap.get(path).source, matcher);
-            pathToAstMap.put(path, gherkinDocument);
-            final Map<Integer, AstNode> nodeMap = new HashMap<>();
-            final AstNode currentParent = new AstNode(gherkinDocument.getFeature(), null);
-            for (ScenarioDefinition child : gherkinDocument.getFeature().getChildren()) {
-                processScenarioDefinition(nodeMap, child, currentParent);
-            }
-            pathToNodeMap.put(path, nodeMap);
-        } catch (ParserException e) {
-            LOGGER.trace(e.getMessage(), e);
-        }
-    }
-
-    private void processScenarioDefinition(
-            final Map<Integer, AstNode> nodeMap, final ScenarioDefinition child, final AstNode currentParent
-    ) {
-        final AstNode childNode = new AstNode(child, currentParent);
-        nodeMap.put(child.getLocation().getLine(), childNode);
-
-        child.getSteps().forEach(
-            step -> nodeMap.put(step.getLocation().getLine(), new AstNode(step, childNode))
-        );
-
-        if (child instanceof ScenarioOutline) {
-            processScenarioOutlineExamples(nodeMap, (ScenarioOutline) child, childNode);
-        }
-    }
-
-    private void processScenarioOutlineExamples(
-            final Map<Integer, AstNode> nodeMap, final ScenarioOutline scenarioOutline, final AstNode childNode
-    ) {
-        scenarioOutline.getExamples().forEach(examples -> {
-            final AstNode examplesNode = new AstNode(examples, childNode);
-            final TableRow headerRow = examples.getTableHeader();
-            final AstNode headerNode = new AstNode(headerRow, examplesNode);
-            nodeMap.put(headerRow.getLocation().getLine(), headerNode);
-            IntStream.range(0, examples.getTableBody().size()).forEach(i -> {
-                final TableRow examplesRow = examples.getTableBody().get(i);
-                final Node rowNode = new CucumberSourceUtils.ExamplesRowWrapperNode(examplesRow, i);
-                final AstNode expandedScenarioNode = new AstNode(rowNode, examplesNode);
-                nodeMap.put(examplesRow.getLocation().getLine(), expandedScenarioNode);
-            });
-        });
-    }
-
-    private AstNode getAstNode(final String path, final int line) {
-        if (!pathToNodeMap.containsKey(path)) {
-            parseGherkinSource(path);
-        }
-        if (pathToNodeMap.containsKey(path)) {
-            return pathToNodeMap.get(path).get(line);
-        }
-        return null;
-    }
-
-    public ScenarioDefinition getScenarioDefinition(final String path, final int line) {
-        return getScenarioDefinition(getAstNode(path, line));
-    }
-
-    private ScenarioDefinition getScenarioDefinition(final AstNode astNode) {
-        return astNode.getNode() instanceof ScenarioDefinition
-                ? (ScenarioDefinition) astNode.getNode()
-                : (ScenarioDefinition) astNode.getParent().getParent().getNode();
-    }
-
-    public String getKeywordFromSource(final String uri, final int stepLine) {
-        final Feature feature = getFeature(uri);
-        if (feature != null) {
-            final TestSourceRead event = getTestSourceReadEvent(uri);
-            final String trimmedSourceLine = event.source.split("\n")[stepLine - 1].trim();
-            final GherkinDialect dialect = new GherkinDialectProvider(feature.getLanguage()).getDefaultDialect();
-            for (String keyword : dialect.getStepKeywords()) {
-                if (trimmedSourceLine.startsWith(keyword)) {
-                    return keyword;
-                }
-            }
-        }
-        return "";
-    }
-
-    private TestSourceRead getTestSourceReadEvent(final String uri) {
-        if (pathToReadEventMap.containsKey(uri)) {
-            return pathToReadEventMap.get(uri);
-        }
-        return null;
-    }
-
-    /**
-     * Representation of Examples row.
-     */
-    private static class ExamplesRowWrapperNode extends Node {
-        private final int bodyRowIndex;
-
-        ExamplesRowWrapperNode(final Node examplesRow, final int bodyRowIndex) {
-            super(examplesRow.getLocation());
-            this.bodyRowIndex = bodyRowIndex;
-        }
-
-        public int getBodyRowIndex() {
-            return bodyRowIndex;
-        }
-    }
-
-    /**
-     * Representation of leaf node.
-     */
-    private static class AstNode {
-        private final Node node;
-        private final AstNode parent;
-
-        AstNode(final Node node, final AstNode parent) {
-            this.node = node;
-            this.parent = parent;
-        }
-
-        public Node getNode() {
-            return node;
-        }
-
-        public AstNode getParent() {
-            return parent;
-        }
-    }
-}
diff --git a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java b/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java
deleted file mode 100644
index e73fc9c41..000000000
--- a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm;
-
-import cucumber.api.TestCase;
-import gherkin.ast.Feature;
-import gherkin.pickles.PickleTag;
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.util.ResultsUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Pattern;
-
-import static io.qameta.allure.util.ResultsUtils.createFeatureLabel;
-import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
-import static io.qameta.allure.util.ResultsUtils.createHostLabel;
-import static io.qameta.allure.util.ResultsUtils.createIssueLink;
-import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
-import static io.qameta.allure.util.ResultsUtils.createLink;
-import static io.qameta.allure.util.ResultsUtils.createPackageLabel;
-import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
-import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
-import static io.qameta.allure.util.ResultsUtils.createSuiteLabel;
-import static io.qameta.allure.util.ResultsUtils.createTagLabel;
-import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
-import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
-import static io.qameta.allure.util.ResultsUtils.createTmsLink;
-
-/**
- * Scenario labels and links builder.
- */
-@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount"})
-class LabelBuilder {
-    private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
-    private static final String COMPOSITE_TAG_DELIMITER = "=";
-
-    private static final String SEVERITY = "@SEVERITY";
-    private static final String ISSUE_LINK = "@ISSUE";
-    private static final String TMS_LINK = "@TMSLINK";
-    private static final String PLAIN_LINK = "@LINK";
-
-    private final List<Label> scenarioLabels = new ArrayList<>();
-    private final List<Link> scenarioLinks = new ArrayList<>();
-
-    LabelBuilder(final Feature feature, final TestCase scenario, final Deque<PickleTag> tags) {
-        final TagParser tagParser = new TagParser(feature, scenario);
-
-        getScenarioLabels().add(createFeatureLabel(feature.getName()));
-        getScenarioLabels().add(createStoryLabel(scenario.getName()));
-
-        while (tags.peek() != null) {
-            final PickleTag tag = tags.remove();
-
-            final String tagString = tag.getName();
-
-            if (tagString.contains(COMPOSITE_TAG_DELIMITER)) {
-
-                final String[] tagParts = tagString.split(COMPOSITE_TAG_DELIMITER, 2);
-                if (tagParts.length < 2 || Objects.isNull(tagParts[1]) || tagParts[1].isEmpty()) {
-                    // skip empty tags, e.g. '@tmsLink=', to avoid formatter errors
-                    continue;
-                }
-
-                final String tagKey = tagParts[0].toUpperCase();
-                final String tagValue = tagParts[1];
-
-                // Handle composite named links
-                if (tagKey.startsWith(PLAIN_LINK + ".")) {
-                    tryHandleNamedLink(tagString);
-                    continue;
-                }
-
-                switch (tagKey) {
-                    case SEVERITY:
-                        getScenarioLabels().add(createSeverityLabel(tagValue.toLowerCase()));
-                        break;
-                    case TMS_LINK:
-                        getScenarioLinks().add(createTmsLink(tagValue));
-                        break;
-                    case ISSUE_LINK:
-                        getScenarioLinks().add(createIssueLink(tagValue));
-                        break;
-                    case PLAIN_LINK:
-                        getScenarioLinks().add(createLink(null, tagValue, tagValue, null));
-                        break;
-                    default:
-                        LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey);
-                        getScenarioLabels().add(getTagLabel(tag));
-                        break;
-                }
-            } else if (tagParser.isPureSeverityTag(tag)) {
-                getScenarioLabels().add(createSeverityLabel(tagString.substring(1)));
-            } else if (!tagParser.isResultTag(tag)) {
-                getScenarioLabels().add(getTagLabel(tag));
-            }
-        }
-
-        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
-        getScenarioLabels().addAll(Arrays.asList(
-                createHostLabel(),
-                createThreadLabel(),
-                createPackageLabel(feature.getName()),
-                createSuiteLabel(feature.getName()),
-                createTestClassLabel(scenario.getName()),
-                createFrameworkLabel("cucumber3jvm"),
-                createLanguageLabel("java")
-        ));
-    }
-
-    public List<Label> getScenarioLabels() {
-        return scenarioLabels;
-    }
-
-    public List<Link> getScenarioLinks() {
-        return scenarioLinks;
-    }
-
-    private Label getTagLabel(final PickleTag tag) {
-        return createTagLabel(tag.getName().substring(1));
-    }
-
-    /**
-     * Handle composite named links.
-     *
-     * @param tagString Full tag name and value
-     */
-    private void tryHandleNamedLink(final String tagString) {
-        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+(-|_)?)+";
-        final Pattern namedLinkPattern = Pattern.compile(namedLinkPatternString, Pattern.CASE_INSENSITIVE);
-
-        if (namedLinkPattern.matcher(tagString).matches()) {
-            final String type = tagString.split(COMPOSITE_TAG_DELIMITER)[0].split("[.]")[1];
-            final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
-            getScenarioLinks().add(createLink(null, name, null, type));
-        } else {
-            LOGGER.warn("Composite named tag {} is not matches regex {}. skipping", tagString,
-                    namedLinkPatternString);
-        }
-    }
-
-}
diff --git a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/TagParser.java b/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/TagParser.java
deleted file mode 100644
index 55b6c40cb..000000000
--- a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/TagParser.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm;
-
-import cucumber.api.TestCase;
-import gherkin.ast.Feature;
-import gherkin.pickles.PickleTag;
-import io.qameta.allure.SeverityLevel;
-
-import java.util.Arrays;
-
-/**
- * Parser for tags.
- */
-class TagParser {
-    private static final String FLAKY = "@FLAKY";
-    private static final String KNOWN = "@KNOWN";
-    private static final String MUTED = "@MUTED";
-
-    private final Feature feature;
-    private final TestCase scenario;
-
-    TagParser(final Feature feature, final TestCase scenario) {
-        this.feature = feature;
-        this.scenario = scenario;
-    }
-
-    protected boolean isFlaky() {
-        return getStatusDetailByTag(FLAKY);
-    }
-
-    protected boolean isMuted() {
-        return getStatusDetailByTag(MUTED);
-    }
-
-    protected boolean isKnown() {
-        return getStatusDetailByTag(KNOWN);
-    }
-
-    protected boolean getStatusDetailByTag(final String tagName) {
-        return scenario.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName))
-                || feature.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
-    }
-
-    protected boolean isResultTag(final PickleTag tag) {
-        return Arrays.asList(new String[]{FLAKY, KNOWN, MUTED})
-                .contains(tag.getName().toUpperCase());
-    }
-
-    protected boolean isPureSeverityTag(final PickleTag tag) {
-        return Arrays.stream(SeverityLevel.values())
-                .map(SeverityLevel::value)
-                .map(value -> "@" + value)
-                .anyMatch(value -> value.equalsIgnoreCase(tag.getName()));
-    }
-
-}
diff --git a/allure-cucumber3-jvm/src/main/resources/META-INF/aop-ajc.xml b/allure-cucumber3-jvm/src/main/resources/META-INF/aop-ajc.xml
deleted file mode 100644
index 09e38300c..000000000
--- a/allure-cucumber3-jvm/src/main/resources/META-INF/aop-ajc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<aspectj>
-    <weaver options="-warn:none -Xlint:ignore"/>
-    <aspects>
-        <aspect name="io.qameta.allure.aspects.StepsAspects"/>
-        <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
-    </aspects>
-</aspectj>
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java b/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java
deleted file mode 100644
index 29b64f837..000000000
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm;
-
-import cucumber.runtime.ClassFinder;
-import cucumber.runtime.Runtime;
-import cucumber.runtime.RuntimeOptions;
-import cucumber.runtime.io.MultiLoader;
-import cucumber.runtime.io.ResourceLoader;
-import cucumber.runtime.io.ResourceLoaderClassFinder;
-import cucumber.runtime.model.CucumberFeature;
-import gherkin.AstBuilder;
-import gherkin.Parser;
-import gherkin.TokenMatcher;
-import gherkin.ast.GherkinDocument;
-import io.github.glytching.junit.extension.system.SystemProperty;
-import io.github.glytching.junit.extension.system.SystemPropertyExtension;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.Issue;
-import io.qameta.allure.model.Attachment;
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.Stage;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.test.AllureFeatures;
-import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
-import org.apache.commons.io.IOUtils;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.parallel.ResourceLock;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static java.lang.Thread.currentThread;
-import static java.util.Objects.nonNull;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
-import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-@SuppressWarnings("unchecked")
-class AllureCucumber3JvmTest {
-
-    @AllureFeatures.Base
-    @Test
-    void shouldSetName() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getName)
-                .containsExactlyInAnyOrder("Add a to b");
-
-    }
-
-    @AllureFeatures.PassedTests
-    @Test
-    void shouldSetStatus() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.FailedTests
-    @Test
-    void shouldSetFailedStatus() {
-        final AllureResults results = runFeature("features/failed.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-    @AllureFeatures.FailedTests
-    @Test
-    void shouldSetStatusDetails() {
-        final AllureResults results = runFeature("features/failed.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatusDetails)
-                .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("expected: <15> but was: <123>");
-    }
-
-    @AllureFeatures.BrokenTests
-    @Test
-    void shouldSetBrokenStatus() {
-        final AllureResults results = runFeature("features/broken.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-    @AllureFeatures.Stages
-    @Test
-    void shouldSetStage() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStage)
-                .containsExactlyInAnyOrder(Stage.FINISHED);
-    }
-
-    @AllureFeatures.Timings
-    @Test
-    void shouldSetStart() {
-        final long before = Instant.now().toEpochMilli();
-        final AllureResults results = runFeature("features/simple.feature");
-        final long after = Instant.now().toEpochMilli();
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStart)
-                .allMatch(v -> v >= before && v <= after);
-    }
-
-    @AllureFeatures.Timings
-    @Test
-    void shouldSetStop() {
-        final long before = Instant.now().toEpochMilli();
-        final AllureResults results = runFeature("features/simple.feature");
-        final long after = Instant.now().toEpochMilli();
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStop)
-                .allMatch(v -> v >= before && v <= after);
-    }
-
-    @AllureFeatures.FullName
-    @Test
-    void shouldSetFullName() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getFullName)
-                .containsExactlyInAnyOrder("Simple feature: Add a to b");
-    }
-
-    @AllureFeatures.Descriptions
-    @Test
-    void shouldSetDescription() {
-        final AllureResults results = runFeature("features/description.feature");
-
-        final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getDescription)
-                .containsExactlyInAnyOrder(
-                        expected,
-                        expected
-                );
-    }
-
-    @AllureFeatures.Attachments
-    @Test
-    void shouldAddDataTableAttachment() {
-        final AllureResults results = runFeature("features/datatable.feature");
-
-        final List<Attachment> attachments = results.getTestResults().stream()
-                .map(TestResult::getSteps)
-                .flatMap(Collection::stream)
-                .map(StepResult::getAttachments)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-
-        assertThat(attachments)
-                .extracting(Attachment::getName, Attachment::getType)
-                .containsExactlyInAnyOrder(
-                        tuple("Data table", "text/tab-separated-values")
-                );
-
-        final Attachment dataTableAttachment = attachments.iterator().next();
-        final Map<String, byte[]> attachmentFiles = results.getAttachments();
-        assertThat(attachmentFiles)
-                .containsKeys(dataTableAttachment.getSource());
-
-        final byte[] bytes = attachmentFiles.get(dataTableAttachment.getSource());
-        final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
-
-        assertThat(attachmentContent)
-                .isEqualTo("name\tlogin\temail\n" +
-                        "Viktor\tclicman\tclicman@ya.ru\n" +
-                        "Viktor2\tclicman2\tclicman2@ya.ru\n"
-                );
-
-    }
-
-    @AllureFeatures.Attachments
-    @Test
-    void shouldAddAttachments() {
-        final AllureResults results = runFeature("features/attachments.feature");
-
-        final List<Attachment> attachments = results.getTestResults().stream()
-                .map(TestResult::getSteps)
-                .flatMap(Collection::stream)
-                .map(StepResult::getAttachments)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-
-        assertThat(attachments)
-                .extracting(Attachment::getName, Attachment::getType)
-                .containsExactlyInAnyOrder(
-                        tuple("Text output", "text/plain"),
-                        tuple("Screenshot", null)
-                );
-
-        final List<String> attachmentContents = results.getAttachments().values().stream()
-                .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
-                .collect(Collectors.toList());
-
-        assertThat(attachmentContents)
-                .containsExactlyInAnyOrder("text attachment", "image attachment");
-    }
-
-    @AllureFeatures.Steps
-    @Test
-    void shouldAddBackgroundSteps() {
-        final AllureResults results = runFeature("features/background.feature");
-
-        assertThat(results.getTestResults())
-                .hasSize(1)
-                .flatExtracting(TestResult::getSteps)
-                .extracting(StepResult::getName)
-                .containsExactly(
-                        "Given  cat is sad",
-                        "And  cat is murmur",
-                        "When  Pet the cat",
-                        "Then  Cat is happy"
-                );
-    }
-
-    @AllureFeatures.Parameters
-    @Test
-    void shouldAddParametersFromExamples() {
-        final AllureResults results = runFeature("features/examples.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(2);
-
-        assertThat(testResults.get(0).getParameters())
-                .hasSize(3);
-
-        assertThat(testResults.get(1).getParameters())
-                .hasSize(3);
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getParameters)
-                .extracting(Parameter::getName, Parameter::getValue)
-                .containsExactlyInAnyOrder(
-                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
-                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
-                );
-
-    }
-
-    @AllureFeatures.Parameters
-    @Test
-    void shouldHandleMultipleExamplesPerOutline() throws IOException {
-        final AllureResults results = runFeature("features/multi-examples.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(2);
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getParameters)
-                .extracting(Parameter::getName, Parameter::getValue)
-                .containsExactlyInAnyOrder(
-                        tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
-                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
-                );
-    }
-
-    @AllureFeatures.Parameters
-    @Test
-    void shouldSupportTaggedExamplesBlocks() throws IOException {
-        final AllureResults results = runFeature("features/multi-examples.feature", "--tags", "@ExamplesTag2");
-
-        final List<TestResult> testResults = results.getTestResults();
-
-        assertThat(testResults)
-                .hasSize(1);
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("tag", "ExamplesTag2")
-                );
-
-        assertThat(testResults)
-                .flatExtracting(TestResult::getParameters)
-                .extracting(Parameter::getName, Parameter::getValue)
-                .containsExactlyInAnyOrder(
-                        tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
-                );
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldAddTags() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("tag", "FeatureTag"),
-                        tuple("tag", "good")
-                );
-    }
-
-    @AllureFeatures.Links
-    @ExtendWith(SystemPropertyExtension.class)
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
-    @Test
-    void shouldAddLinks() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLinks)
-                .extracting(Link::getName, Link::getType, Link::getUrl)
-                .contains(
-                        tuple("OAT-4444", "tms", "https://example.org/tms/OAT-4444"),
-                        tuple("BUG-22400", "issue", "https://example.org/issue/BUG-22400")
-                );
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldAddBddLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("feature", "Test Simple Scenarios"),
-                        tuple("story", "Add a to b")
-                );
-    }
-
-    @AllureFeatures.Timeline
-    @Test
-    void shouldThreadHostLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName)
-                .contains("host", "thread");
-    }
-
-    @AllureFeatures.MarkerAnnotations
-    @Test
-    void shouldCommonLabels() {
-        final AllureResults results = runFeature("features/tags.feature");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("package", "Test Simple Scenarios"),
-                        tuple("suite", "Test Simple Scenarios"),
-                        tuple("testClass", "Add a to b")
-                );
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldProcessNotImplementedScenario() {
-        final AllureResults results = runFeature("features/undefined.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.Base
-    @Test
-    void shouldSupportDryRun() {
-        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactlyInAnyOrder(
-                        tuple("Add a to b", Status.SKIPPED)
-                );
-    }
-
-    @AllureFeatures.Base
-    @Issue("173")
-    @Issue("164")
-    @Test
-    void shouldUseUuid() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getUuid)
-                .allMatch(uuid -> nonNull(uuid) && uuid.matches("[\\-a-z0-9]+"), "UUID");
-    }
-
-    private AllureResults runFeature(final String featureResource,
-                                     final String... moreOptions) {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumber3Jvm cucumber3Jvm = new AllureCucumber3Jvm(lifecycle);
-        final ClassLoader classLoader = currentThread().getContextClassLoader();
-        final ResourceLoader resourceLoader = new MultiLoader(classLoader);
-        final ClassFinder classFinder = new ResourceLoaderClassFinder(resourceLoader, classLoader);
-        final List<String> opts = new ArrayList<>(Arrays.asList(
-                "--glue", "io.qameta.allure.cucumber3jvm.samples",
-                "--plugin", "null"
-        ));
-        opts.addAll(Arrays.asList(moreOptions));
-        final RuntimeOptions options = new RuntimeOptions(opts);
-        final Runtime runtime = new Runtime(resourceLoader, classFinder, classLoader, options);
-
-        options.addPlugin(cucumber3Jvm);
-        options.noSummaryPrinter();
-
-        final String gherkin = readResource(featureResource);
-        Parser<GherkinDocument> parser = new Parser<>(new AstBuilder());
-        TokenMatcher matcher = new TokenMatcher();
-        GherkinDocument gherkinDocument = parser.parse(gherkin, matcher);
-        CucumberFeature feature = new CucumberFeature(gherkinDocument, featureResource, gherkin);
-
-        feature.sendTestSourceRead(runtime.getEventBus());
-        runtime.runFeature(feature);
-        return writer;
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusFailedOnBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_sf_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusSkippedOnBadBefore() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bf_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusSkippedOnBadBeforeAndBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bf_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusBrokenOnBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-    @AllureFeatures.Fixtures
-    @Test
-    void shouldSetStatusFailedOnBadSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_sf_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusBrokenOnUndefinedStepsAndBadAfter() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_su_af");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.BROKEN);
-    }
-
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusPassedOnUndefinedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_su_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusSkippedOnUndefinedAndFailedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_suf_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
-    }
-
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusPassedOnPassedAndUndefinedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_spu_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
-    }
-
-    @AllureFeatures.NotImplementedTests
-    @Test
-    void shouldSetStatusFailedOnFailedAndUndefinedSteps() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t", "@bp_sfu_ap");
-
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.FAILED);
-    }
-
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm3-test-provided")
-    @Test
-    void shouldSupportProvidedLabels() {
-        final AllureResults results = runFeature("features/simple.feature");
-
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .hasSize(1)
-                .flatExtracting(TestResult::getLabels)
-                .extracting(Label::getName, Label::getValue)
-                .contains(
-                        tuple("x-provided", "cucumberjvm3-test-provided")
-                );
-    }
-
-    private String readResource(final String resourceName) {
-        try (InputStream is = currentThread().getContextClassLoader().getResourceAsStream(resourceName)) {
-            return IOUtils.toString(is, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            throw new RuntimeException("Feature file not found " + resourceName);
-        }
-    }
-}
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/AttachmentSteps.java b/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/AttachmentSteps.java
deleted file mode 100644
index 8b9b4a69e..000000000
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/AttachmentSteps.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm.samples;
-
-import cucumber.api.Scenario;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
-
-public class AttachmentSteps
-{
-    private Scenario scenario;
-
-    @Before("@attachments")
-    public void setup(Scenario scenario)
-    {
-        this.scenario = scenario;
-    }
-
-    @Given("step with scenario write")
-    public void stepWithScenarioWrite()
-    {
-        scenario.write("text attachment");
-    }
-
-    @Given("step with scenario embed")
-    public void stepWithScenarioEmbed()
-    {
-        scenario.embed("image attachment".getBytes(), "image/png");
-    }
-}
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BackgroundFeatureSteps.java
deleted file mode 100644
index d93a51ba2..000000000
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BackgroundFeatureSteps.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm.samples;
-
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-public class BackgroundFeatureSteps {
-
-    @Given("^cat is sad$")
-    public void catIsSad() {
-    }
-
-    @Given("^cat is murmur$")
-    public void catIsMurMur() {
-    }
-
-    @When("^pet the cat$")
-    public void petTheCat() {
-    }
-
-    @Then("^cat is happy$")
-    public void catIsHappy() {
-    }
-
-}
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BrokenFeatureSteps.java b/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BrokenFeatureSteps.java
deleted file mode 100644
index f015d4255..000000000
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/BrokenFeatureSteps.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm.samples;
-
-import cucumber.api.java.en.Given;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-public class BrokenFeatureSteps {
-
-    @Given("^everything is broken$")
-    public void everythingIsBroken() {
-        throw new RuntimeException("Oops");
-    }
-
-}
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/DatatableFeatureSteps.java b/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/DatatableFeatureSteps.java
deleted file mode 100644
index 342d0d634..000000000
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/DatatableFeatureSteps.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm.samples;
-
-import cucumber.api.java.en.Given;
-import io.cucumber.datatable.DataTable;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-@SuppressWarnings("unused")
-public class DatatableFeatureSteps {
-
-    @Given("^users are:$")
-    public void usersAre(DataTable table) {
-    }
-
-}
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/Hooks.java b/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/Hooks.java
deleted file mode 100644
index 70cf9af8b..000000000
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/Hooks.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm.samples;
-
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
-
-public class Hooks {
-
-    @Before("@bp")
-    public void beforePassed() {
-    }
-
-    @Before("@bf")
-    public void beforeFailed() {
-        throw new AssertionError("This hook should fail");
-    }
-
-    @After("@ap")
-    public void afterPassed() {
-    }
-
-    @After("@af")
-    public void afterFailed() {
-        throw new AssertionError("This hook should fail");
-    }
-}
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/SimpleFeatureSteps.java b/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/SimpleFeatureSteps.java
deleted file mode 100644
index ac5bf7c9d..000000000
--- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/samples/SimpleFeatureSteps.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.cucumber3jvm.samples;
-
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-public class SimpleFeatureSteps {
-
-    private int a;
-    private int b;
-    private int c;
-
-    @Given("^a is (\\d+)$")
-    public void a_is(int arg1) {
-        this.a = arg1;
-    }
-
-    @Given("^b is (\\d+)$")
-    public void b_is(int arg1) {
-        this.b = arg1;
-    }
-
-    @When("^I add a to b$")
-    public void i_add_a_to_b() {
-        this.c = this.a + this.b;
-    }
-
-    @Then("^result is (\\d+)$")
-    public void result_is(int arg1) {
-        assertEquals(this.c, arg1);
-    }
-
-}
diff --git a/allure-cucumber3-jvm/src/test/resources/allure.properties b/allure-cucumber3-jvm/src/test/resources/allure.properties
deleted file mode 100644
index dbfefee44..000000000
--- a/allure-cucumber3-jvm/src/test/resources/allure.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-allure.model.indentOutput=true
-allure.results.directory=build/allure-results
-allure.label.epic=#project.description#
diff --git a/allure-cucumber3-jvm/src/test/resources/features/attachments.feature b/allure-cucumber3-jvm/src/test/resources/features/attachments.feature
deleted file mode 100644
index 1585fbe81..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/attachments.feature
+++ /dev/null
@@ -1,8 +0,0 @@
-@attachments
-Feature: Feature with attachments
-
-  Scenario: Simple scenario with a text attachment
-    Given step with scenario write
-
-  Scenario: Simple scenario with an image attachment
-    Given step with scenario embed
\ No newline at end of file
diff --git a/allure-cucumber3-jvm/src/test/resources/features/background.feature b/allure-cucumber3-jvm/src/test/resources/features/background.feature
deleted file mode 100644
index 307f10267..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/background.feature
+++ /dev/null
@@ -1,9 +0,0 @@
-Feature: Test Scenarios with backgrounds
-
-  Background:
-    Given cat is sad
-    And cat is murmur
-
-  Scenario: Scenario with background
-    When Pet the cat
-    Then Cat is happy
diff --git a/allure-cucumber3-jvm/src/test/resources/features/broken.feature b/allure-cucumber3-jvm/src/test/resources/features/broken.feature
deleted file mode 100644
index 42bd7ba4f..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/broken.feature
+++ /dev/null
@@ -1,4 +0,0 @@
-Feature: Simple feature
-
-  Scenario: Exception during step
-    Given everything is broken
diff --git a/allure-cucumber3-jvm/src/test/resources/features/datatable.feature b/allure-cucumber3-jvm/src/test/resources/features/datatable.feature
deleted file mode 100644
index ea5e94d3b..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/datatable.feature
+++ /dev/null
@@ -1,8 +0,0 @@
-Feature: Test Scenarios with Data Tables
-
-  Scenario: Simple data table
-    Given users are:
-      | name    | login    | email          |
-      | Viktor  | clicman  | clicman@ya.ru  |
-      | Viktor2 | clicman2 | clicman2@ya.ru |
-
diff --git a/allure-cucumber3-jvm/src/test/resources/features/description.feature b/allure-cucumber3-jvm/src/test/resources/features/description.feature
deleted file mode 100644
index 935b6731a..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/description.feature
+++ /dev/null
@@ -1,17 +0,0 @@
-Feature: Descriptions feature
-
-This is description for current feature.
-It should appear on each scenario in report
-
-  Scenario: Add a to b (1)
-    Given a is 5
-    And b is 10
-    When I add a to b
-    Then result is 15
-
-  Scenario: Add a to b (2)
-    Given a is 1
-    And b is 2
-    When I add a to b
-    Then result is 3
-
diff --git a/allure-cucumber3-jvm/src/test/resources/features/examples.feature b/allure-cucumber3-jvm/src/test/resources/features/examples.feature
deleted file mode 100644
index 23d6c5f21..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/examples.feature
+++ /dev/null
@@ -1,12 +0,0 @@
-Feature: Test Scenarios with Examples
-
-  Scenario Outline: Scenario with Positive Examples
-    Given a is <a>
-    And b is <b>
-    When I add a to b
-    Then result is <result>
-
-    Examples:
-      | a | b | result |
-      | 1 | 3 | 4      |
-      | 2 | 4 | 6      |
diff --git a/allure-cucumber3-jvm/src/test/resources/features/failed.feature b/allure-cucumber3-jvm/src/test/resources/features/failed.feature
deleted file mode 100644
index a70f8ec79..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/failed.feature
+++ /dev/null
@@ -1,7 +0,0 @@
-Feature: Simple feature
-
-  Scenario: Add a to b
-    Given a is 5
-    And b is 10
-    When I add a to b
-    Then result is 123
diff --git a/allure-cucumber3-jvm/src/test/resources/features/hooks.feature b/allure-cucumber3-jvm/src/test/resources/features/hooks.feature
deleted file mode 100644
index 7f8fdf16e..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/hooks.feature
+++ /dev/null
@@ -1,77 +0,0 @@
-Feature: Hooks variations
-
-  @bp @af @bp_sf_af
-  Scenario: Scenario with good before and bad after but failed
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 3
-
-
-  @bf @ap @bf_ap
-  Scenario: Scenario with bad before and good after
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 2
-
-
-  @bf @af @bf_af
-  Scenario: Scenario with bad before and bad after
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 2
-
-
-  @bp @af @bp_af
-  Scenario: Scenario with bad after
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 2
-
-
-  @bp @ap @bp_sf_ap
-  Scenario: Scenario with good before and good after but failed
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 3
-
-
-  @bp @af @bp_su_af
-  Scenario: Step is not implemented with bad after
-    Given hello my friend
-
-
-  @bp @ap @bp_su_ap
-  Scenario: Step is not implemented
-    Given hello my friend
-
-
-  @bp @ap @bp_suf_ap
-  Scenario: Step is not implemented
-    Given hello my friend
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 3
-
-
-  @bp @ap @bp_spu_ap
-  Scenario: Step is not implemented
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 2
-    Given hello my friend
-
-
-  @bp @ap @bp_sfu_ap
-  Scenario: Step is not implemented
-    Given a is 1
-    And b is 1
-    When I add a to b
-    Then result is 3
-    Given hello my friend
diff --git a/allure-cucumber3-jvm/src/test/resources/features/multi-examples.feature b/allure-cucumber3-jvm/src/test/resources/features/multi-examples.feature
deleted file mode 100644
index c83e923db..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/multi-examples.feature
+++ /dev/null
@@ -1,17 +0,0 @@
-Feature: Test Scenarios with multiple Examples
-
-  Scenario Outline: Scenario with Multiple Examples
-    Given a is <a>
-    And b is <b>
-    When I add a to b
-    Then result is <result>
-
-    @ExamplesTag1
-    Examples:
-      | a | b | result |
-      | 1 | 3 | 4      |
-
-    @ExamplesTag2
-    Examples:
-      | a | b | result |
-      | 2 | 4 | 6      |
\ No newline at end of file
diff --git a/allure-cucumber3-jvm/src/test/resources/features/simple.feature b/allure-cucumber3-jvm/src/test/resources/features/simple.feature
deleted file mode 100644
index c5b5f2b5f..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/simple.feature
+++ /dev/null
@@ -1,7 +0,0 @@
-Feature: Simple feature
-
-  Scenario: Add a to b
-    Given a is 5
-    And b is 10
-    When I add a to b
-    Then result is 15
diff --git a/allure-cucumber3-jvm/src/test/resources/features/tags.feature b/allure-cucumber3-jvm/src/test/resources/features/tags.feature
deleted file mode 100644
index 2632623ee..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/tags.feature
+++ /dev/null
@@ -1,13 +0,0 @@
-@FeatureTag
-@tmsLink=OAT-4444
-@flaky
-@issue=BUG-22400
-Feature: Test Simple Scenarios
-
-  @good
-  Scenario: Add a to b
-    Given a is 5
-    And b is 10
-    When I add a to b
-    Then result is 15
-
diff --git a/allure-cucumber3-jvm/src/test/resources/features/undefined.feature b/allure-cucumber3-jvm/src/test/resources/features/undefined.feature
deleted file mode 100644
index caa0b507b..000000000
--- a/allure-cucumber3-jvm/src/test/resources/features/undefined.feature
+++ /dev/null
@@ -1,4 +0,0 @@
-Feature: Simple feature
-
-  Scenario: Step is not implemented
-    Given hello my friend
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
index 57d0a95df..ecefc8ef6 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
@@ -53,6 +53,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.LinkedList;
@@ -74,8 +75,10 @@
  * Allure plugin for Cucumber JVM 4.0.
  */
 @SuppressWarnings({
+        "ClassDataAbstractionCoupling",
+        "ClassFanOutComplexity",
+        "MultipleStringLiterals",
         "PMD.ExcessiveImports",
-        "ClassFanOutComplexity", "ClassDataAbstractionCoupling"
 })
 public class AllureCucumber4Jvm implements ConcurrentEventListener {
 
@@ -100,6 +103,9 @@ public class AllureCucumber4Jvm implements ConcurrentEventListener {
 
     private static final String TXT_EXTENSION = ".txt";
     private static final String TEXT_PLAIN = "text/plain";
+    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().toString();
+    private static final String CLASSPATH_PREFIX = "classpath:";
+    private static final String FILE_PREFIX = "file:";
 
     @SuppressWarnings("unused")
     public AllureCucumber4Jvm() {
@@ -139,27 +145,27 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         currentContainer.set(UUID.randomUUID().toString());
         forbidTestCaseStatusChange.set(false);
 
-        final Deque<PickleTag> tags = new LinkedList<>(currentTestCase.get().getTags());
+        final TestCase testCase = currentTestCase.get();
+        final Deque<PickleTag> tags = new LinkedList<>(testCase.getTags());
 
         final Feature feature = currentFeature.get();
-        final LabelBuilder labelBuilder = new LabelBuilder(feature, currentTestCase.get(), tags);
+        final LabelBuilder labelBuilder = new LabelBuilder(feature, testCase, tags);
 
-        final String name = currentTestCase.get().getName();
-        final String featureName = feature.getName();
+        final String name = testCase.getName();
 
         final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(currentTestCase.get()))
-                .setHistoryId(getHistoryId(currentTestCase.get()))
-                .setFullName(featureName + ": " + name)
+                .setUuid(getTestCaseUuid(testCase))
+                .setHistoryId(getHistoryId(testCase))
+                .setFullName(getTestCaseUri(testCase) + ":" + testCase.getLine())
                 .setName(name)
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
 
         final ScenarioDefinition scenarioDefinition =
-                testSources.getScenarioDefinition(currentFeatureFile.get(), currentTestCase.get().getLine());
+                testSources.getScenarioDefinition(currentFeatureFile.get(), testCase.getLine());
         if (scenarioDefinition instanceof ScenarioOutline) {
             result.setParameters(
-                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition, currentTestCase.get())
+                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition, testCase)
             );
         }
 
@@ -175,11 +181,11 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         final TestResultContainer resultContainer = new TestResultContainer()
                 .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
                 .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase.get())));
+                .setChildren(Collections.singletonList(getTestCaseUuid(testCase)));
 
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(currentTestCase.get()));
+        lifecycle.startTestCase(getTestCaseUuid(testCase));
     }
 
     private void handleTestCaseFinished(final TestCaseFinished event) {
@@ -267,16 +273,16 @@ private String getTestCaseUuid(final TestCase testCase) {
 
     private String getStepUuid(final PickleStepTestStep step) {
         return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-                + step.getPickleStep().getText() + step.getStepLine();
+               + step.getPickleStep().getText() + step.getStepLine();
     }
 
     private String getHookStepUuid(final HookTestStep step) {
         return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-                + step.getHookType().toString() + step.getCodeLocation();
+               + step.getHookType().toString() + step.getCodeLocation();
     }
 
     private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = testCase.getUri() + ":" + testCase.getLine();
+        final String testCaseLocation = getTestCaseUri(testCase) + ":" + testCase.getLine();
         return md5(testCaseLocation);
     }
 
@@ -298,8 +304,7 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(
-            final ScenarioOutline scenarioOutline, final TestCase localCurrentTestCase
-    ) {
+            final ScenarioOutline scenarioOutline, final TestCase localCurrentTestCase) {
         final Optional<Examples> examplesBlock =
                 scenarioOutline.getExamples().stream()
                         .filter(example -> example.getTableBody().stream()
@@ -351,9 +356,11 @@ private void handleHookStep(final TestStepFinished event) {
             final StatusDetails statusDetails = getStatusDetails(event.result.getError())
                     .orElseGet(StatusDetails::new);
 
-            final String errorMessage = event.result.getError() == null ? hookStep.getHookType()
-                    .name() + " is failed." : hookStep.getHookType()
-                    .name() + " is failed: " + event.result.getError().getLocalizedMessage();
+            final String errorMessage = event.result.getError() == null
+                    ? hookStep.getHookType().name() + " is failed."
+                    : hookStep.getHookType().name() + " is failed: "
+                      + event.result.getError().getLocalizedMessage();
+
             statusDetails.setMessage(errorMessage);
 
             if (hookStep.getHookType() == HookType.Before) {
@@ -418,4 +425,18 @@ private void updateTestCaseStatus(final Status status) {
                     result -> result.setStatus(status));
         }
     }
+
+    private String getTestCaseUri(final TestCase testCase) {
+        final String testCaseUri = testCase.getUri();
+        if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
+            return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
+        }
+        if (testCaseUri.startsWith(CLASSPATH_PREFIX)) {
+            return testCaseUri.substring(CLASSPATH_PREFIX.length());
+        }
+        if (testCaseUri.startsWith(FILE_PREFIX)) {
+            return testCaseUri.substring(FILE_PREFIX.length());
+        }
+        return testCaseUri;
+    }
 }
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
index 95d08f2f8..b39650faf 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
@@ -16,24 +16,19 @@
 package io.qameta.allure.cucumber4jvm;
 
 import cucumber.runtime.ClassFinder;
-import cucumber.runtime.FeatureSupplier;
+import cucumber.runtime.FeaturePathFeatureSupplier;
 import cucumber.runtime.Runtime;
 import cucumber.runtime.io.MultiLoader;
 import cucumber.runtime.io.ResourceLoader;
 import cucumber.runtime.io.ResourceLoaderClassFinder;
-import cucumber.runtime.model.CucumberFeature;
-import gherkin.AstBuilder;
-import gherkin.Parser;
-import gherkin.TokenMatcher;
-import gherkin.ast.GherkinDocument;
-import gherkin.events.PickleEvent;
-import gherkin.pickles.Compiler;
-import gherkin.pickles.Pickle;
+import cucumber.runtime.model.FeatureLoader;
+import io.cucumber.core.model.FeatureWithLines;
 import io.cucumber.core.options.CommandlineOptionsParser;
 import io.cucumber.core.options.RuntimeOptions;
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.github.glytching.junit.extension.system.SystemPropertyExtension;
 import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.Step;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
@@ -45,22 +40,18 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
+import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.AllureResultsWriterStub;
-import org.apache.commons.io.IOUtils;
+import io.qameta.allure.test.AllureTestCommonsUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.parallel.ResourceLock;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -77,16 +68,14 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("unchecked")
 class AllureCucumber4JvmTest {
 
     @AllureFeatures.Base
     @Test
     void shouldSetName() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName)
                 .containsExactlyInAnyOrder("Add a to b");
@@ -95,10 +84,9 @@ void shouldSetName() {
     @AllureFeatures.PassedTests
     @Test
     void shouldSetStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.PASSED);
@@ -107,10 +95,9 @@ void shouldSetStatus() {
     @AllureFeatures.FailedTests
     @Test
     void shouldSetFailedStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/failed.feature");
+        final AllureResults results = runFeature("features/failed.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.FAILED);
@@ -119,10 +106,9 @@ void shouldSetFailedStatus() {
     @AllureFeatures.FailedTests
     @Test
     void shouldSetStatusDetails() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/failed.feature");
+        final AllureResults results = runFeature("features/failed.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
@@ -132,10 +118,9 @@ void shouldSetStatusDetails() {
     @AllureFeatures.BrokenTests
     @Test
     void shouldSetBrokenStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/broken.feature");
+        final AllureResults results = runFeature("features/broken.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.BROKEN);
@@ -144,10 +129,9 @@ void shouldSetBrokenStatus() {
     @AllureFeatures.Stages
     @Test
     void shouldSetStage() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStage)
                 .containsExactlyInAnyOrder(Stage.FINISHED);
@@ -157,11 +141,10 @@ void shouldSetStage() {
     @Test
     void shouldSetStart() {
         final long before = Instant.now().toEpochMilli();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
         final long after = Instant.now().toEpochMilli();
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStart)
                 .allMatch(v -> v >= before && v <= after);
@@ -171,11 +154,10 @@ void shouldSetStart() {
     @Test
     void shouldSetStop() {
         final long before = Instant.now().toEpochMilli();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
         final long after = Instant.now().toEpochMilli();
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStop)
                 .allMatch(v -> v >= before && v <= after);
@@ -184,25 +166,23 @@ void shouldSetStop() {
     @AllureFeatures.FullName
     @Test
     void shouldSetFullName() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getFullName)
-                .containsExactlyInAnyOrder("Simple feature: Add a to b");
+                .containsExactlyInAnyOrder("src/test/resources/features/simple.feature:3");
     }
 
     @AllureFeatures.Descriptions
     @Test
     void shouldSetDescription() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/description.feature");
+        final AllureResults results = runFeature("features/description.feature");
 
         final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getDescription)
                 .containsExactlyInAnyOrder(
@@ -214,13 +194,12 @@ void shouldSetDescription() {
     @AllureFeatures.Descriptions
     @Test
     void shouldSetScenarioDescription() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/scenario_description.feature");
+        final AllureResults results = runFeature("features/scenario_description.feature");
 
         final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getDescription)
                 .containsExactlyInAnyOrder(
@@ -232,10 +211,9 @@ void shouldSetScenarioDescription() {
     @AllureFeatures.Attachments
     @Test
     void shouldAddDataTableAttachment() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/datatable.feature");
+        final AllureResults results = runFeature("features/datatable.feature");
 
-        final List<Attachment> attachments = writer.getTestResults().stream()
+        final List<Attachment> attachments = results.getTestResults().stream()
                 .map(TestResult::getSteps)
                 .flatMap(Collection::stream)
                 .map(StepResult::getAttachments)
@@ -249,7 +227,7 @@ void shouldAddDataTableAttachment() {
                 );
 
         final Attachment dataTableAttachment = attachments.iterator().next();
-        final Map<String, byte[]> attachmentFiles = writer.getAttachments();
+        final Map<String, byte[]> attachmentFiles = results.getAttachments();
         assertThat(attachmentFiles)
                 .containsKeys(dataTableAttachment.getSource());
 
@@ -257,9 +235,11 @@ void shouldAddDataTableAttachment() {
         final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
 
         assertThat(attachmentContent)
-                .isEqualTo("name\tlogin\temail\n" +
-                        "Viktor\tclicman\tclicman@ya.ru\n" +
-                        "Viktor2\tclicman2\tclicman2@ya.ru\n"
+                .isEqualTo("""
+                        name\tlogin\temail
+                        Viktor\tclicman\tclicman@ya.ru
+                        Viktor2\tclicman2\tclicman2@ya.ru
+                        """
                 );
 
     }
@@ -267,10 +247,9 @@ void shouldAddDataTableAttachment() {
     @AllureFeatures.Attachments
     @Test
     void shouldAddAttachments() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/attachments.feature");
+        final AllureResults results = runFeature("features/attachments.feature");
 
-        final List<Attachment> attachments = writer.getTestResults().stream()
+        final List<Attachment> attachments = results.getTestResults().stream()
                 .map(TestResult::getSteps)
                 .flatMap(Collection::stream)
                 .map(StepResult::getAttachments)
@@ -284,7 +263,7 @@ void shouldAddAttachments() {
                         tuple("Screenshot", null)
                 );
 
-        final List<String> attachmentContents = writer.getAttachments().values().stream()
+        final List<String> attachmentContents = results.getAttachments().values().stream()
                 .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
                 .collect(Collectors.toList());
 
@@ -295,10 +274,9 @@ void shouldAddAttachments() {
     @AllureFeatures.Steps
     @Test
     void shouldAddBackgroundSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/background.feature");
+        final AllureResults results = runFeature("features/background.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(1)
@@ -315,10 +293,9 @@ void shouldAddBackgroundSteps() {
     @AllureFeatures.Parameters
     @Test
     void shouldAddParametersFromExamples() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/examples.feature");
+        final AllureResults results = runFeature("features/examples.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(2);
@@ -342,10 +319,9 @@ void shouldAddParametersFromExamples() {
     @AllureFeatures.Parameters
     @Test
     void shouldHandleMultipleExamplesPerOutline() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/multi-examples.feature");
+        final AllureResults results = runFeature("features/multi-examples.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(2);
@@ -362,10 +338,9 @@ void shouldHandleMultipleExamplesPerOutline() {
     @AllureFeatures.Parameters
     @Test
     void shouldSupportTaggedExamplesBlocks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/multi-examples.feature", "--tags", "@ExamplesTag2");
+        final AllureResults results = runFeature("features/multi-examples.feature", "--tags", "@ExamplesTag2");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(1);
@@ -388,10 +363,9 @@ void shouldSupportTaggedExamplesBlocks() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddTags() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -408,10 +382,9 @@ void shouldAddTags() {
     @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
     @Test
     void shouldAddLinks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLinks)
@@ -425,10 +398,9 @@ void shouldAddLinks() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddBddLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -442,10 +414,9 @@ void shouldAddBddLabels() {
     @AllureFeatures.Timeline
     @Test
     void shouldAddThreadHostLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -456,16 +427,15 @@ void shouldAddThreadHostLabels() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddCommonLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
                 .extracting(Label::getName, Label::getValue)
                 .contains(
-                        tuple(PACKAGE_LABEL_NAME, "features.tags_feature.Test Simple Scenarios"),
+                        tuple(PACKAGE_LABEL_NAME, "src.test.resources.features.tags_feature.Test Simple Scenarios"),
                         tuple(SUITE_LABEL_NAME, "Test Simple Scenarios"),
                         tuple(TEST_CLASS_LABEL_NAME, "Add a to b")
                 );
@@ -474,10 +444,9 @@ void shouldAddCommonLabels() {
     @AllureFeatures.Steps
     @Test
     void shouldProcessUndefinedSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/undefined.feature");
+        final AllureResults results = runFeature("features/undefined.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.SKIPPED);
@@ -495,10 +464,9 @@ void shouldProcessUndefinedSteps() {
     @AllureFeatures.Steps
     @Test
     void shouldProcessPendingExceptionsInSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/pending.feature");
+        final AllureResults results = runFeature("features/pending.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.SKIPPED);
@@ -515,10 +483,9 @@ void shouldProcessPendingExceptionsInSteps() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForSimpleFeatures() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature", "--dry-run");
+        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -539,24 +506,23 @@ void shouldSupportDryRunForSimpleFeatures() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForHooks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/hooks.feature", "--dry-run", "-t",
+        final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .startsWith(
                         tuple("Simple scenario with Before and After hooks", Status.SKIPPED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainers().get(0).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.beforeHook()", Status.SKIPPED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainers().get(0).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.afterHook()", Status.SKIPPED)
@@ -575,67 +541,69 @@ void shouldSupportDryRunForHooks() {
     @AllureFeatures.History
     @Test
     void shouldPersistHistoryIdForScenarios() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults.get(0).getHistoryId())
-                .isEqualTo("2f9965e6cc23d5c5f9c5268a2ff6f921");
+                .isEqualTo("892e5eabe51184301cf1358453c9f052");
     }
 
     @AllureFeatures.History
     @Test
     void shouldPersistHistoryIdForExamples() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/examples.feature", "--threads", "2");
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
-                .containsExactlyInAnyOrder("16d71185f704fe21cbc98f9eaa3292bb", "d64467f9921e0209deae4286f5599f5d");
+                .containsExactlyInAnyOrder("646aca5d0775cd4f13161e1ea1a68c39", "c0f824814a130048e9f86358363cf23e");
     }
 
-    private Comparator<TestResult> byHistoryId =
-            Comparator.comparing(TestResult::getHistoryId);
+    @AllureFeatures.History
+    @Test
+    void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation() {
+        final AllureResults results1 = runFeature("features/simple.feature");
+        final AllureResults results2 = runFeature("features/same/simple.feature");
+
+        assertThat(results1.getTestResults().get(0).getHistoryId())
+                .isNotEqualTo(results2.getTestResults().get(0).getHistoryId());
+    }
 
     @AllureFeatures.Parallel
     @Test
     void shouldProcessScenariosInParallelMode() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/parallel.feature", "--threads", "3");
+        final AllureResults results = runFeature("features/parallel.feature", "--threads", "3");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(3);
 
-        List<TestResult> sortedTestResults = testResults.stream().sorted(byHistoryId).collect(Collectors.toList());
-
-        assertThat(sortedTestResults.get(0).getSteps())
-                .extracting(StepResult::getName)
-                .containsExactly(
-                        "Given  a is 1",
-                        "And  b is 3",
-                        "When  I add a to b",
-                        "Then  result is 4"
+        assertThat(testResults)
+                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .containsSubsequence(
+                        Arrays.asList("Given  a is 1",
+                                "And  b is 3",
+                                "When  I add a to b",
+                                "Then  result is 4")
                 );
 
-        assertThat(sortedTestResults.get(1).getSteps())
-                .extracting(StepResult::getName)
-                .containsExactly(
-                        "Given  a is 2",
-                        "And  b is 4",
-                        "When  I add a to b",
-                        "Then  result is 6"
+        assertThat(testResults)
+                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .containsSubsequence(
+                        Arrays.asList("Given  a is 2",
+                                "And  b is 4",
+                                "When  I add a to b",
+                                "Then  result is 6")
                 );
 
-        assertThat(sortedTestResults.get(2).getSteps())
-                .extracting(StepResult::getName)
-                .containsExactly(
-                        "Given  a is 7",
-                        "And  b is 8",
-                        "When  I add a to b",
-                        "Then  result is 15"
+        assertThat(testResults)
+                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .containsSubsequence(
+                        Arrays.asList("Given  a is 7",
+                                "And  b is 8",
+                                "When  I add a to b",
+                                "Then  result is 15")
                 );
     }
 
@@ -643,11 +611,10 @@ void shouldProcessScenariosInParallelMode() {
     @AllureFeatures.Stages
     @Test
     void shouldDisplayHooksAsStages() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/hooks.feature", "-t",
+        final AllureResults results = runFeature("features/hooks.feature", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -666,13 +633,13 @@ void shouldDisplayHooksAsStages() {
                 );
 
 
-        assertThat(writer.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainers().get(0).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainers().get(0).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.afterHook()", Status.PASSED)
@@ -688,7 +655,7 @@ void shouldDisplayHooksAsStages() {
                 );
 
 
-        assertThat(writer.getTestResultContainers().get(1).getBefores())
+        assertThat(results.getTestResultContainers().get(1).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.beforeHookWithException()", Status.FAILED)
@@ -704,7 +671,7 @@ void shouldDisplayHooksAsStages() {
                         tuple("Then  result is 15", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(2).getAfters())
+        assertThat(results.getTestResultContainers().get(2).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.afterHookWithException()", Status.FAILED)
@@ -715,10 +682,9 @@ void shouldDisplayHooksAsStages() {
     @AllureFeatures.BrokenTests
     @Test
     void shouldHandleAmbigiousStepsExceptions() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/ambigious.feature");
+        final AllureResults results = runFeature("features/ambigious.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -737,8 +703,7 @@ void shouldHandleAmbigiousStepsExceptions() {
     @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm4-test-provided")
     @Test
     void shouldSupportProvidedLabels() {
-        final AllureResultsWriterStub results = new AllureResultsWriterStub();
-        runFeature(results, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
@@ -750,9 +715,12 @@ void shouldSupportProvidedLabels() {
                 );
     }
 
-    private byte runFeature(final AllureResultsWriterStub writer,
-                            final String featureResource,
-                            final String... moreOptions) {
+    @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
+    @Step
+    private AllureResults runFeature(final String featureResource,
+                                     final String... moreOptions) {
+
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
 
         final AllureLifecycle lifecycle = new AllureLifecycle(writer);
         final AllureCucumber4Jvm cucumber4Jvm = new AllureCucumber4Jvm(lifecycle);
@@ -764,51 +732,26 @@ private byte runFeature(final AllureResultsWriterStub writer,
                 "--plugin", "null_summary"
         ));
         opts.addAll(Arrays.asList(moreOptions));
-        final RuntimeOptions options = new CommandlineOptionsParser().parse(opts).build();
-        boolean mt = options.isMultiThreaded();
-
-        FeatureSupplier featureSupplier = () -> {
-            try {
-                final String gherkin = readResource(featureResource);
-                Parser<GherkinDocument> parser = new Parser<>(new AstBuilder());
-                TokenMatcher matcher = new TokenMatcher();
-                GherkinDocument gherkinDocument = parser.parse(gherkin, matcher);
-                List<PickleEvent> pickleEvents = compilePickles(gherkinDocument, featureResource);
-                CucumberFeature feature = new CucumberFeature(gherkinDocument, URI.create(featureResource), gherkin, pickleEvents);
-
-                return Collections.singletonList(feature);
-            } catch (IOException e) {
-                return Collections.EMPTY_LIST;
-            }
-        };
+        final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
+        final RuntimeOptions options = new CommandlineOptionsParser()
+                .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
+
+        final FeaturePathFeatureSupplier supplier
+                = new FeaturePathFeatureSupplier(new FeatureLoader(resourceLoader), options);
+
         final Runtime runtime = Runtime.builder()
-                .withResourceLoader(resourceLoader)
-                .withClassFinder(classFinder)
                 .withClassLoader(classLoader)
                 .withRuntimeOptions(options)
                 .withAdditionalPlugins(cucumber4Jvm)
-                .withFeatureSupplier(featureSupplier)
+                .withFeatureSupplier(supplier)
                 .build();
 
         runtime.run();
-        return runtime.exitStatus();
-    }
 
-    private static List<PickleEvent> compilePickles(GherkinDocument gherkinDocument, String resource) {
-        if (gherkinDocument.getFeature() == null) {
-            return Collections.emptyList();
-        }
-        List<PickleEvent> pickleEvents = new ArrayList<>();
-        for (Pickle pickle : new Compiler().compile(gherkinDocument)) {
-            pickleEvents.add(new PickleEvent(resource, pickle));
-        }
-        return pickleEvents;
+        AllureTestCommonsUtils.attach(writer);
+
+        return writer;
     }
 
 
-    private String readResource(final String resourceName) throws IOException {
-        try (InputStream is = currentThread().getContextClassLoader().getResourceAsStream(resourceName)) {
-            return IOUtils.toString(is, StandardCharsets.UTF_8);
-        }
-    }
 }
diff --git a/allure-cucumber2-jvm/src/test/resources/features/simple.feature b/allure-cucumber4-jvm/src/test/resources/features/same/simple.feature
similarity index 100%
rename from allure-cucumber2-jvm/src/test/resources/features/simple.feature
rename to allure-cucumber4-jvm/src/test/resources/features/same/simple.feature
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
index cd0c8aca5..f89c338d0 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
@@ -75,8 +75,8 @@
 @SuppressWarnings({
         "ClassDataAbstractionCoupling",
         "ClassFanOutComplexity",
+        "MultipleStringLiterals",
         "PMD.ExcessiveImports",
-        "PMD.GodClass",
 })
 public class AllureCucumber5Jvm implements ConcurrentEventListener {
 
@@ -101,7 +101,7 @@ public class AllureCucumber5Jvm implements ConcurrentEventListener {
 
     private static final String TXT_EXTENSION = ".txt";
     private static final String TEXT_PLAIN = "text/plain";
-    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().toString();
+    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().getSchemeSpecificPart();
 
     @SuppressWarnings("unused")
     public AllureCucumber5Jvm() {
@@ -140,27 +140,27 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         currentContainer.set(UUID.randomUUID().toString());
         forbidTestCaseStatusChange.set(false);
 
-        final Deque<String> tags = new LinkedList<>(currentTestCase.get().getTags());
+        final TestCase testCase = currentTestCase.get();
+        final Deque<String> tags = new LinkedList<>(testCase.getTags());
 
         final Feature feature = currentFeature.get();
-        final LabelBuilder labelBuilder = new LabelBuilder(feature, currentTestCase.get(), tags);
+        final LabelBuilder labelBuilder = new LabelBuilder(feature, testCase, tags);
 
-        final String name = currentTestCase.get().getName();
-        final String featureName = feature.getName();
+        final String name = testCase.getName();
 
         final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(currentTestCase.get()))
-                .setHistoryId(getHistoryId(currentTestCase.get()))
-                .setFullName(featureName + ": " + name)
+                .setUuid(getTestCaseUuid(testCase))
+                .setHistoryId(getHistoryId(testCase))
+                .setFullName(getTestCaseUri(testCase) + ":" + testCase.getLine())
                 .setName(name)
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
 
         final ScenarioDefinition scenarioDefinition =
-                testSources.getScenarioDefinition(currentFeatureFile.get(), currentTestCase.get().getLine());
+                testSources.getScenarioDefinition(currentFeatureFile.get(), testCase.getLine());
         if (scenarioDefinition instanceof ScenarioOutline) {
             result.setParameters(
-                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition, currentTestCase.get())
+                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition, testCase)
             );
         }
 
@@ -176,11 +176,11 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         final TestResultContainer resultContainer = new TestResultContainer()
                 .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
                 .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase.get())));
+                .setChildren(Collections.singletonList(getTestCaseUuid(testCase)));
 
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(currentTestCase.get()));
+        lifecycle.startTestCase(getTestCaseUuid(testCase));
     }
 
     private void handleTestCaseFinished(final TestCaseFinished event) {
@@ -269,12 +269,12 @@ private String getTestCaseUuid(final TestCase testCase) {
 
     private String getStepUuid(final PickleStepTestStep step) {
         return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-                + step.getStep().getText() + step.getStep().getLine();
+               + step.getStep().getText() + step.getStep().getLine();
     }
 
     private String getHookStepUuid(final HookTestStep step) {
         return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-                + step.getHookType().toString() + step.getCodeLocation();
+               + step.getHookType().toString() + step.getCodeLocation();
     }
 
     private String getHistoryId(final TestCase testCase) {
@@ -283,7 +283,7 @@ private String getHistoryId(final TestCase testCase) {
     }
 
     private String getTestCaseUri(final TestCase testCase) {
-        final String testCaseUri = testCase.getUri().toString();
+        final String testCaseUri = testCase.getUri().getSchemeSpecificPart();
         if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
             return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
         }
@@ -362,9 +362,11 @@ private void handleHookStep(final TestStepFinished event) {
             final StatusDetails statusDetails = getStatusDetails(event.getResult().getError())
                     .orElseGet(StatusDetails::new);
 
-            final String errorMessage = event.getResult().getError() == null ? hookStep.getHookType()
-                    .name() + " is failed." : hookStep.getHookType()
-                    .name() + " is failed: " + event.getResult().getError().getLocalizedMessage();
+            final String errorMessage = event.getResult().getError() == null
+                    ? hookStep.getHookType().name() + " is failed."
+                    : hookStep.getHookType().name() + " is failed: "
+                      + event.getResult().getError().getLocalizedMessage();
+
             statusDetails.setMessage(errorMessage);
 
             if (hookStep.getHookType() == HookType.BEFORE) {
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
index 023c52017..64391b3d4 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
@@ -18,15 +18,16 @@
 import io.cucumber.core.eventbus.EventBus;
 import io.cucumber.core.feature.FeatureParser;
 import io.cucumber.core.feature.FeatureWithLines;
+import io.cucumber.core.options.CommandlineOptionsParser;
+import io.cucumber.core.options.RuntimeOptions;
 import io.cucumber.core.resource.ClassLoaders;
 import io.cucumber.core.runtime.FeaturePathFeatureSupplier;
 import io.cucumber.core.runtime.Runtime;
-import io.cucumber.core.options.CommandlineOptionsParser;
-import io.cucumber.core.options.RuntimeOptions;
 import io.cucumber.core.runtime.TimeServiceEventBus;
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.github.glytching.junit.extension.system.SystemPropertyExtension;
 import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.Step;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
@@ -38,7 +39,9 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
+import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.AllureTestCommonsUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.parallel.ResourceLock;
@@ -46,14 +49,18 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Clock;
 import java.time.Instant;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.SUITE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.TEST_CLASS_LABEL_NAME;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
@@ -62,16 +69,14 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("unchecked")
 class AllureCucumber5JvmTest {
 
     @AllureFeatures.Base
     @Test
     void shouldSetName() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName)
                 .containsExactlyInAnyOrder("Add a to b");
@@ -80,10 +85,9 @@ void shouldSetName() {
     @AllureFeatures.PassedTests
     @Test
     void shouldSetStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.PASSED);
@@ -92,10 +96,9 @@ void shouldSetStatus() {
     @AllureFeatures.FailedTests
     @Test
     void shouldSetFailedStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/failed.feature");
+        final AllureResults results = runFeature("features/failed.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.FAILED);
@@ -104,10 +107,9 @@ void shouldSetFailedStatus() {
     @AllureFeatures.FailedTests
     @Test
     void shouldSetStatusDetails() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/failed.feature");
+        final AllureResults results = runFeature("features/failed.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
@@ -117,10 +119,9 @@ void shouldSetStatusDetails() {
     @AllureFeatures.BrokenTests
     @Test
     void shouldSetBrokenStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/broken.feature");
+        final AllureResults results = runFeature("features/broken.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.BROKEN);
@@ -129,10 +130,9 @@ void shouldSetBrokenStatus() {
     @AllureFeatures.Stages
     @Test
     void shouldSetStage() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStage)
                 .containsExactlyInAnyOrder(Stage.FINISHED);
@@ -142,11 +142,10 @@ void shouldSetStage() {
     @Test
     void shouldSetStart() {
         final long before = Instant.now().toEpochMilli();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
         final long after = Instant.now().toEpochMilli();
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStart)
                 .allMatch(v -> v >= before && v <= after);
@@ -156,11 +155,10 @@ void shouldSetStart() {
     @Test
     void shouldSetStop() {
         final long before = Instant.now().toEpochMilli();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
         final long after = Instant.now().toEpochMilli();
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStop)
                 .allMatch(v -> v >= before && v <= after);
@@ -169,25 +167,23 @@ void shouldSetStop() {
     @AllureFeatures.FullName
     @Test
     void shouldSetFullName() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getFullName)
-                .containsExactlyInAnyOrder("Simple feature: Add a to b");
+                .containsExactlyInAnyOrder("src/test/resources/features/simple.feature:3");
     }
 
     @AllureFeatures.Descriptions
     @Test
     void shouldSetDescription() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/description.feature");
+        final AllureResults results = runFeature("features/description.feature");
 
         final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getDescription)
                 .containsExactlyInAnyOrder(
@@ -199,13 +195,12 @@ void shouldSetDescription() {
     @AllureFeatures.Descriptions
     @Test
     void shouldSetScenarioDescription() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/scenario_description.feature");
+        final AllureResults results = runFeature("features/scenario_description.feature");
 
         final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getDescription)
                 .containsExactlyInAnyOrder(
@@ -217,10 +212,9 @@ void shouldSetScenarioDescription() {
     @AllureFeatures.Attachments
     @Test
     void shouldAddDataTableAttachment() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/datatable.feature");
+        final AllureResults results = runFeature("features/datatable.feature");
 
-        final List<Attachment> attachments = writer.getTestResults().stream()
+        final List<Attachment> attachments = results.getTestResults().stream()
                 .map(TestResult::getSteps)
                 .flatMap(Collection::stream)
                 .map(StepResult::getAttachments)
@@ -234,7 +228,7 @@ void shouldAddDataTableAttachment() {
                 );
 
         final Attachment dataTableAttachment = attachments.iterator().next();
-        final Map<String, byte[]> attachmentFiles = writer.getAttachments();
+        final Map<String, byte[]> attachmentFiles = results.getAttachments();
         assertThat(attachmentFiles)
                 .containsKeys(dataTableAttachment.getSource());
 
@@ -242,9 +236,11 @@ void shouldAddDataTableAttachment() {
         final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
 
         assertThat(attachmentContent)
-                .isEqualTo("name\tlogin\temail\n" +
-                        "Viktor\tclicman\tclicman@ya.ru\n" +
-                        "Viktor2\tclicman2\tclicman2@ya.ru\n"
+                .isEqualTo("""
+                        name\tlogin\temail
+                        Viktor\tclicman\tclicman@ya.ru
+                        Viktor2\tclicman2\tclicman2@ya.ru
+                        """
                 );
 
     }
@@ -252,10 +248,9 @@ void shouldAddDataTableAttachment() {
     @AllureFeatures.Attachments
     @Test
     void shouldAddAttachments() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/attachments.feature");
+        final AllureResults results = runFeature("features/attachments.feature");
 
-        final List<Attachment> attachments = writer.getTestResults().stream()
+        final List<Attachment> attachments = results.getTestResults().stream()
                 .map(TestResult::getSteps)
                 .flatMap(Collection::stream)
                 .map(StepResult::getAttachments)
@@ -269,7 +264,7 @@ void shouldAddAttachments() {
                         tuple("Screenshot", null)
                 );
 
-        final List<String> attachmentContents = writer.getAttachments().values().stream()
+        final List<String> attachmentContents = results.getAttachments().values().stream()
                 .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
                 .collect(Collectors.toList());
 
@@ -280,10 +275,9 @@ void shouldAddAttachments() {
     @AllureFeatures.Steps
     @Test
     void shouldAddBackgroundSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/background.feature");
+        final AllureResults results = runFeature("features/background.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(1)
@@ -300,10 +294,9 @@ void shouldAddBackgroundSteps() {
     @AllureFeatures.Parameters
     @Test
     void shouldAddParametersFromExamples() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/examples.feature");
+        final AllureResults results = runFeature("features/examples.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(2);
@@ -327,10 +320,9 @@ void shouldAddParametersFromExamples() {
     @AllureFeatures.Parameters
     @Test
     void shouldHandleMultipleExamplesPerOutline() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/multi-examples.feature");
+        final AllureResults results = runFeature("features/multi-examples.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(2);
@@ -347,10 +339,9 @@ void shouldHandleMultipleExamplesPerOutline() {
     @AllureFeatures.Parameters
     @Test
     void shouldSupportTaggedExamplesBlocks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/multi-examples.feature", "--tags", "@ExamplesTag2");
+        final AllureResults results = runFeature("features/multi-examples.feature", "--tags", "@ExamplesTag2");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(1);
@@ -373,10 +364,9 @@ void shouldSupportTaggedExamplesBlocks() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddTags() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -393,10 +383,9 @@ void shouldAddTags() {
     @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
     @Test
     void shouldAddLinks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLinks)
@@ -410,10 +399,9 @@ void shouldAddLinks() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddBddLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -427,10 +415,9 @@ void shouldAddBddLabels() {
     @AllureFeatures.Timeline
     @Test
     void shouldAddThreadHostLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -441,10 +428,9 @@ void shouldAddThreadHostLabels() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddCommonLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -459,10 +445,9 @@ void shouldAddCommonLabels() {
     @AllureFeatures.Steps
     @Test
     void shouldProcessUndefinedSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/undefined.feature");
+        final AllureResults results = runFeature("features/undefined.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.SKIPPED);
@@ -480,10 +465,9 @@ void shouldProcessUndefinedSteps() {
     @AllureFeatures.Steps
     @Test
     void shouldProcessPendingExceptionsInSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/pending.feature");
+        final AllureResults results = runFeature("features/pending.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.SKIPPED);
@@ -500,10 +484,9 @@ void shouldProcessPendingExceptionsInSteps() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForSimpleFeatures() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature", "--dry-run");
+        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -524,24 +507,23 @@ void shouldSupportDryRunForSimpleFeatures() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForHooks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/hooks.feature", "--dry-run", "-t",
+        final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .startsWith(
                         tuple("Simple scenario with Before and After hooks", Status.SKIPPED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainers().get(0).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.beforeHook()", Status.SKIPPED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainers().get(0).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.afterHook()", Status.SKIPPED)
@@ -560,10 +542,9 @@ void shouldSupportDryRunForHooks() {
     @AllureFeatures.History
     @Test
     void shouldPersistHistoryIdForScenarios() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults.get(0).getHistoryId())
                 .isEqualTo("892e5eabe51184301cf1358453c9f052");
     }
@@ -571,10 +552,9 @@ void shouldPersistHistoryIdForScenarios() {
     @AllureFeatures.History
     @Test
     void shouldPersistHistoryIdForExamples() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/examples.feature", "--threads", "2");
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
                 .containsExactlyInAnyOrder("c0f824814a130048e9f86358363cf23e", "646aca5d0775cd4f13161e1ea1a68c39");
@@ -583,22 +563,19 @@ void shouldPersistHistoryIdForExamples() {
     @AllureFeatures.History
     @Test
     void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
-        runFeature(writer, "features/same/simple.feature");
+        final AllureResults results1 = runFeature("features/simple.feature");
+        final AllureResults results2 = runFeature("features/same/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
-        assertThat(testResults.get(0).getHistoryId())
-                .isNotEqualTo(testResults.get(1).getHistoryId());
+        assertThat(results1.getTestResults().get(0).getHistoryId())
+                .isNotEqualTo(results2.getTestResults().get(0).getHistoryId());
     }
 
     @AllureFeatures.Parallel
     @Test
     void shouldProcessScenariosInParallelMode() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/parallel.feature", "--threads", "3");
+        final AllureResults results = runFeature("features/parallel.feature", "--threads", "3");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(3);
@@ -607,9 +584,9 @@ void shouldProcessScenariosInParallelMode() {
                 .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
                 .containsSubsequence(
                         Arrays.asList("Given  a is 1",
-                        "And  b is 3",
-                        "When  I add a to b",
-                        "Then  result is 4")
+                                "And  b is 3",
+                                "When  I add a to b",
+                                "Then  result is 4")
                 );
 
         assertThat(testResults)
@@ -635,11 +612,10 @@ void shouldProcessScenariosInParallelMode() {
     @AllureFeatures.Stages
     @Test
     void shouldDisplayHooksAsStages() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/hooks.feature", "-t",
+        final AllureResults results = runFeature("features/hooks.feature", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -658,13 +634,13 @@ void shouldDisplayHooksAsStages() {
                 );
 
 
-        assertThat(writer.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainers().get(0).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainers().get(0).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.afterHook()", Status.PASSED)
@@ -680,7 +656,7 @@ void shouldDisplayHooksAsStages() {
                 );
 
 
-        assertThat(writer.getTestResultContainers().get(1).getBefores())
+        assertThat(results.getTestResultContainers().get(1).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.beforeHookWithException()", Status.FAILED)
@@ -696,7 +672,7 @@ void shouldDisplayHooksAsStages() {
                         tuple("Then  result is 15", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(2).getAfters())
+        assertThat(results.getTestResultContainers().get(2).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.afterHookWithException()", Status.FAILED)
@@ -707,10 +683,9 @@ void shouldDisplayHooksAsStages() {
     @AllureFeatures.BrokenTests
     @Test
     void shouldHandleAmbigiousStepsExceptions() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/ambigious.feature");
+        final AllureResults results = runFeature("features/ambigious.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -729,8 +704,7 @@ void shouldHandleAmbigiousStepsExceptions() {
     @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm5-test-provided")
     @Test
     void shouldSupportProvidedLabels() {
-        final AllureResultsWriterStub results = new AllureResultsWriterStub();
-        runFeature(results, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
@@ -742,34 +716,43 @@ void shouldSupportProvidedLabels() {
                 );
     }
 
-    private byte runFeature(final AllureResultsWriterStub writer,
-                            final String featureResource,
-                            final String... moreOptions) {
+    @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
+    @Step
+    private AllureResults runFeature(final String featureResource,
+                                     final String... moreOptions) {
+
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
 
         final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumber5Jvm cucumber5Jvm = new AllureCucumber5Jvm(lifecycle);
-        Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
+        final AllureCucumber5Jvm cucumber5jvm = new AllureCucumber5Jvm(lifecycle);
+        final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
         final List<String> opts = new ArrayList<>(Arrays.asList(
                 "--glue", "io.qameta.allure.cucumber5jvm.samples",
                 "--plugin", "null_summary"
         ));
         opts.addAll(Arrays.asList(moreOptions));
-        FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/"+featureResource);
-        final RuntimeOptions options = new CommandlineOptionsParser().parse(opts).addFeature(featureWithLines).build();
-        boolean mt = options.isMultiThreaded();
+        final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
+        final RuntimeOptions options = new CommandlineOptionsParser()
+                .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
 
-        EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
-        FeatureParser parser = new FeatureParser(bus::generateId);
-        FeaturePathFeatureSupplier supplier = new FeaturePathFeatureSupplier(classLoader, options, parser);
+        final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
+        final FeatureParser parser = new FeatureParser(bus::generateId);
+        final FeaturePathFeatureSupplier supplier
+                = new FeaturePathFeatureSupplier(classLoader, options, parser);
 
         final Runtime runtime = Runtime.builder()
                 .withClassLoader(classLoader)
                 .withRuntimeOptions(options)
-                .withAdditionalPlugins(cucumber5Jvm)
+                .withAdditionalPlugins(cucumber5jvm)
                 .withFeatureSupplier(supplier)
                 .build();
 
         runtime.run();
-        return runtime.exitStatus();
+
+        AllureTestCommonsUtils.attach(writer);
+
+        return writer;
     }
+
+
 }
diff --git a/allure-cucumber6-jvm/build.gradle.kts b/allure-cucumber6-jvm/build.gradle.kts
index a0dd9cb50..e0a1922ab 100644
--- a/allure-cucumber6-jvm/build.gradle.kts
+++ b/allure-cucumber6-jvm/build.gradle.kts
@@ -7,15 +7,17 @@ dependencies {
     api(project(":allure-java-commons"))
     compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
     implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
-    testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
+    testImplementation("commons-io:commons-io")
     testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
     testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
-    testImplementation("commons-io:commons-io")
+    testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
index ed3bc9e66..693171406 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
@@ -75,7 +75,6 @@
         "ClassDataAbstractionCoupling",
         "ClassFanOutComplexity",
         "PMD.ExcessiveImports",
-        "PMD.GodClass",
 })
 public class AllureCucumber6Jvm implements ConcurrentEventListener {
 
@@ -100,7 +99,7 @@ public class AllureCucumber6Jvm implements ConcurrentEventListener {
 
     private static final String TXT_EXTENSION = ".txt";
     private static final String TEXT_PLAIN = "text/plain";
-    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().toString();
+    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().getSchemeSpecificPart();
 
     @SuppressWarnings("unused")
     public AllureCucumber6Jvm() {
@@ -139,18 +138,25 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         currentContainer.set(UUID.randomUUID().toString());
         forbidTestCaseStatusChange.set(false);
 
-        final Deque<String> tags = new LinkedList<>(currentTestCase.get().getTags());
+        final TestCase testCase = currentTestCase.get();
+        final Deque<String> tags = new LinkedList<>(testCase.getTags());
 
         final Feature feature = currentFeature.get();
-        final LabelBuilder labelBuilder = new LabelBuilder(feature, currentTestCase.get(), tags);
-
-        final String name = currentTestCase.get().getName();
-        final String featureName = feature.getName();
+        final LabelBuilder labelBuilder = new LabelBuilder(feature, testCase, tags);
+
+        final String name = testCase.getName();
+        // the same way full name is generated for
+        // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
+        // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
+        final String fullName = String.format("%s:%d",
+                getTestCaseUri(event.getTestCase()),
+                event.getTestCase().getLocation().getLine()
+        );
 
         final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(currentTestCase.get()))
-                .setHistoryId(getHistoryId(currentTestCase.get()))
-                .setFullName(featureName + ": " + name)
+                .setUuid(getTestCaseUuid(testCase))
+                .setHistoryId(getHistoryId(testCase))
+                .setFullName(fullName)
                 .setName(name)
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
@@ -158,12 +164,12 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         final Scenario scenarioDefinition =
                 testSources.getScenarioDefinition(
                         currentFeatureFile.get(),
-                        currentTestCase.get().getLocation().getLine()
+                        testCase.getLocation().getLine()
                 );
 
         if (scenarioDefinition.getExamplesCount() > 0) {
             result.setParameters(
-                    getExamplesAsParameters(scenarioDefinition, currentTestCase.get())
+                    getExamplesAsParameters(scenarioDefinition, testCase)
             );
         }
 
@@ -179,11 +185,11 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         final TestResultContainer resultContainer = new TestResultContainer()
                 .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
                 .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase.get())));
+                .setChildren(Collections.singletonList(getTestCaseUuid(testCase)));
 
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(currentTestCase.get()));
+        lifecycle.startTestCase(getTestCaseUuid(testCase));
     }
 
     private void handleTestCaseFinished(final TestCaseFinished event) {
@@ -272,12 +278,12 @@ private String getTestCaseUuid(final TestCase testCase) {
 
     private String getStepUuid(final PickleStepTestStep step) {
         return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-                + step.getStep().getText() + step.getStep().getLine();
+               + step.getStep().getText() + step.getStep().getLine();
     }
 
     private String getHookStepUuid(final HookTestStep step) {
         return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-                + step.getHookType().toString() + step.getCodeLocation();
+               + step.getHookType().toString() + step.getCodeLocation();
     }
 
     private String getHistoryId(final TestCase testCase) {
@@ -286,7 +292,7 @@ private String getHistoryId(final TestCase testCase) {
     }
 
     private String getTestCaseUri(final TestCase testCase) {
-        final String testCaseUri = testCase.getUri().toString();
+        final String testCaseUri = testCase.getUri().getSchemeSpecificPart();
         if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
             return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
         }
@@ -317,7 +323,7 @@ private List<Parameter> getExamplesAsParameters(
                 scenario.getExamplesList().stream()
                         .filter(example -> example.getTableBodyList().stream()
                                 .anyMatch(row -> row.getLocation().getLine()
-                                        == localCurrentTestCase.getLocation().getLine())
+                                                 == localCurrentTestCase.getLocation().getLine())
                         )
                         .findFirst();
 
@@ -378,9 +384,11 @@ private void handleHookStep(final TestStepFinished event) {
             final StatusDetails statusDetails = getStatusDetails(event.getResult().getError())
                     .orElseGet(StatusDetails::new);
 
-            final String errorMessage = event.getResult().getError() == null ? hookStep.getHookType()
-                    .name() + " is failed." : hookStep.getHookType()
-                    .name() + " is failed: " + event.getResult().getError().getLocalizedMessage();
+            final String errorMessage = event.getResult().getError() == null
+                    ? hookStep.getHookType().name() + " is failed."
+                    : hookStep.getHookType().name()
+                      + " is failed: "
+                      + event.getResult().getError().getLocalizedMessage();
             statusDetails.setMessage(errorMessage);
 
             if (hookStep.getHookType() == HookType.BEFORE) {
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
index 68c61e24f..1e29208c4 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
@@ -18,15 +18,16 @@
 import io.cucumber.core.eventbus.EventBus;
 import io.cucumber.core.feature.FeatureParser;
 import io.cucumber.core.feature.FeatureWithLines;
+import io.cucumber.core.options.CommandlineOptionsParser;
+import io.cucumber.core.options.RuntimeOptions;
 import io.cucumber.core.resource.ClassLoaders;
 import io.cucumber.core.runtime.FeaturePathFeatureSupplier;
 import io.cucumber.core.runtime.Runtime;
-import io.cucumber.core.options.CommandlineOptionsParser;
-import io.cucumber.core.options.RuntimeOptions;
 import io.cucumber.core.runtime.TimeServiceEventBus;
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.github.glytching.junit.extension.system.SystemPropertyExtension;
 import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.Step;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
@@ -38,7 +39,9 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
+import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.AllureTestCommonsUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.parallel.ResourceLock;
@@ -46,14 +49,18 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Clock;
 import java.time.Instant;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.SUITE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.TEST_CLASS_LABEL_NAME;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
@@ -62,16 +69,14 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("unchecked")
 class AllureCucumber6JvmTest {
 
     @AllureFeatures.Base
     @Test
     void shouldSetName() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName)
                 .containsExactlyInAnyOrder("Add a to b");
@@ -80,10 +85,9 @@ void shouldSetName() {
     @AllureFeatures.PassedTests
     @Test
     void shouldSetStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.PASSED);
@@ -92,10 +96,9 @@ void shouldSetStatus() {
     @AllureFeatures.FailedTests
     @Test
     void shouldSetFailedStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/failed.feature");
+        final AllureResults results = runFeature("features/failed.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.FAILED);
@@ -104,10 +107,9 @@ void shouldSetFailedStatus() {
     @AllureFeatures.FailedTests
     @Test
     void shouldSetStatusDetails() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/failed.feature");
+        final AllureResults results = runFeature("features/failed.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
@@ -117,10 +119,9 @@ void shouldSetStatusDetails() {
     @AllureFeatures.BrokenTests
     @Test
     void shouldSetBrokenStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/broken.feature");
+        final AllureResults results = runFeature("features/broken.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.BROKEN);
@@ -129,10 +130,9 @@ void shouldSetBrokenStatus() {
     @AllureFeatures.Stages
     @Test
     void shouldSetStage() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStage)
                 .containsExactlyInAnyOrder(Stage.FINISHED);
@@ -142,11 +142,10 @@ void shouldSetStage() {
     @Test
     void shouldSetStart() {
         final long before = Instant.now().toEpochMilli();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
         final long after = Instant.now().toEpochMilli();
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStart)
                 .allMatch(v -> v >= before && v <= after);
@@ -156,11 +155,10 @@ void shouldSetStart() {
     @Test
     void shouldSetStop() {
         final long before = Instant.now().toEpochMilli();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
         final long after = Instant.now().toEpochMilli();
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStop)
                 .allMatch(v -> v >= before && v <= after);
@@ -169,25 +167,23 @@ void shouldSetStop() {
     @AllureFeatures.FullName
     @Test
     void shouldSetFullName() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getFullName)
-                .containsExactlyInAnyOrder("Simple feature: Add a to b");
+                .containsExactlyInAnyOrder("src/test/resources/features/simple.feature:3");
     }
 
     @AllureFeatures.Descriptions
     @Test
     void shouldSetDescription() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/description.feature");
+        final AllureResults results = runFeature("features/description.feature");
 
         final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getDescription)
                 .containsExactlyInAnyOrder(
@@ -199,13 +195,12 @@ void shouldSetDescription() {
     @AllureFeatures.Descriptions
     @Test
     void shouldSetScenarioDescription() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/scenario_description.feature");
+        final AllureResults results = runFeature("features/scenario_description.feature");
 
         final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getDescription)
                 .containsExactlyInAnyOrder(
@@ -217,10 +212,9 @@ void shouldSetScenarioDescription() {
     @AllureFeatures.Attachments
     @Test
     void shouldAddDataTableAttachment() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/datatable.feature");
+        final AllureResults results = runFeature("features/datatable.feature");
 
-        final List<Attachment> attachments = writer.getTestResults().stream()
+        final List<Attachment> attachments = results.getTestResults().stream()
                 .map(TestResult::getSteps)
                 .flatMap(Collection::stream)
                 .map(StepResult::getAttachments)
@@ -234,7 +228,7 @@ void shouldAddDataTableAttachment() {
                 );
 
         final Attachment dataTableAttachment = attachments.iterator().next();
-        final Map<String, byte[]> attachmentFiles = writer.getAttachments();
+        final Map<String, byte[]> attachmentFiles = results.getAttachments();
         assertThat(attachmentFiles)
                 .containsKeys(dataTableAttachment.getSource());
 
@@ -242,9 +236,11 @@ void shouldAddDataTableAttachment() {
         final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
 
         assertThat(attachmentContent)
-                .isEqualTo("name\tlogin\temail\n" +
-                        "Viktor\tclicman\tclicman@ya.ru\n" +
-                        "Viktor2\tclicman2\tclicman2@ya.ru\n"
+                .isEqualTo("""
+                        name\tlogin\temail
+                        Viktor\tclicman\tclicman@ya.ru
+                        Viktor2\tclicman2\tclicman2@ya.ru
+                        """
                 );
 
     }
@@ -252,10 +248,9 @@ void shouldAddDataTableAttachment() {
     @AllureFeatures.Attachments
     @Test
     void shouldAddAttachments() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/attachments.feature");
+        final AllureResults results = runFeature("features/attachments.feature");
 
-        final List<Attachment> attachments = writer.getTestResults().stream()
+        final List<Attachment> attachments = results.getTestResults().stream()
                 .map(TestResult::getSteps)
                 .flatMap(Collection::stream)
                 .map(StepResult::getAttachments)
@@ -269,7 +264,7 @@ void shouldAddAttachments() {
                         tuple("ImageAttachment", "image/png")
                 );
 
-        final List<String> attachmentContents = writer.getAttachments().values().stream()
+        final List<String> attachmentContents = results.getAttachments().values().stream()
                 .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
                 .collect(Collectors.toList());
 
@@ -280,10 +275,9 @@ void shouldAddAttachments() {
     @AllureFeatures.Steps
     @Test
     void shouldAddBackgroundSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/background.feature");
+        final AllureResults results = runFeature("features/background.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(1)
@@ -300,10 +294,9 @@ void shouldAddBackgroundSteps() {
     @AllureFeatures.Parameters
     @Test
     void shouldAddParametersFromExamples() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/examples.feature");
+        final AllureResults results = runFeature("features/examples.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(2);
@@ -327,10 +320,9 @@ void shouldAddParametersFromExamples() {
     @AllureFeatures.Parameters
     @Test
     void shouldHandleMultipleExamplesPerOutline() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/multi-examples.feature");
+        final AllureResults results = runFeature("features/multi-examples.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(2);
@@ -347,10 +339,9 @@ void shouldHandleMultipleExamplesPerOutline() {
     @AllureFeatures.Parameters
     @Test
     void shouldSupportTaggedExamplesBlocks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/multi-examples.feature", "--tags", "@ExamplesTag2");
+        final AllureResults results = runFeature("features/multi-examples.feature", "--tags", "@ExamplesTag2");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(1);
@@ -373,10 +364,9 @@ void shouldSupportTaggedExamplesBlocks() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddTags() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -393,10 +383,9 @@ void shouldAddTags() {
     @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
     @Test
     void shouldAddLinks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLinks)
@@ -410,10 +399,9 @@ void shouldAddLinks() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddBddLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -427,10 +415,9 @@ void shouldAddBddLabels() {
     @AllureFeatures.Timeline
     @Test
     void shouldAddThreadHostLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -441,10 +428,9 @@ void shouldAddThreadHostLabels() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddCommonLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -459,10 +445,9 @@ void shouldAddCommonLabels() {
     @AllureFeatures.Steps
     @Test
     void shouldProcessUndefinedSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/undefined.feature");
+        final AllureResults results = runFeature("features/undefined.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.SKIPPED);
@@ -480,10 +465,9 @@ void shouldProcessUndefinedSteps() {
     @AllureFeatures.Steps
     @Test
     void shouldProcessPendingExceptionsInSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/pending.feature");
+        final AllureResults results = runFeature("features/pending.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.SKIPPED);
@@ -500,10 +484,9 @@ void shouldProcessPendingExceptionsInSteps() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForSimpleFeatures() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature", "--dry-run");
+        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -524,24 +507,23 @@ void shouldSupportDryRunForSimpleFeatures() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForHooks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/hooks.feature", "--dry-run", "-t",
+        final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .startsWith(
                         tuple("Simple scenario with Before and After hooks", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainers().get(0).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainers().get(0).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHook()", Status.PASSED)
@@ -560,10 +542,9 @@ void shouldSupportDryRunForHooks() {
     @AllureFeatures.History
     @Test
     void shouldPersistHistoryIdForScenarios() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults.get(0).getHistoryId())
                 .isEqualTo("892e5eabe51184301cf1358453c9f052");
     }
@@ -571,10 +552,9 @@ void shouldPersistHistoryIdForScenarios() {
     @AllureFeatures.History
     @Test
     void shouldPersistHistoryIdForExamples() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/examples.feature", "--threads", "2");
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
                 .containsExactlyInAnyOrder("c0f824814a130048e9f86358363cf23e", "646aca5d0775cd4f13161e1ea1a68c39");
@@ -583,22 +563,19 @@ void shouldPersistHistoryIdForExamples() {
     @AllureFeatures.History
     @Test
     void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
-        runFeature(writer, "features/same/simple.feature");
+        final AllureResults results1 = runFeature("features/simple.feature");
+        final AllureResults results2 = runFeature("features/same/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
-        assertThat(testResults.get(0).getHistoryId())
-                .isNotEqualTo(testResults.get(1).getHistoryId());
+        assertThat(results1.getTestResults().get(0).getHistoryId())
+                .isNotEqualTo(results2.getTestResults().get(0).getHistoryId());
     }
 
     @AllureFeatures.Parallel
     @Test
     void shouldProcessScenariosInParallelMode() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/parallel.feature", "--threads", "3");
+        final AllureResults results = runFeature("features/parallel.feature", "--threads", "3");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(3);
@@ -607,9 +584,9 @@ void shouldProcessScenariosInParallelMode() {
                 .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
                 .containsSubsequence(
                         Arrays.asList("Given  a is 1",
-                        "And  b is 3",
-                        "When  I add a to b",
-                        "Then  result is 4")
+                                "And  b is 3",
+                                "When  I add a to b",
+                                "Then  result is 4")
                 );
 
         assertThat(testResults)
@@ -635,11 +612,10 @@ void shouldProcessScenariosInParallelMode() {
     @AllureFeatures.Stages
     @Test
     void shouldDisplayHooksAsStages() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/hooks.feature", "-t",
+        final AllureResults results = runFeature("features/hooks.feature", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -658,13 +634,13 @@ void shouldDisplayHooksAsStages() {
                 );
 
 
-        assertThat(writer.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainers().get(0).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainers().get(0).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHook()", Status.PASSED)
@@ -680,7 +656,7 @@ void shouldDisplayHooksAsStages() {
                 );
 
 
-        assertThat(writer.getTestResultContainers().get(1).getBefores())
+        assertThat(results.getTestResultContainers().get(1).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHookWithException()", Status.FAILED)
@@ -696,7 +672,7 @@ void shouldDisplayHooksAsStages() {
                         tuple("Then  result is 15", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(2).getAfters())
+        assertThat(results.getTestResultContainers().get(2).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHookWithException()", Status.FAILED)
@@ -707,10 +683,9 @@ void shouldDisplayHooksAsStages() {
     @AllureFeatures.BrokenTests
     @Test
     void shouldHandleAmbigiousStepsExceptions() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/ambigious.feature");
+        final AllureResults results = runFeature("features/ambigious.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -729,8 +704,7 @@ void shouldHandleAmbigiousStepsExceptions() {
     @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm6-test-provided")
     @Test
     void shouldSupportProvidedLabels() {
-        final AllureResultsWriterStub results = new AllureResultsWriterStub();
-        runFeature(results, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
@@ -742,26 +716,29 @@ void shouldSupportProvidedLabels() {
                 );
     }
 
-    private byte runFeature(final AllureResultsWriterStub writer,
-                            final String featureResource,
-                            final String... moreOptions) {
+    @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
+    @Step
+    private AllureResults runFeature(final String featureResource,
+                                     final String... moreOptions) {
+
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
 
         final AllureLifecycle lifecycle = new AllureLifecycle(writer);
         final AllureCucumber6Jvm cucumber6jvm = new AllureCucumber6Jvm(lifecycle);
-        Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
+        final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
         final List<String> opts = new ArrayList<>(Arrays.asList(
                 "--glue", "io.qameta.allure.cucumber6jvm.samples",
                 "--plugin", "null_summary"
         ));
         opts.addAll(Arrays.asList(moreOptions));
-        FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/"+featureResource);
+        final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
         final RuntimeOptions options = new CommandlineOptionsParser(System.out)
                 .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
-        boolean mt = options.isMultiThreaded();
 
-        EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
-        FeatureParser parser = new FeatureParser(bus::generateId);
-        FeaturePathFeatureSupplier supplier = new FeaturePathFeatureSupplier(classLoader, options, parser);
+        final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
+        final FeatureParser parser = new FeatureParser(bus::generateId);
+        final FeaturePathFeatureSupplier supplier
+                = new FeaturePathFeatureSupplier(classLoader, options, parser);
 
         final Runtime runtime = Runtime.builder()
                 .withClassLoader(classLoader)
@@ -771,6 +748,9 @@ private byte runFeature(final AllureResultsWriterStub writer,
                 .build();
 
         runtime.run();
-        return runtime.exitStatus();
+
+        AllureTestCommonsUtils.attach(writer);
+
+        return writer;
     }
 }
diff --git a/allure-cucumber7-jvm/build.gradle.kts b/allure-cucumber7-jvm/build.gradle.kts
index 72936800d..4b33f0eaf 100644
--- a/allure-cucumber7-jvm/build.gradle.kts
+++ b/allure-cucumber7-jvm/build.gradle.kts
@@ -1,29 +1,33 @@
 description = "Allure CucumberJVM 7.0"
 
-val cucumberVersion = "7.8.1"
-val cucumberGherkinVersion = "24.0.0"
+val cucumberVersion = "7.13.0"
+val cucumberGherkinVersion = "26.2.0"
 
 dependencies {
     api(project(":allure-java-commons"))
     compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
     implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
-    testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
+    testImplementation("commons-io:commons-io")
     testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
     testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
-    testImplementation("commons-io:commons-io")
+    testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
 tasks.jar {
     manifest {
-        attributes(mapOf(
+        attributes(
+            mapOf(
                 "Automatic-Module-Name" to "io.qameta.allure.cucumber7jvm"
-        ))
+            )
+        )
     }
 }
 
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
index 38f0e52f1..123a1e29b 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
@@ -75,7 +75,6 @@
         "ClassDataAbstractionCoupling",
         "ClassFanOutComplexity",
         "PMD.ExcessiveImports",
-        "PMD.GodClass",
 })
 public class AllureCucumber7Jvm implements ConcurrentEventListener {
 
@@ -100,7 +99,7 @@ public class AllureCucumber7Jvm implements ConcurrentEventListener {
 
     private static final String TXT_EXTENSION = ".txt";
     private static final String TEXT_PLAIN = "text/plain";
-    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().toString();
+    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().getSchemeSpecificPart();
 
     @SuppressWarnings("unused")
     public AllureCucumber7Jvm() {
@@ -139,18 +138,26 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         currentContainer.set(UUID.randomUUID().toString());
         forbidTestCaseStatusChange.set(false);
 
-        final Deque<String> tags = new LinkedList<>(currentTestCase.get().getTags());
+        final TestCase testCase = currentTestCase.get();
+        final Deque<String> tags = new LinkedList<>(testCase.getTags());
 
         final Feature feature = currentFeature.get();
-        final LabelBuilder labelBuilder = new LabelBuilder(feature, currentTestCase.get(), tags);
+        final LabelBuilder labelBuilder = new LabelBuilder(feature, testCase, tags);
 
-        final String name = currentTestCase.get().getName();
-        final String featureName = feature.getName();
+        final String name = testCase.getName();
+
+        // the same way full name is generated for
+        // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
+        // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
+        final String fullName = String.format("%s:%d",
+                getTestCaseUri(testCase),
+                testCase.getLocation().getLine()
+        );
 
         final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(currentTestCase.get()))
-                .setHistoryId(getHistoryId(currentTestCase.get()))
-                .setFullName(featureName + ": " + name)
+                .setUuid(getTestCaseUuid(testCase))
+                .setHistoryId(getHistoryId(testCase))
+                .setFullName(fullName)
                 .setName(name)
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
@@ -158,12 +165,12 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         final Scenario scenarioDefinition =
                 testSources.getScenarioDefinition(
                         currentFeatureFile.get(),
-                        currentTestCase.get().getLocation().getLine()
+                        testCase.getLocation().getLine()
                 );
 
         if (scenarioDefinition.getExamples() != null) {
             result.setParameters(
-                    getExamplesAsParameters(scenarioDefinition, currentTestCase.get())
+                    getExamplesAsParameters(scenarioDefinition, testCase)
             );
         }
 
@@ -179,11 +186,11 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         final TestResultContainer resultContainer = new TestResultContainer()
                 .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
                 .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase.get())));
+                .setChildren(Collections.singletonList(getTestCaseUuid(testCase)));
 
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(currentTestCase.get()));
+        lifecycle.startTestCase(getTestCaseUuid(testCase));
     }
 
     private void handleTestCaseFinished(final TestCaseFinished event) {
@@ -272,12 +279,12 @@ private String getTestCaseUuid(final TestCase testCase) {
 
     private String getStepUuid(final PickleStepTestStep step) {
         return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-                + step.getStep().getText() + step.getStep().getLine();
+               + step.getStep().getText() + step.getStep().getLine();
     }
 
     private String getHookStepUuid(final HookTestStep step) {
         return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-                + step.getHookType().toString() + step.getCodeLocation();
+               + step.getHookType().toString() + step.getCodeLocation();
     }
 
     private String getHistoryId(final TestCase testCase) {
@@ -286,7 +293,7 @@ private String getHistoryId(final TestCase testCase) {
     }
 
     private String getTestCaseUri(final TestCase testCase) {
-        final String testCaseUri = testCase.getUri().toString();
+        final String testCaseUri = testCase.getUri().getSchemeSpecificPart();
         if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
             return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
         }
@@ -317,7 +324,7 @@ private List<Parameter> getExamplesAsParameters(
                 scenario.getExamples().stream()
                         .filter(example -> example.getTableBody().stream()
                                 .anyMatch(row -> row.getLocation().getLine()
-                                        == localCurrentTestCase.getLocation().getLine())
+                                                 == localCurrentTestCase.getLocation().getLine())
                         )
                         .findFirst();
 
@@ -378,9 +385,11 @@ private void handleHookStep(final TestStepFinished event) {
             final StatusDetails statusDetails = getStatusDetails(event.getResult().getError())
                     .orElseGet(StatusDetails::new);
 
-            final String errorMessage = event.getResult().getError() == null ? hookStep.getHookType()
-                    .name() + " is failed." : hookStep.getHookType()
-                    .name() + " is failed: " + event.getResult().getError().getLocalizedMessage();
+            final String errorMessage = event.getResult().getError() == null
+                    ? hookStep.getHookType().name() + " is failed."
+                    : hookStep.getHookType().name()
+                      + " is failed: "
+                      + event.getResult().getError().getLocalizedMessage();
             statusDetails.setMessage(errorMessage);
 
             if (hookStep.getHookType() == HookType.BEFORE) {
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
index 34a42887a..13064c4f8 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
@@ -18,15 +18,16 @@
 import io.cucumber.core.eventbus.EventBus;
 import io.cucumber.core.feature.FeatureParser;
 import io.cucumber.core.feature.FeatureWithLines;
+import io.cucumber.core.options.CommandlineOptionsParser;
+import io.cucumber.core.options.RuntimeOptions;
 import io.cucumber.core.resource.ClassLoaders;
 import io.cucumber.core.runtime.FeaturePathFeatureSupplier;
 import io.cucumber.core.runtime.Runtime;
-import io.cucumber.core.options.CommandlineOptionsParser;
-import io.cucumber.core.options.RuntimeOptions;
 import io.cucumber.core.runtime.TimeServiceEventBus;
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.github.glytching.junit.extension.system.SystemPropertyExtension;
 import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.Step;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
@@ -38,7 +39,9 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
+import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.AllureTestCommonsUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.parallel.ResourceLock;
@@ -46,14 +49,18 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Clock;
 import java.time.Instant;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.SUITE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.TEST_CLASS_LABEL_NAME;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
@@ -62,16 +69,14 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("unchecked")
 class AllureCucumber7JvmTest {
 
     @AllureFeatures.Base
     @Test
     void shouldSetName() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName)
                 .containsExactlyInAnyOrder("Add a to b");
@@ -80,10 +85,9 @@ void shouldSetName() {
     @AllureFeatures.PassedTests
     @Test
     void shouldSetStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.PASSED);
@@ -92,10 +96,9 @@ void shouldSetStatus() {
     @AllureFeatures.FailedTests
     @Test
     void shouldSetFailedStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/failed.feature");
+        final AllureResults results = runFeature("features/failed.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.FAILED);
@@ -104,10 +107,9 @@ void shouldSetFailedStatus() {
     @AllureFeatures.FailedTests
     @Test
     void shouldSetStatusDetails() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/failed.feature");
+        final AllureResults results = runFeature("features/failed.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
@@ -117,10 +119,9 @@ void shouldSetStatusDetails() {
     @AllureFeatures.BrokenTests
     @Test
     void shouldSetBrokenStatus() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/broken.feature");
+        final AllureResults results = runFeature("features/broken.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.BROKEN);
@@ -129,10 +130,9 @@ void shouldSetBrokenStatus() {
     @AllureFeatures.Stages
     @Test
     void shouldSetStage() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStage)
                 .containsExactlyInAnyOrder(Stage.FINISHED);
@@ -142,11 +142,10 @@ void shouldSetStage() {
     @Test
     void shouldSetStart() {
         final long before = Instant.now().toEpochMilli();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
         final long after = Instant.now().toEpochMilli();
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStart)
                 .allMatch(v -> v >= before && v <= after);
@@ -156,11 +155,10 @@ void shouldSetStart() {
     @Test
     void shouldSetStop() {
         final long before = Instant.now().toEpochMilli();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
         final long after = Instant.now().toEpochMilli();
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStop)
                 .allMatch(v -> v >= before && v <= after);
@@ -169,25 +167,23 @@ void shouldSetStop() {
     @AllureFeatures.FullName
     @Test
     void shouldSetFullName() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getFullName)
-                .containsExactlyInAnyOrder("Simple feature: Add a to b");
+                .containsExactlyInAnyOrder("src/test/resources/features/simple.feature:3");
     }
 
     @AllureFeatures.Descriptions
     @Test
     void shouldSetDescription() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/description.feature");
+        final AllureResults results = runFeature("features/description.feature");
 
         final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getDescription)
                 .containsExactlyInAnyOrder(
@@ -199,13 +195,12 @@ void shouldSetDescription() {
     @AllureFeatures.Descriptions
     @Test
     void shouldSetScenarioDescription() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/scenario_description.feature");
+        final AllureResults results = runFeature("features/scenario_description.feature");
 
         final String expected = "This is description for current feature.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getDescription)
                 .containsExactlyInAnyOrder(
@@ -217,10 +212,9 @@ void shouldSetScenarioDescription() {
     @AllureFeatures.Attachments
     @Test
     void shouldAddDataTableAttachment() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/datatable.feature");
+        final AllureResults results = runFeature("features/datatable.feature");
 
-        final List<Attachment> attachments = writer.getTestResults().stream()
+        final List<Attachment> attachments = results.getTestResults().stream()
                 .map(TestResult::getSteps)
                 .flatMap(Collection::stream)
                 .map(StepResult::getAttachments)
@@ -234,7 +228,7 @@ void shouldAddDataTableAttachment() {
                 );
 
         final Attachment dataTableAttachment = attachments.iterator().next();
-        final Map<String, byte[]> attachmentFiles = writer.getAttachments();
+        final Map<String, byte[]> attachmentFiles = results.getAttachments();
         assertThat(attachmentFiles)
                 .containsKeys(dataTableAttachment.getSource());
 
@@ -242,9 +236,11 @@ void shouldAddDataTableAttachment() {
         final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
 
         assertThat(attachmentContent)
-                .isEqualTo("name\tlogin\temail\n" +
-                        "Viktor\tclicman\tclicman@ya.ru\n" +
-                        "Viktor2\tclicman2\tclicman2@ya.ru\n"
+                .isEqualTo("""
+                        name\tlogin\temail
+                        Viktor\tclicman\tclicman@ya.ru
+                        Viktor2\tclicman2\tclicman2@ya.ru
+                        """
                 );
 
     }
@@ -252,10 +248,9 @@ void shouldAddDataTableAttachment() {
     @AllureFeatures.Attachments
     @Test
     void shouldAddAttachments() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/attachments.feature");
+        final AllureResults results = runFeature("features/attachments.feature");
 
-        final List<Attachment> attachments = writer.getTestResults().stream()
+        final List<Attachment> attachments = results.getTestResults().stream()
                 .map(TestResult::getSteps)
                 .flatMap(Collection::stream)
                 .map(StepResult::getAttachments)
@@ -269,7 +264,7 @@ void shouldAddAttachments() {
                         tuple("ImageAttachment", "image/png")
                 );
 
-        final List<String> attachmentContents = writer.getAttachments().values().stream()
+        final List<String> attachmentContents = results.getAttachments().values().stream()
                 .map(bytes -> new String(bytes, StandardCharsets.UTF_8))
                 .collect(Collectors.toList());
 
@@ -280,10 +275,9 @@ void shouldAddAttachments() {
     @AllureFeatures.Steps
     @Test
     void shouldAddBackgroundSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/background.feature");
+        final AllureResults results = runFeature("features/background.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(1)
@@ -300,10 +294,9 @@ void shouldAddBackgroundSteps() {
     @AllureFeatures.Parameters
     @Test
     void shouldAddParametersFromExamples() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/examples.feature");
+        final AllureResults results = runFeature("features/examples.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(2);
@@ -327,10 +320,9 @@ void shouldAddParametersFromExamples() {
     @AllureFeatures.Parameters
     @Test
     void shouldHandleMultipleExamplesPerOutline() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/multi-examples.feature");
+        final AllureResults results = runFeature("features/multi-examples.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(2);
@@ -347,10 +339,9 @@ void shouldHandleMultipleExamplesPerOutline() {
     @AllureFeatures.Parameters
     @Test
     void shouldSupportTaggedExamplesBlocks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/multi-examples.feature", "--tags", "@ExamplesTag2");
+        final AllureResults results = runFeature("features/multi-examples.feature", "--tags", "@ExamplesTag2");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(1);
@@ -373,10 +364,9 @@ void shouldSupportTaggedExamplesBlocks() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddTags() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -393,10 +383,9 @@ void shouldAddTags() {
     @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
     @Test
     void shouldAddLinks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLinks)
@@ -410,10 +399,9 @@ void shouldAddLinks() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddBddLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -427,10 +415,9 @@ void shouldAddBddLabels() {
     @AllureFeatures.Timeline
     @Test
     void shouldAddThreadHostLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -441,10 +428,9 @@ void shouldAddThreadHostLabels() {
     @AllureFeatures.MarkerAnnotations
     @Test
     void shouldAddCommonLabels() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/tags.feature");
+        final AllureResults results = runFeature("features/tags.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .flatExtracting(TestResult::getLabels)
@@ -459,10 +445,9 @@ void shouldAddCommonLabels() {
     @AllureFeatures.Steps
     @Test
     void shouldProcessUndefinedSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/undefined.feature");
+        final AllureResults results = runFeature("features/undefined.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.SKIPPED);
@@ -480,10 +465,9 @@ void shouldProcessUndefinedSteps() {
     @AllureFeatures.Steps
     @Test
     void shouldProcessPendingExceptionsInSteps() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/pending.feature");
+        final AllureResults results = runFeature("features/pending.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getStatus)
                 .containsExactlyInAnyOrder(Status.SKIPPED);
@@ -500,10 +484,9 @@ void shouldProcessPendingExceptionsInSteps() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForSimpleFeatures() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature", "--dry-run");
+        final AllureResults results = runFeature("features/simple.feature", "--dry-run");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -524,24 +507,23 @@ void shouldSupportDryRunForSimpleFeatures() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForHooks() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/hooks.feature", "--dry-run", "-t",
+        final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .startsWith(
                         tuple("Simple scenario with Before and After hooks", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainers().get(0).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainers().get(0).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.afterHook()", Status.PASSED)
@@ -560,10 +542,9 @@ void shouldSupportDryRunForHooks() {
     @AllureFeatures.History
     @Test
     void shouldPersistHistoryIdForScenarios() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults.get(0).getHistoryId())
                 .isEqualTo("892e5eabe51184301cf1358453c9f052");
     }
@@ -571,10 +552,9 @@ void shouldPersistHistoryIdForScenarios() {
     @AllureFeatures.History
     @Test
     void shouldPersistHistoryIdForExamples() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/examples.feature", "--threads", "2");
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
                 .containsExactlyInAnyOrder("c0f824814a130048e9f86358363cf23e", "646aca5d0775cd4f13161e1ea1a68c39");
@@ -583,22 +563,19 @@ void shouldPersistHistoryIdForExamples() {
     @AllureFeatures.History
     @Test
     void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/simple.feature");
-        runFeature(writer, "features/same/simple.feature");
+        final AllureResults results1 = runFeature("features/simple.feature");
+        final AllureResults results2 = runFeature("features/same/simple.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
-        assertThat(testResults.get(0).getHistoryId())
-                .isNotEqualTo(testResults.get(1).getHistoryId());
+        assertThat(results1.getTestResults().get(0).getHistoryId())
+                .isNotEqualTo(results2.getTestResults().get(0).getHistoryId());
     }
 
     @AllureFeatures.Parallel
     @Test
     void shouldProcessScenariosInParallelMode() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/parallel.feature", "--threads", "3");
+        final AllureResults results = runFeature("features/parallel.feature", "--threads", "3");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
 
         assertThat(testResults)
                 .hasSize(3);
@@ -607,9 +584,9 @@ void shouldProcessScenariosInParallelMode() {
                 .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
                 .containsSubsequence(
                         Arrays.asList("Given  a is 1",
-                        "And  b is 3",
-                        "When  I add a to b",
-                        "Then  result is 4")
+                                "And  b is 3",
+                                "When  I add a to b",
+                                "Then  result is 4")
                 );
 
         assertThat(testResults)
@@ -635,11 +612,10 @@ void shouldProcessScenariosInParallelMode() {
     @AllureFeatures.Stages
     @Test
     void shouldDisplayHooksAsStages() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/hooks.feature", "-t",
+        final AllureResults results = runFeature("features/hooks.feature", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -658,13 +634,13 @@ void shouldDisplayHooksAsStages() {
                 );
 
 
-        assertThat(writer.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainers().get(0).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainers().get(0).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.afterHook()", Status.PASSED)
@@ -680,7 +656,7 @@ void shouldDisplayHooksAsStages() {
                 );
 
 
-        assertThat(writer.getTestResultContainers().get(1).getBefores())
+        assertThat(results.getTestResultContainers().get(1).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.beforeHookWithException()", Status.FAILED)
@@ -696,7 +672,7 @@ void shouldDisplayHooksAsStages() {
                         tuple("Then  result is 15", Status.PASSED)
                 );
 
-        assertThat(writer.getTestResultContainers().get(2).getAfters())
+        assertThat(results.getTestResultContainers().get(2).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.afterHookWithException()", Status.FAILED)
@@ -707,10 +683,9 @@ void shouldDisplayHooksAsStages() {
     @AllureFeatures.BrokenTests
     @Test
     void shouldHandleAmbigiousStepsExceptions() {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        runFeature(writer, "features/ambigious.feature");
+        final AllureResults results = runFeature("features/ambigious.feature");
 
-        final List<TestResult> testResults = writer.getTestResults();
+        final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
@@ -729,8 +704,7 @@ void shouldHandleAmbigiousStepsExceptions() {
     @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm7-test-provided")
     @Test
     void shouldSupportProvidedLabels() {
-        final AllureResultsWriterStub results = new AllureResultsWriterStub();
-        runFeature(results, "features/simple.feature");
+        final AllureResults results = runFeature("features/simple.feature");
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
@@ -742,27 +716,29 @@ void shouldSupportProvidedLabels() {
                 );
     }
 
-    @SystemProperty(name="cucumber.junit-platform.naming-strategy", value="long")
-    private byte runFeature(final AllureResultsWriterStub writer,
-                            final String featureResource,
-                            final String... moreOptions) {
+    @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
+    @Step
+    private AllureResults runFeature(final String featureResource,
+                                     final String... moreOptions) {
+
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
 
         final AllureLifecycle lifecycle = new AllureLifecycle(writer);
         final AllureCucumber7Jvm cucumber7jvm = new AllureCucumber7Jvm(lifecycle);
-        Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
+        final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
         final List<String> opts = new ArrayList<>(Arrays.asList(
                 "--glue", "io.qameta.allure.cucumber7jvm.samples",
                 "--no-summary"
         ));
         opts.addAll(Arrays.asList(moreOptions));
-        FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/"+featureResource);
+        final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
         final RuntimeOptions options = new CommandlineOptionsParser(System.out)
                 .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
-        boolean mt = options.isMultiThreaded();
 
-        EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
-        FeatureParser parser = new FeatureParser(bus::generateId);
-        FeaturePathFeatureSupplier supplier = new FeaturePathFeatureSupplier(classLoader, options, parser);
+        final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
+        final FeatureParser parser = new FeatureParser(bus::generateId);
+        final FeaturePathFeatureSupplier supplier
+                = new FeaturePathFeatureSupplier(classLoader, options, parser);
 
         final Runtime runtime = Runtime.builder()
                 .withClassLoader(classLoader)
@@ -772,6 +748,11 @@ private byte runFeature(final AllureResultsWriterStub writer,
                 .build();
 
         runtime.run();
-        return runtime.exitStatus();
+
+        AllureTestCommonsUtils.attach(writer);
+
+        return writer;
     }
+
+
 }
diff --git a/allure-java-commons-test/build.gradle.kts b/allure-java-commons-test/build.gradle.kts
index ea06623dc..e1d5c3995 100644
--- a/allure-java-commons-test/build.gradle.kts
+++ b/allure-java-commons-test/build.gradle.kts
@@ -5,6 +5,7 @@ dependencies {
     api("io.github.benas:random-beans")
     api("org.apache.commons:commons-lang3")
     api(project(":allure-java-commons"))
+    implementation("com.fasterxml.jackson.core:jackson-databind")
 }
 
 tasks.jar {
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
new file mode 100644
index 000000000..3020f34f5
--- /dev/null
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
@@ -0,0 +1,80 @@
+/*
+ *  Copyright 2023 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureConstants;
+
+import java.io.ByteArrayInputStream;
+import java.io.UncheckedIOException;
+
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+import static com.fasterxml.jackson.databind.MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public final class AllureTestCommonsUtils {
+
+    private static final ObjectWriter WRITER = JsonMapper
+            .builder()
+            .configure(USE_WRAPPER_NAME_AS_PROPERTY_NAME, true)
+            .serializationInclusion(NON_NULL)
+            .build()
+            .writerWithDefaultPrettyPrinter();
+
+    private AllureTestCommonsUtils() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    /**
+     * Attach {@link AllureResults} to the report.
+     */
+    public static void attach(final AllureResults allureResults) {
+        allureResults.getTestResults().forEach(testResult -> {
+            try {
+                Allure.addAttachment(
+                        testResult.getUuid() + AllureConstants.TEST_RESULT_FILE_SUFFIX,
+                        WRITER.writeValueAsString(testResult)
+                );
+            } catch (JsonProcessingException e) {
+                throw new UncheckedIOException(e);
+            }
+        });
+
+        allureResults.getTestResultContainers().forEach(container -> {
+            try {
+                Allure.addAttachment(
+                        container.getUuid() + AllureConstants.TEST_RESULT_CONTAINER_FILE_SUFFIX,
+                        WRITER.writeValueAsString(container)
+                );
+            } catch (JsonProcessingException e) {
+                throw new UncheckedIOException(e);
+            }
+        });
+
+        allureResults.getAttachments().forEach((fileName, body) -> Allure
+                .addAttachment(
+                        fileName,
+                        new ByteArrayInputStream(body)
+                )
+        );
+    }
+
+}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index 998542ed3..4893dd4d5 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -64,7 +64,6 @@
         "ClassDataAbstractionCoupling",
         "PMD.ExcessiveImports",
         "PMD.TooManyMethods",
-        "PMD.GodClass"
 })
 public final class ResultsUtils {
 
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index 5ff3384df..75b1c1e07 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -34,6 +34,7 @@
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.TestTag;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.descriptor.ClassSource;
 import org.junit.platform.engine.support.descriptor.MethodSource;
@@ -84,11 +85,12 @@
  * @author ehborisov
  */
 @SuppressWarnings({
+        "ClassDataAbstractionCoupling",
         "ClassFanOutComplexity",
         "MultipleStringLiterals",
-        "ClassDataAbstractionCoupling",
-        "PMD.GodClass",
-        "PMD.TooManyMethods"
+        "PMD.CyclomaticComplexity",
+        "PMD.NcssCount",
+        "PMD.TooManyMethods",
 })
 public class AllureJunitPlatform implements TestExecutionListener {
 
@@ -117,7 +119,20 @@ public class AllureJunitPlatform implements TestExecutionListener {
     private static final boolean HAS_SPOCK2_IN_CLASSPATH
             = isClassAvailableOnClasspath("io.qameta.allure.spock2.AllureSpock2");
 
+    private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM6_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber6jvm.AllureCucumber6Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM5_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber5jvm.AllureCucumber5Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM4_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm");
+
     private static final String ENGINE_SPOCK2 = "spock";
+    private static final String ENGINE_CUCUMBER = "cucumber";
 
     private final ThreadLocal<TestPlan> testPlanStorage = new InheritableThreadLocal<>();
 
@@ -148,15 +163,45 @@ public AllureLifecycle getLifecycle() {
         return lifecycle;
     }
 
+    @SuppressWarnings({"CyclomaticComplexity", "BooleanExpressionComplexity"})
     private boolean shouldSkipReportingFor(final TestIdentifier testIdentifier) {
-        return !testIdentifier.getParentId().isPresent()
-               || HAS_SPOCK2_IN_CLASSPATH && engineIs(testIdentifier, ENGINE_SPOCK2);
+        // Always skip root
+        if (!testIdentifier.getParentId().isPresent()) {
+            return true;
+        }
+
+        final Optional<String> maybeEngine = getEngine(testIdentifier);
+        // can't find the engine, don't know if it's possible but just in case
+        // keep reporting such nodes.
+        if (!maybeEngine.isPresent()) {
+            return false;
+        }
+
+        final String engine = maybeEngine.get();
+
+
+        return HAS_SPOCK2_IN_CLASSPATH && ENGINE_SPOCK2.equals(engine)
+               || (HAS_CUCUMBERJVM7_IN_CLASSPATH
+                   || HAS_CUCUMBERJVM6_IN_CLASSPATH
+                   || HAS_CUCUMBERJVM5_IN_CLASSPATH
+                   || HAS_CUCUMBERJVM4_IN_CLASSPATH
+                  ) && ENGINE_CUCUMBER.equals(engine);
     }
 
-    private boolean engineIs(final TestIdentifier testIdentifier, final String engineId) {
-        return testIdentifier.getUniqueIdObject().getEngineId()
-                .filter(v -> Objects.equals(engineId, v))
-                .isPresent();
+    private Optional<String> getEngine(final TestIdentifier testIdentifier) {
+        final UniqueId uniqueId = testIdentifier.getUniqueIdObject();
+        final List<UniqueId.Segment> segments = uniqueId.getSegments();
+        // since junit-platform-suite engine creates nested engine segments
+        // we need to lookup for the last one with type engine
+        // to determinate the actual used engine:
+        // [engine:junit-platform-suite]/[suite:org.example.JUnitRunnerTest]/[engine:cucumber]/...
+        for (int i = segments.size() - 1; i >= 0; i--) {
+            final UniqueId.Segment segment = segments.get(i);
+            if ("engine".equals(segment.getType())) {
+                return Optional.of(segment.getValue());
+            }
+        }
+        return Optional.empty();
     }
 
     private static boolean isClassAvailableOnClasspath(final String clazz) {
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
index 4230cee0e..d7727fd20 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
@@ -17,6 +17,7 @@
 
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.engine.support.descriptor.ClasspathResourceSource;
 import org.junit.platform.engine.support.descriptor.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,6 +32,7 @@
 /* package-private */ final class AllureJunitPlatformUtils {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureJunitPlatformUtils.class);
+    private static final String EMPTY = "";
 
     private AllureJunitPlatformUtils() {
         throw new IllegalStateException("do not instance");
@@ -45,6 +47,13 @@ public static Optional<String> getFullName(final TestSource source) {
             final ClassSource cs = (ClassSource) source;
             return Optional.ofNullable(cs.getClassName());
         }
+        if (source instanceof ClasspathResourceSource) {
+            final ClasspathResourceSource crs = (ClasspathResourceSource) source;
+            final String s = crs.getPosition()
+                    .map(filePosition -> ":" + filePosition.getLine())
+                    .orElse(EMPTY);
+            return Optional.of(crs.getClasspathResourceName() + s);
+        }
         return Optional.empty();
     }
 
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
index c66e592de..8e802de7d 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
@@ -113,7 +113,6 @@ private String findAllureId(final Collection<TestTag> tags) {
                 })
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .filter(Objects::nonNull)
                 .findAny()
                 .orElse(null);
     }
diff --git a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
new file mode 100644
index 000000000..b68fe181b
--- /dev/null
+++ b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
@@ -0,0 +1,46 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4.aspect;
+
+import io.qameta.allure.junit4.AllureJunit4Filter;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.junit.runner.Runner;
+import org.junit.runner.manipulation.Filterable;
+import org.junit.runner.manipulation.NoTestsRemainException;
+
+/**
+ * @author Egor Borisov ehborisov@gmail.com
+ */
+@Aspect
+public class AllureJunit4FilterAspect {
+
+    @SuppressWarnings("PMD.SystemPrintln")
+    @AfterReturning(
+            value = "execution(public org.junit.runner.Runner org.junit.runner.Request+.getRunner())",
+            returning = "runner"
+    )
+    public void filterBeforeRun(final Runner runner) {
+        if (runner instanceof Filterable) {
+            try {
+                ((Filterable) runner).filter(new AllureJunit4Filter());
+            } catch (NoTestsRemainException ignored) {
+                //do nothing
+            }
+        }
+    }
+
+}
diff --git a/allure-junit4-aspect/src/main/resources/META-INF/aop.xml b/allure-junit4-aspect/src/main/resources/META-INF/aop.xml
index 95f3e6a10..d17b2a93b 100644
--- a/allure-junit4-aspect/src/main/resources/META-INF/aop.xml
+++ b/allure-junit4-aspect/src/main/resources/META-INF/aop.xml
@@ -2,5 +2,6 @@
     <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.junit4.aspect.AllureJunit4ListenerAspect"/>
+        <aspect name="io.qameta.allure.junit4.aspect.AllureJunit4FilterAspect"/>
     </aspects>
 </aspectj>
diff --git a/allure-junit4/build.gradle.kts b/allure-junit4/build.gradle.kts
index 9e026c739..9597c6391 100644
--- a/allure-junit4/build.gradle.kts
+++ b/allure-junit4/build.gradle.kts
@@ -5,6 +5,7 @@ val junitVersion = "4.13.2"
 dependencies {
     api(project(":allure-java-commons"))
     implementation("junit:junit:$junitVersion")
+    implementation(project(":allure-test-filter"))
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index 3b312bb1b..72589a82b 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -58,6 +58,18 @@
 @SuppressWarnings({"PMD.ExcessiveImports", "PMD.CouplingBetweenObjects", "checkstyle:ClassFanOutComplexity"})
 public class AllureJunit4 extends RunListener {
 
+    private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM6_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber6jvm.AllureCucumber6Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM5_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber5jvm.AllureCucumber5Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM4_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm");
+
     private final ThreadLocal<String> testCases = new InheritableThreadLocal<String>() {
         @Override
         protected String initialValue() {
@@ -91,6 +103,9 @@ public void testRunFinished(final Result result) {
 
     @Override
     public void testStarted(final Description description) {
+        if (shouldIgnore(description)) {
+            return;
+        }
         final String uuid = testCases.get();
         final TestResult result = createTestResult(uuid, description);
         getLifecycle().scheduleTestCase(result);
@@ -99,6 +114,9 @@ public void testStarted(final Description description) {
 
     @Override
     public void testFinished(final Description description) {
+        if (shouldIgnore(description)) {
+            return;
+        }
         final String uuid = testCases.get();
         testCases.remove();
         getLifecycle().updateTestCase(uuid, testResult -> {
@@ -113,6 +131,9 @@ public void testFinished(final Description description) {
 
     @Override
     public void testFailure(final Failure failure) {
+        if (shouldIgnore(failure.getDescription())) {
+            return;
+        }
         final String uuid = testCases.get();
         getLifecycle().updateTestCase(uuid, testResult -> testResult
                 .setStatus(getStatus(failure.getException()).orElse(null))
@@ -122,6 +143,9 @@ public void testFailure(final Failure failure) {
 
     @Override
     public void testAssumptionFailure(final Failure failure) {
+        if (shouldIgnore(failure.getDescription())) {
+            return;
+        }
         final String uuid = testCases.get();
         getLifecycle().updateTestCase(uuid, testResult ->
                 testResult.setStatus(Status.SKIPPED)
@@ -131,6 +155,9 @@ public void testAssumptionFailure(final Failure failure) {
 
     @Override
     public void testIgnored(final Description description) {
+        if (shouldIgnore(description)) {
+            return;
+        }
         final String uuid = testCases.get();
         testCases.remove();
 
@@ -194,7 +221,7 @@ private TestResult createTestResult(final String uuid, final Description descrip
         final String className = description.getClassName();
         final String methodName = description.getMethodName();
         final String name = Objects.nonNull(methodName) ? methodName : className;
-        final String fullName = Objects.nonNull(methodName) ? String.format("%s.%s", className, methodName) : className;
+        final String fullName = AllureJunit4Utils.getFullName(description);
         final String suite = Optional.ofNullable(description.getTestClass())
                 .map(it -> it.getAnnotation(DisplayName.class))
                 .map(DisplayName::value).orElse(className);
@@ -224,4 +251,21 @@ private TestResult createTestResult(final String uuid, final Description descrip
         return testResult;
     }
 
+    @SuppressWarnings({"CyclomaticComplexity", "BooleanExpressionComplexity"})
+    private boolean shouldIgnore(final Description description) {
+        return (HAS_CUCUMBERJVM7_IN_CLASSPATH
+                || HAS_CUCUMBERJVM6_IN_CLASSPATH
+                || HAS_CUCUMBERJVM5_IN_CLASSPATH
+                || HAS_CUCUMBERJVM4_IN_CLASSPATH
+               ) && AllureJunit4Utils.isCucumberTest(description);
+    }
+
+    private static boolean isClassAvailableOnClasspath(final String clazz) {
+        try {
+            AllureJunit4.class.getClassLoader().loadClass(clazz);
+            return true;
+        } catch (Exception ignored) {
+            return false;
+        }
+    }
 }
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
new file mode 100644
index 000000000..ea9cc77a7
--- /dev/null
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
@@ -0,0 +1,95 @@
+/*
+ *  Copyright 2023 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4;
+
+import io.qameta.allure.model.Label;
+import io.qameta.allure.testfilter.FileTestPlanSupplier;
+import io.qameta.allure.testfilter.TestPlan;
+import io.qameta.allure.testfilter.TestPlanV1_0;
+import io.qameta.allure.util.AnnotationUtils;
+import org.junit.runner.Description;
+import org.junit.runner.manipulation.Filter;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import static io.qameta.allure.util.ResultsUtils.ALLURE_ID_LABEL_NAME;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AllureJunit4Filter extends Filter {
+
+    private final TestPlan testPlan;
+
+    public AllureJunit4Filter() {
+        this(new FileTestPlanSupplier().supply().orElse(null));
+    }
+
+    public AllureJunit4Filter(final TestPlan testPlan) {
+        this.testPlan = testPlan;
+    }
+
+    @Override
+    public boolean shouldRun(final Description description) {
+        if (Objects.isNull(testPlan)) {
+            return true;
+        }
+
+        if (description.isSuite()) {
+            return true;
+        }
+
+        final String fullName = AllureJunit4Utils.getFullName(description);
+        final String allureId = findAllureId(description).orElse(null);
+
+        return isIncluded(testPlan, allureId, fullName);
+    }
+
+    @Override
+    public String describe() {
+        return "allure testplan filter";
+    }
+
+    private boolean isIncluded(final TestPlan testPlan,
+                               final String allureId,
+                               final String fullName) {
+        if (testPlan instanceof TestPlanV1_0) {
+            final TestPlanV1_0 tp = (TestPlanV1_0) testPlan;
+            return Objects.isNull(tp.getTests()) || tp.getTests()
+                    .stream()
+                    .filter(Objects::nonNull)
+                    .anyMatch(tc -> match(tc, allureId, fullName));
+        }
+        return true;
+    }
+
+    @SuppressWarnings("BooleanExpressionComplexity")
+    private boolean match(final TestPlanV1_0.TestCase tc,
+                          final String allureId,
+                          final String fullName) {
+        return Objects.nonNull(tc.getId()) && tc.getId().equals(allureId)
+               || Objects.nonNull(tc.getSelector()) && tc.getSelector().equals(fullName);
+    }
+
+    private static Optional<String> findAllureId(final Description description) {
+        return AnnotationUtils.getLabels(description.getAnnotations())
+                .stream()
+                .filter(l -> ALLURE_ID_LABEL_NAME.equals(l.getName()))
+                .map(Label::getValue)
+                .findAny();
+    }
+}
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
new file mode 100644
index 000000000..8cdb25c28
--- /dev/null
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
@@ -0,0 +1,115 @@
+/*
+ *  Copyright 2023 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4;
+
+import org.junit.runner.Description;
+
+import java.io.Serializable;
+import java.nio.file.Paths;
+import java.util.Objects;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+/* package-private */ final class AllureJunit4Utils {
+
+    private static final Description CUCUMBER_CHECK_DESCRIPTION = Description
+            .createSuiteDescription("check", new CucumberCheck());
+
+    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().toString();
+    private static final String CLASSPATH_PREFIX = "classpath:";
+    private static final String FILE_PREFIX = "file:";
+
+    private AllureJunit4Utils() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    public static String getFullName(final Description description) {
+        final Class<?> testClass = description.getTestClass();
+        if (Objects.isNull(testClass)) {
+            final UniqueIdExtract uniqueId = new UniqueIdExtract();
+            //noinspection ResultOfMethodCallIgnored
+            Description.createSuiteDescription("extract", uniqueId)
+                    .equals(description);
+            final String testCaseUri = uniqueId.id;
+            if (Objects.nonNull(testCaseUri)) {
+                if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
+                    return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
+                }
+                if (testCaseUri.startsWith(CLASSPATH_PREFIX)) {
+                    return testCaseUri.substring(CLASSPATH_PREFIX.length());
+                }
+                if (testCaseUri.startsWith(FILE_PREFIX)) {
+                    return testCaseUri.substring(FILE_PREFIX.length());
+                }
+                return testCaseUri;
+            }
+        }
+
+        final String className = description.getClassName();
+        final String methodName = description.getMethodName();
+        return Objects.nonNull(methodName)
+                ? String.format("%s.%s", className, methodName) : className;
+    }
+
+    public static boolean isCucumberTest(final Description description) {
+        return CUCUMBER_CHECK_DESCRIPTION.equals(description);
+    }
+
+    /**
+     * This is the Dummy class to check is {@link Description} object created
+     * by Cucumber runner. We are using the fact that Cucumber runner creates
+     * Descriptions with uniqueId of type <code>io.cucumber.junit.PickleRunners.PickleId</code>.
+     */
+    static class CucumberCheck implements Serializable {
+
+        @Override
+        public boolean equals(final Object obj) {
+            if (Objects.isNull(obj)) {
+                return false;
+            }
+            return "io.cucumber.junit.PickleRunners.PickleId"
+                    .equals(obj.getClass().getCanonicalName());
+        }
+
+        @Override
+        public int hashCode() {
+            return 1;
+        }
+    }
+
+    /**
+     * This is the Dummy class to extract <code>fUniqueId</code> field
+     * from {@link Description} object.
+     */
+    @SuppressWarnings("VisibilityModifier")
+    static class UniqueIdExtract implements Serializable {
+
+        String id;
+
+        @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
+        @Override
+        public boolean equals(final Object obj) {
+            id = Objects.toString(obj);
+            return true;
+        }
+
+        @Override
+        public int hashCode() {
+            return 1;
+        }
+    }
+}
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
index cb63aae33..2d1d29a51 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
@@ -24,6 +24,7 @@
 import io.qameta.allure.junit4.samples.BrokenTest;
 import io.qameta.allure.junit4.samples.BrokenWithoutMessageTest;
 import io.qameta.allure.junit4.samples.FailedTest;
+import io.qameta.allure.junit4.samples.FilterSimpleTests;
 import io.qameta.allure.junit4.samples.IgnoredClassTest;
 import io.qameta.allure.junit4.samples.IgnoredTests;
 import io.qameta.allure.junit4.samples.OneTest;
@@ -42,10 +43,13 @@
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.AllureResultsWriterStub;
-
+import io.qameta.allure.testfilter.TestPlan;
+import io.qameta.allure.testfilter.TestPlanV1_0;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.JUnitCore;
+import org.junit.runner.Request;
 
+import java.util.Collections;
 import java.util.List;
 
 import static io.qameta.allure.junit4.samples.TaggedTests.CLASS_TAG1;
@@ -343,19 +347,68 @@ void shouldSupportTestsNotBasedOnClasses() {
                 );
     }
 
+    @Test
+    @AllureFeatures.FullName
+    void shouldFilterByFullName() {
+        final AllureResults results = runClasses(
+                new TestPlanV1_0()
+                        .setTests(Collections.singletonList(
+                                new TestPlanV1_0.TestCase()
+                                        .setSelector("io.qameta.allure.junit4.samples.OneTest.simpleTest")
+                        )),
+                OneTest.class, FailedTest.class,
+                TaggedTests.class, BrokenTest.class
+        );
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .hasSize(1)
+                .extracting(TestResult::getFullName)
+                .containsExactly("io.qameta.allure.junit4.samples.OneTest.simpleTest");
+    }
+
+    @Test
+    @AllureFeatures.FullName
+    void shouldFilterByAllureId() {
+        final AllureResults results = runClasses(
+                new TestPlanV1_0()
+                        .setTests(Collections.singletonList(
+                                new TestPlanV1_0.TestCase()
+                                        .setId("771")
+                                        .setSelector("invalid")
+                        )),
+                OneTest.class, FailedTest.class,
+                TaggedTests.class, BrokenTest.class,
+                FilterSimpleTests.class
+        );
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .hasSize(1)
+                .extracting(TestResult::getFullName)
+                .containsExactly("io.qameta.allure.junit4.samples.FilterSimpleTests.test3");
+    }
+
     @Step("Run classes {classes}")
     private AllureResults runClasses(final Class<?>... classes) {
+        return runClasses(null, classes);
+    }
+
+    @Step("Run classes {classes}")
+    private AllureResults runClasses(final TestPlan testPlan, final Class<?>... classes) {
         final AllureResultsWriterStub writerStub = new AllureResultsWriterStub();
         final AllureLifecycle lifecycle = new AllureLifecycle(writerStub);
         final JUnitCore core = new JUnitCore();
         core.addListener(new AllureJunit4(lifecycle));
 
+        final Request request = Request
+                .classes(classes)
+                .filterWith(new AllureJunit4Filter(testPlan));
+
         final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
         try {
             Allure.setLifecycle(lifecycle);
             StepsAspects.setLifecycle(lifecycle);
             AttachmentsAspects.setLifecycle(lifecycle);
-            core.run(classes);
+            core.run(request);
             return writerStub;
         } finally {
             Allure.setLifecycle(defaultLifecycle);
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/DatatableFeatureSteps.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java
similarity index 66%
rename from allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/DatatableFeatureSteps.java
rename to allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java
index 5085334e0..540b06ab4 100644
--- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/samples/DatatableFeatureSteps.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2023 Qameta Software OÜ
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,19 +13,26 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.cucumber2jvm.samples;
+package io.qameta.allure.junit4.samples;
 
-import cucumber.api.DataTable;
-import cucumber.api.java.en.Given;
+import io.qameta.allure.AllureId;
+import org.junit.Test;
 
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("unused")
-public class DatatableFeatureSteps {
+public class FilterSimpleTests {
 
-    @Given("^users are:$")
-    public void usersAre(DataTable table) {
+    @Test
+    public void test1() {
     }
 
+    @Test
+    public void test2() {
+    }
+
+    @AllureId("771")
+    @Test
+    public void test3() {
+    }
 }
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
index 4cb9afa0d..fecc30ecb 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
@@ -62,10 +62,12 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -100,9 +102,13 @@
  * Allure TestNG listener.
  */
 @SuppressWarnings({
-        "PMD.ExcessiveImports", "PMD.TooManyMethods", "PMD.GodClass", "PMD.CyclomaticComplexity",
-        "ClassFanOutComplexity", "ClassDataAbstractionCoupling", "PMD.ExcessiveClassLength",
-        "PMD.NcssCount"
+        "ClassDataAbstractionCoupling",
+        "ClassFanOutComplexity",
+        "PMD.CyclomaticComplexity",
+        "PMD.ExcessiveClassLength",
+        "PMD.ExcessiveImports",
+        "PMD.NcssCount",
+        "PMD.TooManyMethods",
 })
 public class AllureTestNg implements
         ISuiteListener,
@@ -117,6 +123,19 @@ public class AllureTestNg implements
     private static final List<Class<?>> INJECTED_TYPES = Arrays.asList(
             ITestContext.class, ITestResult.class, XmlTest.class, Method.class, Object[].class
     );
+
+    private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM6_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber6jvm.AllureCucumber6Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM5_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber5jvm.AllureCucumber5Jvm");
+
+    private static final boolean HAS_CUCUMBERJVM4_IN_CLASSPATH
+            = isClassAvailableOnClasspath("io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm");
+
     /**
      * Store current testng result uuid to attach before/after methods into.
      */
@@ -270,6 +289,10 @@ public void onAfterClass(final ITestClass testClass) {
 
     @Override
     public void onTestStart(final ITestResult testResult) {
+        if (shouldSkipReportingFor(testResult)) {
+            return;
+        }
+
         Current current = currentTestResult.get();
         if (current.isStarted()) {
             current = refreshContext();
@@ -286,6 +309,25 @@ public void onTestStart(final ITestResult testResult) {
                 .ifPresent(clazz -> addClassContainerChild(clazz, uuid));
     }
 
+    @SuppressWarnings("BooleanExpressionComplexity")
+    protected boolean shouldSkipReportingFor(final ITestResult testResult) {
+        final String[] groups = Optional.of(testResult)
+                .map(ITestResult::getMethod)
+                .map(ITestNGMethod::getGroups)
+                .orElseGet(() -> new String[]{});
+
+        if (groups.length == 0) {
+            return false;
+        }
+
+        final Set<String> groupsSet = new HashSet<>(Arrays.asList(groups));
+        return (HAS_CUCUMBERJVM7_IN_CLASSPATH
+                || HAS_CUCUMBERJVM6_IN_CLASSPATH
+                || HAS_CUCUMBERJVM5_IN_CLASSPATH
+                || HAS_CUCUMBERJVM4_IN_CLASSPATH
+               ) && groupsSet.contains("cucumber");
+    }
+
     protected void startTestCase(final ITestResult testResult,
                                  final String parentUuid,
                                  final String uuid) {
@@ -299,7 +341,7 @@ protected void startTestCase(final ITestResult testResult,
         );
     }
 
-    @SuppressWarnings({"Indentation", "PMD.ExcessiveMethodLength", "deprecation"})
+    @SuppressWarnings({"Indentation", "PMD.ExcessiveMethodLength"})
     protected void startTestCase(final ITestContext context,
                                  final ITestNGMethod method,
                                  final IClass iClass,
@@ -354,6 +396,10 @@ protected void startTestCase(final ITestContext context,
 
     @Override
     public void onTestSuccess(final ITestResult testResult) {
+        if (shouldSkipReportingFor(testResult)) {
+            return;
+        }
+
         final Current current = currentTestResult.get();
         current.after();
         getLifecycle().updateTestCase(current.getUuid(), setStatus(Status.PASSED));
@@ -363,6 +409,10 @@ public void onTestSuccess(final ITestResult testResult) {
 
     @Override
     public void onTestFailure(final ITestResult result) {
+        if (shouldSkipReportingFor(result)) {
+            return;
+        }
+
         Current current = currentTestResult.get();
 
         if (current.isAfter()) {
@@ -391,6 +441,10 @@ protected void stopTestCase(final String uuid, final Throwable throwable, final
 
     @Override
     public void onTestSkipped(final ITestResult result) {
+        if (shouldSkipReportingFor(result)) {
+            return;
+        }
+
         Current current = currentTestResult.get();
 
         //testng is being skipped as dependent on failed testng, closing context for previous testng here
@@ -600,9 +654,9 @@ protected Status getStatus(final Throwable throwable) {
     @SuppressWarnings("BooleanExpressionComplexity")
     private boolean isSupportedConfigurationFixture(final ITestNGMethod testMethod) {
         return testMethod.isBeforeMethodConfiguration() || testMethod.isAfterMethodConfiguration()
-                || testMethod.isBeforeTestConfiguration() || testMethod.isAfterTestConfiguration()
-                || testMethod.isBeforeClassConfiguration() || testMethod.isAfterClassConfiguration()
-                || testMethod.isBeforeSuiteConfiguration() || testMethod.isAfterSuiteConfiguration();
+               || testMethod.isBeforeTestConfiguration() || testMethod.isAfterTestConfiguration()
+               || testMethod.isBeforeClassConfiguration() || testMethod.isAfterClassConfiguration()
+               || testMethod.isBeforeSuiteConfiguration() || testMethod.isAfterSuiteConfiguration();
     }
 
     private void validateContainerExists(final String fixtureName, final String containerUuid) {
@@ -818,6 +872,15 @@ private Current refreshContext() {
         return currentTestResult.get();
     }
 
+    private static boolean isClassAvailableOnClasspath(final String clazz) {
+        try {
+            AllureTestNg.class.getClassLoader().loadClass(clazz);
+            return true;
+        } catch (Exception ignored) {
+            return false;
+        }
+    }
+
     /**
      * The stage of current result context.
      */
@@ -859,4 +922,5 @@ public String getUuid() {
             return uuid;
         }
     }
+
 }
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
index 37047a919..376a00e60 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
@@ -45,7 +45,8 @@ public AllureTestNgTestFilter(final TestPlan testPlan) {
     }
 
     @Override
-    public List<IMethodInstance> intercept(final List<IMethodInstance> methods, final ITestContext context) {
+    public List<IMethodInstance> intercept(final List<IMethodInstance> methods,
+                                           final ITestContext context) {
         return methods.stream()
                 .filter(this::isSelected)
                 .sorted(Comparator.comparing(
diff --git a/gradle/quality-configs/pmd/pmd.xml b/gradle/quality-configs/pmd/pmd.xml
index 50f8afec6..3d45d9f69 100644
--- a/gradle/quality-configs/pmd/pmd.xml
+++ b/gradle/quality-configs/pmd/pmd.xml
@@ -62,6 +62,7 @@
         <exclude name="ExcessiveClassLength"/> <!-- replaced by NcssCount -->
         <exclude name="ExcessiveImports"/>
         <exclude name="ExcessiveMethodLength"/> <!-- replaced by NcssCount -->
+        <exclude name="GodClass"/>
         <exclude name="LawOfDemeter"/>
         <exclude name="LoosePackageCoupling"/>
         <exclude name="ModifiedCyclomaticComplexity"/>
@@ -120,6 +121,7 @@
         <exclude name="LoggerIsNotStaticFinal"/>
         <exclude name="MissingSerialVersionUID"/>
         <exclude name="NullAssignment"/> <!-- disabled due to false positive for initialization with ternary operator -->
+        <exclude name="OverrideBothEqualsAndHashcode"/> <!-- duplicated by EqualsHashCode rule in Checkstyle -->
         <exclude name="StaticEJBFieldShouldBeFinal"/> <!-- earlier j2ee group-->
         <exclude name="UseCorrectExceptionLogging"/>
         <exclude name="UseLocaleWithCaseConversions"/>
diff --git a/gradle/quality-configs/spotbugs/exclude.xml b/gradle/quality-configs/spotbugs/exclude.xml
index fb6124d4c..0b8a2de89 100644
--- a/gradle/quality-configs/spotbugs/exclude.xml
+++ b/gradle/quality-configs/spotbugs/exclude.xml
@@ -13,7 +13,7 @@
          you will have to use @NotNull annotation, which contradict with original contract
          (actually not, because guava intend weaker semantics). So disable this check to be able to properly
          use nullability annotations -->
-        <Bug pattern="NP_METHOD_PARAMETER_TIGHTENS_ANNOTATION" />
+        <Bug pattern="NP_METHOD_PARAMETER_TIGHTENS_ANNOTATION"/>
     </Match>
     <Match>
         <!-- Disabled as confusing check (very misleading description) and also not so useful -->
@@ -29,7 +29,7 @@
     <Match>
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
         <And>
-            <Class name="io.qameta.allure.util.PropertiesUtils" />
+            <Class name="io.qameta.allure.util.PropertiesUtils"/>
             <Method name="loadPropertiesFrom"/>
         </And>
     </Match>
@@ -47,4 +47,8 @@
         <Bug pattern="MS_EXPOSE_REP"/>
     </Match>
 
+    <Match>
+        <Class name="io.qameta.allure.junit4.AllureJunit4Utils$UniqueIdExtract"/>
+    </Match>
+
 </FindBugsFilter>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 156f0d60e..a1c4358dd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,8 +5,6 @@ include("allure-attachments")
 include("allure-awaitility")
 include("allure-bom")
 include("allure-citrus")
-include("allure-cucumber2-jvm")
-include("allure-cucumber3-jvm")
 include("allure-cucumber4-jvm")
 include("allure-cucumber5-jvm")
 include("allure-cucumber6-jvm")

From d14c012c857e952bc6b93105a04501f6dd3810e5 Mon Sep 17 00:00:00 2001
From: Mikhail Zheltyshev <39348763+mihalichzh@users.noreply.github.com>
Date: Mon, 21 Aug 2023 16:02:27 +0200
Subject: [PATCH 039/233] spock2: add test plan filter support (via #943)

---
 .../io/qameta/allure/spock2/AllureSpock2.java |  49 +++++++-
 .../allure/spock2/AllureSpock2Test.java       | 108 +++++++++++++++++-
 .../samples/TestsWithIdForFilter.groovy       |  60 ++++++++++
 3 files changed, 213 insertions(+), 4 deletions(-)
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy

diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
index 0e9881d18..4bf6cd39d 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -16,6 +16,7 @@
 package io.qameta.allure.spock2;
 
 import io.qameta.allure.Allure;
+import io.qameta.allure.AllureId;
 import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
@@ -26,6 +27,10 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
+import io.qameta.allure.testfilter.FileTestPlanSupplier;
+import io.qameta.allure.testfilter.TestPlan;
+import io.qameta.allure.testfilter.TestPlanUnknown;
+import io.qameta.allure.testfilter.TestPlanV1_0;
 import io.qameta.allure.util.AnnotationUtils;
 import io.qameta.allure.util.ExceptionUtils;
 import io.qameta.allure.util.ResultsUtils;
@@ -94,6 +99,8 @@ protected String initialValue() {
 
     private final AllureLifecycle lifecycle;
 
+    private final TestPlan testPlan;
+
     @SuppressWarnings("unused")
     public AllureSpock2() {
         this(Allure.getLifecycle());
@@ -102,6 +109,13 @@ public AllureSpock2() {
     public AllureSpock2(final AllureLifecycle lifecycle) {
         this.lifecycle = lifecycle;
         this.streamsCapturer.addStandardStreamsListener(this);
+        this.testPlan = new FileTestPlanSupplier().supply().orElse(new TestPlanUnknown());
+    }
+
+    public AllureSpock2(final AllureLifecycle lifecycle, final TestPlan plan) {
+        this.lifecycle = lifecycle;
+        this.streamsCapturer.addStandardStreamsListener(this);
+        this.testPlan = plan;
     }
 
     @Override
@@ -111,6 +125,8 @@ public void start() {
 
     @Override
     public void visitSpec(final SpecInfo spec) {
+        spec.getAllFeatures().forEach(methodInfo -> methodInfo.setSkipped(this.isSkipped(methodInfo)));
+
         spec.addListener(this);
 
         final String specContainerUuid = UUID.randomUUID().toString();
@@ -258,7 +274,15 @@ public void beforeIteration(final IterationInfo iteration) {
     }
 
     private String getQualifiedName(final IterationInfo iteration) {
-        return iteration.getFeature().getSpec().getReflection().getName() + "." + iteration.getName();
+        return this.getQualifiedName(iteration.getFeature().getSpec().getReflection().getName(), iteration.getName());
+    }
+
+    private String getQualifiedName(final FeatureInfo featureInfo) {
+        return this.getQualifiedName(featureInfo.getSpec().getReflection().getName(), featureInfo.getName());
+    }
+
+    private String getQualifiedName(final String specName, final String testName) {
+        return specName + "." + testName;
     }
 
     private String getHistoryId(final String name, final List<Parameter> parameters) {
@@ -274,6 +298,29 @@ private String getHistoryId(final String name, final List<Parameter> parameters)
         return bytesToHex(bytes);
     }
 
+    private boolean isSkipped(final FeatureInfo featureInfo) {
+        if (this.testPlan instanceof TestPlanV1_0) {
+            final TestPlanV1_0 tp = (TestPlanV1_0) testPlan;
+            return !Objects.isNull(tp.getTests()) && tp.getTests()
+                    .stream()
+                    .filter(Objects::nonNull)
+                    .noneMatch(tc -> this.match(tc, this.getAllureId(featureInfo), this.getQualifiedName(featureInfo)));
+        }
+        return false;
+    }
+
+    private String getAllureId(final FeatureInfo featureInfo) {
+        final AllureId annotation = featureInfo.getFeatureMethod().getAnnotation(AllureId.class);
+        if (Objects.nonNull(annotation)) {
+            return annotation.value();
+        }
+        return null;
+    }
+
+    private boolean match(final TestPlanV1_0.TestCase tc, final String allureId, final String qualifiedName) {
+        return Objects.equals(allureId, tc.getId()) || Objects.equals(qualifiedName, tc.getSelector());
+    }
+
     @Override
     public void error(final ErrorInfo error) {
         final String uuid = testResults.get();
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
index 8188969e8..13faff49e 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -20,7 +20,6 @@
 import io.qameta.allure.Step;
 import io.qameta.allure.aspects.AttachmentsAspects;
 import io.qameta.allure.aspects.StepsAspects;
-import io.qameta.allure.junitplatform.AllurePostDiscoveryFilter;
 import io.qameta.allure.model.ExecutableItem;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
@@ -46,9 +45,12 @@
 import io.qameta.allure.spock2.samples.TestWithAnnotationsOnClass;
 import io.qameta.allure.spock2.samples.TestWithCustomAnnotations;
 import io.qameta.allure.spock2.samples.TestWithSteps;
+import io.qameta.allure.spock2.samples.TestsWithIdForFilter;
+import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.AllureResultsWriterStub;
 import io.qameta.allure.testfilter.TestPlan;
+import io.qameta.allure.testfilter.TestPlanV1_0;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Triple;
 import org.junit.jupiter.api.Test;
@@ -494,6 +496,107 @@ void shouldNotMixUpFixturesBetweenTests() {
                 );
     }
 
+    private final TestPlanV1_0.TestCase onlyId2 = new TestPlanV1_0.TestCase().setId("2");
+    private final TestPlanV1_0.TestCase onlyId4 = new TestPlanV1_0.TestCase().setId("4");
+
+    private final TestPlanV1_0.TestCase test1 = new TestPlanV1_0.TestCase().setId("1")
+            .setSelector("io.qameta.allure.spock2.samples.TestsWithIdForFilter.test 1");
+    private final TestPlanV1_0.TestCase test2 = new TestPlanV1_0.TestCase()
+            .setId("2")
+            .setSelector("io.qameta.allure.spock2.samples.TestsWithIdForFilter.test 2");
+    private final TestPlanV1_0.TestCase test3 = new TestPlanV1_0.TestCase()
+            .setId("3")
+            .setSelector("io.qameta.allure.spock2.samples.TestsWithIdForFilter.test 3");
+
+    private final TestPlanV1_0.TestCase correctIdIncorrectSelector = new TestPlanV1_0.TestCase()
+            .setId("4")
+            .setSelector("io.qameta.allure.spock2.samples.TestsWithIdForFilter_bla.test 3");
+    private final TestPlanV1_0.TestCase correctIdIncorrectSelectorFailed = new TestPlanV1_0.TestCase()
+            .setId("6")
+            .setSelector("io.qameta.allure.spock2.samples.TestsWithIdForFilter_bla.test 3");
+    private final TestPlanV1_0.TestCase otherId = new TestPlanV1_0.TestCase().setId("4")
+            .setSelector("io.qameta.allure.spock2.samples.TestsWithIdForFilter.test 1");
+    private final TestPlanV1_0.TestCase ignored = new TestPlanV1_0.TestCase().setId("5")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.test 5");
+
+    @Test
+    @AllureFeatures.Filtration
+    public void simpleFiltration() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(test1, test2, test3));
+        List<TestResult> testResults = runClasses(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(3)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test 1", Status.PASSED),
+                        tuple("test 2", Status.PASSED),
+                        tuple("test 3", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void onlyId() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(onlyId2, onlyId4));
+        List<TestResult> testResults = runClasses(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test 4", Status.PASSED),
+                        tuple("test 2", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void idAssignToOtherTest() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Collections.singletonList(otherId));
+        List<TestResult> testResults = runClasses(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test 1", Status.PASSED),
+                        tuple("test 4", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void skippedTest() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(test1, ignored));
+        List<TestResult> testResults = runClasses(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test 1", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void correctIdIncorrectSelector() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(
+                Arrays.asList(test1, test2, correctIdIncorrectSelector, correctIdIncorrectSelectorFailed)
+        );
+        List<TestResult> testResults = runClasses(plan, TestsWithIdForFilter.class).getTestResults();
+        assertThat(testResults)
+                .hasSize(4)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test 1", Status.PASSED),
+                        tuple("test 2", Status.PASSED),
+                        tuple("test 4", Status.PASSED),
+                        tuple("test 6", Status.FAILED)
+                );
+    }
+
     @Step("Run classes {classes}")
     public static AllureResults runClasses(final Class<?>... classes) {
         return runClasses(null, classes);
@@ -509,7 +612,6 @@ public static AllureResults runClasses(final TestPlan testPlan, final Class<?>..
                 .toArray(ClassSelector[]::new);
 
         final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
-                .filters(new AllurePostDiscoveryFilter(testPlan))
                 .selectors(classSelectors)
                 .build();
 
@@ -519,7 +621,7 @@ public static AllureResults runClasses(final TestPlan testPlan, final Class<?>..
                 .andThenTry(GlobalExtensionRegistry.class::cast)
                 .toOptional()
                 .orElseThrow(() -> new AssertionError("could not access globalExtensionRegistry field of RunContext"));
-        extensionRegistry.getGlobalExtensions().add(new AllureSpock2(lifecycle));
+        extensionRegistry.getGlobalExtensions().add(new AllureSpock2(lifecycle, testPlan));
 
         final LauncherConfig config = LauncherConfig.builder()
                 .enableTestEngineAutoRegistration(false)
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy
new file mode 100644
index 000000000..b05be8128
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy
@@ -0,0 +1,60 @@
+/*
+ *  Copyright 2023 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import spock.lang.Ignore;
+
+import io.qameta.allure.AllureId;
+import spock.lang.Specification;
+
+class TestsWithIdForFilter extends Specification {
+
+    @AllureId("1")
+    def "test 1"() {
+        expect:
+        true
+    }
+
+    @AllureId("2")
+    def "test 2"() {
+        expect:
+        true
+    }
+
+    def "test 3"() {
+        expect:
+        true
+    }
+
+    @AllureId("4")
+    def "test 4"() {
+        expect:
+        true
+    }
+
+    @Ignore
+    @AllureId("5")
+    def "test 5"() {
+        expect:
+        true
+    }
+
+    @AllureId("6")
+    def "test 6"() {
+        expect:
+        false
+    }
+}

From 772edcfa47e69446fb8ea8c005372e56869957b9 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 24 Aug 2023 14:25:18 +0100
Subject: [PATCH 040/233] remove spock2 system out capture (fixes #866, via
 #951)

---
 .../io/qameta/allure/spock2/AllureSpock2.java | 73 +++----------------
 .../allure/spock2/AllureSpock2Test.java       | 11 ---
 .../allure/spock2/samples/OneTest.groovy      |  4 +-
 .../allure/spock2/samples/SpecFixtures.groovy |  6 +-
 .../spock2/samples/SpecInheritanceSpec.groovy | 32 +++++---
 .../spock2/samples/StepsAndBlocks.groovy      |  2 +-
 .../spock2/samples/StreamsListener.groovy     | 31 --------
 7 files changed, 40 insertions(+), 119 deletions(-)
 delete mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StreamsListener.groovy

diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
index 4bf6cd39d..c7be6decc 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -24,19 +24,15 @@
 import io.qameta.allure.model.Parameter;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
 import io.qameta.allure.testfilter.FileTestPlanSupplier;
 import io.qameta.allure.testfilter.TestPlan;
-import io.qameta.allure.testfilter.TestPlanUnknown;
 import io.qameta.allure.testfilter.TestPlanV1_0;
 import io.qameta.allure.util.AnnotationUtils;
 import io.qameta.allure.util.ExceptionUtils;
 import io.qameta.allure.util.ResultsUtils;
 import org.spockframework.runtime.AbstractRunListener;
-import org.spockframework.runtime.IStandardStreamsListener;
-import org.spockframework.runtime.StandardStreamsCapturer;
 import org.spockframework.runtime.extension.IGlobalExtension;
 import org.spockframework.runtime.extension.IMethodInterceptor;
 import org.spockframework.runtime.extension.IMethodInvocation;
@@ -86,9 +82,7 @@
 @SuppressWarnings({
         "PMD.NcssCount"
 })
-public class AllureSpock2 extends AbstractRunListener implements IGlobalExtension, IStandardStreamsListener {
-
-    private final StandardStreamsCapturer streamsCapturer = new StandardStreamsCapturer();
+public class AllureSpock2 extends AbstractRunListener implements IGlobalExtension {
 
     private final ThreadLocal<String> testResults = new InheritableThreadLocal<String>() {
         @Override
@@ -107,22 +101,14 @@ public AllureSpock2() {
     }
 
     public AllureSpock2(final AllureLifecycle lifecycle) {
-        this.lifecycle = lifecycle;
-        this.streamsCapturer.addStandardStreamsListener(this);
-        this.testPlan = new FileTestPlanSupplier().supply().orElse(new TestPlanUnknown());
+        this(lifecycle, new FileTestPlanSupplier().supply().orElse(null));
     }
 
     public AllureSpock2(final AllureLifecycle lifecycle, final TestPlan plan) {
         this.lifecycle = lifecycle;
-        this.streamsCapturer.addStandardStreamsListener(this);
         this.testPlan = plan;
     }
 
-    @Override
-    public void start() {
-        //do nothing at this point
-    }
-
     @Override
     public void visitSpec(final SpecInfo spec) {
         spec.getAllFeatures().forEach(methodInfo -> methodInfo.setSkipped(this.isSkipped(methodInfo)));
@@ -156,42 +142,6 @@ public void visitSpec(final SpecInfo spec) {
                 }));
     }
 
-    @Override
-    public void stop() {
-        //do nothing at this point
-    }
-
-    @Override
-    public void standardOut(final String message) {
-        logMessage(message, Status.PASSED);
-    }
-
-    @Override
-    public void standardErr(final String message) {
-        logMessage(message, Status.BROKEN);
-    }
-
-    private void logMessage(final String message, final Status status) {
-        if (Objects.isNull(message)) {
-            return;
-        }
-
-        final String trimmed = message.trim();
-        if (trimmed.isEmpty()) {
-            return;
-        }
-
-        getLifecycle().getCurrentTestCaseOrStep().ifPresent(parentUuid -> {
-            final String uuid = UUID.randomUUID().toString();
-            getLifecycle().startStep(
-                    parentUuid, uuid,
-                    new StepResult().setName(trimmed).setStatus(status)
-            );
-            getLifecycle().stopStep(uuid);
-        });
-    }
-
-
     @Override
     public void beforeIteration(final IterationInfo iteration) {
         final String uuid = testResults.get();
@@ -299,12 +249,19 @@ private String getHistoryId(final String name, final List<Parameter> parameters)
     }
 
     private boolean isSkipped(final FeatureInfo featureInfo) {
+        if (Objects.isNull(this.testPlan)) {
+            return false;
+        }
         if (this.testPlan instanceof TestPlanV1_0) {
             final TestPlanV1_0 tp = (TestPlanV1_0) testPlan;
             return !Objects.isNull(tp.getTests()) && tp.getTests()
                     .stream()
                     .filter(Objects::nonNull)
-                    .noneMatch(tc -> this.match(tc, this.getAllureId(featureInfo), this.getQualifiedName(featureInfo)));
+                    .noneMatch(tc -> this.match(
+                            tc,
+                            this.getAllureId(featureInfo),
+                            this.getQualifiedName(featureInfo))
+                    );
         }
         return false;
     }
@@ -344,16 +301,6 @@ public void afterIteration(final IterationInfo iteration) {
         getLifecycle().writeTestCase(uuid);
     }
 
-    @Override
-    public void beforeSpec(final SpecInfo spec) {
-        streamsCapturer.start();
-    }
-
-    @Override
-    public void afterSpec(final SpecInfo spec) {
-        streamsCapturer.stop();
-    }
-
     private List<Parameter> getParameters(final List<String> names, final Object... values) {
         return IntStream.range(0, Math.min(names.size(), values.length))
                 .mapToObj(index -> createParameter(names.get(index), values[index]))
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
index 13faff49e..6f1444615 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -40,7 +40,6 @@
 import io.qameta.allure.spock2.samples.ParametersTest;
 import io.qameta.allure.spock2.samples.SpecFixtures;
 import io.qameta.allure.spock2.samples.StepsAndBlocks;
-import io.qameta.allure.spock2.samples.StreamsListener;
 import io.qameta.allure.spock2.samples.TestWithAnnotations;
 import io.qameta.allure.spock2.samples.TestWithAnnotationsOnClass;
 import io.qameta.allure.spock2.samples.TestWithCustomAnnotations;
@@ -90,16 +89,6 @@ void shouldStoreTestsInformation() {
                 .hasSize(1);
     }
 
-    @Test
-    void shouldCaptureSystemStreams() {
-        final AllureResults results = runClasses(StreamsListener.class);
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getName, this::printSteps)
-                .containsExactlyInAnyOrder(
-                        tuple("Streams Test", "step1, error step, expect")
-                );
-    }
-
     @Test
     void shouldSupportTestsWithStepsAndBlocks() {
         final AllureResults results = runClasses(StepsAndBlocks.class);
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
index c5b4efdb8..debc96f55 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
@@ -17,13 +17,15 @@ package io.qameta.allure.spock2.samples
 
 import spock.lang.Specification
 
+import static io.qameta.allure.Allure.step
+
 /**
  * @author charlie (Dmitry Baev).
  */
 class OneTest extends Specification {
 
     def setup() {
-        println "OneTest#setup"
+        step "OneTest#setup"
     }
 
     def "Simple Test"() {
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
index 41a74e6fe..7e4c8c0b0 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
@@ -17,17 +17,19 @@ package io.qameta.allure.spock2.samples
 
 import spock.lang.Specification
 
+import static io.qameta.allure.Allure.step
+
 /**
  * @author charlie (Dmitry Baev).
  */
 class SpecFixtures extends Specification {
 
     def setupSpec() {
-        println "SpecFixtures#setupSpec"
+        step "SpecFixtures#setupSpec"
     }
 
     def cleanupSpec() {
-        println "SpecFixtures#cleanupSpec"
+        step "SpecFixtures#cleanupSpec"
     }
 
     def "test with spec fixtures"() {
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
index 060ad1ef9..d0b598387 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
@@ -17,22 +17,34 @@ package io.qameta.allure.spock2.samples
 
 import spock.lang.Specification
 
+import static io.qameta.allure.Allure.step
+
 abstract class BaseSpec extends Specification {
-  def setupSpec() { println 'base setupSpec()' }
-  def cleanupSpec() { println 'base cleanupSpec()' }
+    def setupSpec() { step 'base setupSpec()' }
+
+    def cleanupSpec() { step 'base cleanupSpec()' }
+
+    def setup() { step 'base setup()' }
 
-  def setup() { println 'base setup()' }
-  def cleanup() { println 'base cleanup()' }
+    def cleanup() { step 'base cleanup()' }
 
-  def baseSpecMethod() { setup: println 'base spec method' }
+    def baseSpecMethod() {
+        setup:
+        step 'base spec method'
+    }
 }
 
 class DerivedSpec extends BaseSpec {
-  def setupSpec() { println 'derived setupSpec()' }
-  def cleanupSpec() { println 'derived cleanupSpec()' }
+    def setupSpec() { step 'derived setupSpec()' }
+
+    def cleanupSpec() { step 'derived cleanupSpec()' }
+
+    def setup() { step 'derived setup()' }
 
-  def setup() { println 'derived setup()' }
-  def cleanup() { println 'derived cleanup()' }
+    def cleanup() { step 'derived cleanup()' }
 
-  def derivedSpecMethod() { setup: println 'derived spec method' }
+    def derivedSpecMethod() {
+        setup:
+        step 'derived spec method'
+    }
 }
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
index 2c3db006e..47dff03e0 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
@@ -41,6 +41,6 @@ class StepsAndBlocks extends Specification {
 
     @Step
     def "step some"() {
-        println "yaaa"
+        step "yaaa"
     }
 }
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StreamsListener.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StreamsListener.groovy
deleted file mode 100644
index bddf79ee3..000000000
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StreamsListener.groovy
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  Copyright 2019 Qameta Software OÜ
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.spock2.samples
-
-import spock.lang.Specification
-
-/**
- * @author charlie (Dmitry Baev).
- */
-class StreamsListener extends Specification {
-
-    def "Streams Test"() {
-        println "step1"
-        System.err.println("error step")
-        expect:
-        true
-    }
-}

From 892106b18e3de3cc13d7f75712564fdd7337d1f1 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Fri, 25 Aug 2023 17:18:34 +0000
Subject: [PATCH 041/233] release 2.24.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index de2753ed4..408967428 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.24-SNAPSHOT
+version=2.24.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 0e8fcfea497e255bf6b3674d7ed6520aa65e67e9 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Fri, 25 Aug 2023 17:18:35 +0000
Subject: [PATCH 042/233] set next development version 2.25

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 408967428..318f5a898 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.24.0
+version=2.25-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 9a78a4ebb17b5957e0fdf8d3892263ab52dd7d06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 11:28:45 +0100
Subject: [PATCH 043/233] bump actions/checkout from 3.5.3 to 3.6.0 (via #952)

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/publish.yml | 2 +-
 .github/workflows/release.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e6d1241d1..e3c5f24c0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '17.0.x' ]
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v3.6.0
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v3
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1588f1359..95a487a7d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v3.6.0
 
       - name: "Set up JDK 17.0.x"
         uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 21fe7321b..c6839fa67 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: "Check next version"
         run: |
           expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v3.6.0
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From 27a480dace21d025efdb71c47a3a0885169aeead Mon Sep 17 00:00:00 2001
From: Pavel <Mashino@mail.ru>
Date: Fri, 1 Sep 2023 23:51:50 +0300
Subject: [PATCH 044/233] add cucumber to readme with code examples (fixes
 #954, via #955)

---
 README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/README.md b/README.md
index 668eac198..1a0873618 100644
--- a/README.md
+++ b/README.md
@@ -239,3 +239,18 @@ Usage example:
 ```
 Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
 ```
+
+## Cucumber
+4,5,6,7 versions are supported instead of N use the required version.
+To use Cucumber simply add the following dependency to your project:
+
+[How to use allure cucumber code examples](https://github.com/allure-examples?q=cucumber&type=all&language=java)
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-cucumberN-jvm</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+
+```
\ No newline at end of file

From 437bfbb4826d813cc89e4826764ed01393391b18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 12:17:44 +0100
Subject: [PATCH 045/233] bump actions/checkout from 3.6.0 to 4.0.0 (via #956)

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/publish.yml | 2 +-
 .github/workflows/release.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e3c5f24c0..b9de322e3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '17.0.x' ]
     steps:
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.0.0
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v3
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 95a487a7d..88a06f763 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.0.0
 
       - name: "Set up JDK 17.0.x"
         uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c6839fa67..32e5972fd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: "Check next version"
         run: |
           expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.0.0
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From e1c883be8313c8a312dbed18404063aaa486700e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 12:18:10 +0100
Subject: [PATCH 046/233] bump io.github.glytching:junit-extensions from 2.5.0
 to 2.6.0 (via #948)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6a04155e1..79e22c477 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -146,7 +146,7 @@ configure(libs) {
             dependency("com.squareup.retrofit2:retrofit:2.9.0")
             dependency("commons-io:commons-io:2.11.0")
             dependency("io.github.benas:random-beans:3.9.0")
-            dependency("io.github.glytching:junit-extensions:2.5.0")
+            dependency("io.github.glytching:junit-extensions:2.6.0")
             dependency("javax.annotation:javax.annotation-api:1.3.2")
             dependency("net.sourceforge.pmd:pmd-java:6.46.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")

From e6fd80bb37e143cd9a5eec59acd436cadb5257d7 Mon Sep 17 00:00:00 2001
From: Pavel <Mashino@mail.ru>
Date: Tue, 5 Sep 2023 16:12:26 +0300
Subject: [PATCH 047/233] bump selenide version from 6.11.2 to 6.17.1 (via
 #950)

---
 allure-selenide/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts
index 641605ec6..39ca99aa1 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Selenide Integration"
 
-val selenideVersion = "6.11.2"
+val selenideVersion = "6.17.1"
 
 dependencies {
     api(project(":allure-java-commons"))

From 2c3ed8b4dfa720ace1444a1bd4cbed5f5c4ccade Mon Sep 17 00:00:00 2001
From: Pavel <Mashino@mail.ru>
Date: Tue, 5 Sep 2023 16:12:53 +0300
Subject: [PATCH 048/233] bump rest assured version from 5.1.1 to 5.3.1 (via
 #949)

---
 allure-rest-assured/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-rest-assured/build.gradle.kts b/allure-rest-assured/build.gradle.kts
index d2b534b18..ba734a063 100644
--- a/allure-rest-assured/build.gradle.kts
+++ b/allure-rest-assured/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Rest-Assured Integration"
 
-val restAssuredVersion = "5.1.1"
+val restAssuredVersion = "5.3.1"
 
 dependencies {
     api(project(":allure-attachments"))

From 3add1c9c5b29fca28ce5c49d8c040166ca8ba411 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Thu, 19 Oct 2023 14:41:36 +0200
Subject: [PATCH 049/233] fix(descriptions-javadoc): put descriptions in
 META-INF folder (via #971)

---
 .../description/JavaDocDescriptionsProcessor.java  |  6 ++++--
 .../description/ProcessDescriptionsTest.java       | 14 +++++++-------
 .../java/io/qameta/allure/util/ResultsUtils.java   |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
index 1ee9c5209..ca1fa6f8d 100644
--- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
@@ -46,6 +46,8 @@
 @SupportedAnnotationTypes("io.qameta.allure.Description")
 public class JavaDocDescriptionsProcessor extends AbstractProcessor {
 
+    private static final String ALLURE_DESCRIPTIONS_FOLDER = "META-INF/allureDescriptions/";
+
     private Filer filer;
     private Elements elementUtils;
     private Messager messager;
@@ -85,8 +87,8 @@ public boolean process(final Set<? extends TypeElement> annotations, final Round
 
             final String hash = generateMethodSignatureHash(el.getEnclosingElement().toString(), name, typeParams);
             try {
-                final FileObject file = filer.createResource(StandardLocation.CLASS_OUTPUT,
-                        "allureDescriptions", hash);
+                final FileObject file = filer.createResource(StandardLocation.CLASS_OUTPUT, "",
+                        ALLURE_DESCRIPTIONS_FOLDER + hash);
                 try (Writer writer = file.openWriter()) {
                     writer.write(docs);
                 }
diff --git a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
index d285ea178..850b63ae6 100644
--- a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
+++ b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
@@ -31,7 +31,7 @@
  */
 class ProcessDescriptionsTest {
 
-    private static final String ALLURE_PACKAGE_NAME = "allureDescriptions";
+    private static final String ALLURE_DESCRIPTIONS_FOLDER = "META-INF/allureDescriptions/";
 
     @Test
     void captureDescriptionTest() {
@@ -58,8 +58,8 @@ void captureDescriptionTest() {
         Compilation compilation = compiler.compile(source);
         assertThat(compilation).generatedFile(
                 StandardLocation.CLASS_OUTPUT,
-                ALLURE_PACKAGE_NAME,
-                expectedMethodSignatureHash
+                "",
+                ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
         );
     }
 
@@ -121,8 +121,8 @@ void captureDescriptionParametrizedTestWithGenericParameterTest() {
         Compilation compilation = compiler.compile(source);
         assertThat(compilation).generatedFile(
                 StandardLocation.CLASS_OUTPUT,
-                ALLURE_PACKAGE_NAME,
-                expectedMethodSignatureHash
+                "",
+                ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
         );
     }
 
@@ -154,8 +154,8 @@ void captureDescriptionParametrizedTestWithPrimitivesParameterTest() {
         Compilation compilation = compiler.compile(source);
         assertThat(compilation).generatedFile(
                 StandardLocation.CLASS_OUTPUT,
-                ALLURE_PACKAGE_NAME,
-                expectedMethodSignatureHash
+                "",
+                ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
         );
     }
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index 4893dd4d5..12596f129 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -97,7 +97,7 @@ public final class ResultsUtils {
     public static final String LANGUAGE_LABEL_NAME = "language";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ResultsUtils.class);
-    private static final String ALLURE_DESCRIPTIONS_PACKAGE = "allureDescriptions/";
+    private static final String ALLURE_DESCRIPTIONS_FOLDER = "META-INF/allureDescriptions/";
     private static final String MD_5 = "MD5";
 
     private static String cachedHost;
@@ -305,7 +305,7 @@ public static Optional<String> getJavadocDescription(final ClassLoader classLoad
                 name,
                 parameterTypes);
 
-        return readResource(classLoader, ALLURE_DESCRIPTIONS_PACKAGE + signatureHash)
+        return readResource(classLoader, ALLURE_DESCRIPTIONS_FOLDER + signatureHash)
                 .map(desc -> separateLines() ? desc.replace("\n", "<br />") : desc);
     }
 

From 12f88427a052e38e9d6d6800def6e54b43b90fc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 13:42:03 +0100
Subject: [PATCH 050/233] bump actions/checkout from 4.0.0 to 4.1.1 (via #969)

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/publish.yml | 2 +-
 .github/workflows/release.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b9de322e3..c11327a83 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '17.0.x' ]
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.1
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v3
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 88a06f763..8a2d029c9 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.1
 
       - name: "Set up JDK 17.0.x"
         uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 32e5972fd..c2167b9d7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: "Check next version"
         run: |
           expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.1
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From 686028be9811b9a553ad4ded58ced3c52a11e440 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 26 Oct 2023 16:40:05 +0100
Subject: [PATCH 051/233] fix(spock2): add support for test tags (via #974)

---
 .../io/qameta/allure/spock2/AllureSpock2.java |  7 ++++
 .../allure/spock2/AllureSpock2Test.java       | 14 ++++++++
 .../allure/spock2/samples/SpockTags.groovy    | 32 +++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy

diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
index c7be6decc..9c973b7de 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -42,6 +42,7 @@
 import org.spockframework.runtime.model.MethodInfo;
 import org.spockframework.runtime.model.MethodKind;
 import org.spockframework.runtime.model.SpecInfo;
+import org.spockframework.runtime.model.TestTag;
 
 import java.lang.reflect.Method;
 import java.security.MessageDigest;
@@ -185,6 +186,12 @@ public void beforeIteration(final IterationInfo iteration) {
             labels.add(createParentSuiteLabel(superSpec.getName()));
         }
 
+        final List<Label> testTags = feature.getTestTags().stream()
+                .map(TestTag::getValue)
+                .map(ResultsUtils::createTagLabel)
+                .collect(Collectors.toList());
+
+        labels.addAll(testTags);
         labels.addAll(featureLabels);
         labels.addAll(specLabels);
         labels.addAll(getProvidedLabels());
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
index 6f1444615..38fa96dc1 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -39,6 +39,7 @@
 import io.qameta.allure.spock2.samples.OneTest;
 import io.qameta.allure.spock2.samples.ParametersTest;
 import io.qameta.allure.spock2.samples.SpecFixtures;
+import io.qameta.allure.spock2.samples.SpockTags;
 import io.qameta.allure.spock2.samples.StepsAndBlocks;
 import io.qameta.allure.spock2.samples.TestWithAnnotations;
 import io.qameta.allure.spock2.samples.TestWithAnnotationsOnClass;
@@ -219,6 +220,19 @@ void shouldProcessMethodAnnotations() {
                 );
     }
 
+    @Test
+    void shouldProcessSpockTags() {
+        final AllureResults results = runClasses(SpockTags.class);
+        assertThat(results.getTestResults())
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("tag", "first"),
+                        tuple("tag", "second")
+                );
+    }
+
     @Test
     void shouldProcessClassAnnotations() {
         final AllureResults results = runClasses(TestWithAnnotationsOnClass.class);
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy
new file mode 100644
index 000000000..7bcf50ff2
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy
@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import spock.lang.Specification
+import spock.lang.Tag
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class SpockTags extends Specification {
+
+    @Tag("first")
+    @Tag("second")
+    def "someTest"() {
+        expect:
+        true
+    }
+}

From a632f35739442a09e334429930d6b3bcae40f213 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Wed, 29 Nov 2023 13:37:02 +0000
Subject: [PATCH 052/233] update pom metadata

---
 README.md        |  4 ++--
 build.gradle.kts | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 1a0873618..202c13479 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 [twitter-team]: https://twitter.com/QametaSoftware/lists/team/members "Team"
 
 [CONTRIBUTING.md]: .github/CONTRIBUTING.md
-[docs]: https://docs.qameta.io/allure/2.0/
+[docs]: https://allurereport.org/docs/
 
 # Allure Java Integrations 
 
@@ -253,4 +253,4 @@ To use Cucumber simply add the following dependency to your project:
    <version>$LATEST_VERSION</version>
 </dependency>
 
-```
\ No newline at end of file
+```
diff --git a/build.gradle.kts b/build.gradle.kts
index 79e22c477..277888eee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -68,11 +68,15 @@ configure(subprojects) {
                 pom {
                     name.set(project.name)
                     description.set("Module ${project.name} of Allure Framework.")
-                    url.set("https://github.com/allure-framework/allure-java")
+                    url.set("https://allurereport.org/")
+                    organization {
+                        name.set("Qameta Software")
+                        url.set("https://qameta.io/")
+                    }
                     licenses {
                         license {
                             name.set("The Apache License, Version 2.0")
-                            url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                            url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
                         }
                     }
                     developers {
@@ -80,11 +84,13 @@ configure(subprojects) {
                             id.set("baev")
                             name.set("Dmitry Baev")
                             email.set("dmitry.baev@qameta.io")
+                            url.set("https://github.com/baev")
                         }
                         developer {
                             id.set("eroshenkoam")
                             name.set("Artem Eroshenko")
                             email.set("artem.eroshenko@qameta.io")
+                            url.set("https://github.com/eroshenkoam")
                         }
                     }
                     scm {
@@ -93,9 +99,13 @@ configure(subprojects) {
                         url.set("https://github.com/allure-framework/allure-java")
                     }
                     issueManagement {
-                        system.set("GitHub Issues")
+                        system.set("Github Issues")
                         url.set("https://github.com/allure-framework/allure-java/issues")
                     }
+                    ciManagement {
+                        system.set("Github Actions")
+                        url.set("https://github.com/allure-framework/allure-java/actions")
+                    }
                 }
             }
         }

From 1017cb53c9750c26ae4bdb58e44bf924071f3287 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Dec 2023 15:23:55 +0000
Subject: [PATCH 053/233] bump actions/setup-java from 3 to 4 (via #980)

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/publish.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c11327a83..69f577fc1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
 
       - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8a2d029c9..75b78957e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
 
       - name: "Set up JDK 17.0.x"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17.0.x'

From 43c4d6b74ea04ea553f342b4966dc92264f96bb9 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 4 Dec 2023 10:38:45 +0000
Subject: [PATCH 054/233] feat(descriptions-javadoc): various improvements
 (fixes #982, fixes #962, via #981)

---
 allure-descriptions-javadoc/build.gradle.kts  |  8 +-
 .../qameta/allure/description/ClassNames.java | 28 +++++++
 .../JavaDocDescriptionsProcessor.java         | 67 +++++++++++----
 .../description/ProcessDescriptionsTest.java  | 82 +++++++++++++------
 .../java/io/qameta/allure/Description.java    |  4 +-
 .../io/qameta/allure/util/ResultsUtils.java   |  5 +-
 allure-junit4/build.gradle.kts                |  1 +
 .../io/qameta/allure/junit4/AllureJunit4.java | 40 ++++++++-
 .../allure/junit4/AllureJunit4Test.java       | 28 +++++++
 .../junit4/samples/DescriptionsJavadoc.java   | 33 ++++++++
 .../allure/junit4/samples/TheoriesTest.java   | 44 ++++++++++
 .../allure/testng/AllureTestNgTest.java       |  2 +-
 12 files changed, 292 insertions(+), 50 deletions(-)
 create mode 100644 allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java
 create mode 100644 allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
 create mode 100644 allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java

diff --git a/allure-descriptions-javadoc/build.gradle.kts b/allure-descriptions-javadoc/build.gradle.kts
index 266bcb3ab..4862cfc18 100644
--- a/allure-descriptions-javadoc/build.gradle.kts
+++ b/allure-descriptions-javadoc/build.gradle.kts
@@ -3,8 +3,6 @@ description = "Allure Javadoc Descriptions"
 val agent: Configuration by configurations.creating
 
 dependencies {
-    api("commons-io:commons-io")
-    api(project(":allure-java-commons"))
     testImplementation("com.google.testing.compile:compile-testing")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
@@ -18,9 +16,11 @@ dependencies {
 
 tasks.jar {
     manifest {
-        attributes(mapOf(
+        attributes(
+            mapOf(
                 "Automatic-Module-Name" to "io.qameta.allure.description"
-        ))
+            )
+        )
     }
 }
 
diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java
new file mode 100644
index 000000000..a6b225139
--- /dev/null
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java
@@ -0,0 +1,28 @@
+/*
+ *  Copyright 2023 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.description;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+final class ClassNames {
+
+    static final String DESCRIPTION_ANNOTATION = "io.qameta.allure.Description";
+
+    private ClassNames() {
+        throw new IllegalStateException("do not instance");
+    }
+}
diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
index ca1fa6f8d..32ce95707 100644
--- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
@@ -15,8 +15,6 @@
  */
 package io.qameta.allure.description;
 
-import io.qameta.allure.Description;
-
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;
@@ -28,22 +26,27 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
+import javax.lang.model.util.ElementFilter;
 import javax.lang.model.util.Elements;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 import java.io.IOException;
 import java.io.Writer;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static io.qameta.allure.util.ResultsUtils.generateMethodSignatureHash;
+import static io.qameta.allure.description.ClassNames.DESCRIPTION_ANNOTATION;
 
 /**
  * @author Egor Borisov ehborisov@gmail.com
  */
-@SupportedAnnotationTypes("io.qameta.allure.Description")
+@SupportedAnnotationTypes(DESCRIPTION_ANNOTATION)
 public class JavaDocDescriptionsProcessor extends AbstractProcessor {
 
     private static final String ALLURE_DESCRIPTIONS_FOLDER = "META-INF/allureDescriptions/";
@@ -68,24 +71,29 @@ public SourceVersion getSupportedSourceVersion() {
 
     @Override
     public boolean process(final Set<? extends TypeElement> annotations, final RoundEnvironment env) {
-        final Set<? extends Element> elements = env.getElementsAnnotatedWith(Description.class);
-        elements.forEach(el -> {
-            if (!el.getAnnotation(Description.class).useJavaDoc()) {
+        final TypeElement typeElement = elementUtils.getTypeElement(DESCRIPTION_ANNOTATION);
+        final Set<? extends Element> elements = env.getElementsAnnotatedWith(typeElement);
+        final Set<ExecutableElement> methods = ElementFilter.methodsIn(elements);
+        methods.forEach(method -> {
+            final String rawDocs = elementUtils.getDocComment(method);
+
+            if (rawDocs == null) {
                 return;
             }
-            final String docs = elementUtils.getDocComment(el);
-            final List<String> typeParams = ((ExecutableElement) el).getParameters().stream()
-                    .map(this::methodParameterTypeMapper)
-                    .collect(Collectors.toList());
-            final String name = el.getSimpleName().toString();
-            if (docs == null) {
-                messager.printMessage(Diagnostic.Kind.WARNING,
-                        "Unable to create resource for method " + name + typeParams
-                                + " as it does not have a docs comment");
+
+            final String docs = rawDocs.trim();
+            if ("".equals(docs)) {
                 return;
             }
 
-            final String hash = generateMethodSignatureHash(el.getEnclosingElement().toString(), name, typeParams);
+            final String name = method.getSimpleName().toString();
+            final List<String> typeParams = method.getParameters().stream()
+                    .map(this::methodParameterTypeMapper)
+                    .collect(Collectors.toList());
+
+            final String hash = generateMethodSignatureHash(
+                    method.getEnclosingElement().toString(), name, typeParams
+            );
             try {
                 final FileObject file = filer.createResource(StandardLocation.CLASS_OUTPUT, "",
                         ALLURE_DESCRIPTIONS_FOLDER + hash);
@@ -105,4 +113,29 @@ private String methodParameterTypeMapper(final VariableElement parameter) {
         final Element typeElement = processingEnv.getTypeUtils().asElement(parameter.asType());
         return typeElement != null ? typeElement.toString() : parameter.asType().toString();
     }
+
+    private static String generateMethodSignatureHash(final String className,
+                                                      final String methodName,
+                                                      final List<String> parameterTypes) {
+        final MessageDigest md = getMd5Digest();
+        md.update(className.getBytes(StandardCharsets.UTF_8));
+        md.update(methodName.getBytes(StandardCharsets.UTF_8));
+        parameterTypes.stream()
+                .map(string -> string.getBytes(StandardCharsets.UTF_8))
+                .forEach(md::update);
+        final byte[] bytes = md.digest();
+        return bytesToHex(bytes);
+    }
+
+    private static MessageDigest getMd5Digest() {
+        try {
+            return MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException e) {
+            throw new IllegalStateException("Can not find hashing algorithm", e);
+        }
+    }
+
+    private static String bytesToHex(final byte[] bytes) {
+        return new BigInteger(1, bytes).toString(16);
+    }
 }
diff --git a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
index 850b63ae6..ff8f7dbdc 100644
--- a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
+++ b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
@@ -37,7 +37,7 @@ class ProcessDescriptionsTest {
     void captureDescriptionTest() {
         final String expectedMethodSignatureHash = "4e7f896021ef2fce7c1deb7f5b9e38fb";
 
-        JavaFileObject source = JavaFileObjects.forSourceLines(
+        final JavaFileObject source = JavaFileObjects.forSourceLines(
                 "io.qameta.allure.description.test.DescriptionSample",
                 "package io.qameta.allure.description.test;",
                 "import io.qameta.allure.Description;",
@@ -53,19 +53,55 @@ void captureDescriptionTest() {
                 "}"
         );
 
-        Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor())
+        final Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor())
                 .withOptions("-Werror");
-        Compilation compilation = compiler.compile(source);
-        assertThat(compilation).generatedFile(
-                StandardLocation.CLASS_OUTPUT,
+        final Compilation compilation = compiler.compile(source);
+        assertThat(compilation)
+                .generatedFile(
+                        StandardLocation.CLASS_OUTPUT,
+                        "",
+                        ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
+                )
+                .contentsAsUtf8String()
+                .isEqualTo("Captured javadoc description");
+    }
+
+    @Test
+    void captureDescriptionTestIfNoUseJavadocIsSpecified() {
+        final String expectedMethodSignatureHash = "4e7f896021ef2fce7c1deb7f5b9e38fb";
+
+        final JavaFileObject source = JavaFileObjects.forSourceLines(
+                "io.qameta.allure.description.test.DescriptionSample",
+                "package io.qameta.allure.description.test;",
+                "import io.qameta.allure.Description;",
                 "",
-                ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
+                "public class DescriptionSample {",
+                "",
+                "/**",
+                "* Captured javadoc description",
+                "*/",
+                "@Description",
+                "public void sampleTest() {",
+                "}",
+                "}"
         );
+
+        final Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor())
+                .withOptions("-Werror");
+        final Compilation compilation = compiler.compile(source);
+        assertThat(compilation)
+                .generatedFile(
+                        StandardLocation.CLASS_OUTPUT,
+                        "",
+                        ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
+                )
+                .contentsAsUtf8String()
+                .contains("Captured javadoc description");
     }
 
     @Test
     void skipUncommentedMethodTest() {
-        JavaFileObject source = JavaFileObjects.forSourceLines(
+        final JavaFileObject source = JavaFileObjects.forSourceLines(
                 "io.qameta.allure.description.test.DescriptionSample",
                 "package io.qameta.allure.description.test;",
                 "import io.qameta.allure.Description;",
@@ -78,19 +114,16 @@ void skipUncommentedMethodTest() {
                 "}"
         );
 
-        Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
-        Compilation compilation = compiler.compile(source);
+        final Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
+        final Compilation compilation = compiler.compile(source);
         assertThat(compilation).succeeded();
-        assertThat(compilation)
-                .hadWarningContaining("Unable to create resource for method "
-                        + "sampleTestWithoutJavadocComment[] as it does not have a docs comment");
     }
 
     @Test
     void captureDescriptionParametrizedTestWithGenericParameterTest() {
         final String expectedMethodSignatureHash = "e90e26691bf14511db819d78624ba716";
 
-        JavaFileObject source = JavaFileObjects.forSourceLines(
+        final JavaFileObject source = JavaFileObjects.forSourceLines(
                 "io.qameta.allure.description.test.DescriptionSample",
                 "package io.qameta.allure.description.test;",
                 "import io.qameta.allure.Description;",
@@ -117,8 +150,8 @@ void captureDescriptionParametrizedTestWithGenericParameterTest() {
                 "}"
         );
 
-        Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
-        Compilation compilation = compiler.compile(source);
+        final Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
+        final Compilation compilation = compiler.compile(source);
         assertThat(compilation).generatedFile(
                 StandardLocation.CLASS_OUTPUT,
                 "",
@@ -130,7 +163,7 @@ void captureDescriptionParametrizedTestWithGenericParameterTest() {
     void captureDescriptionParametrizedTestWithPrimitivesParameterTest() {
         final String expectedMethodSignatureHash = "edeeeaa02f01218cc206e0c6ff024c7a";
 
-        JavaFileObject source = JavaFileObjects.forSourceLines(
+        final JavaFileObject source = JavaFileObjects.forSourceLines(
                 "io.qameta.allure.description.test.DescriptionSample",
                 "package io.qameta.allure.description.test;",
                 "import io.qameta.allure.Description;",
@@ -150,12 +183,15 @@ void captureDescriptionParametrizedTestWithPrimitivesParameterTest() {
                 "}"
         );
 
-        Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
-        Compilation compilation = compiler.compile(source);
-        assertThat(compilation).generatedFile(
-                StandardLocation.CLASS_OUTPUT,
-                "",
-                ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
-        );
+        final Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
+        final Compilation compilation = compiler.compile(source);
+        assertThat(compilation)
+                .generatedFile(
+                        StandardLocation.CLASS_OUTPUT,
+                        "",
+                        ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
+                )
+                .contentsAsUtf8String()
+                .isEqualTo("Captured javadoc description");
     }
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Description.java b/allure-java-commons/src/main/java/io/qameta/allure/Description.java
index c02c4405e..7ee351433 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Description.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Description.java
@@ -21,7 +21,7 @@
 import java.lang.annotation.Target;
 
 /**
- *  Annotation that allows to attach a description for a test.
+ * Annotation that allows to attach a description for a test.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
@@ -39,7 +39,9 @@
      * supports html markdown.
      *
      * @return boolean flag to enable description extraction from javadoc.
+     * @deprecated use {@link Description} without value specified instead.
      */
+    @Deprecated
     boolean useJavaDoc() default false;
 
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index 12596f129..aa86319d2 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -389,11 +389,12 @@ public static void processDescription(final ClassLoader classLoader,
                                           final Consumer<String> setDescription,
                                           final Consumer<String> setDescriptionHtml) {
         if (method.isAnnotationPresent(Description.class)) {
-            if (method.getAnnotation(Description.class).useJavaDoc()) {
+            final Description annotation = method.getAnnotation(Description.class);
+            if ("".equals(annotation.value())) {
                 getJavadocDescription(classLoader, method)
                         .ifPresent(setDescriptionHtml);
             } else {
-                final String description = method.getAnnotation(Description.class).value();
+                final String description = annotation.value();
                 setDescription.accept(description);
             }
         }
diff --git a/allure-junit4/build.gradle.kts b/allure-junit4/build.gradle.kts
index 9597c6391..d8117ef55 100644
--- a/allure-junit4/build.gradle.kts
+++ b/allure-junit4/build.gradle.kts
@@ -6,6 +6,7 @@ dependencies {
     api(project(":allure-java-commons"))
     implementation("junit:junit:$junitVersion")
     implementation(project(":allure-test-filter"))
+    testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index 72589a82b..8cf402579 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -29,12 +29,15 @@
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunListener;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static io.qameta.allure.util.AnnotationUtils.getLabels;
 import static io.qameta.allure.util.AnnotationUtils.getLinks;
@@ -46,6 +49,7 @@
 import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
 import static io.qameta.allure.util.ResultsUtils.createTestMethodLabel;
 import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+import static io.qameta.allure.util.ResultsUtils.getJavadocDescription;
 import static io.qameta.allure.util.ResultsUtils.getProvidedLabels;
 import static io.qameta.allure.util.ResultsUtils.getStatus;
 import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
@@ -176,9 +180,40 @@ private Optional<String> getDisplayName(final Description result) {
                 .map(DisplayName::value);
     }
 
+    @SuppressWarnings("PMD.AvoidLiteralsInIfCondition")
     private Optional<String> getDescription(final Description result) {
-        return Optional.ofNullable(result.getAnnotation(io.qameta.allure.Description.class))
-                .map(io.qameta.allure.Description::value);
+        final io.qameta.allure.Description annotation = result
+                .getAnnotation(io.qameta.allure.Description.class);
+
+        if (Objects.isNull(annotation)) {
+            return Optional.empty();
+        }
+
+        if (!"".equals(annotation.value())) {
+            return Optional.of(annotation.value());
+        }
+
+        // since we have no access to method & method parameter types
+        // we simply find all the methods within test class that matching
+        // specified method name. If there is only one result, consider it a
+        // test.
+        final Class<?> testClass = result.getTestClass();
+        final String methodName = result.getMethodName();
+        if (Objects.nonNull(testClass) && Objects.nonNull(methodName)) {
+            final List<Method> found = Stream.of(testClass.getMethods())
+                    .filter(method -> Objects.equals(methodName, method.getName()))
+                    .collect(Collectors.toList());
+            if (found.size() != 1) {
+                return Optional.empty();
+            }
+
+            final Method method = found.get(0);
+            return getJavadocDescription(
+                    method.getDeclaringClass().getClassLoader(),
+                    method
+            );
+        }
+        return Optional.empty();
     }
 
     private List<Link> extractLinks(final Description description) {
@@ -247,6 +282,7 @@ private TestResult createTestResult(final String uuid, final Description descrip
         testResult.getLinks().addAll(extractLinks(description));
 
         getDisplayName(description).ifPresent(testResult::setName);
+
         getDescription(description).ifPresent(testResult::setDescription);
         return testResult;
     }
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
index 2d1d29a51..7da9aba36 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
@@ -23,6 +23,7 @@
 import io.qameta.allure.junit4.samples.AssumptionFailedTest;
 import io.qameta.allure.junit4.samples.BrokenTest;
 import io.qameta.allure.junit4.samples.BrokenWithoutMessageTest;
+import io.qameta.allure.junit4.samples.DescriptionsJavadoc;
 import io.qameta.allure.junit4.samples.FailedTest;
 import io.qameta.allure.junit4.samples.FilterSimpleTests;
 import io.qameta.allure.junit4.samples.IgnoredClassTest;
@@ -33,6 +34,7 @@
 import io.qameta.allure.junit4.samples.TestWithAnnotations;
 import io.qameta.allure.junit4.samples.TestWithSteps;
 import io.qameta.allure.junit4.samples.TestWithTimeout;
+import io.qameta.allure.junit4.samples.TheoriesTest;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import io.qameta.allure.model.Stage;
@@ -387,6 +389,32 @@ void shouldFilterByAllureId() {
                 .containsExactly("io.qameta.allure.junit4.samples.FilterSimpleTests.test3");
     }
 
+    @Test
+    void shouldProcessJavadocDescriptions() {
+        final AllureResults results = runClasses(DescriptionsJavadoc.class);
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        tuple("simpleTest", "Description from javadoc.")
+                );
+    }
+
+    @Test
+    void shouldProcessJavadocDescriptionsInTheories() {
+        final AllureResults results = runClasses(TheoriesTest.class);
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        tuple("simpleTest", "Description from javadoc.")
+                );
+    }
+
     @Step("Run classes {classes}")
     private AllureResults runClasses(final Class<?>... classes) {
         return runClasses(null, classes);
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
new file mode 100644
index 000000000..467f4c513
--- /dev/null
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2023 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4.samples;
+
+import io.qameta.allure.Description;
+import org.junit.Test;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class DescriptionsJavadoc {
+
+    /**
+     * Description from javadoc.
+     */
+    @Description
+    @Test
+    public void simpleTest() {
+    }
+}
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java
new file mode 100644
index 000000000..22768d2b6
--- /dev/null
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java
@@ -0,0 +1,44 @@
+/*
+ *  Copyright 2023 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4.samples;
+
+import io.qameta.allure.Description;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@RunWith(Theories.class)
+public class TheoriesTest {
+
+    @DataPoints
+    public static final String[] VALUES = new String[]{
+            "first",
+            "second"
+    };
+
+    /**
+     * Description from javadoc.
+     */
+    @Description
+    @Theory
+    public void simpleTest(final String value) {
+        System.out.println(value);
+    }
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
index 69ce4f043..ed5cb1c79 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -206,7 +206,7 @@ public void descriptionsWithLineSeparationTest() {
             System.setProperty(ALLURE_SEPARATE_LINES_SYSPROP, "true");
         }
         try {
-            final String testDescription = "Sample test description<br /> - next line<br /> - another line<br />";
+            final String testDescription = "Sample test description<br /> - next line<br /> - another line";
             final AllureResults results = runTestNgSuites("suites/descriptions-test.xml");
             List<TestResult> testResult = results.getTestResults();
 

From 954175ff518601bad5095f5274505bf245d3a947 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 10:47:33 +0000
Subject: [PATCH 055/233] bump grpcVersion from 1.57.1 to 1.57.2 (via #958)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index fa09af0d7..1205a6caf 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -8,7 +8,7 @@ description = "Allure gRPC Integration"
 
 val agent: Configuration by configurations.creating
 
-val grpcVersion = "1.57.1"
+val grpcVersion = "1.57.2"
 val protobufVersion = "3.22.4"
 
 dependencies {

From 207f00a5eaf0b29aae110ef7ccc6c79ca1ef4339 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 4 Dec 2023 11:18:17 +0000
Subject: [PATCH 056/233] release 2.25.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 318f5a898..9898f04de 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.25-SNAPSHOT
+version=2.25.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From fa0ffee3ebb78a2147cf7d36f64e341a06e39d00 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 4 Dec 2023 11:18:18 +0000
Subject: [PATCH 057/233] set next development version 2.26

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 9898f04de..3f8ca07ec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.25.0
+version=2.26-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 2881d11419496a52da4f2edbb2ffa6185efe6f53 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 7 Dec 2023 18:14:19 +0000
Subject: [PATCH 058/233] remove unnecessary variables from build file

---
 build.gradle.kts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 277888eee..951c24723 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,9 +1,3 @@
-val linkHomepage by extra("https://qameta.io/allure")
-val linkCi by extra("https://ci.qameta.in/job/allure-java_deploy/")
-val linkScmUrl by extra("https://github.com/allure-framework/allure-java")
-val linkScmConnection by extra("scm:git:git://github.com/allure-framework/allure-java.git")
-val linkScmDevConnection by extra("scm:git:ssh://git@github.com:allure-framework/allure-java.git")
-
 val gradleScriptDir by extra("${rootProject.projectDir}/gradle")
 val qualityConfigsDir by extra("$gradleScriptDir/quality-configs")
 val spotlessDtr by extra("$qualityConfigsDir/spotless")

From 9130b84a6817131fb507ead1ff42eeee37edab7e Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 21 Dec 2023 18:56:30 +0000
Subject: [PATCH 059/233] update README.md

---
 README.md | 74 ++++++++++++++++++++++---------------------------------
 1 file changed, 30 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index 202c13479..e452787b3 100644
--- a/README.md
+++ b/README.md
@@ -13,48 +13,48 @@
 [![Build](https://github.com/allure-framework/allure-java/actions/workflows/build.yml/badge.svg)](https://github.com/allure-framework/allure-java/actions/workflows/build.yml) 
 [![Allure Java](https://img.shields.io/github/release/allure-framework/allure-java.svg)](https://github.com/allure-framework/allure-java/releases/latest)
 
-The repository contains new versions of adaptors for JVM-based test frameworks.
+> The repository contains new versions of adaptors for JVM-based test frameworks.
 
-All the artifacts are deployed to `https://repo1.maven.org/maven2/io/qameta/allure/`.
+[<img src="https://allurereport.org/public/img/allure-report.svg" height="85px" alt="Allure Report logo" align="right" />](https://allurereport.org "Allure Report")
 
-## TestNG
-
-The new TestNG adaptors is pretty much ready. To use the adaptor you should add the following dependency:
+- Learn more about Allure Report at [https://allurereport.org](https://allurereport.org)
+- 📚 [Documentation](https://allurereport.org/docs/) – discover official documentation for Allure Report
+- ❓ [Questions and Support](https://github.com/orgs/allure-framework/discussions/categories/questions-support) – get help from the team and community
+- 📢 [Official announcements](https://github.com/orgs/allure-framework/discussions/categories/announcements) –  stay updated with our latest news and updates
+- 💬 [General Discussion](https://github.com/orgs/allure-framework/discussions/categories/general-discussion) – engage in casual conversations, share insights and ideas with the community
+- 🖥️ [Live Demo](https://demo.allurereport.org/) — explore a live example of Allure Report in action
 
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-testng</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
+---
+## TestNG
 
-also you need to configure AspectJ weaver to support steps.
+- 🚀 Documentation — https://allurereport.org/docs/testng/
+- 📚 Example project — https://github.com/allure-examples?q=topic%3Atestng
+- ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
 
 ## JUnit 4
 
-The first draft of a new JUnit 4 adaptor is ready. To use the adaptor you should add the following dependency:
+- 🚀 Documentation — work in progress
+- 📚 Example project — https://github.com/allure-examples?q=topic%3Ajunit4
+- ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
+- 
+## JUnit 5
 
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-junit4</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
+- 🚀 Documentation — https://allurereport.org/docs/junit5/
+- 📚 Example project — https://github.com/allure-examples?q=topic%3Ajunit5
+- ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
 
-## JUnit 5
+## Cucumber JVM
 
-To use JUnit 5 simply add the following dependency to your project:
+- 🚀 Documentation — https://allurereport.org/docs/cucumberjvm/
+- 📚 Example project — https://github.com/allure-examples?q=cucumber&type=all&language=java
+- ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
 
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-junit5</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
+## Spock
 
+- 🚀 Documentation — https://allurereport.org/docs/spock/
+- 📚 Example project — https://github.com/allure-examples?q=topic%3Aspock
+- ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
+  
 ## Selenide
 
 Listener for Selenide, that logging steps for Allure:
@@ -240,17 +240,3 @@ Usage example:
 Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
 ```
 
-## Cucumber
-4,5,6,7 versions are supported instead of N use the required version.
-To use Cucumber simply add the following dependency to your project:
-
-[How to use allure cucumber code examples](https://github.com/allure-examples?q=cucumber&type=all&language=java)
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-cucumberN-jvm</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-
-```

From f90955ecde86b09bc71e06668aa7116eb57d8d8b Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 17 Jan 2024 11:06:17 +0000
Subject: [PATCH 060/233] update release.yml

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c2167b9d7..1f8821c29 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,5 @@
 name: Release
+run-name: Release ${{ inputs.releaseVersion }} (next ${{ inputs.nextVersion }}) by ${{ github.actor }}
 
 on:
   workflow_dispatch:

From 51dc4b96c40c94508e3cbe30450fc36f13d7cc1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:27:55 +0000
Subject: [PATCH 061/233] bump org.mockito:mockito-core from 5.3.0 to 5.10.0
 (via #993)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 951c24723..4d6d8249d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -164,7 +164,7 @@ configure(libs) {
             dependency("org.hamcrest:hamcrest:2.2")
             dependency("org.jboss.resteasy:resteasy-client:6.2.1.Final")
             dependency("org.mock-server:mockserver-netty:5.15.0")
-            dependency("org.mockito:mockito-core:5.3.0")
+            dependency("org.mockito:mockito-core:5.10.0")
             dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")
             dependency("org.slf4j:slf4j-nop:${orgSlf4jVersion}")
             dependency("org.slf4j:slf4j-simple:${orgSlf4jVersion}")

From 706f73dd53a7fd353a59e177082eff9e021bb159 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:31:30 +0000
Subject: [PATCH 062/233] happy new year

---
 .../src/main/java/io/qameta/allure/assertj/AllureAspectJ.java | 2 +-
 .../test/java/io/qameta/allure/assertj/AllureAspectJTest.java | 2 +-
 .../java/io/qameta/allure/attachment/AttachmentContent.java   | 2 +-
 .../main/java/io/qameta/allure/attachment/AttachmentData.java | 2 +-
 .../java/io/qameta/allure/attachment/AttachmentProcessor.java | 2 +-
 .../qameta/allure/attachment/AttachmentRenderException.java   | 2 +-
 .../java/io/qameta/allure/attachment/AttachmentRenderer.java  | 2 +-
 .../io/qameta/allure/attachment/DefaultAttachmentContent.java | 2 +-
 .../qameta/allure/attachment/DefaultAttachmentProcessor.java  | 2 +-
 .../allure/attachment/FreemarkerAttachmentRenderer.java       | 2 +-
 .../qameta/allure/attachment/http/HttpRequestAttachment.java  | 2 +-
 .../qameta/allure/attachment/http/HttpResponseAttachment.java | 2 +-
 .../allure/attachment/DefaultAttachmentProcessorTest.java     | 2 +-
 .../allure/attachment/FreemarkerAttachmentRendererTest.java   | 2 +-
 .../attachment/NegativeFreemarkerAttachmentRendererTest.java  | 2 +-
 .../java/io/qameta/allure/attachment/testdata/TestData.java   | 2 +-
 .../io/qameta/allure/awaitility/AllureAwaitilityListener.java | 2 +-
 .../java/io/qameta/allure/awaitility/TemporalDuration.java    | 2 +-
 .../allure/awaitility/ConditionListenersPositiveTest.java     | 2 +-
 .../qameta/allure/awaitility/GlobalSettingsNegativeTest.java  | 2 +-
 .../qameta/allure/awaitility/GlobalSettingsPositiveTest.java  | 2 +-
 .../src/main/java/io/qameta/allure/citrus/AllureCitrus.java   | 2 +-
 .../test/java/io/qameta/allure/citrus/AllureCitrusTest.java   | 2 +-
 .../cucumber/runtime/formatter/TestSourcesModelProxy.java     | 2 +-
 .../io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java     | 2 +-
 .../main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java | 2 +-
 .../main/java/io/qameta/allure/cucumber4jvm/TagParser.java    | 2 +-
 .../io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java | 2 +-
 .../io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java | 2 +-
 .../qameta/allure/cucumber4jvm/samples/AttachmentSteps.java   | 2 +-
 .../allure/cucumber4jvm/samples/BackgroundFeatureSteps.java   | 2 +-
 .../allure/cucumber4jvm/samples/BrokenFeatureSteps.java       | 2 +-
 .../allure/cucumber4jvm/samples/DatatableFeatureSteps.java    | 2 +-
 .../java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java | 2 +-
 .../io/qameta/allure/cucumber4jvm/samples/PendingSteps.java   | 2 +-
 .../allure/cucumber4jvm/samples/SimpleFeatureSteps.java       | 2 +-
 .../io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java     | 2 +-
 .../main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java | 2 +-
 .../main/java/io/qameta/allure/cucumber5jvm/TagParser.java    | 2 +-
 .../allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java | 2 +-
 .../cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java   | 2 +-
 .../io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java | 2 +-
 .../io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java | 2 +-
 .../qameta/allure/cucumber5jvm/samples/AttachmentSteps.java   | 2 +-
 .../allure/cucumber5jvm/samples/BackgroundFeatureSteps.java   | 2 +-
 .../allure/cucumber5jvm/samples/BrokenFeatureSteps.java       | 2 +-
 .../allure/cucumber5jvm/samples/DatatableFeatureSteps.java    | 2 +-
 .../java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java | 2 +-
 .../io/qameta/allure/cucumber5jvm/samples/PendingSteps.java   | 2 +-
 .../allure/cucumber5jvm/samples/SimpleFeatureSteps.java       | 2 +-
 .../io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java     | 2 +-
 .../main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java | 2 +-
 .../main/java/io/qameta/allure/cucumber6jvm/TagParser.java    | 2 +-
 .../allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java | 2 +-
 .../cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java   | 2 +-
 .../io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java | 2 +-
 .../io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java | 2 +-
 .../qameta/allure/cucumber6jvm/samples/AttachmentSteps.java   | 2 +-
 .../allure/cucumber6jvm/samples/BackgroundFeatureSteps.java   | 2 +-
 .../allure/cucumber6jvm/samples/BrokenFeatureSteps.java       | 2 +-
 .../allure/cucumber6jvm/samples/DatatableFeatureSteps.java    | 2 +-
 .../java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java | 2 +-
 .../io/qameta/allure/cucumber6jvm/samples/PendingSteps.java   | 2 +-
 .../allure/cucumber6jvm/samples/SimpleFeatureSteps.java       | 2 +-
 .../io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java     | 2 +-
 .../main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java | 2 +-
 .../main/java/io/qameta/allure/cucumber7jvm/TagParser.java    | 2 +-
 .../allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java | 2 +-
 .../cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java   | 2 +-
 .../io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java | 2 +-
 .../io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java | 2 +-
 .../qameta/allure/cucumber7jvm/samples/AttachmentSteps.java   | 2 +-
 .../allure/cucumber7jvm/samples/BackgroundFeatureSteps.java   | 2 +-
 .../allure/cucumber7jvm/samples/BrokenFeatureSteps.java       | 2 +-
 .../allure/cucumber7jvm/samples/DatatableFeatureSteps.java    | 2 +-
 .../java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java | 2 +-
 .../io/qameta/allure/cucumber7jvm/samples/PendingSteps.java   | 2 +-
 .../allure/cucumber7jvm/samples/SimpleFeatureSteps.java       | 2 +-
 .../main/java/io/qameta/allure/description/ClassNames.java    | 2 +-
 .../allure/description/JavaDocDescriptionsProcessor.java      | 2 +-
 .../io/qameta/allure/description/ProcessDescriptionsTest.java | 2 +-
 .../src/main/java/io/qameta/allure/grpc/AllureGrpc.java       | 2 +-
 .../java/io/qameta/allure/grpc/GrpcRequestAttachment.java     | 2 +-
 .../java/io/qameta/allure/grpc/GrpcResponseAttachment.java    | 2 +-
 .../src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java   | 2 +-
 .../java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java  | 2 +-
 .../AllureHamcrestAssertionNameContainsReasonTest.java        | 2 +-
 .../hamcrest/AllureHamcrestCollectionsMatchersTest.java       | 2 +-
 .../allure/hamcrest/AllureHamcrestLogicalMatchersTest.java    | 2 +-
 .../allure/hamcrest/AllureHamcrestNumberMatchersTest.java     | 2 +-
 .../allure/hamcrest/AllureHamcrestObjectMatchersTest.java     | 2 +-
 .../allure/hamcrest/AllureHamcrestTextMatchersTest.java       | 2 +-
 .../io/qameta/allure/httpclient/AllureHttpClientRequest.java  | 2 +-
 .../io/qameta/allure/httpclient/AllureHttpClientResponse.java | 2 +-
 .../io/qameta/allure/httpclient/AllureHttpClientTest.java     | 2 +-
 .../qameta/allure/httpclient5/AllureHttpClient5Request.java   | 2 +-
 .../qameta/allure/httpclient5/AllureHttpClient5Response.java  | 2 +-
 .../io/qameta/allure/httpclient5/AllureHttpEntityUtils.java   | 2 +-
 .../allure/httpclient5/AllureHttpClient5DeleteTest.java       | 2 +-
 .../qameta/allure/httpclient5/AllureHttpClient5GetTest.java   | 2 +-
 .../qameta/allure/httpclient5/AllureHttpClient5PostTest.java  | 2 +-
 .../src/main/java/io/qameta/allure/test/AllureFeatures.java   | 2 +-
 .../src/main/java/io/qameta/allure/test/AllurePredicates.java | 2 +-
 .../src/main/java/io/qameta/allure/test/AllureResults.java    | 2 +-
 .../java/io/qameta/allure/test/AllureResultsWriterStub.java   | 2 +-
 .../java/io/qameta/allure/test/AllureTestCommonsUtils.java    | 2 +-
 .../src/main/java/io/qameta/allure/test/RunUtils.java         | 2 +-
 .../src/main/java/io/qameta/allure/test/TestData.java         | 2 +-
 .../java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java | 2 +-
 .../src/main/java/io/qameta/allure/Allure.java                | 2 +-
 .../src/main/java/io/qameta/allure/AllureConstants.java       | 2 +-
 .../src/main/java/io/qameta/allure/AllureId.java              | 2 +-
 .../src/main/java/io/qameta/allure/AllureLifecycle.java       | 2 +-
 .../java/io/qameta/allure/AllureResultsWriteException.java    | 2 +-
 .../src/main/java/io/qameta/allure/AllureResultsWriter.java   | 2 +-
 .../src/main/java/io/qameta/allure/Attachment.java            | 2 +-
 .../src/main/java/io/qameta/allure/Description.java           | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Epic.java  | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Epics.java | 2 +-
 .../src/main/java/io/qameta/allure/Feature.java               | 2 +-
 .../src/main/java/io/qameta/allure/Features.java              | 2 +-
 .../main/java/io/qameta/allure/FileSystemResultsWriter.java   | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Flaky.java | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Issue.java | 2 +-
 .../src/main/java/io/qameta/allure/Issues.java                | 2 +-
 .../src/main/java/io/qameta/allure/LabelAnnotation.java       | 2 +-
 .../src/main/java/io/qameta/allure/LabelAnnotations.java      | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Lead.java  | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Link.java  | 2 +-
 .../src/main/java/io/qameta/allure/LinkAnnotation.java        | 2 +-
 .../src/main/java/io/qameta/allure/LinkAnnotations.java       | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Links.java | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Muted.java | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Owner.java | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Param.java | 2 +-
 .../src/main/java/io/qameta/allure/Severity.java              | 2 +-
 .../src/main/java/io/qameta/allure/SeverityLevel.java         | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Step.java  | 2 +-
 .../src/main/java/io/qameta/allure/Stories.java               | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Story.java | 2 +-
 .../src/main/java/io/qameta/allure/TmsLink.java               | 2 +-
 .../src/main/java/io/qameta/allure/TmsLinks.java              | 2 +-
 .../java/io/qameta/allure/aspects/AttachmentsAspects.java     | 2 +-
 .../src/main/java/io/qameta/allure/aspects/StepsAspects.java  | 2 +-
 .../java/io/qameta/allure/internal/Allure2ModelJackson.java   | 2 +-
 .../main/java/io/qameta/allure/internal/AllureStorage.java    | 2 +-
 .../java/io/qameta/allure/internal/AllureThreadContext.java   | 2 +-
 .../io/qameta/allure/listener/ContainerLifecycleListener.java | 2 +-
 .../io/qameta/allure/listener/FixtureLifecycleListener.java   | 2 +-
 .../java/io/qameta/allure/listener/LifecycleListener.java     | 2 +-
 .../java/io/qameta/allure/listener/LifecycleNotifier.java     | 2 +-
 .../java/io/qameta/allure/listener/StepLifecycleListener.java | 2 +-
 .../java/io/qameta/allure/listener/TestLifecycleListener.java | 2 +-
 .../src/main/java/io/qameta/allure/util/AnnotationUtils.java  | 2 +-
 .../src/main/java/io/qameta/allure/util/AspectUtils.java      | 2 +-
 .../src/main/java/io/qameta/allure/util/ExceptionUtils.java   | 2 +-
 .../src/main/java/io/qameta/allure/util/NamingUtils.java      | 2 +-
 .../src/main/java/io/qameta/allure/util/ObjectUtils.java      | 2 +-
 .../src/main/java/io/qameta/allure/util/ParameterUtils.java   | 2 +-
 .../src/main/java/io/qameta/allure/util/PropertiesUtils.java  | 2 +-
 .../src/main/java/io/qameta/allure/util/ResultsUtils.java     | 2 +-
 .../main/java/io/qameta/allure/util/ServiceLoaderUtils.java   | 2 +-
 .../src/test/java/io/qameta/allure/AllureLifecycleTest.java   | 2 +-
 .../src/test/java/io/qameta/allure/AllureTest.java            | 2 +-
 .../java/io/qameta/allure/FileSystemResultsWriterTest.java    | 2 +-
 .../src/test/java/io/qameta/allure/ResultsUtilsTest.java      | 2 +-
 .../test/java/io/qameta/allure/StepLifecycleListenerTest.java | 2 +-
 .../test/java/io/qameta/allure/aspects/StepsAspectsTest.java  | 2 +-
 .../io/qameta/allure/internal/AllureThreadContextTest.java    | 2 +-
 .../src/test/java/io/qameta/allure/testdata/DummyCard.java    | 2 +-
 .../src/test/java/io/qameta/allure/testdata/DummyEmail.java   | 2 +-
 .../src/test/java/io/qameta/allure/testdata/DummyUser.java    | 2 +-
 .../test/java/io/qameta/allure/util/AnnotationUtilsTest.java  | 2 +-
 .../src/test/java/io/qameta/allure/util/NamingUtilsTest.java  | 2 +-
 .../src/test/java/io/qameta/allure/util/ObjectUtilsTest.java  | 2 +-
 .../java/io/qameta/allure/aspects/Allure1Annotations.java     | 2 +-
 .../java/io/qameta/allure/aspects/Allure1AttachAspects.java   | 2 +-
 .../io/qameta/allure/aspects/Allure1ParametersAspects.java    | 2 +-
 .../java/io/qameta/allure/aspects/Allure1StepsAspects.java    | 2 +-
 .../java/io/qameta/allure/aspects/Allure1TestCaseAspects.java | 2 +-
 .../src/main/java/io/qameta/allure/aspects/Allure1Utils.java  | 2 +-
 .../java/ru/yandex/qatools/allure/annotations/Attachment.java | 2 +-
 .../ru/yandex/qatools/allure/annotations/Description.java     | 2 +-
 .../java/ru/yandex/qatools/allure/annotations/Features.java   | 2 +-
 .../main/java/ru/yandex/qatools/allure/annotations/Issue.java | 2 +-
 .../java/ru/yandex/qatools/allure/annotations/Issues.java     | 2 +-
 .../java/ru/yandex/qatools/allure/annotations/Parameter.java  | 2 +-
 .../java/ru/yandex/qatools/allure/annotations/Severity.java   | 2 +-
 .../main/java/ru/yandex/qatools/allure/annotations/Step.java  | 2 +-
 .../java/ru/yandex/qatools/allure/annotations/Stories.java    | 2 +-
 .../java/ru/yandex/qatools/allure/annotations/TestCaseId.java | 2 +-
 .../main/java/ru/yandex/qatools/allure/annotations/Title.java | 2 +-
 .../java/ru/yandex/qatools/allure/model/DescriptionType.java  | 2 +-
 .../java/ru/yandex/qatools/allure/model/SeverityLevel.java    | 2 +-
 .../io/qameta/allure/aspects/Allure1AttachAspectsTest.java    | 2 +-
 .../io/qameta/allure/aspects/Allure1StepsAspectsTest.java     | 2 +-
 .../io/qameta/allure/aspects/Allure1TestCaseAspectsTest.java  | 2 +-
 .../src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java     | 2 +-
 .../java/io/qameta/allure/httpclient/AllureJaxRsTest.java     | 2 +-
 .../src/main/java/io/qameta/allure/jbehave/AllureJbehave.java | 2 +-
 .../test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java | 2 +-
 .../test/java/io/qameta/allure/jbehave/LoggingReporter.java   | 2 +-
 .../io/qameta/allure/jbehave/samples/BrokenStorySteps.java    | 2 +-
 .../io/qameta/allure/jbehave/samples/SimpleStorySteps.java    | 2 +-
 .../main/java/io/qameta/allure/jbehave5/AllureJbehave5.java   | 2 +-
 .../java/io/qameta/allure/jbehave5/AllureJbehave5Test.java    | 2 +-
 .../test/java/io/qameta/allure/jbehave5/LoggingReporter.java  | 2 +-
 .../io/qameta/allure/jbehave5/samples/BrokenStorySteps.java   | 2 +-
 .../io/qameta/allure/jbehave5/samples/SimpleStorySteps.java   | 2 +-
 .../src/main/java/io/qameta/allure/jooq/AllureJooq.java       | 2 +-
 .../src/test/java/io/qameta/allure/jooq/AllureJooqTest.java   | 2 +-
 .../io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java   | 2 +-
 .../qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java | 2 +-
 .../main/java/io/qameta/allure/jsonunit/DiffAttachment.java   | 2 +-
 .../src/main/java/io/qameta/allure/jsonunit/DiffModel.java    | 2 +-
 .../java/io/qameta/allure/jsonunit/JsonPatchListener.java     | 2 +-
 .../main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java | 2 +-
 .../java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java | 2 +-
 .../java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java | 2 +-
 .../io/qameta/allure/junitplatform/AllureJunitPlatform.java   | 2 +-
 .../qameta/allure/junitplatform/AllureJunitPlatformUtils.java | 2 +-
 .../allure/junitplatform/AllurePostDiscoveryFilter.java       | 2 +-
 .../qameta/allure/junitplatform/AllureJunitPlatformTest.java  | 2 +-
 .../allure/junitplatform/AllureJunitPlatformTestUtils.java    | 2 +-
 .../allure/junitplatform/AllurePostDiscoveryFilterTest.java   | 2 +-
 .../junitplatform/features/AllureIdAnnotationSupport.java     | 2 +-
 .../allure/junitplatform/features/BrokenInAfterAllTests.java  | 2 +-
 .../allure/junitplatform/features/BrokenInBeforeAllTests.java | 2 +-
 .../io/qameta/allure/junitplatform/features/BrokenTests.java  | 2 +-
 .../allure/junitplatform/features/DescriptionJavadocTest.java | 2 +-
 .../allure/junitplatform/features/DisabledRepeatedTests.java  | 2 +-
 .../qameta/allure/junitplatform/features/DisabledTests.java   | 2 +-
 .../junitplatform/features/DisplayNameOnClassTests.java       | 2 +-
 .../io/qameta/allure/junitplatform/features/DynamicTests.java | 2 +-
 .../io/qameta/allure/junitplatform/features/FailedTests.java  | 2 +-
 .../junitplatform/features/FilterParameterizedTests.java      | 2 +-
 .../allure/junitplatform/features/FilterSimpleTests.java      | 2 +-
 .../allure/junitplatform/features/JupiterUniqueIdTest.java    | 2 +-
 .../junitplatform/features/MarkerAnnotationSupport.java       | 2 +-
 .../java/io/qameta/allure/junitplatform/features/OneTest.java | 2 +-
 .../io/qameta/allure/junitplatform/features/OwnerTest.java    | 2 +-
 .../qameta/allure/junitplatform/features/ParallelTests.java   | 2 +-
 .../allure/junitplatform/features/ParameterisedTests.java     | 2 +-
 .../features/ParameterisedTestsWithDisplayName.java           | 2 +-
 .../io/qameta/allure/junitplatform/features/PassedTests.java  | 2 +-
 .../qameta/allure/junitplatform/features/RepeatedTests.java   | 2 +-
 .../allure/junitplatform/features/ReportEntryParameter.java   | 2 +-
 .../io/qameta/allure/junitplatform/features/SeverityTest.java | 2 +-
 .../junitplatform/features/SkippedInBeforeAllTests.java       | 2 +-
 .../io/qameta/allure/junitplatform/features/SkippedTests.java | 2 +-
 .../io/qameta/allure/junitplatform/features/TaggedTests.java  | 2 +-
 .../allure/junitplatform/features/TestClassDisabled.java      | 2 +-
 .../features/TestClassWithDisplayNameAnnotation.java          | 2 +-
 .../features/TestClassWithoutDisplayNameAnnotation.java       | 2 +-
 .../allure/junitplatform/features/TestWithClassLabels.java    | 2 +-
 .../allure/junitplatform/features/TestWithClassLinks.java     | 2 +-
 .../allure/junitplatform/features/TestWithDescription.java    | 2 +-
 .../allure/junitplatform/features/TestWithDisplayName.java    | 2 +-
 .../allure/junitplatform/features/TestWithMethodLabels.java   | 2 +-
 .../allure/junitplatform/features/TestWithMethodLinks.java    | 2 +-
 .../qameta/allure/junitplatform/features/TestWithSteps.java   | 2 +-
 .../allure/junitplatform/features/TestWithSystemErr.java      | 2 +-
 .../allure/junitplatform/features/TestWithSystemOut.java      | 2 +-
 .../allure/junitplatform/features/TestsWithAllureId.java      | 2 +-
 .../qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java | 2 +-
 .../allure/junit4/aspect/AllureJunit4ListenerAspect.java      | 2 +-
 .../src/main/java/io/qameta/allure/junit4/AllureJunit4.java   | 2 +-
 .../main/java/io/qameta/allure/junit4/AllureJunit4Filter.java | 2 +-
 .../main/java/io/qameta/allure/junit4/AllureJunit4Utils.java  | 2 +-
 .../src/main/java/io/qameta/allure/junit4/DisplayName.java    | 2 +-
 allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java  | 2 +-
 allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java | 2 +-
 allure-junit4/src/test/java/SampleTestInDefaultPackage.java   | 2 +-
 .../test/java/io/qameta/allure/junit4/AllureJunit4Test.java   | 2 +-
 .../io/qameta/allure/junit4/samples/AssumptionFailedTest.java | 2 +-
 .../test/java/io/qameta/allure/junit4/samples/BrokenTest.java | 2 +-
 .../allure/junit4/samples/BrokenWithoutMessageTest.java       | 2 +-
 .../io/qameta/allure/junit4/samples/DescriptionsJavadoc.java  | 2 +-
 .../test/java/io/qameta/allure/junit4/samples/FailedTest.java | 2 +-
 .../io/qameta/allure/junit4/samples/FilterSimpleTests.java    | 2 +-
 .../io/qameta/allure/junit4/samples/IgnoredClassTest.java     | 2 +-
 .../java/io/qameta/allure/junit4/samples/IgnoredTests.java    | 2 +-
 .../test/java/io/qameta/allure/junit4/samples/OneTest.java    | 2 +-
 .../java/io/qameta/allure/junit4/samples/TaggedTests.java     | 2 +-
 .../qameta/allure/junit4/samples/TestBasedOnSampleRunner.java | 2 +-
 .../io/qameta/allure/junit4/samples/TestWithAnnotations.java  | 2 +-
 .../java/io/qameta/allure/junit4/samples/TestWithSteps.java   | 2 +-
 .../java/io/qameta/allure/junit4/samples/TestWithTimeout.java | 2 +-
 .../java/io/qameta/allure/junit4/samples/TheoriesTest.java    | 2 +-
 .../io/qameta/allure/junit5assert/AllureJunit5Assert.java     | 2 +-
 .../io/qameta/allure/junit5assert/AllureJunit5AssertTest.java | 2 +-
 .../src/main/java/io/qameta/allure/junit5/AllureJunit5.java   | 2 +-
 .../test/java/io/qameta/allure/junit5/AllureJunit5Test.java   | 2 +-
 .../allure/junit5/features/AfterEachFixtureBrokenSupport.java | 2 +-
 .../io/qameta/allure/junit5/features/AllFixtureSupport.java   | 2 +-
 .../junit5/features/BeforeAllFixtureFailureSupport.java       | 2 +-
 .../junit5/features/BeforeEachFixtureBrokenSupport.java       | 2 +-
 .../io/qameta/allure/junit5/features/EachFixtureSupport.java  | 2 +-
 .../features/ParameterisedBlankParameterValueTests.java       | 2 +-
 .../allure/junit5/features/ParameterisedPrimitivesTests.java  | 2 +-
 .../io/qameta/allure/junit5/features/ParameterisedTests.java  | 2 +-
 .../qameta/allure/junit5/features/SkipOtherInjectables.java   | 2 +-
 .../src/main/java/io/qameta/allure/karate/AllureKarate.java   | 2 +-
 .../test/java/io/qameta/allure/karate/AllureKarateTest.java   | 2 +-
 .../src/test/java/io/qameta/allure/karate/TestRunner.java     | 2 +-
 .../src/main/java/io/qameta/allure/model/Attachment.java      | 2 +-
 .../src/main/java/io/qameta/allure/model/ExecutableItem.java  | 2 +-
 .../src/main/java/io/qameta/allure/model/FixtureResult.java   | 2 +-
 allure-model/src/main/java/io/qameta/allure/model/Label.java  | 2 +-
 allure-model/src/main/java/io/qameta/allure/model/Link.java   | 2 +-
 .../src/main/java/io/qameta/allure/model/Parameter.java       | 2 +-
 allure-model/src/main/java/io/qameta/allure/model/Stage.java  | 2 +-
 allure-model/src/main/java/io/qameta/allure/model/Status.java | 2 +-
 .../src/main/java/io/qameta/allure/model/StatusDetails.java   | 2 +-
 .../src/main/java/io/qameta/allure/model/StepResult.java      | 2 +-
 .../src/main/java/io/qameta/allure/model/TestResult.java      | 2 +-
 .../main/java/io/qameta/allure/model/TestResultContainer.java | 2 +-
 .../src/main/java/io/qameta/allure/model/WithAttachments.java | 2 +-
 .../src/main/java/io/qameta/allure/model/WithLinks.java       | 2 +-
 .../src/main/java/io/qameta/allure/model/WithParameters.java  | 2 +-
 .../src/main/java/io/qameta/allure/model/WithStatus.java      | 2 +-
 .../main/java/io/qameta/allure/model/WithStatusDetails.java   | 2 +-
 .../src/main/java/io/qameta/allure/model/WithSteps.java       | 2 +-
 .../src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java   | 2 +-
 .../test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java  | 2 +-
 .../src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java | 2 +-
 .../test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java | 2 +-
 .../java/io/qameta/allure/reader/AllureEnumDeserializer.java  | 2 +-
 .../io/qameta/allure/reader/AllureObjectMapperFactory.java    | 2 +-
 .../io/qameta/allure/reader/ParameterModeDeserializer.java    | 2 +-
 .../main/java/io/qameta/allure/reader/StageDeserializer.java  | 2 +-
 .../main/java/io/qameta/allure/reader/StatusDeserializer.java | 2 +-
 .../java/io/qameta/allure/restassured/AllureRestAssured.java  | 2 +-
 .../io/qameta/allure/restassured/AllureRestAssuredTest.java   | 2 +-
 .../scala/io/qameta/allure/scalatest/AllureScalatest.scala    | 2 +-
 .../io/qameta/allure/scalatest/AllureScalatestTest.scala      | 2 +-
 .../io/qameta/allure/scalatest/testdata/AllureApiSpec.scala   | 2 +-
 .../allure/scalatest/testdata/AnnotationsOnClassSpec.scala    | 2 +-
 .../io/qameta/allure/scalatest/testdata/BrokenSpec.scala      | 2 +-
 .../io/qameta/allure/scalatest/testdata/CancelledSpec.scala   | 2 +-
 .../io/qameta/allure/scalatest/testdata/FailedSpec.scala      | 2 +-
 .../io/qameta/allure/scalatest/testdata/IgnoredSpec.scala     | 2 +-
 .../io/qameta/allure/scalatest/testdata/SeveritySpec.scala    | 2 +-
 .../io/qameta/allure/scalatest/testdata/SimpleSpec.scala      | 2 +-
 .../main/java/io/qameta/allure/selenide/AllureSelenide.java   | 2 +-
 .../src/main/java/io/qameta/allure/selenide/LogType.java      | 2 +-
 .../java/io/qameta/allure/selenide/AllureSelenideTest.java    | 2 +-
 .../allure/servletapi/HttpServletAttachmentBuilder.java       | 2 +-
 .../src/main/java/io/qameta/allure/spock/AllureSpock.java     | 2 +-
 .../test/groovy/io/qameta/allure/spock/AllureSpockTest.java   | 2 +-
 .../groovy/io/qameta/allure/spock/samples/BrokenTest.groovy   | 2 +-
 .../io/qameta/allure/spock/samples/DataDrivenTest.groovy      | 2 +-
 .../groovy/io/qameta/allure/spock/samples/FailedTest.groovy   | 2 +-
 .../groovy/io/qameta/allure/spock/samples/JiraIssue.groovy    | 2 +-
 .../test/groovy/io/qameta/allure/spock/samples/OneTest.groovy | 2 +-
 .../io/qameta/allure/spock/samples/ParametersTest.groovy      | 2 +-
 .../io/qameta/allure/spock/samples/TestWithAnnotations.groovy | 2 +-
 .../allure/spock/samples/TestWithAnnotationsOnClass.groovy    | 2 +-
 .../allure/spock/samples/TestWithCustomAnnotations.groovy     | 2 +-
 .../io/qameta/allure/spock/samples/TestWithSteps.groovy       | 2 +-
 .../test/groovy/io/qameta/allure/spock/samples/XrayId.groovy  | 2 +-
 .../src/main/java/io/qameta/allure/spock2/AllureSpock2.java   | 2 +-
 .../compiler/AllureStatementsLabelsToStepsTransformation.java | 2 +-
 .../test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java | 2 +-
 .../groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy  | 2 +-
 .../io/qameta/allure/spock2/samples/DataDrivenTest.groovy     | 2 +-
 .../groovy/io/qameta/allure/spock2/samples/FailedTest.groovy  | 2 +-
 .../io/qameta/allure/spock2/samples/FixturesTest.groovy       | 2 +-
 .../io/qameta/allure/spock2/samples/HelloSpockSpec.groovy     | 2 +-
 .../groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy   | 2 +-
 .../groovy/io/qameta/allure/spock2/samples/OneTest.groovy     | 2 +-
 .../io/qameta/allure/spock2/samples/ParametersTest.groovy     | 2 +-
 .../io/qameta/allure/spock2/samples/SpecFixtures.groovy       | 2 +-
 .../qameta/allure/spock2/samples/SpecInheritanceSpec.groovy   | 2 +-
 .../groovy/io/qameta/allure/spock2/samples/SpockTags.groovy   | 2 +-
 .../io/qameta/allure/spock2/samples/StepsAndBlocks.groovy     | 2 +-
 .../qameta/allure/spock2/samples/TestWithAnnotations.groovy   | 2 +-
 .../allure/spock2/samples/TestWithAnnotationsOnClass.groovy   | 2 +-
 .../allure/spock2/samples/TestWithCustomAnnotations.groovy    | 2 +-
 .../io/qameta/allure/spock2/samples/TestWithSteps.groovy      | 2 +-
 .../qameta/allure/spock2/samples/TestsWithIdForFilter.groovy  | 2 +-
 .../test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy | 2 +-
 .../java/io/qameta/allure/springweb/AllureRestTemplate.java   | 2 +-
 .../io/qameta/allure/springweb/AllureRestTemplateTest.java    | 2 +-
 .../io/qameta/allure/testfilter/FileTestPlanSupplier.java     | 2 +-
 .../src/main/java/io/qameta/allure/testfilter/TestPlan.java   | 2 +-
 .../java/io/qameta/allure/testfilter/TestPlanSupplier.java    | 2 +-
 .../java/io/qameta/allure/testfilter/TestPlanUnknown.java     | 2 +-
 .../main/java/io/qameta/allure/testfilter/TestPlanV1_0.java   | 2 +-
 .../src/main/java/io/qameta/allure/testng/AllureTestNg.java   | 2 +-
 .../java/io/qameta/allure/testng/AllureTestNgTestFilter.java  | 2 +-
 allure-testng/src/main/java/io/qameta/allure/testng/Tag.java  | 2 +-
 allure-testng/src/main/java/io/qameta/allure/testng/Tags.java | 2 +-
 .../java/io/qameta/allure/testng/TestInstanceParameter.java   | 2 +-
 .../io/qameta/allure/testng/config/AllureTestNgConfig.java    | 2 +-
 .../test/java/io/qameta/allure/testng/AllureTestNgTest.java   | 2 +-
 .../allure/testng/samples/AfterFixturesCombination.java       | 2 +-
 .../java/io/qameta/allure/testng/samples/AllFeatures.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/AttachmentsTest.java | 2 +-
 .../test/java/io/qameta/allure/testng/samples/BaseTest.java   | 2 +-
 .../test/java/io/qameta/allure/testng/samples/BaseTestA.java  | 2 +-
 .../test/java/io/qameta/allure/testng/samples/BaseTestB.java  | 2 +-
 .../io/qameta/allure/testng/samples/BddAnnotationsTests.java  | 2 +-
 .../allure/testng/samples/BddAnnotationsTestsInherited.java   | 2 +-
 .../allure/testng/samples/BeforeFixturesCombination.java      | 2 +-
 .../java/io/qameta/allure/testng/samples/BeforeMethods.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/ClassFixtures1.java  | 2 +-
 .../java/io/qameta/allure/testng/samples/ClassFixtures2.java  | 2 +-
 .../java/io/qameta/allure/testng/samples/ClassFixtures3.java  | 2 +-
 .../qameta/allure/testng/samples/ClassFixturesInParent.java   | 2 +-
 .../qameta/allure/testng/samples/ClassFixturesInherited.java  | 2 +-
 .../io/qameta/allure/testng/samples/ConfigurationFailure.java | 2 +-
 .../io/qameta/allure/testng/samples/CyrillicDescriptions.java | 2 +-
 .../qameta/allure/testng/samples/DataProviderWithArray.java   | 2 +-
 .../qameta/allure/testng/samples/DescriptionsAnotherTest.java | 2 +-
 .../io/qameta/allure/testng/samples/DescriptionsTest.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/DisabledTest.java    | 2 +-
 .../allure/testng/samples/FactoryOnConstructorTests.java      | 2 +-
 .../io/qameta/allure/testng/samples/FailedAfterMethod.java    | 2 +-
 .../io/qameta/allure/testng/samples/FailedAfterSuite.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/FailedAfterTest.java | 2 +-
 .../io/qameta/allure/testng/samples/FailedBeforeClass.java    | 2 +-
 .../io/qameta/allure/testng/samples/FailedBeforeMethod.java   | 2 +-
 .../io/qameta/allure/testng/samples/FailedBeforeSuite.java    | 2 +-
 .../io/qameta/allure/testng/samples/FailedBeforeTest.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/FailedFlakyTest.java | 2 +-
 .../java/io/qameta/allure/testng/samples/FailedSetUp.java     | 2 +-
 .../allure/testng/samples/FailedTestPassedBeforeFixture.java  | 2 +-
 .../qameta/allure/testng/samples/FixtureWithDescription.java  | 2 +-
 .../java/io/qameta/allure/testng/samples/FlakyMethods.java    | 2 +-
 .../qameta/allure/testng/samples/FlakyMethodsInherited.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/FlakyTestClass.java  | 2 +-
 .../qameta/allure/testng/samples/FlakyTestClassInherited.java | 2 +-
 .../testng/samples/HistoryIdForTestWithDataProvider.java      | 2 +-
 .../test/java/io/qameta/allure/testng/samples/JustTest.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/LinksOnTests.java    | 2 +-
 .../qameta/allure/testng/samples/LinksOnTestsInherited.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/MutedMethods.java    | 2 +-
 .../qameta/allure/testng/samples/MutedMethodsInherited.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/MutedTestClass.java  | 2 +-
 .../qameta/allure/testng/samples/MutedTestClassInherited.java | 2 +-
 .../java/io/qameta/allure/testng/samples/NestedSteps.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/NullParamTest.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/OwnerClassTest.java  | 2 +-
 .../qameta/allure/testng/samples/OwnerClassTestInherited.java | 2 +-
 .../java/io/qameta/allure/testng/samples/OwnerMethodTest.java | 2 +-
 .../allure/testng/samples/OwnerMethodTestInherited.java       | 2 +-
 .../allure/testng/samples/ParallelDataProviderSample.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/ParallelMethods.java | 2 +-
 .../io/qameta/allure/testng/samples/ParameterizedTest.java    | 2 +-
 .../io/qameta/allure/testng/samples/PerClassFixtures.java     | 2 +-
 .../io/qameta/allure/testng/samples/PerMethodFixtures.java    | 2 +-
 .../io/qameta/allure/testng/samples/PerSuiteFixtures.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/PerTestFixtures.java | 2 +-
 .../java/io/qameta/allure/testng/samples/PriorityTests.java   | 2 +-
 .../test/java/io/qameta/allure/testng/samples/RetryTest.java  | 2 +-
 .../io/qameta/allure/testng/samples/SeverityClassTest.java    | 2 +-
 .../allure/testng/samples/SeverityClassTestInherited.java     | 2 +-
 .../io/qameta/allure/testng/samples/SeverityMethodTest.java   | 2 +-
 .../allure/testng/samples/SeverityMethodTestInherited.java    | 2 +-
 .../java/io/qameta/allure/testng/samples/SkippedSuite.java    | 2 +-
 .../io/qameta/allure/testng/samples/SuiteParameterTest.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/TagClassTest.java    | 2 +-
 .../java/io/qameta/allure/testng/samples/TagMethodTest.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/TestTagFixtures.java | 2 +-
 .../io/qameta/allure/testng/samples/TestWithParameters.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/TestWithTimeout.java | 2 +-
 .../io/qameta/allure/testng/samples/TestsWithIdForFilter.java | 2 +-
 .../java/io/qameta/allure/testng/samples/TestsWithSteps.java  | 2 +-
 .../io/qameta/allure/testng/samples/VarargsParameters.java    | 2 +-
 gradle/quality-configs/spotless/header.java                   | 4 ++--
 471 files changed, 472 insertions(+), 472 deletions(-)

diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
index fbf10f7f0..128791172 100644
--- a/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java b/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
index 12437b900..57ddef240 100644
--- a/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
+++ b/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java
index c8fe7c111..50af67ea4 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java
index 86b318a05..e097b8815 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java
index cfc93c716..467261139 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java
index 5d702bffa..daaf9cc91 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
index 1d239331e..355f6d782 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java
index ab26abbb6..ccdc978a8 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentProcessor.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentProcessor.java
index dc57e9a01..652c8ca5f 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentProcessor.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentProcessor.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java
index 244230d25..50ac53924 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
index 47493fc46..5d4514140 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
index ee79d0ba5..2369e10f8 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/DefaultAttachmentProcessorTest.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/DefaultAttachmentProcessorTest.java
index 1283d6116..a1d2def2e 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/DefaultAttachmentProcessorTest.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/DefaultAttachmentProcessorTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
index 0dabc89d2..0a773e59f 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java
index 865eb5e48..fbc2e6611 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
index 60903f8c1..f5933c6db 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
index 8a3f468b2..93f6c0ee8 100644
--- a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
+++ b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
index 17a489e27..b9f58879d 100644
--- a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
+++ b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
index e62e0314f..74cfa88f2 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
index 4b27b17e6..29577aee2 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
index da5f84137..db00c41e6 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java b/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
index 3db26c236..21f68bebe 100644
--- a/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
+++ b/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java b/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java
index a31fd6f00..7f29c0490 100644
--- a/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java
+++ b/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/main/java/cucumber/runtime/formatter/TestSourcesModelProxy.java b/allure-cucumber4-jvm/src/main/java/cucumber/runtime/formatter/TestSourcesModelProxy.java
index e6af04883..f55994b76 100644
--- a/allure-cucumber4-jvm/src/main/java/cucumber/runtime/formatter/TestSourcesModelProxy.java
+++ b/allure-cucumber4-jvm/src/main/java/cucumber/runtime/formatter/TestSourcesModelProxy.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
index ecefc8ef6..d2ec2204c 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
index 9958e8e85..a0ed3c28b 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
index dec84aeb5..0c7417c05 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
index b39650faf..da872dced 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
index 3f76659a8..2b43b9ea8 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
index e72223093..c0308b3f3 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java
index b2ff7f6e6..b39835696 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java
index 7ff508ab6..53e0895c5 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
index d903702e6..4faa730ab 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
index ee2d6a5b6..68aa59fd7 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java
index c1ab1b965..7d122c577 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java
index 44e64a45f..f2baf281a 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
index f89c338d0..928fff4d1 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
index ba18430d3..645487621 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
index a6e5724b7..211939586 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java
index 6ffda30d3..2b3909c62 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java
index 46937911c..0e459841e 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
index 64391b3d4..f4fe1a151 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java
index bf219907f..f2a15b537 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java
index e3a335a9e..8439cb453 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BackgroundFeatureSteps.java
index 5f9177674..135a0bb19 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BackgroundFeatureSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BackgroundFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java
index 6a78e6bf9..d9ee5ce1a 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/DatatableFeatureSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/DatatableFeatureSteps.java
index a75c68849..10ecd8bc9 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/DatatableFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java
index 00f96ebc3..857683726 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/PendingSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/PendingSteps.java
index 29ee3cbf4..52a8da1a5 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/PendingSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/PendingSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java
index 3c7c2fd0a..01c1c1534 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
index 693171406..fba287315 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
index 2c0dcdc5f..94247a990 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
index f1e5940bf..a594d97d9 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
index 8545fd102..2bdc4b09b 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java
index 84f757ff0..228f1623a 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
index 1e29208c4..b5a1ff4d4 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
index 434852199..8d8a22dfe 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
index cf896ffe2..b3f397a3b 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java
index 9eb6f294f..f8b041039 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java
index 9e815c978..22b64b97b 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java
index bd0cec6f6..416732c3d 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
index e0de9fc63..fcc108bf7 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java
index df67e1a8a..db1279635 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java
index 85d03e315..ffa41cb13 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
index 123a1e29b..f5cf815e4 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
index 4889a23da..a5ffd0948 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
index 8ef92b7ab..8efb825a4 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
index 5ce13730f..37d2fb7ff 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java
index 662adf763..1ceacf741 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
index 13064c4f8..055fd7dbc 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
index c74d4c10d..2358228cd 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
index c0242a460..0c8d10141 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java
index 5442225d0..f1a6f01f5 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java
index df3f7042b..206f927f7 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java
index ae937b57f..30e7e406e 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
index 247572252..072c7d810 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java
index 060e5c1dc..c55390ed0 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java
index 69d63049b..9212f0318 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java
index a6b225139..5bdaf305c 100644
--- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
index 32ce95707..b4487310e 100644
--- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
index ff8f7dbdc..4b3b5fc90 100644
--- a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
+++ b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
index d394a16aa..1217dcf92 100644
--- a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
index ef32e4dde..39eeb7213 100644
--- a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
index 7824d9ee2..ffd2a9b33 100644
--- a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java b/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
index f75df916b..6c83b9f03 100644
--- a/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
+++ b/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java b/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
index cf836d8f1..d78020e78 100644
--- a/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
+++ b/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java
index 6086258f9..f04ba4d74 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
index 805b593c4..a8c07b827 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java
index f2c810425..5d0a376d1 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java
index c6d43e44c..f5fa62efa 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java
index 3b0170d24..44d468b1c 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java
index ec401a53b..cddd89106 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java
index 5dc0fdd9e..fdbbc52fc 100644
--- a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java
+++ b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
index f75891181..1eb4bfe75 100644
--- a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
+++ b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java b/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
index d7e56ea95..ddc3019ed 100644
--- a/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
+++ b/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
index d593c4576..2e4ab5584 100644
--- a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
index 97e6c1c86..bf5bff643 100644
--- a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
index 342093031..43297a28c 100644
--- a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
index 453b57bc4..364ea253f 100644
--- a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
index 4453f2e49..301e13862 100644
--- a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
index 7220171dc..6b73e36dd 100644
--- a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java
index d4641dcc8..9ea66a2fb 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java
index f59a9581d..4cd1ce35d 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
index d0a22173f..621b213ae 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResultsWriterStub.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResultsWriterStub.java
index 0e560c932..cdbfcd85f 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResultsWriterStub.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResultsWriterStub.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
index 3020f34f5..ae099c33f 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
index 27eae0ccf..185a98b54 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java
index 3748458f8..ce23958a4 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java
index d0be47326..092c183e9 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
index 21c90d2fa..afc8ddbc3 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java
index 7e432af99..8b3b8cdc8 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureId.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureId.java
index cd5786aac..3ca5b245a 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureId.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureId.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
index 5b9e0065f..bea1d4dce 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriteException.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriteException.java
index ca3b92180..0dd0b5ef1 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriteException.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriteException.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriter.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriter.java
index e997fd492..9e266b383 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriter.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Attachment.java b/allure-java-commons/src/main/java/io/qameta/allure/Attachment.java
index 848ba4f4c..b08ed83ed 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Attachment.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Attachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Description.java b/allure-java-commons/src/main/java/io/qameta/allure/Description.java
index 7ee351433..3f83f6855 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Description.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Description.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Epic.java b/allure-java-commons/src/main/java/io/qameta/allure/Epic.java
index c6515b41e..851c90f56 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Epic.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Epic.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Epics.java b/allure-java-commons/src/main/java/io/qameta/allure/Epics.java
index 8e462ca77..2ea16dbdb 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Epics.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Epics.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Feature.java b/allure-java-commons/src/main/java/io/qameta/allure/Feature.java
index b340558de..d938062bc 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Feature.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Feature.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Features.java b/allure-java-commons/src/main/java/io/qameta/allure/Features.java
index 4c6795e79..8c80d6399 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Features.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Features.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java b/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
index 3e361b07b..187f39dc0 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Flaky.java b/allure-java-commons/src/main/java/io/qameta/allure/Flaky.java
index 3d6748826..f1fc21733 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Flaky.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Flaky.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Issue.java b/allure-java-commons/src/main/java/io/qameta/allure/Issue.java
index f795897c7..9abe55616 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Issue.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Issue.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Issues.java b/allure-java-commons/src/main/java/io/qameta/allure/Issues.java
index 2ab62c75b..c70da23de 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Issues.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Issues.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotation.java b/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotation.java
index 294108077..36a28f031 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotation.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotations.java b/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotations.java
index 8afd77f89..5a63ee889 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotations.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotations.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Lead.java b/allure-java-commons/src/main/java/io/qameta/allure/Lead.java
index 760f61bc2..30c95c176 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Lead.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Lead.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Link.java b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
index b0b4dacb6..d48f8b873 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Link.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
index e646de636..f8ef85974 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
index 50428d1c8..e4df3187a 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Links.java b/allure-java-commons/src/main/java/io/qameta/allure/Links.java
index 4e0c977d9..b85c39857 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Links.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Links.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Muted.java b/allure-java-commons/src/main/java/io/qameta/allure/Muted.java
index 16ac6f222..42ab5879a 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Muted.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Muted.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Owner.java b/allure-java-commons/src/main/java/io/qameta/allure/Owner.java
index d0eea5eb4..cce5b56a2 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Owner.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Owner.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Param.java b/allure-java-commons/src/main/java/io/qameta/allure/Param.java
index 33e34f5bc..5c03f1f33 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Param.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Param.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Severity.java b/allure-java-commons/src/main/java/io/qameta/allure/Severity.java
index 767bc0b90..d34ca0e26 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Severity.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Severity.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/SeverityLevel.java b/allure-java-commons/src/main/java/io/qameta/allure/SeverityLevel.java
index eb8e3a0b6..ad7bcd152 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/SeverityLevel.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/SeverityLevel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Step.java b/allure-java-commons/src/main/java/io/qameta/allure/Step.java
index 1fec2ab71..2ddcc2e33 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Step.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Step.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Stories.java b/allure-java-commons/src/main/java/io/qameta/allure/Stories.java
index e9f376d94..9e990597c 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Stories.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Stories.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Story.java b/allure-java-commons/src/main/java/io/qameta/allure/Story.java
index bf74c5ceb..929485db8 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Story.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Story.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java b/allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java
index d5e839017..f4f3b68d2 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/TmsLinks.java b/allure-java-commons/src/main/java/io/qameta/allure/TmsLinks.java
index 1253436b4..f364bab76 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/TmsLinks.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/TmsLinks.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java b/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
index 617eae770..02b4ac000 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java b/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
index 407c82d40..965a93814 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
index 6613230ca..b3e490bf8 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java
index a72614684..5ae89b1e1 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
index cc7236a79..ddfcc5c12 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java
index 73db041ad..e8cca6af8 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java
index cb2e70558..39296505a 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleListener.java
index b6930873b..b411081f2 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
index 92f56097a..d74a3107d 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java
index f59b5b812..e304beab3 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java
index 12a0b1ea6..bed90719b 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
index b575111e0..d241a4683 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java
index 640298f9d..ea6396924 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java
index 4764b04f2..e658e8e28 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
index f52209b51..ba129a460 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
index 5c7eccf0b..f20f935e8 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java
index f0e68f7ec..2cb2687c9 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java
index cd8b4d657..da96fe87b 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index aa86319d2..8d8acd47c 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java
index 64d09f047..c6ff3c5b9 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
index 35ea19d86..cf8fa80b9 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java b/allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java
index 9e874187c..a4b8afa51 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
index 9c0b103c6..d4bc5bda0 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
index 44b77706b..3e70d0a03 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java b/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java
index 5a325a5f0..bd09c6935 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java
index eb2cfb8c5..dd053822e 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/internal/AllureThreadContextTest.java b/allure-java-commons/src/test/java/io/qameta/allure/internal/AllureThreadContextTest.java
index 722e1027f..77fefe583 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/internal/AllureThreadContextTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/internal/AllureThreadContextTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyCard.java b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyCard.java
index ff3473519..7cdf5ebe2 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyCard.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyCard.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyEmail.java b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyEmail.java
index 8231cb698..31f42ec82 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyEmail.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyEmail.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyUser.java b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyUser.java
index 60c58714b..d9476fda9 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyUser.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyUser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
index b7eaa4b04..71d3b47d8 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
index c1fb825fa..422c825cd 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
index 64045ea81..218ef4a33 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java
index 0bb4ebe84..1232ea19a 100644
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java
+++ b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java
index d3c8e21b6..b575be44e 100644
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java
+++ b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1ParametersAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1ParametersAspects.java
index 7eacbabdb..c80e556aa 100644
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1ParametersAspects.java
+++ b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1ParametersAspects.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1StepsAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1StepsAspects.java
index c3d93787d..9fcfd8531 100644
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1StepsAspects.java
+++ b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1StepsAspects.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1TestCaseAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1TestCaseAspects.java
index 8e0a1ed91..3267b3bdf 100644
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1TestCaseAspects.java
+++ b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1TestCaseAspects.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Utils.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Utils.java
index 48acffa35..a80c9ba36 100644
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Utils.java
+++ b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Utils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Attachment.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Attachment.java
index 8b919da51..108904979 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Attachment.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Attachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Description.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Description.java
index 694d1ad63..f3a9fcc38 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Description.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Description.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Features.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Features.java
index 32ed82576..71659ddbe 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Features.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Features.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issue.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issue.java
index 82e0af871..cbd576255 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issue.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issue.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issues.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issues.java
index 6dc700f9d..e77ec28fc 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issues.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issues.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Parameter.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Parameter.java
index 970a73448..8642fee4a 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Parameter.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Parameter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Severity.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Severity.java
index 1d0c86e75..2b8013ffc 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Severity.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Severity.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Step.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Step.java
index 92f3266fb..993f11ccb 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Step.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Step.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Stories.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Stories.java
index 09e4470fb..bff28bd3e 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Stories.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Stories.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/TestCaseId.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/TestCaseId.java
index 3b43d7f23..3f3d010b9 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/TestCaseId.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/TestCaseId.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Title.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Title.java
index cfc836e6b..b24e62303 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Title.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Title.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/DescriptionType.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/DescriptionType.java
index e0bdbe22f..8fb2988c2 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/DescriptionType.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/DescriptionType.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/SeverityLevel.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/SeverityLevel.java
index e37bf5b71..0f0f50044 100644
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/SeverityLevel.java
+++ b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/SeverityLevel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java
index 47df223cf..96734ba5b 100644
--- a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java
+++ b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1StepsAspectsTest.java b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1StepsAspectsTest.java
index 6458b5f47..f62082a0c 100644
--- a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1StepsAspectsTest.java
+++ b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1StepsAspectsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1TestCaseAspectsTest.java b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1TestCaseAspectsTest.java
index 9f92462a7..03c0b2071 100644
--- a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1TestCaseAspectsTest.java
+++ b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1TestCaseAspectsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java b/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
index 7d28b0a1f..d7f61baa0 100644
--- a/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
+++ b/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java b/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java
index 3f3ea9e27..d0bc75158 100644
--- a/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java
+++ b/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java b/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
index b362e3e71..d1ee185b7 100644
--- a/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
+++ b/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
index a2f7fe9c2..5e7035e47 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/LoggingReporter.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/LoggingReporter.java
index 19103dfb4..dc3b7ba83 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/LoggingReporter.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/LoggingReporter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java
index edc2a804e..e401c825f 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java
index 9e7a664b0..45a93ede9 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
index 3c38c214c..266fbf626 100644
--- a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
+++ b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
index 3b15aeaca..eb670babc 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java
index 44a416927..3389fe420 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java
index a96a97a0c..e1a0b5e2b 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java
index 883199e9e..99aab03b3 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
index 79c976ae7..3d314b172 100644
--- a/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
+++ b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2022 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java b/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
index b1804ff82..d4e6f853e 100644
--- a/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
+++ b/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
index 875adf470..6a940d4dc 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
index 05871c70d..07851666f 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java
index bd7e7b60c..c747b1121 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffModel.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffModel.java
index 514a0215e..3a65e6012 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffModel.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffModel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
index df7a7dc49..1a92c20f0 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
index 34d154682..b9f53b131 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java
index 28f3cb80e..4b6b043ac 100644
--- a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java
+++ b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java
index 7959ddcf9..29e85869d 100644
--- a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java
+++ b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index 75b1c1e07..e7303595d 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
index d7727fd20..14769ed22 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
index 8e802de7d..56525bd02 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
index 930c35764..33be21458 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
index b26897f22..df27d2f3e 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
index 2f7dfc144..eb13add0b 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/AllureIdAnnotationSupport.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/AllureIdAnnotationSupport.java
index 2db9bcdf2..5fce824ad 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/AllureIdAnnotationSupport.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/AllureIdAnnotationSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java
index 32a766fe8..2fb9f401b 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java
index c9ba4f15e..f91459bad 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenTests.java
index e286688b3..a69c7c4f9 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java
index 6a769becf..d4fa32846 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledRepeatedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledRepeatedTests.java
index 88da3190b..f3e8101f7 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledRepeatedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledRepeatedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledTests.java
index b6794dbe8..48cfcef98 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisplayNameOnClassTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisplayNameOnClassTests.java
index 77b7be46f..a3940fa20 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisplayNameOnClassTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisplayNameOnClassTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java
index 74debbb95..1a8a1d779 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FailedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FailedTests.java
index 6c7a79df0..91be711a6 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FailedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FailedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.java
index f7bf17ad1..44867edd0 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java
index 11ee50512..dad7fcb45 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java
index 2ff1ecf52..d3f33cafc 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java
index f2ee83da6..b8c91afbe 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OneTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OneTest.java
index 6b64f3932..9a9ea4136 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OneTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OneTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OwnerTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OwnerTest.java
index e1933ab01..f59e95fad 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OwnerTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OwnerTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParallelTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParallelTests.java
index e580f5077..06dbe11f4 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParallelTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParallelTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTests.java
index 19457b4ab..ee0606cd1 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java
index dfb83eff8..e3677440a 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java
index 7a38a1fd3..4b6cb9f62 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/RepeatedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/RepeatedTests.java
index 02797b0b8..a63a81cca 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/RepeatedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/RepeatedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java
index c7dc820d3..de199041f 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SeverityTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SeverityTest.java
index af0062a66..055a34537 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SeverityTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SeverityTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java
index ca6cc60c1..51e856360 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedTests.java
index b0f227314..17bfcafff 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java
index 8b287509f..8f544d85b 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassDisabled.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassDisabled.java
index e12bdec81..bba2c9e0e 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassDisabled.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassDisabled.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithDisplayNameAnnotation.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithDisplayNameAnnotation.java
index b9ddc449a..8dcf86e56 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithDisplayNameAnnotation.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithDisplayNameAnnotation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithoutDisplayNameAnnotation.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithoutDisplayNameAnnotation.java
index f018a3973..1119c59dc 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithoutDisplayNameAnnotation.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithoutDisplayNameAnnotation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java
index f4d1867a1..d2ee4ed9f 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java
index 9ae2ab1f5..39701deca 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDescription.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDescription.java
index 688931756..09d45396c 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDescription.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDescription.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDisplayName.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDisplayName.java
index 480f345fd..77f6d1409 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDisplayName.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDisplayName.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java
index 16ec35209..a1f8b6706 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java
index 020c1dfd2..7310b02bb 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java
index b677ac22f..1e3762d4b 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemErr.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemErr.java
index a63d21cf4..ee2c4a38a 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemErr.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemErr.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemOut.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemOut.java
index 84552795b..e66f077ff 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemOut.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemOut.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
index 26c8380d8..2f013ff0d 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
index b68fe181b..166933c16 100644
--- a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
+++ b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java
index b1d52f2f5..da9e03535 100644
--- a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java
+++ b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index 8cf402579..ed594591b 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
index ea9cc77a7..f856bf269 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
index 8cdb25c28..ebe87e56b 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/DisplayName.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/DisplayName.java
index 0b091f852..e72d01575 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/DisplayName.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/DisplayName.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
index b38023280..271dc7c5a 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
index 49bacad4b..112db3588 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/SampleTestInDefaultPackage.java b/allure-junit4/src/test/java/SampleTestInDefaultPackage.java
index a5b1dff0d..065c7d47a 100644
--- a/allure-junit4/src/test/java/SampleTestInDefaultPackage.java
+++ b/allure-junit4/src/test/java/SampleTestInDefaultPackage.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
index 7da9aba36..011443e08 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/AssumptionFailedTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/AssumptionFailedTest.java
index 66b3874bd..ed9b654f2 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/AssumptionFailedTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/AssumptionFailedTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenTest.java
index 71510083c..a4a66c02a 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenWithoutMessageTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenWithoutMessageTest.java
index 85d15ee48..d622552ef 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenWithoutMessageTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenWithoutMessageTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
index 467f4c513..f7f0e97d1 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FailedTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FailedTest.java
index 8d4fd2c35..9887d7f8c 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FailedTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FailedTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java
index 540b06ab4..31cec99f8 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredClassTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredClassTest.java
index c17bceb5c..6702ec083 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredClassTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredClassTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredTests.java
index 18599f91e..ff16dc0f7 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredTests.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java
index ed3e37ecd..3600cc143 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
index 7c2fc3911..a72c91bc8 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestBasedOnSampleRunner.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestBasedOnSampleRunner.java
index 64aa280ac..446dc661b 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestBasedOnSampleRunner.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestBasedOnSampleRunner.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java
index 0f843bbdf..3eb78a05a 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithSteps.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithSteps.java
index f19e72e41..51f48e489 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithSteps.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithTimeout.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithTimeout.java
index 15133dfb8..53640d19a 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithTimeout.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithTimeout.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java
index 22768d2b6..e668da036 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java b/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
index 375a3d19e..b483e0802 100644
--- a/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
+++ b/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java b/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
index 44d187e5e..4848e2b90 100644
--- a/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
+++ b/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
index f0fed32a9..6ede30ed2 100644
--- a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
+++ b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
index 2ae6ecb78..09e15eb3d 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
index eacb46a00..1f7ba67dd 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java
index 2ef2e0550..923d4f75b 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
index d34b07973..6cf6f09b3 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
index 9bd91d4c4..8084c1b56 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java
index ac6005395..8231baf97 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java
index 6a5b1eab5..ab53e4547 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
index a257a3581..1553e2a81 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
index e1ab37cf2..3cbb9adc6 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java
index 4e566370b..9209f1ad7 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
index 9629018e3..a300f0ecd 100644
--- a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
+++ b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
index 782e6478b..21fba0ecf 100644
--- a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java b/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
index 099ef0a25..0e53fbf89 100644
--- a/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Attachment.java b/allure-model/src/main/java/io/qameta/allure/model/Attachment.java
index 750bc7239..dc5b36e7c 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Attachment.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Attachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java b/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java
index b73cfee17..714a30b17 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/FixtureResult.java b/allure-model/src/main/java/io/qameta/allure/model/FixtureResult.java
index 7c2e12427..20e7b3cdc 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/FixtureResult.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/FixtureResult.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Label.java b/allure-model/src/main/java/io/qameta/allure/model/Label.java
index d8b400379..af9c52595 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Label.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Label.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Link.java b/allure-model/src/main/java/io/qameta/allure/model/Link.java
index a5de7c71d..7009aee99 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Link.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Link.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Parameter.java b/allure-model/src/main/java/io/qameta/allure/model/Parameter.java
index b41727380..6fbb0fb00 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Parameter.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Parameter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Stage.java b/allure-model/src/main/java/io/qameta/allure/model/Stage.java
index 14b0b199b..697478122 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Stage.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Stage.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Status.java b/allure-model/src/main/java/io/qameta/allure/model/Status.java
index 4f6c73d55..15c275bd2 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Status.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Status.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java b/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java
index 940ffd9d1..92e5449e5 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/StepResult.java b/allure-model/src/main/java/io/qameta/allure/model/StepResult.java
index 04855631a..92de00ecf 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/StepResult.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/StepResult.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/TestResult.java b/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
index fdbd569db..f6eb0f1f1 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java b/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java
index db4f430cb..b83500026 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java b/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java
index 970ba3262..772228218 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java b/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java
index 35d93ae89..63d640788 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java b/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java
index 59634c8fd..4b043d412 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java b/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java
index 14ce4ecd8..8fdd95234 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithStatusDetails.java b/allure-model/src/main/java/io/qameta/allure/model/WithStatusDetails.java
index 409886584..08400c748 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithStatusDetails.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithStatusDetails.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java b/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java
index 11952fa58..c225a6c27 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java b/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
index 781927cf5..4826eb0ea 100644
--- a/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
+++ b/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java b/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java
index 15e39c6fe..4a6c9dc3f 100644
--- a/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java
+++ b/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java b/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
index e47a956bd..bb784fb00 100644
--- a/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
+++ b/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java b/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java
index 3d0adc6c1..b2a8630f4 100644
--- a/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java
+++ b/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
index f7ed171cb..9a9861826 100644
--- a/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java b/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
index ad91d2899..88fe9eccf 100644
--- a/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
index a83ba7c65..f048e72e1 100644
--- a/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
index 47858a16c..8b6ddb62a 100644
--- a/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java
index 2500e65ca..f7824aa0e 100644
--- a/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
index a916012fe..6eebf322c 100644
--- a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
+++ b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
index d3121ed0f..f38e778af 100644
--- a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
+++ b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala b/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
index defd7019c..a1b84719e 100644
--- a/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
+++ b/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
index 085e617a4..03f172a3d 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala
index 1b0e55df2..77cb1fdc5 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala
index 85e283061..9e7b6460c 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala
index 11e41d4d7..351fddf4a 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala
index 66b84ea75..b13b174bd 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala
index 26e2d1ce7..29f996fef 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala
index 8cba30608..9a13d712d 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala
index d363790c0..39011d68b 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala
index e94fcd842..31bfcb563 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java b/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
index 53aceea47..ca06a32b4 100644
--- a/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
+++ b/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-selenide/src/main/java/io/qameta/allure/selenide/LogType.java b/allure-selenide/src/main/java/io/qameta/allure/selenide/LogType.java
index 9857debe2..97995efc5 100644
--- a/allure-selenide/src/main/java/io/qameta/allure/selenide/LogType.java
+++ b/allure-selenide/src/main/java/io/qameta/allure/selenide/LogType.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java b/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java
index 4aaabffd7..889fd8ff5 100644
--- a/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java
+++ b/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java b/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
index b3a547053..5822a102a 100644
--- a/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
+++ b/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java b/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
index 4157abd74..6ef5a51dd 100644
--- a/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
+++ b/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java b/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java
index 4b9e005ca..afb51f3ef 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/BrokenTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/BrokenTest.groovy
index f3b7b5d33..908722f4a 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/BrokenTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/BrokenTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy
index 4b5512c81..e07a9db3a 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy
index 913120c53..00bf73451 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy
index ec3afda57..ad8c2234c 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/OneTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/OneTest.groovy
index 055a01137..28f18540e 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/OneTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/OneTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/ParametersTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/ParametersTest.groovy
index 3f357adbd..506c514ba 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/ParametersTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/ParametersTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy
index 95e80a03c..d7b086890 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy
index 5b7f691a6..c6eda8825 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithCustomAnnotations.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithCustomAnnotations.groovy
index 1995b0575..32efd0e2a 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithCustomAnnotations.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithCustomAnnotations.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy
index 438e4a162..1e019b408 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/XrayId.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/XrayId.groovy
index cd91a219f..2055e1d73 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/XrayId.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/XrayId.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
index 9c973b7de..a07a47f06 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
index e97e15594..c90a393ab 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
index 38fa96dc1..402a77eef 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy
index ec7f8c110..722cdc975 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy
index 572f7489a..8a7a62afd 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
index e0e1cb8f6..b690390b2 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy
index f0b747b35..581241776 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
index b8ab906df..890d8aca1 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy
index a35128212..3ae0b7f34 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
index debc96f55..27e7e70dd 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy
index 252f16ec1..d5b4f5beb 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
index 7e4c8c0b0..3884e6fed 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
index d0b598387..41a1ef57f 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy
index 7bcf50ff2..25940b3c1 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
index 47dff03e0..2aed57c68 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
index d5065cafd..8f1a4b46e 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
index 169711214..58347d7b2 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy
index 78e290cdf..a535ba9c4 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy
index ac6029158..c80c9e4ab 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy
index b05be8128..64ae85712 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy
index ab73089df..ac88117c5 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
index 012ceb974..9f1daf988 100644
--- a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
+++ b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java b/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
index 8da4532dc..3911b640f 100644
--- a/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
+++ b/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java
index 901b685da..5587bbf3c 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
index a0c5b7c21..64bad2ebd 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java
index b3a2c27a7..bbd53e1cd 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java
index 937a7c74a..fd4720302 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
index 72d79e816..c282ce882 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
index fecc30ecb..ebbc0a63e 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
index 376a00e60..886f3e55e 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/Tag.java b/allure-testng/src/main/java/io/qameta/allure/testng/Tag.java
index 3336c1e51..b6ddaec1b 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/Tag.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/Tag.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/Tags.java b/allure-testng/src/main/java/io/qameta/allure/testng/Tags.java
index 7c78a40f5..2d1590102 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/Tags.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/Tags.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/TestInstanceParameter.java b/allure-testng/src/main/java/io/qameta/allure/testng/TestInstanceParameter.java
index 7fcafee50..62de34c33 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/TestInstanceParameter.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/TestInstanceParameter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java b/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
index f35fdea72..e68c09879 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
index ed5cb1c79..736564729 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java
index 19e5b5df2..563680c60 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java
index 7399eac70..f24a42c19 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AttachmentsTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AttachmentsTest.java
index 71f88dc7d..a816b75d7 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AttachmentsTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AttachmentsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java
index e90bca720..62485655a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestA.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestA.java
index e2fee0852..460d1b0c9 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestA.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestA.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestB.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestB.java
index 1d71e10e7..a99c791bb 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestB.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestB.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTests.java
index e37b6c1c3..23e4b8949 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTestsInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTestsInherited.java
index cdcdf49b9..9aa261359 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTestsInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTestsInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeFixturesCombination.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeFixturesCombination.java
index 24efb054b..0122ae8df 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeFixturesCombination.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeFixturesCombination.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeMethods.java
index b0b8c6b37..802a5a309 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeMethods.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures1.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures1.java
index c500d2873..258a738fd 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures1.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures1.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures2.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures2.java
index dd4984ba3..a58f47ace 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures2.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures2.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures3.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures3.java
index 7df51b414..76195b36f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures3.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures3.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInParent.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInParent.java
index fc3b8262b..a620ffbba 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInParent.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInParent.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInherited.java
index da723cfd2..196aad966 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ConfigurationFailure.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ConfigurationFailure.java
index 5775f0ac3..d258efa0b 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ConfigurationFailure.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ConfigurationFailure.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/CyrillicDescriptions.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/CyrillicDescriptions.java
index a13f441be..475ffb5bd 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/CyrillicDescriptions.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/CyrillicDescriptions.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithArray.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithArray.java
index bd9fc9a9c..994e32565 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithArray.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithArray.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsAnotherTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsAnotherTest.java
index 3e8ab149f..cb5f9f3df 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsAnotherTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsAnotherTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsTest.java
index 3772bce0d..c16eab81a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DisabledTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DisabledTest.java
index 82e1c751d..b01b16f4f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DisabledTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DisabledTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FactoryOnConstructorTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FactoryOnConstructorTests.java
index 8d9fdfc24..4f2af21c4 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FactoryOnConstructorTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FactoryOnConstructorTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterMethod.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterMethod.java
index 649fea153..5297b3d69 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterMethod.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterMethod.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterSuite.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterSuite.java
index c794347a3..09ed05877 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterSuite.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterSuite.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterTest.java
index 9fd4a952c..417b2fbfc 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java
index f28c7a7d8..05d8853fb 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeMethod.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeMethod.java
index 85b1326ae..fdba2be7f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeMethod.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeMethod.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeSuite.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeSuite.java
index f0f10afef..4226d81f8 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeSuite.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeSuite.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeTest.java
index 0e57ae2d3..bd498a19a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedFlakyTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedFlakyTest.java
index a11acb9ab..7bf87987e 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedFlakyTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedFlakyTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedSetUp.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedSetUp.java
index 4d3524532..578b4f807 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedSetUp.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedSetUp.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedTestPassedBeforeFixture.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedTestPassedBeforeFixture.java
index 1dedbe5ee..d5a24421c 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedTestPassedBeforeFixture.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedTestPassedBeforeFixture.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FixtureWithDescription.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FixtureWithDescription.java
index 37ef45fbc..94e0922d9 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FixtureWithDescription.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FixtureWithDescription.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethods.java
index 293d00a23..5441c5940 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethods.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethodsInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethodsInherited.java
index b1d50c574..970dd55af 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethodsInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethodsInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClass.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClass.java
index 20cd5155c..317c0603b 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClass.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClass.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClassInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClassInherited.java
index 80ea6f84a..65b002350 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClassInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClassInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/HistoryIdForTestWithDataProvider.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/HistoryIdForTestWithDataProvider.java
index c2297a372..e21a0ac06 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/HistoryIdForTestWithDataProvider.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/HistoryIdForTestWithDataProvider.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/JustTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/JustTest.java
index cb383f502..98f2f142d 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/JustTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/JustTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java
index f98541dfb..b964fbb46 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTestsInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTestsInherited.java
index 351a5b5dd..c63d7b821 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTestsInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTestsInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethods.java
index 2f960863f..fd0f30bfa 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethods.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethodsInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethodsInherited.java
index f079e1a71..078f3b0a4 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethodsInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethodsInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClass.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClass.java
index eb149798c..0edc9b78f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClass.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClass.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClassInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClassInherited.java
index cb9c3a304..741cb2924 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClassInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClassInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/NestedSteps.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/NestedSteps.java
index 25f6f0df1..f12af9f78 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/NestedSteps.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/NestedSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/NullParamTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/NullParamTest.java
index 211522528..bb1482c06 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/NullParamTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/NullParamTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTest.java
index f0d534ed3..36cbed218 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTestInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTestInherited.java
index 64780d44d..26a18b612 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTestInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTestInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTest.java
index a6fb4e849..8c5b56bc7 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTestInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTestInherited.java
index 198586ca0..1b6e7251e 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTestInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTestInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java
index 28d4cd5ca..5a98b901b 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java
index de1adde10..3adfa59eb 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParameterizedTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParameterizedTest.java
index 567b6dae7..385689b14 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParameterizedTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParameterizedTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerClassFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerClassFixtures.java
index 701663c7f..49c67d25c 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerClassFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerClassFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerMethodFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerMethodFixtures.java
index c8a859938..ec0515dbf 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerMethodFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerMethodFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java
index f3d5adced..51c1a6c1a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java
index f77ed3f79..da09bb7fd 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java
index 43997cbdf..b61c15088 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/RetryTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/RetryTest.java
index f24a30ca5..94f28efc4 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/RetryTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/RetryTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTest.java
index fd8e25385..3f8468389 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTestInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTestInherited.java
index 2f59dc291..968fbe9ff 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTestInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTestInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTest.java
index b7e262097..fe2671834 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTestInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTestInherited.java
index 2cb9f4349..87d1ddffd 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTestInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTestInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SkippedSuite.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SkippedSuite.java
index 8dbb03e05..45d36923c 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SkippedSuite.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SkippedSuite.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SuiteParameterTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SuiteParameterTest.java
index 69d676785..d1ab7946d 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SuiteParameterTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SuiteParameterTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java
index 4c6d07bfa..f9fa0f65a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java
index aabb2ed36..0aae5a0aa 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestTagFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestTagFixtures.java
index c9242d7e2..af3aeb2f4 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestTagFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestTagFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithParameters.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithParameters.java
index f23e504e4..bd08a9ba2 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithParameters.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithParameters.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithTimeout.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithTimeout.java
index 02447df3c..548d2780c 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithTimeout.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithTimeout.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java
index 70bcdcde4..aa401db70 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithSteps.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithSteps.java
index 157a9981e..25faca37c 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithSteps.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/VarargsParameters.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/VarargsParameters.java
index b2f363422..f620badc1 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/VarargsParameters.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/VarargsParameters.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/gradle/quality-configs/spotless/header.java b/gradle/quality-configs/spotless/header.java
index e42de8108..a91c27d5a 100644
--- a/gradle/quality-configs/spotless/header.java
+++ b/gradle/quality-configs/spotless/header.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright $YEAR Qameta Software OÜ
+ *  Copyright 2016-2024 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -12,4 +12,4 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- */
\ No newline at end of file
+ */

From cb1ce6f90416d2f30e88002622ec613af123631b Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:36:30 +0000
Subject: [PATCH 063/233] cleanup workflows

---
 .github/ISSUE_TEMPLATE/bug_report.yml |  2 +-
 .github/workflows/build.yml           |  2 +-
 Jenkinsfile                           | 40 ---------------------------
 3 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 Jenkinsfile

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index fb19a1b5d..bb09719d9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -79,7 +79,7 @@ body:
     id: terms
     attributes:
       label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/allure-framework/allure-java/blob/master/CODE_OF_CONDUCT.md)
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/allure-framework/allure-java/blob/main/CODE_OF_CONDUCT.md)
       options:
         - label: I agree to follow this project's Code of Conduct
           required: true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69f577fc1..ad77feb7d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
       - '*'
   push:
     branches:
-      - 'master'
+      - 'main'
       - 'hotfix-*'
 
 jobs:
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 64bac5a9e..000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,40 +0,0 @@
-pipeline {
-    agent { label 'java' }
-    parameters {
-        booleanParam(name: 'RELEASE', defaultValue: false, description: 'Perform release?')
-        string(name: 'RELEASE_VERSION', defaultValue: '', description: 'Release version')
-        string(name: 'NEXT_VERSION', defaultValue: '', description: 'Next version (without SNAPSHOT)')
-    }
-    stages {
-        stage('Build') {
-            steps {
-                sh './gradlew build'
-            }
-        }
-        stage('Release') {
-            when { expression { return params.RELEASE } }
-            steps {
-                withCredentials([usernamePassword(credentialsId: 'qameta-ci_bintray',
-                        usernameVariable: 'BINTRAY_USER', passwordVariable: 'BINTRAY_API_KEY')]) {
-                    sshagent(['qameta-ci_ssh']) {
-                        sh 'git checkout master && git pull origin master'
-                        sh "./gradlew release -Prelease.useAutomaticVersion=true " +
-                                "-Prelease.releaseVersion=${RELEASE_VERSION} " +
-                                "-Prelease.newVersion=${NEXT_VERSION}-SNAPSHOT"
-                    }
-                }
-            }
-        }
-    }
-    post {
-        always {
-            allure results: [[path: '**/build/allure-results']]
-            deleteDir()
-        }
-
-        failure {
-            slackSend message: "${env.JOB_NAME} - #${env.BUILD_NUMBER} failed (<${env.BUILD_URL}|Open>)",
-                    color: 'danger', teamDomain: 'qameta', channel: 'allure', tokenCredentialId: 'allure-channel'
-        }
-    }
-}

From 2b85a8cd884abab316b1c31f010c884ec46b041d Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:39:56 +0000
Subject: [PATCH 064/233] add dependency submission action

---
 .github/workflows/dependency-submission.yml | 22 +++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/dependency-submission.yml

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
new file mode 100644
index 000000000..0f479b11a
--- /dev/null
+++ b/.github/workflows/dependency-submission.yml
@@ -0,0 +1,22 @@
+name: Dependency Submission
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+
+jobs:
+  dependency-submission:
+    name: Dependency Submission
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Generate and submit dependency graph
+        uses: gradle/actions/dependency-submission@v3
+        env:
+          DEPENDENCY_GRAPH_EXCLUDE_PROJECTS: ':allure-java-commons-test'
+          DEPENDENCY_GRAPH_EXCLUDE_CONFIGURATIONS: 'test(Compile|Runtime)Classpath'

From 08bc3ac109224125b065fb8f688604458ea97b25 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:46:23 +0000
Subject: [PATCH 065/233] update license year

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index e078585bf..aa0c10ae1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 Qameta Software OÜ
+   Copyright 2016-2024 Qameta Software Inc
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

From 790c39f5f8176267fe727ee700d8ad97565e81a4 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Mon, 29 Jan 2024 19:23:08 +0000
Subject: [PATCH 066/233] update ds action

---
 .github/workflows/dependency-submission.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index 0f479b11a..f11f89b35 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.github/workflows/dependency-submission.yml
@@ -17,6 +17,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Generate and submit dependency graph
         uses: gradle/actions/dependency-submission@v3
+        with:
+          dependency-graph: generate-and-upload
         env:
           DEPENDENCY_GRAPH_EXCLUDE_PROJECTS: ':allure-java-commons-test'
           DEPENDENCY_GRAPH_EXCLUDE_CONFIGURATIONS: 'test(Compile|Runtime)Classpath'

From f97bb819f3a2840ac0674b91620488e80e9a0d2c Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Mon, 29 Jan 2024 19:32:14 +0000
Subject: [PATCH 067/233] only include runtime classpath

---
 .github/workflows/dependency-submission.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index f11f89b35..bb93c2eb2 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.github/workflows/dependency-submission.yml
@@ -17,8 +17,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Generate and submit dependency graph
         uses: gradle/actions/dependency-submission@v3
-        with:
-          dependency-graph: generate-and-upload
         env:
           DEPENDENCY_GRAPH_EXCLUDE_PROJECTS: ':allure-java-commons-test'
-          DEPENDENCY_GRAPH_EXCLUDE_CONFIGURATIONS: 'test(Compile|Runtime)Classpath'
+          DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS: 'runtimeClasspath'

From 2ba9ee9452e2e28da9dab42b1f981bffd5e50a1e Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Tue, 30 Jan 2024 10:18:18 +0000
Subject: [PATCH 068/233] gradle 8 (via #996)

---
 .../allure/internal/AllureThreadContext.java  |   2 +-
 .../io/qameta/allure/jooq/AllureJooq.java     |   1 +
 .../junitplatform/AllureJunitPlatform.java    |   2 +-
 allure-scalatest/build.gradle.kts             |   2 +-
 ...StatementsLabelsToStepsTransformation.java |   4 +-
 build.gradle.kts                              |  75 +++--
 gradle/quality-configs/pmd/pmd.xml            |   5 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin 59536 -> 60756 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       | 263 +++++++++++-------
 gradlew.bat                                   |  14 +-
 settings.gradle.kts                           |   2 +-
 12 files changed, 234 insertions(+), 138 deletions(-)

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
index ddfcc5c12..bbf94fd4e 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
@@ -79,7 +79,7 @@ public void clear() {
     /**
      * Thread local context that stores information about not finished tests and steps.
      */
-    private static class Context extends InheritableThreadLocal<LinkedList<String>> {
+    private static final class Context extends InheritableThreadLocal<LinkedList<String>> {
 
         @Override
         public LinkedList<String> initialValue() {
diff --git a/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
index 3d314b172..3498deb2b 100644
--- a/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
+++ b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
@@ -34,6 +34,7 @@
 /**
  * @author charlie (Dmitry Baev).
  */
+@SuppressWarnings("PMD.NonSerializableClass")
 public class AllureJooq implements ExecuteListener {
 
     private static final String STEP_UUID
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index e7303595d..e48ee7713 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -730,7 +730,7 @@ private String getOrCreateTest(final TestIdentifier testIdentifier) {
         return tests.get().getOrCreate(testIdentifier);
     }
 
-    private static class Uuids {
+    private static final class Uuids {
 
         private final Map<TestIdentifier, String> storage = new ConcurrentHashMap<>();
         private final ReadWriteLock lock = new ReentrantReadWriteLock();
diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts
index 382bbfbf5..910d28ad2 100644
--- a/allure-scalatest/build.gradle.kts
+++ b/allure-scalatest/build.gradle.kts
@@ -22,7 +22,7 @@ if (hasProperty("scalaVersion")) {
 }
 
 val baseScalaVersion = selectedScalaVersion.substring(0, selectedScalaVersion.lastIndexOf("."))
-project.base.archivesBaseName = "allure-scalatest_$baseScalaVersion"
+project.base.archivesName.set("allure-scalatest_$baseScalaVersion")
 
 for (sv in availableScalaVersions) {
     val taskSuffix = sv.replace('.', '_')
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
index c90a393ab..4db9dc0fe 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
@@ -59,7 +59,7 @@ public void visit(final ASTNode[] nodes, final SourceUnit sourceUnit) {
     /**
      * Use of nested class defers linking until after groovy version check.
      */
-    private static class Impl {
+    private static final class Impl {
         private static final AstNodeCache NODE_CACHE = new AstNodeCache();
 
         private void visit(final SourceUnit sourceUnit) {
@@ -100,7 +100,7 @@ private void processSpec(final SourceUnit sourceUnit,
     /**
      * Adds Allure steps for statements with labels.
      */
-    private static class MethodVisitor implements GroovyClassVisitor {
+    private static final class MethodVisitor implements GroovyClassVisitor {
 
         private static final ClassNode ALLURE = ClassHelper.makeWithoutCaching(Allure.class);
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 4d6d8249d..82d806791 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.github.spotbugs.snom.SpotBugsTask
+
 val gradleScriptDir by extra("${rootProject.projectDir}/gradle")
 val qualityConfigsDir by extra("$gradleScriptDir/quality-configs")
 val spotlessDtr by extra("$qualityConfigsDir/spotless")
@@ -5,7 +7,7 @@ val spotlessDtr by extra("$qualityConfigsDir/spotless")
 val libs = subprojects.filterNot { it.name in "allure-bom" }
 
 tasks.withType(Wrapper::class) {
-    gradleVersion = "7.5.1"
+    gradleVersion = "8.5"
 }
 
 plugins {
@@ -13,12 +15,14 @@ plugins {
     `java-library`
     `maven-publish`
     signing
+    checkstyle
+    pmd
+    id("com.github.spotbugs")
     id("com.diffplug.spotless")
     id("io.github.gradle-nexus.publish-plugin")
     id("io.qameta.allure-adapter") apply false
     id("io.qameta.allure-report")
     id("io.spring.dependency-management")
-    id("ru.vyarus.quality")
 }
 
 java {
@@ -125,13 +129,15 @@ configure(subprojects) {
 
 configure(libs) {
     val project = this
+    apply(plugin = "checkstyle")
+    apply(plugin = "pmd")
+    apply(plugin = "com.github.spotbugs")
     apply(plugin = "com.diffplug.spotless")
     apply(plugin = "io.qameta.allure-report")
     apply(plugin = "io.qameta.allure-adapter")
     apply(plugin = "io.spring.dependency-management")
     apply(plugin = "java")
     apply(plugin = "java-library")
-    apply(plugin = "ru.vyarus.quality")
 
     val orgSlf4jVersion = "1.7.36"
     val assertJVersion = "1.9.9.1"
@@ -142,17 +148,17 @@ configure(libs) {
             mavenBom("org.junit:junit-bom:5.9.2")
         }
         dependencies {
-            dependency("com.github.spotbugs:spotbugs:4.7.3")
+            dependency("com.github.spotbugs:spotbugs:4.8.3")
             dependency("com.github.tomakehurst:wiremock:2.27.2")
             dependency("com.google.inject:guice:5.1.0")
             dependency("com.google.testing.compile:compile-testing:0.19")
-            dependency("com.puppycrawl.tools:checkstyle:9.3")
+            dependency("com.puppycrawl.tools:checkstyle:10.13.0")
             dependency("com.squareup.retrofit2:retrofit:2.9.0")
             dependency("commons-io:commons-io:2.11.0")
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.6.0")
             dependency("javax.annotation:javax.annotation-api:1.3.2")
-            dependency("net.sourceforge.pmd:pmd-java:6.46.0")
+            dependency("net.sourceforge.pmd:pmd-java:6.55.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
             dependency("org.apache.httpcomponents.client5:httpclient5:5.2.1")
@@ -260,16 +266,24 @@ configure(libs) {
         }
     }
 
-    quality {
-        configDir = qualityConfigsDir
-        checkstyleVersion = dependencyManagement.managedVersions["com.puppycrawl.tools:checkstyle"]
-        pmdVersion = dependencyManagement.managedVersions["net.sourceforge.pmd:pmd-java"]
-        spotbugsVersion = dependencyManagement.managedVersions["com.github.spotbugs:spotbugs"]
-        spotbugs = true
-        pmd = true
-        checkstyle = true
-        htmlReports = false
-        enabled = !project.hasProperty("disableQuality")
+    val enableQuality = true
+    fun excludeGeneratedSources(source: FileTree): FileTree = (source - fileTree("build/generated-sources")).asFileTree
+
+    checkstyle {
+        toolVersion = dependencyManagement.managedVersions["com.puppycrawl.tools:checkstyle"]!!
+        configDirectory = rootProject.layout.projectDirectory.dir("gradle/quality-configs/checkstyle")
+    }
+
+    pmd {
+        toolVersion = dependencyManagement.managedVersions["net.sourceforge.pmd:pmd-java"]!!
+        ruleSets = listOf()
+        ruleSetFiles = rootProject.files("gradle/quality-configs/pmd/pmd.xml")
+    }
+
+    spotbugs {
+        toolVersion = dependencyManagement.managedVersions["com.github.spotbugs:spotbugs"]!!
+        excludeFilter = rootProject.file("gradle/quality-configs/spotbugs/exclude.xml")
+
         afterEvaluate {
             val spotbugs = configurations.findByName("spotbugs")
             if (spotbugs != null) {
@@ -281,11 +295,36 @@ configure(libs) {
         }
     }
 
+    tasks.withType(Checkstyle::class) {
+        source = excludeGeneratedSources(source)
+        enabled = enableQuality
+    }
+
+    tasks.withType(Pmd::class) {
+        source = excludeGeneratedSources(source)
+        enabled = enableQuality
+    }
+
+    tasks.withType(SpotBugsTask::class) {
+        enabled = enableQuality
+    }
+
+    tasks.checkstyleTest {
+        enabled = false
+    }
+
+    tasks.pmdTest {
+        enabled = false
+    }
+
+    tasks.spotbugsTest {
+        enabled = false
+    }
+
     spotless {
         java {
             target("src/**/*.java")
             removeUnusedImports()
-            @Suppress("INACCESSIBLE_TYPE")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|import|open|module|//startfile)")
             endWithNewline()
             replaceRegex("one blank line after package line", "(package .+;)\n+import", "$1\n\nimport")
@@ -293,7 +332,6 @@ configure(libs) {
         }
         scala {
             target("src/**/*.scala")
-            @Suppress("INACCESSIBLE_TYPE")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|//startfile)")
             endWithNewline()
             replaceRegex("one blank line after package line", "(package .+;)\n+import", "$1\n\nimport")
@@ -301,7 +339,6 @@ configure(libs) {
         }
         groovy {
             target("src/**/*.groovy")
-            @Suppress("INACCESSIBLE_TYPE")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|//startfile) ")
             endWithNewline()
             replaceRegex("one blank line after package line", "(package .+;)\n+import", "$1\n\nimport")
diff --git a/gradle/quality-configs/pmd/pmd.xml b/gradle/quality-configs/pmd/pmd.xml
index 3d45d9f69..7a26c293e 100644
--- a/gradle/quality-configs/pmd/pmd.xml
+++ b/gradle/quality-configs/pmd/pmd.xml
@@ -111,7 +111,7 @@
     <rule ref="category/java/errorprone.xml">
         <exclude name="AvoidAccessibilityAlteration"/> <!-- earlier j2ee group-->
         <exclude name="AvoidCatchingThrowable"/>
-        <exclude name="BeanMembersShouldSerialize"/>
+        <exclude name="AvoidFieldNameMatchingMethodName"/>
         <exclude name="DataflowAnomalyAnalysis"/>
         <exclude name="EmptyFinalizer"/>
         <exclude name="FinalizeDoesNotCallSuperFinalize"/>
@@ -123,6 +123,7 @@
         <exclude name="NullAssignment"/> <!-- disabled due to false positive for initialization with ternary operator -->
         <exclude name="OverrideBothEqualsAndHashcode"/> <!-- duplicated by EqualsHashCode rule in Checkstyle -->
         <exclude name="StaticEJBFieldShouldBeFinal"/> <!-- earlier j2ee group-->
+        <exclude name="TestClassWithoutTestCases"/>
         <exclude name="UseCorrectExceptionLogging"/>
         <exclude name="UseLocaleWithCaseConversions"/>
         <exclude name="UseProperClassLoader"/> <!-- earlier j2ee group-->
@@ -134,7 +135,7 @@
     </rule>
     <rule ref="category/java/errorprone.xml/CloseResource">
         <properties>
-            <property name="types" value="java.sql.Connection,java.sql.Statement,java.sql.ResultSet" />
+            <property name="types" value="java.sql.Connection,java.sql.Statement,java.sql.ResultSet"/>
         </properties>
     </rule>
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..249e5832f090a2944b7473328c07c9755baa3196 100644
GIT binary patch
delta 10158
zcmaKSbyOWsmn~e}-QC?axCPf>!2<-jxI0|j{UX8L-QC?axDz};a7}ppGBe+Nv*x{5
zy?WI?=j^WT(_Md5*V*xNP>X9&wM>xUvNiMuKDK=Xg!N%oM>Yru2rh7#yD-sW0Ov#$
zCKBSOD3>TM%&1T5t&#FK@|@1<wrveF?xuzb0DN5ZcecHg1)GJF@mCu&Hdhy*4I30h
zJRykS{}KS&xtKZG8UMpjRe*v<gn)pDf2WB<K>f)Ze+EE6(7`}J(Ek4})CD@I+W;L{
zO>K;wokKMA)EC6C|D@nz%D2L3U=Nm(qc>e4GM3WsHGu-T?l^PV6m-T-(igun?PZ8U
z{qbiLDMcGSF1`FiKhlsV@qPMRm~h9@z3<WdpU0;sB7d%LQ@I!e1V8)2A(saoq3AgI
zBWz$9Jf7Xg2Z1az-}tTfGP|?+ILal574=7VC|P+-iLut4RtIsQv<cE_zmk8)30?d(
zY8ra0(Mk`(UvuU}=SrRr3@5#Y$>DZmWp;Suh%5BdP6jqHn}$-gu`_xNg|j{PSJ0n$
zbE;Azwq8z6IBlgKIEKc4V?*##hGW#t*rh=f<;~RFWotXS$vr;Mqz>A99PMH3N5BMi
zWLNRjc<es;8df`<rd$>57*z`2)gBV0o4rcGM(u*EG8_H5(|kThAnp|}u2xz>>X6tN
zv)$|P2Nr1D*fk4wvqf(7;NmdRV3eL{!>DO-B98(s*-4$g{)EnRYAw+DP-C`=k)B!*
zHU7!ejcbavGCYuz9k@$aZQaU%#K%6`D}=N_m?~^)Icm<bG05U&P|u!wE{$*DDgxEQ
zvLO!Y3FyGRps?5#F(2)G?vOqL6+8#cx)oR|r1X~#;tUK4*!rZubOb)DR|*2wK1dEP
z6xHh%ER96UM8f8$5KKzo)3ZWRZt4+zXqqhO^iabP7pJDGJm|n>QZun+K)fSIoS>Ws
zwvZ%Rfmw>%c!kC<f2zj>d~Pmf$E%LCj2r>+FzKGDm+%u88|hHprot{*OIV<F2_;5<
zEqFor31vW7n=@T3wHgHFqPvcI{E=+ToLCCP<AEw|a^~JLTN|6rCOfrya;wcfU9|Cv
zn=aD#c+pK4r;*qcLv2ZhjQpuOFa76le(10tyMw8B7|6DcIEN?+^U9_dw38^AF6W1)
zN?&=|ch*?Oik6$Ilp5`N-OhR2D+^qa&d=EA?Gu!{*84=oTp>pi`Vd^^aumtx2L}h}
zPu$v~zdHaWPF<`LVQX4i<t>7bk82h#RwRyORx*z3I}o&>>eBDCif%s7&*vF6kU%1`
zf(bvILch^~>cQ{=Y#?n<A8c)sx9*?j7HNv)C@}3}>x(8C-Uuv7!2_YeCfo?zkP;FK
zX+Kdj<jgIWR&@Y(xof&{Udv2(B6X4Sb*sVoF%JPtUfcOqx|bDyj72pUx9!c{8#;78
znTX_c@?Caq|9<)7cX_`0CUnd0@A^1G+1S5F(KmqPQR^vty#pGxl$7r`CJ>KS;HQ+7
zj>MCBI=d$~9KDJ1I2sb_3=T6D+Mu9{O&vcTnDA(I#<=L8csjEqsOe=&`=QBc7~>u2
zfdcO44PUOST%PcN+8PzKFYoR0;KJ$-Nwu#MgSM{_!?r&%rVM}acp>53if|vpH)q=O
z;6uAi__am8g$EjZ33?PmCrg@(M!V_@(^+#wAWNu&e3<yLD?{U>*pGlfhF2<3NobAC
zlusz>wMV--3ytd@S047g)-J@eOD;DMnC~@zvS=Gnw3=LnRzkeV`LH4#JGPklE4!Q3
zq&;|yGR0FiuE-|&1p2g{MG!Z3)oO9Jf4@0h*3!+RHv=SiEf*oGQCSR<GHCIW1TnIz
zo-=T1aN%Ci0l1`*AuXg-s&$xZ+mljQxlT$$`&=?y)!myBH#7ywjE&LdtLnQA8`Yhw
zs@IuzE^G6#?`SsL%kGNz2GYCqNDhTG+?{pr%bTaqCW~{ruvOa?!GlCroMm&@k)A?2
z3lhpNav)5zvhwC?{<g@A1lMTG1P+882eX+AeR81A>Qf=LqT5~sajcJ8XjE>E*@q$n
z!4|Rz%Lv8TgI23JV6%)N&`Otk6&RBdS|lCe7+#yAfd<SP`m9dOG*?BkgxpW{!RSD)
z#F=VCsgc^l)A%@+wtlyQA%9aJKelR6Z}qY?0aQoIvs*9wSQre(Bqg_YE~cZ&#BAjz
zQsgTT43lYsKQmmc8BzQ$w^~^3%PO7?sX>yEWNTfFb&*S6-;Q}d`de!}*3vM(z71&3
z37B%@GWjeQ_$lr%`m-8B&Zl4Gv^X{+N{GCsQGr!LLU4SHmLt3{B*z-HP{73G8u>nK
zHxNQ4eduv>lARQfULUtIlLx#7ea+O;w?LH}FF28c9pg#*M`pB~{jQmPB*gA;Hik#e
zZpz&X#O}}r#O_#oSr4f`zN^wedt>ST791bAZ5(=g<<jPY9q&gGf@BzolWOA-(fD7I
zFrp^aWczfOe&stBk8Od@k0F6ZdmJ!v`yg#Zzo}<X5WaD-Iv01?Dgp@GaY95sFuT{D
z=2f}x@(K<HG?;_^N&uqR!|bJ&a{bIerE99ItTf(fpt7h6`JEqEDPM<trKC)5!iK60
zWES=o+Qa05$pv7tC|FMABoVGY2zII*4ap+@@%;ve3CK1a-Ft8oD7~{5#XM&-58|qd
zT5~i0pt_K@dF;e(rJs@&lW47Gn51R+nIVtY#JYTcsani>Oj)m9X8J^>Th}fznPY0T
zsD9ayM7Hrlb6?jHXL<{kdA*Q#UPCYce0p`fHxoZ7_P`cF-$1YY9Pi;0QFt{CCf%C#
zuF60A_NTstTQeFR3)O*ThlWKk08}7Nshh}J-sGY=gzE!?(_ZI4ovF6oZ$)&Zt~WZi
z_0@Bk!~R4+<&b6CjI{nGj+P{*+9}6;{RwZ7^?H)xjhiRi;?A|wb0UxjPr?L<KoVRC
zU4z_zQ~yae4;n6iLzO<QLcTPotA@I};(kS7bGRu4Ex3KJMQy3-EQcev2;{tBJ7mK8
z8L2m`?aLvQ`*C1DJys}A29K?9MziN`v8x$W{RzO=j`vHS<;Bf-emD*w42)j5R^qj7
zJ2z2Z%6vo7zMD41YLflp0e{*y+|tSWCbW(oAx)?T?pnh*we?%bs)ya^h2>@$^v|0=
z@6d3+eU|&<O@ArJhi6E%3QEaf>re3+G*X<HV6-%Y$@p_=(a01@d`h8X6^&SF(k#cq
z9qA+Ep{-oQJFQomXCz=t{(@dwzE^@ScC$38h(_sN%$Fdz&@h^HvMJSr;d|QyHA8d3
z`b;Q6K%HJwX8$d?)IL*6$9I9+=Z@ly`t>gFS}tih3;>2-R1x>`2hmUb5+Z~eM4P|$
zAxvE$l@sIhf_#YLnF|Wcfp(Gh@@dJ-yh|FhKqsyQp_>7j1)w|~5OKET<qGP(I8cDh
zY5DGK=g;%4Ujal!^QGBhNVf1>x2P$~`}5huK;{gw_~HXP6=RsG)FKSZ=VYkt+0z&D
zr?`R3bqVV?Zmqj&P<HQ1CvD|)+Uz0P6IcEqH|tEimXSEL5>Q`G3b^PIrd{_K|Hhqt
zAUS#|*WpEOeZ{@h*j6%wYsrL`oHNV=z*^}yT1NCTgk1-Gl(&+TqZhODTKb9|0$3;|
z;{UUq7X9Oz`*gwbi|?&USWH?Fr;6=@Be4w=8zu>DLUsr<sMD*e<<=~P1qShEWvT9C
z;jeaL@lqk{u(-WBF$CkIjigGKs-nw-h1TrrI=^0nOrao@pjX#bY`bp(=x|c{)W;*8
z+e3?+t&ziSi<owL2u+*8>wf+7A`)lpdGykP`^SA8{ok{KE3sM$N@l}kB2GDe7MEN?
zWcQ2I0fJ1ZK%s-YKk?QbEBO6`C{bg$%le0FTgfmSan-Kih0A7)rGy|2gd)_gRH7qp
z*bNlP0u|S^5<)kFcd&wQg*6QP5;y(3ZgI%vUgWk#`g!sMf`02>@xz{Ie9_-fXllyw
zh>P%cK+-HkQ;D$Jh=ig(ASN^zJ7|q*#m;}2M*T#s0a^nF_>jI(L(|*}#|$O&B^t!W
zv-^-vP)kuu<w%c|1|NcUQ$SRT8nfY3DuJk)P3j&dhN~1mQz%M97gjv#zuqyDiVp{6
z;uFf~dyy1e2*C~rN2v#U9ap5^>+b%(o3j)B@do)n*Y0x%YNy`sYj*-z2ncYoggD6l
z6{1L<p-2xg9eoHt16@gs%_@CovliLR7&vBE@rTO3byg~WZcu^kRc)B7VO_<_a^ZF|
zbJH{DCOd2O_szoy8w8CIFS?9!Xc2TsC-MX*%Q5}9<B%ADhNJ>ndTQUh+GCX;7rCrT
z@=vy&^1zyl{#7vRPv;R^PZPaIks8okq)To8!Cks0&`Y^Xy5iOWC+MmCg0Jl?1ufXO
zaK8Q5IO~J&E|<;MnF_oXLc=LU#m{6yeomA^Ood;)fEqGPeD|fJiz(`OHF_f*{oWJq
z1_$NF&Mo7@GKae#f4AD|KIk<oAq;pm_Y63ekK_ormOMop`$2FPmNBN;lJbKz95WF^
z_q9WgehQkzQKTFAjKo)RxA`_ssq_~kR|||)Vn-oA{Ty`|i}Yc3gQP+DOa{g7!M&EN
ziLi!Gv<M2MUAHak7D(d+Y7nx_;MUtb_~TFy4)W;pCG^u^(I(O&E2g)`2nsCW<4U`H
z-Gj9o{}pcBes(@}kyo36%=HEuDOD;riQOuN?()DWEP_feDk34oN&*YcA{5!65Kckt
z)9nc|KcGBY6tydIuwK?8SI=%BYwebs;Mb2C2NM%XjNW4a_%K$#$gbou%kN_+=Zvys
ziBBBNp#PrlD=dRv!Q@Vn31p!fLPY$4H_9HQ=btXeug<k<6YO{UV}KLHW|{Pm*j6*^
zC%G&l9+f>GVi~ubOj<LB?vwh5Ly9)1;RIpw(|3Q1kWT#7*eujrq4j}?-RvLnk0OUN
z5o41(P(-ZLJALSmF5FiG)3NSD+Zb)KnHqZ`)8-G6s~`8i<TNm{n&_U3_}0Tq5Z$5u
z&)L|%iR90{gbe`!Vu64l2V)43fd1oWu}T-gM_=>1C>>WCpQq>MeDTR_2xL01^+K1+
zr$}J>d=fW{65hi2bz&zqRKs8zpDln<HNij)Bf%G=ijol~y%Cx|ydLo)l71(U2(TBL
zJLL1`ygm6fv2%WDd)dhA(%b#R1M^!$XNJ(tHXIp6e#mRJGTtw2U?iw0jZrCrdjWA4
zy6}UtVab`sG#7XF3B{kQ0)Z1Dg~QlX+R_^YpL}k*6QK+R*Y<=XSuX8;&a7gGw#u5>
z*7+Gtfz6rkgfj~#{MB<OklAchNI!siLM-zhb;{z|c{iAb<?6z0;AL=;4y#gWJgQSw
zj<%&wq+-qD36)PdvLC2-#&y1CzAan(rA^#?3I3sEtiMSh*`Xk3Sq{`btR%p)e@Do7
z)<`^J>=49FRP;ge*e0=x#czw5N{@T1{EAl;G&@tpS!+<D*(sThc5;iEQ+B08n8Olx
zbnGIKAyBo?8?)}ZM!vZ07?#80d6Gn1=$NXk*Q&Q)JAHKRIS-O@S)-*=%X0gLEILvc
zr+_uz7AE@hD0o_~8Hs;L@MEEY-$in_3ci5RK9b8RZk5}O4C0B=s~S+G_$ox;;}c~T
z+u`Q5OK9bv*5OpkSA?v@dWyc(@#+bwy$M$@8JjtlDM6o*VQniP9Pk{z!kRhtr)}G&
zoDxG*t$Yy^S};f}k)gKTSZOn*c*>&2&Stf<%<+55R18u2%+}`?PZo8xg|<WG23nKh
zb}QYVQv6Gr6WrAzthXljT3m_suRc6rHq6V@dQ8QIjJ=5J^y=VMj5;efn#pWZCbfk^
z+PZ~pjBT8#!70>Y9Xli<?UJK|B+`Y8YN)8W=5SS!Ia|=c@CMI{OXl}=QaPFd!785J
zaLwf{I~wrW)VDH^3de$3hZPj^BR!1Rkn?0ki{!32{Y$p7gjLq<@gG%j?w=L0()&3o
zKH%6kU}h*OM#Ai!n}4lHgP-vBnzeQhGj1cOrW0(2eem+`=d`tU<p*-HxF>(fSQyC7
z+O5{;ZyW$!eYR~gy>;l6cA+e`oXN6a6t(&kUkWus*Kf<<xt$o!9^*bb!rWm#Q7p~O
zFl{hDZ_BD*-$;XFmX3`vr+uVo^(u$V7ei{U>m$W7L)w5uXYF)->OeWMSUVXi;N#sY
zvz4c?GkBU{D;FaQ)9|HU7$?BX8DFH%hC11a@6s4lI}y{XrB~jd{w1x&6bD?gemdlV
z-+ZnCcldFanu`P=S0S7XzwXO(7N9KV?AkgZzm|J&f{l-Dp<)|-S7?*@HBIfRxmo1%
zcB4`;Al{w-OFD08g=Qochf9=gb56_FPc{C9N5UA<syWga(E)DPl4N-I`vWTnbs^NR
zSt9bF(>jTcJ(`$>)wVhW=A<8i#!bmKD#6~wMBak^2(p56d2vs&O6s4>#NB0UVr24K
z%cw|-Yv}g5`_zcEqrZBaRSoBm;BuXJM^+W$yUVS9?u(`87t)IokPgC_bQ3g_#@0Yg
zywb?u{Di7zd3XQ$y!m^c`6~t-7@g-hwnTppbOXckS-^N?w1`kRMpC!mfMY?K#^Ldm
zYL>771%d{+iqh4a&4RdLNt3_(^^*{U2!A>u^b{7e@<gm)ZoL4nj(HfCBG^qv$jsuZ
zJk}6PMM`O13#k(WT6FdVC`mq}b~r4h-+x`M!M~>}Azd_PiZ>d~(@(<twX2!e8q`z(
z;s~X}DkG&Ab|2%1lfApLT#W8}LuQVon>Q@EYElLAx3LgQ5(ZUf*I%EbGiBTG!g#=t
zXbmPhWH`*B;aZI)$+PWX+W)z?3kTOi{2UY9*b9bpSU!GWcVu+)!^b4MJhf=U9c?jj
z%V)EOF8X3qC5~+!Pmmmd@gXzbycd5J<UrvE&TFBt&<`wBML`;scRJ=B{G`T2bRZll
zS%W?jdc&pG@RgbB<X8J_)?(!NKppGF(}$QEsKxbtVc!o4vB0fbb0@0Y4lz`XJhwPN
z0Uagntdd#!>dn!N#i^50a$4u}8^O<OuOo#9vGkAueP&$N4J@}%q-FJbSFO-l5GF<A
z-U`COk}-j<LY(4R_#C68b=qvX2(IpW7+(%^#teVt)CghOjTatDPQAWznXozak9Jez
z^u@rZ5oT7mGZse4LSLRPyKH8z;}2e2xuSE{u)^|j1h>}DG2$w-U|8QkR-WU1mk4pF
z#_imS#~c2~Z{>!oE?wf<v&paqAn8==SC}CC9U_$O2>Yc+T+g=eJL`{bL6<x0YC+v-
zYk2T=f+&9|w_z}xXr$sTb@a4j`p0(Iu2L}=oGhF(@v+I7E_ZA2Up2eecWSPVP`bl<
zV*L*chb>=Gf_lat2s=|RxgP!e#L|6XA8w{#(Po(xk1~rNQ4UiG``U`eKy7`ot;xv4
zdv54BHMXIq;#^B%W(b8xt%JRueW5PZsB2eW=s3k^Pe1C$-NN8~UA~)=Oy->22yJ%e
zu=(XD^5s{MkmWB)AF_qCFf&SDH%ytqpt-jgs35XK8Ez5FUj?uD3++@2%*9+-65LGQ
zvu1eopeQoFW98@kzU{+He9$Yj#`vaQkqu%?1wCoBd%G=)TROYl2trZa{AZ@#^LARR
zdzg-?EUnt9dK2;W=zCcVj18RTj-%w^#pREbgpD0aL@_v-XV2&Cd@JB^(}GRBU}9gV
z6sWmVZmFZ9qrBN%4b?seOcOdOZ+6cx8-#R(+LYKJu~Y%pF5#85aF9$MnP7r^Bu%D?
zT{b-KBujiy>7_*9{8u0|mTJ(atnnnS%qBDM_Gx5>3V+2~Wt=EeT4cXOdud<p=o+Q6
zZzQq0s{+!Q7YrIW19L5`3GDC7Yob@~E|Xteua$k<$t6c$#JqHTB<zt!=KYwVvt@7`
zTM=!b+qsNzp3XPt_(AftGxanI$bU$EP&B&jf1y2w!M@2th<@+l{EFC0ZErEXLw2JQ
zJgZXlv<jbBpIp$#7B1bHuX0tNW04Y534!9LmNMn_Mya}Qg#W7GH@1^X<CYQ~!vVz6
zSR7GLKt1?C58e$*6Zo*grB4qhxF4aax;Mi__%^;{6lL7#;RG^7#wi%?;dpF$Eg$aT
zdVF|=3wj#`_206VbaOxQ{AuW`xgnwl8cfg!ZSC=){E5Q9X8B_+Jz#1@7xYG3_i_pQ
z7G%Wpm}7E5P!LmREXBdk!bg0h96_>$+weM(>wdBg+cV$}6%(ccP;`!~CzW{0O2aLY
z?rQtBB6`ZztPP@_&`kzDzxc==?a{PUPUbbX31Vy?_(;c+>3q*!df!K(LQYZN<WzEG
zlKY+-oOEdx6EokzFnR6<Q{<3p7MJ8_qVsfomJBSwJ<$KG$l%<S4^Jw0sc1nq;X423
z!l%w1X?tgojAQ?pFFn%!lV^(N&AE^FleG*>rZ>$A*8<4M%e8vj1`%(x9)d~);ym4p
zoo<KF(fCIa3VJO%fDysuJl-K-f=B8JqdKBfOebu|dZgT`%~Sr)<y-UO7kmfu)NRrT
zI*z?FS?}PMO8x30+L-8+Q^Ka%*cy^<B}P_jm!WvHZA}BWmj32UhIX*Z>518$>9Pe|
zZaFGj);h?khh*kgUI-Xvj+Dr#r&~FhU=eQ--$ZcOY9;x%&3U(&)q}eJs=)K5kUgi5
zNaI-m&4?wlwFO^`5l-B?17w4RFk(IKy5fpS0K%txp0qOj$e=+1EUJbLd-u>TYNna~
z+m?gU0~xlcnP>J>%m_y_*7hVMj3d&)2xV8>F%J;6ncm)ILGzF2sPAV|uYk5!-F<za
z5&(K697DN!da-r3WED~>%jL(53^51B<YGph2QrV<;I6q<+Qd-Qb!efb?#dL;;x86(
z^91sGsc1ZMlKr97bz&w2&o!@G`U_1+CZDGVqpu!qf#1~{tt(CQ-nV$6LlY&5AJ3C4
zUzI`Up_RpefmRpt@y<9!q-o2l4PP@v+B+U^jo9?IdL-iec8TgQdj?e2<02a0)#$Em
z74fbWonuc&*N|!GBo#~&1cz8yR*lRL6c@`am$0`(YVG7-Co&T{hVPI;hg3?Gy3>Kr
zc3g7+v^w<4WIhk7a#{N6Ku_u{F`eo;X+u!C(lIaiY#*V5!sMed39%-AgV*`(nI)Im
zemHE^2foBMPyIP<*yuD21{6I?Co?_{pqp-*#N6sZRQAzEBV4HQheOyZT5UBd)>G85
zw^xHvCEP4AJk<{v2kQQ;g;C)rCY=X!c8rNpNJ4mHETN}t1rwSe7=s8u&LzW-+6AEB
z)LX0o7`EqC94HM{4p}d2wOwj2EB|O;?&^FeG9ZrT%c!<mSKRQWCY=xBx#JJX4hTVO
zOGFlEv?xnlmSV6af<aIkVi>J&x`<?9b}*fmO21~d7iPB*{%>Z3D2!cm(UZbFBb`+h
ztfhjq75yuSn2~|Pc)p$Ul6=)}7cfXtBsvc15f&(K{jnEsw5Gh0G<VN0{h2;_Lojj%
zOtJ5zS`AafWGRp(K{sC(Iny)^)Dh91KROn0pgt2-Sq_RsE$fD0@vLnLw9Cz)Salio
zMB0qhq?<=>M^O=JC+X-~@r1kI$=FH=yBzsO#<h&2w5}3x7v!REeE^|ke-C25Q%;vf
zdy;$_+Ui`lly)WW$uVcX!}Yc&@v2~qzhnrF=XyZy(%n>PxR1xU9+T{KuPx7sMe~GX
zSP>AT3%(Xs@Ez**e@GAn{-GvB^oa6}5^2s+Mg~Gw<tSfoDTf5SM%=sr@0-QCk(2E@
z21mR@vs3pEH;`!Q#6FY+_JP#Pl<!E3nyWOTd130@Og^&ZF2G^ssEk0lIG<2yd?Xv{
zj>?<dTyf>#$u&ZP;u~mP|FXsVtr>3k9O?%v>`Ha-3QsOG<7KdXlqKrsN25R|K<<;-
z8kFY!&J&Yrqx3ptevOHiqPxKo_wwAPD)$DWMz{0>{T5qM%>rMqGZ!dJdK(&tP1#89
zVcu}I1I-&3%nMyF62m%MDpl~p<K@q@Ci8fh-XvY%_XYxDZt);qQ=}KD{qEql3ub_W
zkQ-4872`5`tnr7r$*4e^)rTc5#!mJmE56oJ(VXxrUr|YZFeyg7I^|W=jLW_z&h_+!
z4o6IXP@e*S<_0ZNrhz^?)a;4daD*Yw`r$emAw`JFh(k00W-E(`DDIRRA>)PM(%YoR
zD)=W)E7kjwzAr!?^P*`?=fMHd1q4yjLGTTRUidem^Ocjrfgk2Jp|6SabEV<p1f?4C
zgfY9x6kbla_+=;6jebLa*VI6n?T>HKC3c>RX@tNx=&Z7gC<YCd+W_xOz5o@h{ah88
zY8g#Jui=0?*5n|6Wsz3CC;^#y!M-^I4fq!oNKQcQDe-3)jAwA)G9&&a;X$cL=h-a_
zPA?*mKsc5TLEuj3<m_afk$oJ@56t#@j&(YG(K!C`=KrO-Ehm?50TVS3Z^nR6c4F6>
z0ztZoZx+#o36xH8mv6<fOQk@9$2{EwRz`o&J8s=#;EPwonMIu)7jn|SI4GZ^-9&qa
z%RPjnI3`yL;=t|2o-p>;^e{vU;G{JW17kn(RO&0L%q^fpWSYSkr1Cb92@bV->VO5P
z;=V{hS5wcROQfbah6ND{2a$zFnj>@yuOcw}X~E20g7)5=Z#(y)RC878{_rObmGQ;9
zUy>&`YT^2R@jqR1z9Fx&x)WBstIE#*UhAa>WrMm<10={@$UN@Cog+#pxq{W@l0DOf
zJGs^Jv?t8HgIXk(;NFHXun$J{{p})cJ^BWn4BeQo6dMNp%JO@$9z{(}qqEHuZOUQP
zZiwo70Oa@lMYL(W*R4(!oj`)9kR<mpFQ4n>ggJns-A|w+XL=P07>QBMTEbG^gPS)H
zu<Mo{c`s-A!f<>^@MFTFZtsKGFHgj|hupbK({r>PX3_kc<B`#B(V;)7Vka;^mU9Le
z*#g$0;6L~Hd;h^~^&<G<2c!DCsooN8r#<E{U>@|4Jdqr@gyyKrHw8Tu<#0&32Hh?S
zsVm_kQ2K`4+=gjw1mVhdOz7dI7V!Iu8J1LgI+_rF`Wgx5-XwU~$h>b$%<m0-`p&{8
zI>#$U3wWC-ea0P(At2SjPAm57kd;!W5k{do1}X681o}`!c*(w!kCjtGTh7`=!M)$9
zWjTns{<-WX+Xi;&d!lyV&1KT9dKL??8)fu2(?Ox<^?EAzt_(#5bp4wAfgIADYgLU`
z;J7f8g%-tfmTI1ZHjgufKcAT4SO(vx?xSo4p<j*KwLVwE1^MGS4zt$$7c<-mhG7j|
z0edG(_`7V}WS0sj=amh~rU&+YwRk#K&Ep_R(w`L&FFo3o%jTMf3LsTRyt`Pc8E=ik
zIWo_~4)R309!>dWh`3#Yk;DqPGQE0GD?!_<zW4>CfXb(E8WoJt6*Yutnkvmb?7H9B
zVICAYowwxK;VM4(#~|}~Ooyzm*1ddU_Yg%Ax*_FcZm^AzYc$<+9bv;Eucr(<qOBl{
zW3S8=Iy0#NA!tN&m#$t<x}jce<nW|!h%sNj=S|rk9SwC>SSF}*JsjTfb*DY>qmmkt
z;dRkB#~SylP~Jcmr&Bl9TxHf^DcGUelG%rA{&s)5*$|-ww}Kwx-<m>lWnNeghVm@z
zqi3@-oJnN%r2<xhr=xtvxF{tbk6A#^75z`&b&8CXKnf*|6(^U7M=+%<Z{lykX`E^^
zt53Xck-$?~?>O4t9`5I5Z<l&$wH-o<Xa|@y7jtf}FmjbQL5*Mb<LVzJct6_oIbKQ-
zC`Y!!m;x5&<qVUYrjlpRqnC=dGAw;Gn;3Vdx4CX%d-;(9O5FLU%F>fc;^ROHmY6C9
z1VRRX*1+aBlbO_p>B+50f1p&%?_A*16R0n+l}HKWI$yIH3oq2`k4O?tEVd~a4~>iI
zo{d}b8tr+$q<%%K%Ett*i|RAJEMnk9hU7LtL!lxOB45xO1g)ycDBd=NbpaE3j?Gw&
z0M&xx13EkCgNHu%Z8rBLo93XH-zQUfF3{Iy>65-KSPniqIzF+?x$3>`L?oBOBeEsv
zs_y7@7>IbS&w2Vju^#vBpPWQuUv=dDRGm(-MH|l+8T?vfgD;{nE_*-h?@D;GN>4hA
z9{!G@ANfHZOxMq5kkoh4h*p3+zE7z$13ocDJR$XA*7uKtG5Cn_<W7Y+Bdx{!DEiMf
zDOhZSut8Oqk_23^McAOYMDUOFhY&yl33g;A0`II*5dTX6^e)1odO!cG6$YRqfqk}A
z0RBkesVz;w7!sIzTM+Pw1UB9_00g1FcLd<oZDjyA7C5hr7~BcM1MBZF0>-ibn%2h{
z;J0m5aCjg(@_!G>i2FDAvcn5-Aby8b;J0u%u)!`PK#%0FS-C3(cq9J{V`DJEbbE||
zYpTDd+ulcjEd5`&v!?=hVgz&S0|C^We?2|>9|2T6?~nn^_CpLn&kuI|VG7_E{Ofu9
zAqe0Reuq5Zunlx@zyTqEL+ssT15X|Z0LUfZAr-i$1_SJ{j}BHmBm}s8{OgK3lm%4F
zzC%jz!y!8WUJo2FLkU(mVh7-uzC+gcbkV^bM}&Y6=HTTca{!7ZSoB!<Z`NW<$dv!+
zr2eC!L!6860ROjY3Y@n^{8u&g-!ycq|4sXshDucd5`Yc$|JG3b*Zm3u<o<ud{0~Ld
z-&eu}`R^Yo%oZH5tOtm(fA1K;a4YP92bcHhf&+F~g$HY`a01p`|7DgT(1NE{7y-6k
z|8fbT5`fuO83AAX{?o+|7>)l|v<(3ly!jq&P5A2q(U5~h)))aj-`-6&aM~LBySnAy
zA0{Z{FHiUb8rW|Yo%kQwi`Kh>EEE$0g7UxeeeVkcY%~87yCmSjYyxoqq(%Jib*lH;
zz`t5y094U`k_o{-*U^dFH~+1I@GsgwqmGsQC9-Vr0X94TLhlV;Kt#`9h-N?oKHqpx
zzVAOxltd%gzb_Qu{NHnE8vPp=G$#S)Y%&6drobF_#NeY%VL<QfJ7mOFRe*Ufr9nXO
Py&qIq5D-Lb|5*PA>zeod

delta 9041
zcmY*<Ra9KTwr$fuf?JT#KnNb(gS)%CySr=S5D3~hba1y2JZNxtcXti$kDL468|Uo(
zQFG3kRcnvEYShQ7nqGvBn}GdE3j-<J#i%K;JEpIpg}Fq8#Ah7BaoJ*TLcp1fU`;Py
zY!95*mtTE!5SU3tVLZzWZCe+{4VsWHVPR%Ftj{DNaQV<<v<#9O)}v#(KyO963W?UE
zB=0Ouv4VM9;fdZyL7P^G3H1sIz9Zrr6)`^tbB=`-I%?*uv6oSg=hery+ef+4=e?Y8
znDS16T_adJ`-J6|ID(7}Y>t@kVBCBP!g$Qih>$!M(|j-I?-C8+=cK0w!?cVWy9LXH
zd%I}(h%K_>9Qvap&`U=={XcolW-VA%#t9ljo~WmY8+Eb|zcKX3eyx7qiuU|a)zU<G
zyGbv5r~ad@f>5cYm5{k5IAa3ibZf_B&=YT!-XyL<a-DCvMWgdk*b|IE3`W=pCh?UN
z|G+;?Kx|}1MeeKG%e~Avg(yI|v4tfseHS9wgE^yVq^UIXaU8;N5Jvekd+VpSX!O2%
z$Q}XwU>ap%QRdebT+PIcg$KjM3HqA3uZ5|yBj2vv8$L{#$>P=xi+J<emB~^mE*ULc
zNG_|JgyG^>&zLILkooDarGpiupEiuy`9uy&>yEr95d)<a(sI%-B+)Tbos1E<MZB$h
zqyu*fYHKs7CD>64m+~`y*NClGrY|5MLlv!)d5$QEtqW)BeBhrd)W5g1{S@J-t8_J1
zthp@?CJY}$LmSecnf3aicXde(pXfeCei4=~ZN=7VoeU|rEEIW^!UBtx<QCR*Hb$Pt
z*P&TW7$Ii4nkiK2l3Q{u+~<?ax?>Gc6W$x6;0fjRs7Nn)*b9JW5*9uVA<lf7wT<;{
zE3v9p&0seMC4<O%VLG*?`SR;<Oyr!(O~c(qSrKAg?~oL@PYB}Caw-0(g;w$;4>wi)
zj&N7W;i<<sd-^01jRy88l}ZuoEF#ZLI0tC)n0ZTgS_KZdjJlHjb~*ovYqoOfebrdP
zZIv-?2bGGm0GLUz*)63Xh-wdfE3XXUbB;}_&r9FS*R@Sg{VrIu@*SienLS;?C893d
zS%kwI!3@9T1PPLxFE>Qy80(5gsyEIEQm>_+4@4Ol)F?0{YzD(6V~e=zXmc2+R~P~<
zuz5pju;(akH2+w5w!vnpoikD5_{L<6T`uCCi@_Uorr`L(8zh~x!yEK*!LN02Q1Iri
z>v*dEX<(+_;6ZAOIzxm@PbfY4a>ws4D82&_{9UHCfll!x`6o8*i0ZB+B#Ziv%RgtG
z*S}<4!&COp)*ZMmXzl0A8mWA$)fCEzk$Wex*YdB}_-v|k9>jKy^Y>3me;{{|Ab~AL
zQC(naNU=JtU3aP6P>Fm-!_k1XbhdS0t~?uJ$ZvLbvow10>nh*%_Kh>7AD#IflU8SL
zMRF1fmMX#v8m=MG<L#Xq3R)}1-tQerH9_L*4>Gb7y5r!Qf~Y}vBW}fsG<{1CHX7Yz
z=w*V9(vOs6eO>CDuhurDTf3DVVF^j~rqP*7S-$ML<a>SW7Ab>8H-80ly;9Q0BWoNV
zz8Wr2CdK!rW0`sMD&y{Ue{`mEkXm0%S2k;J^iMe|sV5xQbt$ojzfQE+6aM9LWH`t&
z8B;Ig7S<1Dwq`3W*w59L(opjq)ll4E-c?MivCh!4>$0^*=DKI&T2&j?;Z82_iZV$H
zKmK7tEs<BYT(sc+0$&{^zdL@<#vX5RZ9UuKHJXl0Qe7N^Caj!b@ovM*i8@~~Aefoq
z3-+)X#k9hj2G*KdYrTAfliUVuPW_!-BF}8Pg_|Y#;G>7;MI-Vo(9wc1b)kc(t(Yk?
z#Hgo8PG_jlF1^|6ge%;(MG~6fuKDFFd&}>BlhBTh&mmuKsn>2buYS=<5BWw^`ncCb
zrCRWR5`IwKC@URU8^aOJjSrhvO>s}O&RBD8&V=Fk2@~zYY?$qO&!9%s>YecVY0zhK
zBxKGTTyJ(uF`p27CqwPU1y7*)r}y;{|0FUO)-8dKT^>=LUoU_6P^^utg|<kBV1q(+
zDn%Z-pC68v=8hUpv7KURD!BjTKyLfyiq6@`n`43_H`br$+;`KyXaX?!SqZGC_xw>*
zuj}LBA*gS?4EeEdy$bn#FGex)`#y|vg77N<SSfkK+&Z`$y}X-#T73c}CHVd~z@s~T
zU+9klaFL9!O$XDE&+M;O$ivYmQLT5Eqr#`e5=|T`EU5-f0qH2XF;mSc>VEjTUn8%t
z@l|7T({SM!y$PZy9lb2N;BaF}MfGM%rZk10aqvUF`CDaC)&Av|eED$x_;qSoAka*2
z2rR+OTZTAPBx`vQ{;Z{B4Ad}}qOBqg>P4xf%ta|}9kJ2$od>@gyC6Bf&DUE>sqqBT
zYA>(sA=Scl2C_EF8)9d8xwdBSnH5uL=I4hch6KCHj-{99IywUD{HR`d(vk@Kvl)WD
zXC(v{ZTsyLy{rio*6Wi6<M$E1UD26tfRkujOBi|V7!*_c>Lck%L(7T~Is-F_`2R}q
z!H1ylg_)Mv&_|b1{tVl!t{;PDa!0v6^Zqs_<d7AP2qq;-xMDu@V0PoEbb1X}3Z4l$
zV-G2++s{FN^kX9+Z|Or^BMbSv6>`RdxI%@vR)n|`i`7O<Hq0kg><>CIMzqI00y{;`
zhoMyy>1}>?kAk~ND6}`qlUR=B+a&bvA)BWf%`@N)gt@@Ji2`p1GzRGC$r1<2KBO3N
z++YMLD9c|bxC;za_UVJ*r6&Ea;_YC>-Ebe-H=VAgDmx+?Q=DxCE<WMit^>4=yQXrn
z7(0X#oIjyfZUd}fv2$;4?8y|0!L^ep_rMz|1gU-hcgVYIlI~o>o$K&)$rwo(KJO~R
zDcGKo-@im7C<&2$6+q-xtxlR`I4vL|wFd<`a|T}*Nt;(~Vwx&2QG_j$r0Dk<H4ukw
zoKhI(Ld275>tR+6I4W)gUx*cDVBwGe00aa803ZYiwy;d{1p)y0?*IT8ddPS`E~MiS
z1d%Vm0Hb4LN2*f8FZ|6xRQev@ZK-?(oPs+mT*{%NqhGL_0dJ$?rAxA<dme-e40@Wo
zKT4t6rT<8);W=|ztzm5jzr5VR8xqB$bjPO{aS0iTg}rCdn^B6}N)Lpab+cvqs1~cC
zd-2Pk^rLbQ*~<?d`4#Vt#!Y5D&h?n3tM1BkKd^oQ&Vga*kd2y6)dp7`O~quF8p>{2
z`r3MBv&)xblcd>@hArncJpL~C(_HTo&D&CS!_J5Giz$^2EfR_)xjgPg`Bq^u%1C*+
z7W*HGp|{B?dOM}|E)Cs$61y8>&-rHBw;A<vh+XQH4P8p5eOa9BMHh)iIp{3eC0J>8
zgkWw}r$nT%t(1^GLeAVyj1l@)6UkHdM!%LJg|0%BO74M593&LlrksrgoO{iEz$}HK
z4V>WXgk|7Ya!Vgm#WO^ZLtVjxwZ&k5wT6RteViH3ds{VO+2xMJZ`hToOz~_+hRfY{
z%M;ZDKRNTsK5#h6goUF(h#VXSB|7byWWle*d0$IHP+FA`y)Q^5W!|&N$ndaHexdTn
z{vf?T$(9b&tI&O`^+IqpCheAFth;KY(kSl2su_9|Y1B{o9`mm)z^E`Bqw!n+JCRO)
zGbIpJ@sp<iJ)yS$4&el&oou>vz=*Jki{wufWm|m`)<Bf0RG4Ym&b0IabF!;EDq?W5
zmwaAJ$}l+ehT!)NqW0By2GQmg^X3*xk#o9dlZfvECJ>X<yi%AkBroP)L_9}FTq`}_
zjP#u)eesa-x=jmT15t4;oE!o;xijzlefoGd&mwdw<!LUAeQKI}j#-?3j&b3nFqODx
z@oT~5L_fU$?}e$40Hxc?!3F?CAnQe6z*>mDsxvbJR5dLF=kuf_C>dl}{nGO(g4I$8
zSSW#5$?vqUDZHe_%`Zm?Amd^>I4SkBvy+i}wiQYBxj0F1a$*%T+6}Yz?lX&iQ}zaU
zI@%8cw<EHY10o%3eT>VGtF3!Ke3D<eZd-U1o^St{h}NdQg7RB+$w#y%W#bDq!RaNT
zmeToYlvO#OlP+DOEj%OIFD2uGcvW`IrC53TEnGCyU4nSS$51C>e$dL5^j-$Bh3+By
zrS<N>R3c2a>XtaE#TB}^#hq@!vnZ1(An#bk_eKR{?;Z&0cgh4$cMNU2HL=m=YjMTI
zT$BRltXs4T=im;Ao+$Bk3Dz(3!C;rTqelJ?RF)d~d<X2#YayDAOV}2n2g+!UcUJHQ
z*-kET>P9>$_6dbz=_8#MQFMMX0S$waWxY#mtDn}1U{<MN9Z;3|8l-AyB?Wd@K<#o{
z4MSU@LcaqTktW64G)>4PGeRH5?a>{>TU@1UlucMAmzrd@PCwr|il)m1fooO7Z{Vyr
z6wn=2A5z(9g9-OU10X_ei50@~)$}w4u)b+mt)z-sz0X32m}NKTt4>!O{^4wA(|3A8
zkr(DxtMnl$Hol>~XNU<DwJCpn%>E?h9;*pGG&kl*q_<zrfX=4wK$NZ2KYm49*5>pb
z&*$lH70zI=D^s)fU~A7cg4^tUF6*Oa+3W0=7FFB*bf$Kbqw1&amO50YeZM)SDScqy
zTw$-M$NA<_We!@4!|-?V3CEPnfN4t}AeM9W$iSWYz8f;5H)V$pRjMhRV@Z&jDz#FF
zXyWh7UiIc7=0U9L35=$G54RjAupR&4j`(O3i?qjOk6gb!WjNtl1Fj-VmltDTos-Bl
z*OLfOleS~o3`?l!jTYIG!V7?c<;Xu(&#~xf-f(-jwow-0Hv7JZG>}YKvB=rRbdMyv
zmao*-<ELVylXHLHN9&60_c0&0xfNY+N~`4IX$!mhgEquw>!L?)##-S#V^}oRm7^Db
zT5C2RFY4>ov~?w!3l_H}t=#X=vY-*LQy(w>u%r`zQ`_RukSqIv@WyGXa-ppbk-X=g
zyn?TH(`-m*in(w=Ny$%dHNSVxsL|_+X=+kM+v_w{ZC(okof9k1RP5qDvcA-d&u{5U
z?)a9LXht1f6|Tdy5FgXo;sqR|CKxDKruU9RjK~P6xN+4;0eAc|^x%UO^&NM4!nK_!
z6X14Zkk=5tqpl&d6FYuMmlLGQZep0UE3`fT>xzgH>C*hQ2VzCQlO`^kThU6q%3&K^
zf^kfQm|7SeU#c%f8e?A<9mALLJ-;)p_bv6$pp~49_o;>Y=GyU<FTTk3a^wN!$l_Lf
z>Q)*prjFbkU;z%HkOW_*a#j^0b@GF|`6c}7>=W{Ef!#dz5lpkN>@IH+(sx~QMEFe4
z1GeKK67;&P%ExtO>}^JxBeHii)ykX8W@aWhJO!H(w)DH4sPatQ$F-Phiqx_clj`9m
zK;z7X6gD2)8kG^aTr|oY>v<xD`_e}^`p?itAMz4$u!1pUR?=hn=M?T&15YG<lX95s
zeA(t|^!b{e03BIcT&V(bAVzRrlh6e4&t~m%BP>mgOPQ4`_W+xj2j!$YT9x(DH6pF~
zd_C#8c>Gfb)k2Ku4~t=Xb>T^8KW;2HPN#%}@@hC1lNf~Xk)~oj=w-Y11a@DtIyYk8
z9^|_RIAA(1qUSs3rowxr&OuRVFL8(zSqU_rGlqHpkeYT4z7DGdS0q4V-b!3fsv$Yb
zPq4UP^3XFd(G%JAN|0y>?&sLzNir30K(lyzNYvCtE2gDyy-nthPlrXXU75fhoS7kA
zg%GYyBEFQ(xgdjt<WJKy+fjm);V<Q+LFEa&VDsn;*Wuv;_gJi<C9A>v+>?>Q!G!8&
z3+F>)4|N+F1<I=K?Pw4f;qFwD{PA*<U@FMSWxI&aBb3m$bM{lHpn~f0C$>a^T?XC8
zxRRx7-{DV%uUYt&*$z2uQTbZDbUn)PozID*(i^{JDjNq`v?;&OW^&~{ZPE_e+?RMk
z!7O5CUKJSnGZvjTbLX2$zwYRZs_$f{T!hvVHuTg77|O;zBHlA|GIUu_bh4`Bl?7KE
zYB~a`b?O;0SfD?0EZiPYpVf=P4=|zr(u_w}oP0S`YOZziX9cuwpll&%<sQ1p7AuXL
z*@PUop3K}qZEWSl9U1r8UhLr$bDP!{81}Do)F|<u!v2%g3mnqeoX{hw(G4}!VMjqE
z)E70LT$^KBEl+#$p4FFtMeM~^A0rsnb!Y7F2{$<AZ2bN+SaWae5-;xOvJGBzd+{aI
zS8}iU&K}y{eJkmrx#x3l4n51mOJm?S7$6v}V(h$>QMv4bBC_JdP#rT3>MliqySv0&
zh)r=vw?no&;5T}QVTkHKY%t`%{#*#J;aw!wPs}?q2$(e0Y#cdBG1T09ypI@#<t@Hc
zYRfn{p~4}p@j%ic@2uva3>-y24+fzhJem1NSZ$TC<IdqHGmRX4a@T?%?YlFA@{2Sa
zJRt~_UTPRBpDvKpDd&rrT{z}~hwQ8xhXP!9#;BuHdY1t98tJJM#HY**tX(IC_~=XG
zbks>AjU2|ebYG&&6p(0f>wQoNqVa#6J^W!3$gIWEw7d<^k!U~O5v=8goq$jC`p8CS
zrox#Jw3w`k&Ty7UVbm35nZ}FYT5`fN)TO6R`tEUFotxr^BTXZGt|n(Ym<BDcxC}L=
zP<m@21eBbhT9~<!$;iXfV^;AOX+GpgHI&m_c(3oy99yjGZZSP(DLyrgR-b&oEmGN-
z^Kn)yd4iEzbFc3}44SoGb?}tW>qmr^pCu^^w?uX!ONbm?q{y9FehdmcJuV8V%A-ma
zgl=n9+op{wkj-}N;6t;(JA1A#VF3S9AFh6EXRa0~7qop~3^~t1>hc6rdS_4!+D?Xh
z5y?j}*p@*-pmlTb#7C0x{E(E@%eepK_YycNkhrYH^0m)YR&gRuQi4ZqJNv6Rih0zQ
zqjMuSng>Ps;?M0YVyh<;D3~;60;>exDe)Vq3x@GRf!$wgFY5w4=Jo=g*E{76%~jqr
zxTtb_L4Cz_E4RTfm@0eXfr1%ho?zP(>dsRarS>!^uAh~bd0lEhe2x7AEZQmBc%rU;
z&FUrs&mIt8DL`L4JpiFp3NNyk3N>iL6;Nohp*XbZZn%BDhF_y{&<kSKd*sW$w?*Eb
zIlNU{(I<Vyy$1gNL0p~n%W+?KAA-b=TAi%Qvb56m!sj|~EfvU>{X3UtX(7aAyG63P
zELC;>2L`jnFS#vC->A(hZ!tGi7N7^YtW7-LB6!SVdEM&7N?g}r4rW2wLn{Ni*I~$Y
z@#;KwJIl0^?eX{JWiHQxDvccnNKBhHW0h6`j=)OH1`)7)69B$XNT@)l1s25M+~o2_
zpa&X<_vHxN_oR|B#ir2p*VNB~o6Z1OE&~a+_|AxS)(@Dgznq(b(|K8BN_nQ7+>N`=
zXOx_@AhcmmcRvp6eX#4z6sn=V0%KonKFVY@+m&)Rx!Z5U@WdyHMCF4_qzJNpzc9Fw
z7Bdzx54(e7>wcEqHKqH-Paiut;~ZVJpS6_q>ub)zD#TQ4j*i(I8DvS$BfyX~A%<#}
z*=g2$8s;YYjEHl`<aR7t8k*KWs*O4(ZeM9--WL*z`9J)=8<A0pm5iZvsV-Rd=S=w|
z?_O%7K#^;;l;}xZM=qd0%ult2Hz+sfz4v0x@|hDX9xZ9DS6?5>7cKw!a9PFRt8tVR
zM&X|bs?B1#ycjl>AzgbdRkr-@NmBc^ys)aoT75F(yweV&Y-3hNNXj-valA&=)G{NL
zX?smr5sQWi3n;GGPW{%vW)xw-#D0QY%zjXxYj?($b4JzpW0sWY!fkwC5bJMkhTp$J
z6CNVLd=-Ktt7D<^-f|=wjNjf0l%@iu2dR+zdQ&9NLa(B_okKdRy^!Q!F$Ro=hF$-r
z!3@ocUs^7?cvdTMPbn*8S-o!PsF;>FcBkBkg&ET`W`lp?j`Z}4>DF|}9407lK9<NK
z4%vQBXKsYAW@50vSxB3kcp0F;K;3mdC3>y~^No&pT7J|rVQ9Dh>qg|%=gxxg=<U>!
z>WX$!;7s~gDPmPF<--(?CvEnvV*E1KdXpr>XVv!DN~PyISE7d+K_9+W^pnR6cX&?E
ziLr{0`JIs@NcA|;8L|p!3H~9y8mga2Dsm4I?rBS7$3wcT!_l*$^8U3hKUri|_I3N2
zz$xY`)IWA7P*Y1BJtyBEh?8EEvs8Oyl^{(+`gi{9hwpcN#I%Z0j$^yBp?z<;Ny!G$
zra3J_^i0(~LiKuITs%v)qE+YrJr?~w+)`Rcte^O=nwmPg@&!Q7FGTtjpTdI6wH&ZV
z)2}VZY6(MbP`tgoew++(p<fXt4ix3r28%r&<gH`n7hEyV&jr`vxU%{YrjG>t$jVj-
zvPK)pSJ)U(XfUqBqZNo|za#Xx+IVEb?HGQ^wUVH&wTdWgP(z#ijyvXjwk>tFBUn*2
zuj5ENQjT{2&T`k;q54*Z>O~djuUBNwc6l(BzY?Ed4SIt9QA&8+>qaRIck?WdD0rh@
zh`VTZPwSNNCcLH3J}(q<Alk2UZ1DFqkF7`@*$URR@^*@iVLPMNF<|!;<=(W|bx+No
z-*b~|!G4tw!<n=q|MK&?muiuBEXxuajrbCL-ESdG7*~eCsN3-c?1FpjV3I9OiwTgl
zQIc5nK8Iquc5#ZkGI5=X00qprKiK;{;GUtQ5}mS5IIRVlk{&3_FVoP)Npk)~xB{a>
zdEtu@HfxDTpEqWruG=86m;QVO{}E&q8qYWhmA>(FjW`V&rg!CEL1oZCZcA<xy$#3;
zaHF=O>X@yX(2tg8`>m1psG0ZpO+Rnph@Bhjj!~|+S=@+U{*ukwGrBj{5xfIHHP7|}
z^7@g2;d%FMO8f(MS&6c##mrX2i(5uiX1o(=Vw89IQcHw)n{ZTS@``xT$Af@CQTP#w
zl3kn6+MJP+l(;K-rWgjpdBU|CB4>W%cObZBH^Am~EvRO%D>uU^HVRXi<BMNX2v>$1
zb?Pr~ZlopLfT5l%03SjI7>YiGZZs=n(A!c;N9%%aByY<R&)Y{`K2d$pXT?y?(Mg9c
z^1hEw!AQnQRpk1Es)iD~WRy+o3|6j;eU6ym(IixCh^@fT%q9a5c1UN*cc#Klu;PpE
z5kW4F9m(3~3g0_NG;qx5WA#d(C1H>~5(-hS4z_i2wgKYsG%OhhxH#^5i%&9ESb(@#
zV_f5${Gf=$BK)1VY=NX#f+M}6f`OWmpC*OU3&+P@n>$Xvco*Nm$c<=`S|lY6S}Ut-
z80}ztIpkV>W%^Ox`enpk<25_i7`RPiDugxHfUDBD8$bp9XR15>a?r^#&!1Ne6n{MI
z){H`!jwrx}8b-w@@E8H0v)l!5!W8En=u67v+`iNoz<_h4{V*qQK+@)JP^JqsKAedZ
zNh4toE+I7;^}7kkj|hzNVFWkZ$N9rxPl9|_@2kbW*4}&o%(L`WpQCN2M?gz>cyWHk
zul<o=)rN06Va07DuNdsLUXinZj>MwRxpdpx+~P(({@%UY20LwM7sA&1M|`bEoq)Id
zyUHt>@vfu**UOL9wiW*C75cc&qBX37qLd`<;$gS+mvL^v3Z8i4p6(@Wv`N|U6Exn<
zd`@WxqU^8u^Aw+uw#vuDEIByaD)vucU2{4xRseczf_TJXUwaUK+E_IoItXJq88${0
z=K5jGehPa2)CnH&Lcxv&1jQ=T8>*vgp1^%)c&C2TL69;vSN)Q)e#Hj7!oS<jSihkQ
zcp@B)c39W-{M7M`tL`u1#fI2;+HG}3xJ!N~E%eIkew3q?{hQE-A*bTXPSK}&4gN~+
z;ghcmpQS<enTf3c?<4S8Fz~sW@ZBdBqv#;qj}JLOA7-%Pbsph70W}6^pdYLj@m7^k
zo_Dl=`GhzsVra~i?RP|smU~fh(Iuf@F1{aa!NQE@krAI-q-5n7Sz?qQTc?=?p(9CR
zy8t(wWqJNHlCd0JTRdtfgMj_Da4#^R@l_Jvq_m49FHHW!J_Sw<sdGTwkD_mI@P8kr
z&FAu%Lbk!pI7u|axY<Xm+gdzjNPQbzI7o47HMp?x!P`lB*SLSZ(DZhM5Zd4-3%W>0
zlrEmJ=w4N9pID5KEY5qz;?2Q<d8cODvh71+hSbIWVO)%GnPoB5=(EGHJB&#{T4#Sv
zp>}0|4ESEio&cLrp221LTt~j3KjUB`LU?tP=p;B=WSXo;C?8(pnF6@?-ZD0m3DYZ*
z#SzaXh|)hmTC|zQOG>aEMw%4&2XU?prlk5(M3ay-YC^QLRMN+TIB*;TB=wL_atpeD
zh-!sS%<J^Q{RARS_8C0~@T)q7p}WaJ=xdbi3|=SM<M<hD_w7!CCUUm;6^;382>A`3
z=^?niQx+^za_wQd2hRR=hsR0uzUoyOcrY!z7W)G2|C-_gqc`wrG5qCuU!Z?g*GL^H
z?j^<_-A6BC^Dp`p(i0!1&?U{YlF@!|W{E@h=qQ&5*|U~V8wS;m!RK(Q6aX~oH9ToE
zZYKXZoRV~!?P1ADJ74J-PFk2A{e&gh2o)@yZOZu<g!2-Gq&gDELsf5*2Obw--3uWs
z0QOA|a4N&nC;i+SuHRXWoeC+nRvWt}=Dk1);2>Bi^0+Hkp`dX;cZs9C<V+v<pcpNi
z-^5FOCd)W-pdGom!%$#Def$u~Jp}~~!b&EOx2x&7X<F$y>RM+##;P!*BlA%M48TuR
zWUgfD1DLsLs+-4XC>o>wbv-B)!t*47ON5wgoMX%llnmXG%L8209Vi;yZ`+N2v2Ox+
zMe7JHunQE$ckHHhEYRA+e`A3=XO5L%fMau71`XL7v)b{f1rkTY+WWSIkH#sG=pLqe
zA(xZIp>_=4$zKq<?`-?B!#igJrPj9->0t_G7q9@L<d8ib-Mx#-Q#!}B-RqV60bUOv
zEia6wEAzYNOa5=n#Q@89d<wmD0fwu=jKQr}^3!%I{r4ULd)dEepNMN#S_Fx3{<8!>
zZ5D-0{8o%7f>0szA#c;rjL;4Y%hl}wYrx1R`Viq|Pz}c-{{LJY070ym@E~mt*pTyG
z79bfcWTGGEje;PLD;N-XHw=`wS^howfzb$%oP8n)lN$o$ZWjZx|6iSsi2piI_7s7z
zX#b$@z6kIJ^9{-Y^~wJ!s0V^Td5V7#4&pyU#NHw#9)N&qbpNFDR1jqC00W}91OnnS
z{$J@GBz%bka`xsz;rb_iJ|rgmpUVyEZ)Xi*SO5U&|NFkTHb3y@e@%{WrvE&Jp#Lw^
zcj13CbsW+V>i@rj@SEfFf0<Oo{+S#P-$O``n1C$W|0r533dHS*2DqvV$vH9wcIv-1
zq!8+3CLogen}G!qeM|!c*+4c%7$HkX7?8VT5D>@yjS@nbPB0)6D`<rOKQ(XR$o?y&
zqX&cznF4aKL<1c6fMg=mLIjs-fcTye+hrc0q$eZ`4Ie^}0)i~RsZ-u>l<y5<K-5-1
zzz{IRX+;kR3WO-}5kihvxPab4|KQ#>A;e%61nh`-qhydO!uS7jXGQd%i7opEnOL;|
zDn!3EUm(V796;f?fA+RDF<@%qKlo)`0VtL74`!~516_aogYP%QfG#<2kQ!pijthz2
zpaFX3|D$%C7!bL242U?-e@2QZ`q$~lgZbvgfLLyVfT1OC5<8@6lLi=A{stK#zJmWd
zlx+(HbgX)l$RGwH|2rV@P3o@xCrxch0$*z1ASpy(n+d4d2XWd~2AYjQm`xZU3af8F
p+x$Nxf1895@0bJirXkdpJh+N7@Nb7x007(DEB&^Lm}dWn{T~m64-^0Z

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661ee..a59520664 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 744e882ed..a69d9cb6c 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,101 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f93..53a6b238d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a1c4358dd..a3c39ddc5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -56,8 +56,8 @@ pluginManagement {
         id("io.qameta.allure-download") version "2.11.2"
         id("io.qameta.allure-report") version "2.11.2"
         id("io.spring.dependency-management") version "1.1.0"
-        id("ru.vyarus.quality") version "4.7.0"
         id("com.google.protobuf") version "0.9.1"
+        id("com.github.spotbugs") version "6.0.6"
         kotlin("jvm") version "1.7.10"
     }
 }

From dae846458abecccfe0185b8fc7e19a7f05f90261 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 11:03:42 +0000
Subject: [PATCH 069/233] bump com.github.johnrengelman.shadow from 7.1.2 to
 8.1.1 (via #995)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index a3c39ddc5..487d5b0ad 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -48,7 +48,7 @@ pluginManagement {
     }
     plugins {
         id("com.diffplug.spotless") version "6.11.0"
-        id("com.github.johnrengelman.shadow") version "7.1.2"
+        id("com.github.johnrengelman.shadow") version "8.1.1"
         id("com.gradle.enterprise") version "3.12.5"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
         id("io.qameta.allure-adapter") version "2.11.2"

From 5fb84fe2685ae4cb8c48b357cb7df94f8d456ef9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Jan 2024 12:17:32 +0000
Subject: [PATCH 070/233] bump org.mock-server:mockserver-netty from 5.14.0 to
 5.15.0 (via #1000)

---
 allure-karate/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-karate/build.gradle.kts b/allure-karate/build.gradle.kts
index 914f29c08..f300ed9fd 100644
--- a/allure-karate/build.gradle.kts
+++ b/allure-karate/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-java-commons-test"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testImplementation("org.mock-server:mockserver-netty:5.14.0")
+    testImplementation("org.mock-server:mockserver-netty:5.15.0")
 }
 
 tasks.jar {

From ffe0fb5a930619b3b686b4f8542c313eb40d13af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Jan 2024 12:29:24 +0000
Subject: [PATCH 071/233] bump org.postgresql:postgresql from 42.6.0 to 42.7.1
 (via #999)

---
 allure-jooq/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
index a0f29febe..d7aeab402 100644
--- a/allure-jooq/build.gradle.kts
+++ b/allure-jooq/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testRuntimeOnly("org.postgresql:postgresql:42.6.0")
+    testRuntimeOnly("org.postgresql:postgresql:42.7.1")
 }
 
 java {

From e8c7265c64857ff334ebd5a99a1dfa4f74344944 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 31 Jan 2024 16:58:58 +0000
Subject: [PATCH 072/233] rft test commons (via #1001)

---
 .../cucumber4jvm/AllureCucumber4JvmTest.java  | 63 ++++++--------
 .../cucumber5jvm/AllureCucumber5JvmTest.java  | 62 ++++++--------
 .../cucumber6jvm/AllureCucumber6JvmTest.java  | 62 ++++++--------
 .../cucumber7jvm/AllureCucumber7JvmTest.java  | 62 ++++++--------
 .../java/io/qameta/allure/test/RunUtils.java  | 85 ++++++++++++++++---
 .../main/java/io/qameta/allure/Allure.java    |  3 +-
 .../io/qameta/allure/util/ExceptionUtils.java |  2 +-
 .../io/qameta/allure/AllureLifecycleTest.java | 39 +++------
 .../allure/StepLifecycleListenerTest.java     | 54 ++----------
 .../allure/jbehave/AllureJbehaveTest.java     | 68 +++++++--------
 .../allure/jbehave5/AllureJbehave5Test.java   | 68 +++++++--------
 .../AllureJunitPlatformTest.java              | 45 ++++------
 .../AllureJunitPlatformTestUtils.java         | 70 ++++-----------
 .../allure/junit4/AllureJunit4Test.java       | 35 +++-----
 .../allure/junit5/AllureJunit5Test.java       | 51 ++++-------
 .../io/qameta/allure/karate/TestRunner.java   | 54 +++++-------
 .../qameta/allure/spock/AllureSpockTest.java  | 36 ++------
 .../io/qameta/allure/spock2/AllureSpock2.java |  2 +-
 .../allure/spock2/AllureSpock2Test.java       | 71 ++++++----------
 .../allure/testng/AllureTestNgTest.java       | 76 ++++++-----------
 20 files changed, 399 insertions(+), 609 deletions(-)

diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
index da872dced..18940bc83 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
@@ -15,19 +15,16 @@
  */
 package io.qameta.allure.cucumber4jvm;
 
-import cucumber.runtime.ClassFinder;
 import cucumber.runtime.FeaturePathFeatureSupplier;
 import cucumber.runtime.Runtime;
 import cucumber.runtime.io.MultiLoader;
 import cucumber.runtime.io.ResourceLoader;
-import cucumber.runtime.io.ResourceLoaderClassFinder;
 import cucumber.runtime.model.FeatureLoader;
 import io.cucumber.core.model.FeatureWithLines;
 import io.cucumber.core.options.CommandlineOptionsParser;
 import io.cucumber.core.options.RuntimeOptions;
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.github.glytching.junit.extension.system.SystemPropertyExtension;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Step;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.FixtureResult;
@@ -41,8 +38,7 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
-import io.qameta.allure.test.AllureTestCommonsUtils;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.parallel.ResourceLock;
@@ -719,38 +715,31 @@ void shouldSupportProvidedLabels() {
     @Step
     private AllureResults runFeature(final String featureResource,
                                      final String... moreOptions) {
-
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumber4Jvm cucumber4Jvm = new AllureCucumber4Jvm(lifecycle);
-        final ClassLoader classLoader = currentThread().getContextClassLoader();
-        final ResourceLoader resourceLoader = new MultiLoader(classLoader);
-        final ClassFinder classFinder = new ResourceLoaderClassFinder(resourceLoader, classLoader);
-        final List<String> opts = new ArrayList<>(Arrays.asList(
-                "--glue", "io.qameta.allure.cucumber4jvm.samples",
-                "--plugin", "null_summary"
-        ));
-        opts.addAll(Arrays.asList(moreOptions));
-        final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
-        final RuntimeOptions options = new CommandlineOptionsParser()
-                .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
-
-        final FeaturePathFeatureSupplier supplier
-                = new FeaturePathFeatureSupplier(new FeatureLoader(resourceLoader), options);
-
-        final Runtime runtime = Runtime.builder()
-                .withClassLoader(classLoader)
-                .withRuntimeOptions(options)
-                .withAdditionalPlugins(cucumber4Jvm)
-                .withFeatureSupplier(supplier)
-                .build();
-
-        runtime.run();
-
-        AllureTestCommonsUtils.attach(writer);
-
-        return writer;
+        return RunUtils.runTests(lifecycle -> {
+            final AllureCucumber4Jvm cucumber4Jvm = new AllureCucumber4Jvm(lifecycle);
+            final ClassLoader classLoader = currentThread().getContextClassLoader();
+            final ResourceLoader resourceLoader = new MultiLoader(classLoader);
+            final List<String> opts = new ArrayList<>(Arrays.asList(
+                    "--glue", "io.qameta.allure.cucumber4jvm.samples",
+                    "--plugin", "null_summary"
+            ));
+            opts.addAll(Arrays.asList(moreOptions));
+            final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
+            final RuntimeOptions options = new CommandlineOptionsParser()
+                    .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
+
+            final FeaturePathFeatureSupplier supplier
+                    = new FeaturePathFeatureSupplier(new FeatureLoader(resourceLoader), options);
+
+            final Runtime runtime = Runtime.builder()
+                    .withClassLoader(classLoader)
+                    .withRuntimeOptions(options)
+                    .withAdditionalPlugins(cucumber4Jvm)
+                    .withFeatureSupplier(supplier)
+                    .build();
+
+            runtime.run();
+        });
     }
 
 
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
index f4fe1a151..988882c27 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
@@ -26,7 +26,6 @@
 import io.cucumber.core.runtime.TimeServiceEventBus;
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.github.glytching.junit.extension.system.SystemPropertyExtension;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Step;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.FixtureResult;
@@ -40,8 +39,7 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
-import io.qameta.allure.test.AllureTestCommonsUtils;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.parallel.ResourceLock;
@@ -720,38 +718,32 @@ void shouldSupportProvidedLabels() {
     @Step
     private AllureResults runFeature(final String featureResource,
                                      final String... moreOptions) {
-
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumber5Jvm cucumber5jvm = new AllureCucumber5Jvm(lifecycle);
-        final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
-        final List<String> opts = new ArrayList<>(Arrays.asList(
-                "--glue", "io.qameta.allure.cucumber5jvm.samples",
-                "--plugin", "null_summary"
-        ));
-        opts.addAll(Arrays.asList(moreOptions));
-        final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
-        final RuntimeOptions options = new CommandlineOptionsParser()
-                .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
-
-        final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
-        final FeatureParser parser = new FeatureParser(bus::generateId);
-        final FeaturePathFeatureSupplier supplier
-                = new FeaturePathFeatureSupplier(classLoader, options, parser);
-
-        final Runtime runtime = Runtime.builder()
-                .withClassLoader(classLoader)
-                .withRuntimeOptions(options)
-                .withAdditionalPlugins(cucumber5jvm)
-                .withFeatureSupplier(supplier)
-                .build();
-
-        runtime.run();
-
-        AllureTestCommonsUtils.attach(writer);
-
-        return writer;
+        return RunUtils.runTests(lifecycle -> {
+            final AllureCucumber5Jvm cucumber5jvm = new AllureCucumber5Jvm(lifecycle);
+            final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
+            final List<String> opts = new ArrayList<>(Arrays.asList(
+                    "--glue", "io.qameta.allure.cucumber5jvm.samples",
+                    "--plugin", "null_summary"
+            ));
+            opts.addAll(Arrays.asList(moreOptions));
+            final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
+            final RuntimeOptions options = new CommandlineOptionsParser()
+                    .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
+
+            final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
+            final FeatureParser parser = new FeatureParser(bus::generateId);
+            final FeaturePathFeatureSupplier supplier
+                    = new FeaturePathFeatureSupplier(classLoader, options, parser);
+
+            final Runtime runtime = Runtime.builder()
+                    .withClassLoader(classLoader)
+                    .withRuntimeOptions(options)
+                    .withAdditionalPlugins(cucumber5jvm)
+                    .withFeatureSupplier(supplier)
+                    .build();
+
+            runtime.run();
+        });
     }
 
 
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
index b5a1ff4d4..e742aeb02 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
@@ -26,7 +26,6 @@
 import io.cucumber.core.runtime.TimeServiceEventBus;
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.github.glytching.junit.extension.system.SystemPropertyExtension;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Step;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.FixtureResult;
@@ -40,8 +39,7 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
-import io.qameta.allure.test.AllureTestCommonsUtils;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.parallel.ResourceLock;
@@ -720,37 +718,31 @@ void shouldSupportProvidedLabels() {
     @Step
     private AllureResults runFeature(final String featureResource,
                                      final String... moreOptions) {
-
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumber6Jvm cucumber6jvm = new AllureCucumber6Jvm(lifecycle);
-        final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
-        final List<String> opts = new ArrayList<>(Arrays.asList(
-                "--glue", "io.qameta.allure.cucumber6jvm.samples",
-                "--plugin", "null_summary"
-        ));
-        opts.addAll(Arrays.asList(moreOptions));
-        final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
-        final RuntimeOptions options = new CommandlineOptionsParser(System.out)
-                .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
-
-        final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
-        final FeatureParser parser = new FeatureParser(bus::generateId);
-        final FeaturePathFeatureSupplier supplier
-                = new FeaturePathFeatureSupplier(classLoader, options, parser);
-
-        final Runtime runtime = Runtime.builder()
-                .withClassLoader(classLoader)
-                .withRuntimeOptions(options)
-                .withAdditionalPlugins(cucumber6jvm)
-                .withFeatureSupplier(supplier)
-                .build();
-
-        runtime.run();
-
-        AllureTestCommonsUtils.attach(writer);
-
-        return writer;
+        return RunUtils.runTests(lifecycle -> {
+            final AllureCucumber6Jvm cucumber6jvm = new AllureCucumber6Jvm(lifecycle);
+            final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
+            final List<String> opts = new ArrayList<>(Arrays.asList(
+                    "--glue", "io.qameta.allure.cucumber6jvm.samples",
+                    "--plugin", "null_summary"
+            ));
+            opts.addAll(Arrays.asList(moreOptions));
+            final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
+            final RuntimeOptions options = new CommandlineOptionsParser(System.out)
+                    .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
+
+            final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
+            final FeatureParser parser = new FeatureParser(bus::generateId);
+            final FeaturePathFeatureSupplier supplier
+                    = new FeaturePathFeatureSupplier(classLoader, options, parser);
+
+            final Runtime runtime = Runtime.builder()
+                    .withClassLoader(classLoader)
+                    .withRuntimeOptions(options)
+                    .withAdditionalPlugins(cucumber6jvm)
+                    .withFeatureSupplier(supplier)
+                    .build();
+
+            runtime.run();
+        });
     }
 }
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
index 055fd7dbc..ff644c18b 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
@@ -26,7 +26,6 @@
 import io.cucumber.core.runtime.TimeServiceEventBus;
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.github.glytching.junit.extension.system.SystemPropertyExtension;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Step;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.FixtureResult;
@@ -40,8 +39,7 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
-import io.qameta.allure.test.AllureTestCommonsUtils;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.parallel.ResourceLock;
@@ -721,38 +719,32 @@ void shouldSupportProvidedLabels() {
     private AllureResults runFeature(final String featureResource,
                                      final String... moreOptions) {
 
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumber7Jvm cucumber7jvm = new AllureCucumber7Jvm(lifecycle);
-        final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
-        final List<String> opts = new ArrayList<>(Arrays.asList(
-                "--glue", "io.qameta.allure.cucumber7jvm.samples",
-                "--no-summary"
-        ));
-        opts.addAll(Arrays.asList(moreOptions));
-        final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
-        final RuntimeOptions options = new CommandlineOptionsParser(System.out)
-                .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
-
-        final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
-        final FeatureParser parser = new FeatureParser(bus::generateId);
-        final FeaturePathFeatureSupplier supplier
-                = new FeaturePathFeatureSupplier(classLoader, options, parser);
-
-        final Runtime runtime = Runtime.builder()
-                .withClassLoader(classLoader)
-                .withRuntimeOptions(options)
-                .withAdditionalPlugins(cucumber7jvm)
-                .withFeatureSupplier(supplier)
-                .build();
-
-        runtime.run();
-
-        AllureTestCommonsUtils.attach(writer);
-
-        return writer;
+        return RunUtils.runTests(lifecycle -> {
+            final AllureCucumber7Jvm cucumber7jvm = new AllureCucumber7Jvm(lifecycle);
+            final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
+            final List<String> opts = new ArrayList<>(Arrays.asList(
+                    "--glue", "io.qameta.allure.cucumber7jvm.samples",
+                    "--no-summary"
+            ));
+            opts.addAll(Arrays.asList(moreOptions));
+            final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
+            final RuntimeOptions options = new CommandlineOptionsParser(System.out)
+                    .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
+
+            final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
+            final FeatureParser parser = new FeatureParser(bus::generateId);
+            final FeaturePathFeatureSupplier supplier
+                    = new FeaturePathFeatureSupplier(classLoader, options, parser);
+
+            final Runtime runtime = Runtime.builder()
+                    .withClassLoader(classLoader)
+                    .withRuntimeOptions(options)
+                    .withAdditionalPlugins(cucumber7jvm)
+                    .withFeatureSupplier(supplier)
+                    .build();
+
+            runtime.run();
+        });
     }
 
-
 }
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
index 185a98b54..3905c64a7 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
@@ -17,12 +17,15 @@
 
 import io.qameta.allure.Allure;
 import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.AllureResultsWriter;
 import io.qameta.allure.aspects.AttachmentsAspects;
 import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.model.TestResult;
+import io.qameta.allure.util.ExceptionUtils;
 
 import java.util.UUID;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.stream.Stream;
 
 import static io.qameta.allure.util.ResultsUtils.getStatus;
@@ -37,8 +40,21 @@ private RunUtils() {
         throw new IllegalStateException("do not instance");
     }
 
-    public static AllureResults runWithinTestContext(final Runnable runnable) {
-        return runWithinTestContext(
+    public static AllureResults runTests(
+            final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable) {
+        return runTests(
+                runnable,
+                Allure::setLifecycle,
+                StepsAspects::setLifecycle,
+                AttachmentsAspects::setLifecycle
+        );
+    }
+
+    public static AllureResults runTests(
+            final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
+            final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable) {
+        return runTests(
+                lifecycleFactory,
                 runnable,
                 Allure::setLifecycle,
                 StepsAspects::setLifecycle,
@@ -47,18 +63,67 @@ public static AllureResults runWithinTestContext(final Runnable runnable) {
     }
 
     @SafeVarargs
-    public static AllureResults runWithinTestContext(final Runnable runnable,
-                                                     final Consumer<AllureLifecycle>... configurers) {
+    public static AllureResults runTests(
+            final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable,
+            final Consumer<AllureLifecycle>... configurers) {
+        return runTests(AllureLifecycle::new, runnable, configurers);
+    }
+
+    @SafeVarargs
+    public static AllureResults runTests(
+            final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
+            final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable,
+            final Consumer<AllureLifecycle>... configurers) {
         final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
+        final AllureLifecycle lifecycle = lifecycleFactory.apply(writer);
+
+        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
+        try {
+            Stream.of(configurers).forEach(configurer -> configurer.accept(lifecycle));
+
+            runnable.run(lifecycle);
+
+            return writer;
+        } catch (Throwable e) {
+            throw ExceptionUtils.sneakyThrow(e);
+        } finally {
+            Stream.of(configurers).forEach(configurer -> configurer.accept(defaultLifecycle));
 
+            AllureTestCommonsUtils.attach(writer);
+        }
+    }
+
+    public static AllureResults runWithinTestContext(
+            final Runnable runnable) {
+        return runTests(lifecycle -> withTestContext(runnable, lifecycle));
+    }
+
+    public static AllureResults runWithinTestContext(
+            final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
+            final Runnable runnable) {
+        return runTests(lifecycleFactory, lifecycle -> withTestContext(runnable, lifecycle));
+    }
+
+    @SafeVarargs
+    public static AllureResults runWithinTestContext(
+            final Runnable runnable,
+            final Consumer<AllureLifecycle>... configurers) {
+        return runTests(lifecycle -> withTestContext(runnable, lifecycle), configurers);
+    }
+
+    @SafeVarargs
+    public static AllureResults runWithinTestContext(
+            final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
+            final Runnable runnable,
+            final Consumer<AllureLifecycle>... configurers) {
+        return runTests(lifecycleFactory, lifecycle -> withTestContext(runnable, lifecycle), configurers);
+    }
+
+    private static void withTestContext(final Runnable runnable, final AllureLifecycle lifecycle) {
         final String uuid = UUID.randomUUID().toString();
         final TestResult result = new TestResult().setUuid(uuid);
 
-        final AllureLifecycle cached = Allure.getLifecycle();
         try {
-            Stream.of(configurers).forEach(configurer -> configurer.accept(lifecycle));
-
             lifecycle.scheduleTestCase(result);
             lifecycle.startTestCase(uuid);
 
@@ -72,11 +137,7 @@ public static AllureResults runWithinTestContext(final Runnable runnable,
         } finally {
             lifecycle.stopTestCase(uuid);
             lifecycle.writeTestCase(uuid);
-
-            Stream.of(configurers).forEach(configurer -> configurer.accept(cached));
         }
-
-        return writer;
     }
 
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
index afc8ddbc3..445d8b2c4 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
@@ -185,8 +185,7 @@ public static <T> T step(final ThrowableContextRunnable<T, StepContext> runnable
             getLifecycle().updateStep(s -> s
                     .setStatus(getStatus(throwable).orElse(Status.BROKEN))
                     .setStatusDetails(getStatusDetails(throwable).orElse(null)));
-            ExceptionUtils.sneakyThrow(throwable);
-            return null;
+            throw ExceptionUtils.sneakyThrow(throwable);
         } finally {
             getLifecycle().stopStep(uuid);
         }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java
index e658e8e28..f644cf7e7 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java
@@ -25,7 +25,7 @@ private ExceptionUtils() {
     }
 
     @SuppressWarnings("unchecked")
-    public static <T extends Throwable> void sneakyThrow(final Throwable throwable) throws T {
+    public static <T extends Throwable> T sneakyThrow(final Throwable throwable) throws T {
         throw (T) throwable;
     }
 }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
index cf8fa80b9..02a74faa8 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
@@ -20,7 +20,8 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -34,7 +35,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -46,7 +46,6 @@
 import java.util.stream.Collectors;
 
 import static io.qameta.allure.Allure.addStreamAttachmentAsync;
-import static io.qameta.allure.Allure.setLifecycle;
 import static io.qameta.allure.test.TestData.randomId;
 import static io.qameta.allure.test.TestData.randomName;
 import static io.qameta.allure.test.TestData.randomString;
@@ -296,36 +295,24 @@ void shouldCreateTestFixture() {
                 .containsExactly(firstStepName, secondStepName);
     }
 
-    @SuppressWarnings("OptionalGetWithoutIsPresent")
     @Test
     void shouldAttachAsync() {
         final List<CompletableFuture<InputStream>> features = new CopyOnWriteArrayList<>();
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        setLifecycle(lifecycle);
-
-        final String uuid = UUID.randomUUID().toString();
-        final TestResult result = new TestResult().setUuid(uuid);
-
-        lifecycle.scheduleTestCase(result);
-        lifecycle.startTestCase(uuid);
-
-        final String attachment1Content = randomString(100);
-        final String attachment2Content = randomString(100);
 
         final String attachment1Name = randomName();
         final String attachment2Name = randomName();
 
-        features.add(addStreamAttachmentAsync(
-                attachment1Name, "video/mp4", getStreamWithTimeout(2, attachment1Content)));
-        features.add(addStreamAttachmentAsync(
-                attachment2Name, "text/plain", getStreamWithTimeout(1, attachment2Content)));
+        final String attachment1Content = randomString(100);
+        final String attachment2Content = randomString(100);
 
-        lifecycle.stopTestCase(uuid);
-        lifecycle.writeTestCase(uuid);
+        final AllureResults writer = RunUtils.runWithinTestContext(() -> {
+            features.add(addStreamAttachmentAsync(
+                    attachment1Name, "video/mp4", getStreamWithTimeout(2, attachment1Content)));
+            features.add(addStreamAttachmentAsync(
+                    attachment2Name, "text/plain", getStreamWithTimeout(1, attachment2Content)));
 
-        allOf(features.toArray(new CompletableFuture[0])).join();
+            allOf(features.toArray(new CompletableFuture[0])).join();
+        });
 
         final List<io.qameta.allure.model.Attachment> attachments = writer.getTestResults().stream()
                 .map(TestResult::getAttachments)
@@ -351,7 +338,7 @@ void shouldAttachAsync() {
         final io.qameta.allure.model.Attachment attachment1 = attachments.stream()
                 .filter(attachment -> Objects.equals(attachment.getName(), attachment1Name))
                 .findAny()
-                .get();
+                .orElseThrow();
 
         final byte[] actual1 = attachmentFiles.get(attachment1.getSource());
 
@@ -361,7 +348,7 @@ void shouldAttachAsync() {
         final Attachment attachment2 = attachments.stream()
                 .filter(attachment -> Objects.equals(attachment.getName(), attachment2Name))
                 .findAny()
-                .get();
+                .orElseThrow();
 
         final byte[] actual2 = attachmentFiles.get(attachment2.getSource());
 
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java b/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java
index bd09c6935..0a0ba0f78 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java
@@ -15,7 +15,6 @@
  */
 package io.qameta.allure;
 
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.listener.LifecycleNotifier;
 import io.qameta.allure.listener.StepLifecycleListener;
 import io.qameta.allure.model.Attachment;
@@ -23,17 +22,13 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Test;
 
-import java.util.UUID;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
-import static io.qameta.allure.util.ResultsUtils.getStatus;
-import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -133,45 +128,12 @@ public void beforeStepStop(final StepResult result) {
     }
 
     protected AllureResults run(final StepLifecycleListener listener, final String... steps) {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final LifecycleNotifier notifier = new LifecycleNotifier(
-                emptyList(),
-                emptyList(),
-                emptyList(),
-                singletonList(listener)
+        return RunUtils.runWithinTestContext(
+                writer -> new AllureLifecycle(
+                        writer,
+                        new LifecycleNotifier(List.of(), List.of(), List.of(), List.of(listener))
+                ),
+                () -> Stream.of(steps).forEach(step -> Allure.step(step, Status.PASSED))
         );
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer, notifier);
-
-        final String uuid = UUID.randomUUID().toString();
-        final TestResult result = new TestResult().setUuid(uuid);
-
-        final AllureLifecycle cached = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-
-            lifecycle.scheduleTestCase(result);
-            lifecycle.startTestCase(uuid);
-
-            Stream.of(steps).forEach(step -> {
-                final String stepUuid = UUID.randomUUID().toString();
-                lifecycle.startStep(stepUuid, new StepResult().setName(step).setStatus(Status.PASSED));
-                lifecycle.stopStep(stepUuid);
-            });
-        } catch (Throwable e) {
-            lifecycle.updateTestCase(uuid, testResult -> {
-                getStatus(e).ifPresent(testResult::setStatus);
-                getStatusDetails(e).ifPresent(testResult::setStatusDetails);
-
-            });
-        } finally {
-            lifecycle.stopTestCase(uuid);
-            lifecycle.writeTestCase(uuid);
-
-            Allure.setLifecycle(cached);
-            StepsAspects.setLifecycle(cached);
-        }
-
-        return writer;
     }
 }
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
index 5e7035e47..1f1917b97 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
@@ -15,8 +15,6 @@
  */
 package io.qameta.allure.jbehave;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Issue;
 import io.qameta.allure.jbehave.samples.BrokenStorySteps;
 import io.qameta.allure.jbehave.samples.SimpleStorySteps;
@@ -27,7 +25,7 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import org.jbehave.core.configuration.MostUsefulConfiguration;
 import org.jbehave.core.embedder.Embedder;
 import org.jbehave.core.embedder.EmbedderControls;
@@ -176,7 +174,7 @@ void shouldSetDescription() {
         final AllureResults results = runStories("stories/description.story");
 
         final String expected = "This is description for current story.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
         assertThat(results.getTestResults())
                 .extracting(TestResult::getDescription)
@@ -267,42 +265,34 @@ void shouldNotFailIfGivenStoriesSpecified() {
     }
 
     private AllureResults runStories(final String... storyResources) {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-
-        final Embedder embedder = new Embedder();
-        embedder.useEmbedderMonitor(new NullEmbedderMonitor());
-        embedder.useEmbedderControls(new EmbedderControls()
-                .doGenerateViewAfterStories(false)
-                .doFailOnStoryTimeout(false)
-                .doBatch(false)
-                .doIgnoreFailureInStories(true)
-                .doIgnoreFailureInView(true)
-                .doVerboseFailures(false)
-                .doVerboseFiltering(false)
-        );
-        final AllureJbehave allureJbehave = new AllureJbehave(lifecycle);
-        embedder.useConfiguration(new MostUsefulConfiguration()
-                .useStoryLoader(new LoadFromClasspath(this.getClass()))
-                .useStoryReporterBuilder(new ReportlessStoryReporterBuilder(temp.toFile())
-                        .withReporters(allureJbehave)
-                )
-                .useDefaultStoryReporter(new NullStoryReporter())
-        );
-        final InjectableStepsFactory stepsFactory = new InstanceStepsFactory(
-                embedder.configuration(),
-                new SimpleStorySteps(),
-                new BrokenStorySteps()
-        );
-        embedder.useCandidateSteps(stepsFactory.createCandidateSteps());
-        final AllureLifecycle cached = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
+        return RunUtils.runTests(lifecycle -> {
+            final Embedder embedder = new Embedder();
+            embedder.useEmbedderMonitor(new NullEmbedderMonitor());
+            embedder.useEmbedderControls(new EmbedderControls()
+                    .doGenerateViewAfterStories(false)
+                    .doFailOnStoryTimeout(false)
+                    .doBatch(false)
+                    .doIgnoreFailureInStories(true)
+                    .doIgnoreFailureInView(true)
+                    .doVerboseFailures(false)
+                    .doVerboseFiltering(false)
+            );
+            final AllureJbehave allureJbehave = new AllureJbehave(lifecycle);
+            embedder.useConfiguration(new MostUsefulConfiguration()
+                    .useStoryLoader(new LoadFromClasspath(this.getClass()))
+                    .useStoryReporterBuilder(new ReportlessStoryReporterBuilder(temp.toFile())
+                            .withReporters(allureJbehave)
+                    )
+                    .useDefaultStoryReporter(new NullStoryReporter())
+            );
+            final InjectableStepsFactory stepsFactory = new InstanceStepsFactory(
+                    embedder.configuration(),
+                    new SimpleStorySteps(),
+                    new BrokenStorySteps()
+            );
+            embedder.useCandidateSteps(stepsFactory.createCandidateSteps());
             embedder.runStoriesAsPaths(Arrays.asList(storyResources));
-        } finally {
-            Allure.setLifecycle(cached);
-        }
-        return writer;
+        });
     }
 
     static class ReportlessStoryReporterBuilder extends StoryReporterBuilder {
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
index eb670babc..387f94557 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
@@ -15,8 +15,6 @@
  */
 package io.qameta.allure.jbehave5;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Issue;
 import io.qameta.allure.jbehave5.samples.BrokenStorySteps;
 import io.qameta.allure.jbehave5.samples.SimpleStorySteps;
@@ -27,7 +25,7 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import org.jbehave.core.configuration.MostUsefulConfiguration;
 import org.jbehave.core.embedder.Embedder;
 import org.jbehave.core.embedder.EmbedderControls;
@@ -172,7 +170,7 @@ void shouldSetDescription() {
         final AllureResults results = runStories("stories/description.story");
 
         final String expected = "This is description for current story.\n"
-                + "It should appear on each scenario in report";
+                                + "It should appear on each scenario in report";
 
         assertThat(results.getTestResults())
                 .extracting(TestResult::getDescription)
@@ -262,42 +260,34 @@ void shouldNotFailIfGivenStoriesSpecified() {
     }
 
     private AllureResults runStories(final String... storyResources) {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-
-        final Embedder embedder = new Embedder();
-        embedder.useEmbedderMonitor(new NullEmbedderMonitor());
-        embedder.useEmbedderControls(new EmbedderControls()
-                .doGenerateViewAfterStories(false)
-                .doFailOnStoryTimeout(false)
-                .doBatch(false)
-                .doIgnoreFailureInStories(true)
-                .doIgnoreFailureInView(true)
-                .doVerboseFailures(false)
-                .doVerboseFiltering(false)
-        );
-        final AllureJbehave5 allureJbehave5 = new AllureJbehave5(lifecycle);
-        embedder.useConfiguration(new MostUsefulConfiguration()
-                .useStoryLoader(new LoadFromClasspath(this.getClass()))
-                .useStoryReporterBuilder(new ReportlessStoryReporterBuilder(temp.toFile())
-                        .withReporters(allureJbehave5)
-                )
-                .useDefaultStoryReporter(new NullStoryReporter())
-        );
-        final InjectableStepsFactory stepsFactory = new InstanceStepsFactory(
-                embedder.configuration(),
-                new SimpleStorySteps(),
-                new BrokenStorySteps()
-        );
-        embedder.useStepsFactory(stepsFactory);
-        final AllureLifecycle cached = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
+        return RunUtils.runTests(lifecycle -> {
+            final Embedder embedder = new Embedder();
+            embedder.useEmbedderMonitor(new NullEmbedderMonitor());
+            embedder.useEmbedderControls(new EmbedderControls()
+                    .doGenerateViewAfterStories(false)
+                    .doFailOnStoryTimeout(false)
+                    .doBatch(false)
+                    .doIgnoreFailureInStories(true)
+                    .doIgnoreFailureInView(true)
+                    .doVerboseFailures(false)
+                    .doVerboseFiltering(false)
+            );
+            final AllureJbehave5 allureJbehave5 = new AllureJbehave5(lifecycle);
+            embedder.useConfiguration(new MostUsefulConfiguration()
+                    .useStoryLoader(new LoadFromClasspath(this.getClass()))
+                    .useStoryReporterBuilder(new ReportlessStoryReporterBuilder(temp.toFile())
+                            .withReporters(allureJbehave5)
+                    )
+                    .useDefaultStoryReporter(new NullStoryReporter())
+            );
+            final InjectableStepsFactory stepsFactory = new InstanceStepsFactory(
+                    embedder.configuration(),
+                    new SimpleStorySteps(),
+                    new BrokenStorySteps()
+            );
+            embedder.useStepsFactory(stepsFactory);
             embedder.runStoriesAsPaths(Arrays.asList(storyResources));
-        } finally {
-            Allure.setLifecycle(cached);
-        }
-        return writer;
+        });
     }
 
     static class ReportlessStoryReporterBuilder extends StoryReporterBuilder {
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
index 33be21458..ceccd76b3 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -16,11 +16,7 @@
 package io.qameta.allure.junitplatform;
 
 import io.github.glytching.junit.extension.system.SystemProperty;
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Issue;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.junitplatform.features.AllureIdAnnotationSupport;
 import io.qameta.allure.junitplatform.features.BrokenInAfterAllTests;
 import io.qameta.allure.junitplatform.features.BrokenInBeforeAllTests;
@@ -67,7 +63,7 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.ResourceLock;
@@ -841,35 +837,23 @@ void shouldProcessAllureParameterReportingEvents() {
     @Test
     @AllureFeatures.Retries
     void shouldSetDifferentUuidsInDifferentRuns() {
-        final AllureResultsWriterStub results = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(results);
-
-        final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
-                .filters(new AllurePostDiscoveryFilter(null))
-                .selectors(DiscoverySelectors.selectClass(OneTest.class))
-                .build();
-
-        final LauncherConfig config = LauncherConfig.builder()
-                .enableTestExecutionListenerAutoRegistration(false)
-                .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
-                .enablePostDiscoveryFilterAutoRegistration(false)
-                .build();
-        final Launcher launcher = LauncherFactory.create(config);
-
-        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
+        final AllureResults results = RunUtils.runTests(lifecycle -> {
+            final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+                    .filters(new AllurePostDiscoveryFilter(null))
+                    .selectors(DiscoverySelectors.selectClass(OneTest.class))
+                    .build();
+
+            final LauncherConfig config = LauncherConfig.builder()
+                    .enableTestExecutionListenerAutoRegistration(false)
+                    .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
+                    .enablePostDiscoveryFilterAutoRegistration(false)
+                    .build();
+            final Launcher launcher = LauncherFactory.create(config);
 
             // execute request twice
             launcher.execute(request);
             launcher.execute(request);
-        } finally {
-            Allure.setLifecycle(defaultLifecycle);
-            StepsAspects.setLifecycle(defaultLifecycle);
-            AttachmentsAspects.setLifecycle(defaultLifecycle);
-        }
+        });
 
 
         final List<TestResult> testResults = results.getTestResults();
@@ -888,4 +872,5 @@ void shouldSetDifferentUuidsInDifferentRuns() {
                 .isEqualTo(tr2.getHistoryId());
 
     }
+
 }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
index df27d2f3e..9cd8a8f60 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
@@ -15,13 +15,9 @@
  */
 package io.qameta.allure.junitplatform;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Step;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import io.qameta.allure.testfilter.TestPlan;
 import org.junit.platform.engine.discovery.ClassSelector;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
@@ -49,58 +45,24 @@ public static AllureResults runClasses(final Class<?>... classes) {
 
     @Step("Run classes {classes}")
     public static AllureResults runClasses(final TestPlan testPlan, final Class<?>... classes) {
-        final AllureResultsWriterStub writerStub = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writerStub);
+        return RunUtils.runTests(lifecycle -> {
+            final ClassSelector[] classSelectors = Stream.of(classes)
+                    .map(DiscoverySelectors::selectClass)
+                    .toArray(ClassSelector[]::new);
 
-        final ClassSelector[] classSelectors = Stream.of(classes)
-                .map(DiscoverySelectors::selectClass)
-                .toArray(ClassSelector[]::new);
+            final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+                    .filters(new AllurePostDiscoveryFilter(testPlan))
+                    .selectors(classSelectors)
+                    .build();
 
-        final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
-                .filters(new AllurePostDiscoveryFilter(testPlan))
-                .selectors(classSelectors)
-                .build();
-
-        final LauncherConfig config = LauncherConfig.builder()
-                .enableTestExecutionListenerAutoRegistration(false)
-                .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
-                .enablePostDiscoveryFilterAutoRegistration(false)
-                .build();
-        final Launcher launcher = LauncherFactory.create(config);
-
-        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
+            final LauncherConfig config = LauncherConfig.builder()
+                    .enableTestExecutionListenerAutoRegistration(false)
+                    .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
+                    .enablePostDiscoveryFilterAutoRegistration(false)
+                    .build();
+            final Launcher launcher = LauncherFactory.create(config);
             launcher.execute(request);
-            return writerStub;
-        } finally {
-            Allure.setLifecycle(defaultLifecycle);
-            StepsAspects.setLifecycle(defaultLifecycle);
-            AttachmentsAspects.setLifecycle(defaultLifecycle);
-        }
+        });
     }
 
-    @Step("Build test plan for {classes}")
-    public static org.junit.platform.launcher.TestPlan buildPlan(
-            final io.qameta.allure.testfilter.TestPlan testPlan,
-            final Class<?>... classes) {
-        final ClassSelector[] classSelectors = Stream.of(classes)
-                .map(DiscoverySelectors::selectClass)
-                .toArray(ClassSelector[]::new);
-
-        final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
-                .selectors(classSelectors)
-                .filters(new AllurePostDiscoveryFilter(testPlan))
-                .build();
-
-        final LauncherConfig config = LauncherConfig.builder()
-                .enableTestExecutionListenerAutoRegistration(false)
-                .enablePostDiscoveryFilterAutoRegistration(false)
-                .build();
-        final Launcher launcher = LauncherFactory.create(config);
-
-        return launcher.discover(request);
-    }
 }
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
index 011443e08..99d08a644 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
@@ -15,11 +15,7 @@
  */
 package io.qameta.allure.junit4;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Step;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.junit4.samples.AssumptionFailedTest;
 import io.qameta.allure.junit4.samples.BrokenTest;
 import io.qameta.allure.junit4.samples.BrokenWithoutMessageTest;
@@ -44,7 +40,7 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import io.qameta.allure.testfilter.TestPlan;
 import io.qameta.allure.testfilter.TestPlanV1_0;
 import org.junit.jupiter.api.Test;
@@ -422,26 +418,15 @@ private AllureResults runClasses(final Class<?>... classes) {
 
     @Step("Run classes {classes}")
     private AllureResults runClasses(final TestPlan testPlan, final Class<?>... classes) {
-        final AllureResultsWriterStub writerStub = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writerStub);
-        final JUnitCore core = new JUnitCore();
-        core.addListener(new AllureJunit4(lifecycle));
-
-        final Request request = Request
-                .classes(classes)
-                .filterWith(new AllureJunit4Filter(testPlan));
-
-        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
+        return RunUtils.runTests(lifecycle -> {
+            final JUnitCore core = new JUnitCore();
+            core.addListener(new AllureJunit4(lifecycle));
+
+            final Request request = Request
+                    .classes(classes)
+                    .filterWith(new AllureJunit4Filter(testPlan));
+
             core.run(request);
-            return writerStub;
-        } finally {
-            Allure.setLifecycle(defaultLifecycle);
-            StepsAspects.setLifecycle(defaultLifecycle);
-            AttachmentsAspects.setLifecycle(defaultLifecycle);
-        }
+        });
     }
 }
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
index 09e15eb3d..19e62a917 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
@@ -15,12 +15,8 @@
  */
 package io.qameta.allure.junit5;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Issue;
 import io.qameta.allure.Step;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.junit5.features.AfterEachFixtureBrokenSupport;
 import io.qameta.allure.junit5.features.AllFixtureSupport;
 import io.qameta.allure.junit5.features.BeforeAllFixtureFailureSupport;
@@ -39,7 +35,7 @@
 import io.qameta.allure.model.TestResultContainer;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.engine.discovery.ClassSelector;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
@@ -415,35 +411,22 @@ void shouldSupportFailureInBeforeAllFixture() {
 
     @Step("Run classes {classes}")
     private AllureResults runClasses(final Class<?>... classes) {
-        final AllureResultsWriterStub writerStub = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writerStub);
-
-        final ClassSelector[] classSelectors = Stream.of(classes)
-                .map(DiscoverySelectors::selectClass)
-                .toArray(ClassSelector[]::new);
-
-        final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
-                .configurationParameter("junit.jupiter.extensions.autodetection.enabled", "true")
-                .selectors(classSelectors)
-                .build();
-
-        final LauncherConfig config = LauncherConfig.builder()
-                .enableTestExecutionListenerAutoRegistration(false)
-                .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
-                .build();
-        final Launcher launcher = LauncherFactory.create(config);
-
-        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
+        return RunUtils.runTests(lifecycle -> {
+            final ClassSelector[] classSelectors = Stream.of(classes)
+                    .map(DiscoverySelectors::selectClass)
+                    .toArray(ClassSelector[]::new);
+
+            final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+                    .configurationParameter("junit.jupiter.extensions.autodetection.enabled", "true")
+                    .selectors(classSelectors)
+                    .build();
+
+            final LauncherConfig config = LauncherConfig.builder()
+                    .enableTestExecutionListenerAutoRegistration(false)
+                    .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
+                    .build();
+            final Launcher launcher = LauncherFactory.create(config);
             launcher.execute(request);
-            return writerStub;
-        } finally {
-            Allure.setLifecycle(defaultLifecycle);
-            StepsAspects.setLifecycle(defaultLifecycle);
-            AttachmentsAspects.setLifecycle(defaultLifecycle);
-        }
+        });
     }
 }
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java b/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
index 0e53fbf89..a8300251a 100644
--- a/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
@@ -15,12 +15,8 @@
  */
 package io.qameta.allure.karate;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import org.mockserver.client.MockServerClient;
 import org.mockserver.model.HttpRequest;
 import org.mockserver.model.HttpResponse;
@@ -59,36 +55,26 @@ AllureResults runApi(final String... featurePath) {
     }
 
     AllureResults run(final String... path) {
-        final AllureResultsWriterStub writerStub = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writerStub);
-        final AllureKarate allureKarate = new AllureKarate(lifecycle);
+        return RunUtils.runTests(lifecycle -> {
+            final AllureKarate allureKarate = new AllureKarate(lifecycle);
 
-        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
-
-            com.intuit.karate.Runner.builder()
-                    .path(path)
-                    .hook(allureKarate)
-                    .backupReportDir(false)
-                    .outputJunitXml(false)
-                    .outputCucumberJson(false)
-                    .outputHtmlReport(false)
-                    .parallel(1);
-
-            return writerStub;
-        } finally {
-            Allure.setLifecycle(defaultLifecycle);
-            StepsAspects.setLifecycle(defaultLifecycle);
-            AttachmentsAspects.setLifecycle(defaultLifecycle);
-            if (server != null && server.isRunning()) {
-                server.stop();
-            }
-            if (client != null && !client.hasStopped()) {
-                client.stop();
+            try {
+                com.intuit.karate.Runner.builder()
+                        .path(path)
+                        .hook(allureKarate)
+                        .backupReportDir(false)
+                        .outputJunitXml(false)
+                        .outputCucumberJson(false)
+                        .outputHtmlReport(false)
+                        .parallel(1);
+            } finally {
+                if (server != null && server.isRunning()) {
+                    server.stop();
+                }
+                if (client != null && !client.hasStopped()) {
+                    client.stop();
+                }
             }
-        }
+        });
     }
 }
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java b/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java
index afb51f3ef..f7bc5af8b 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java
@@ -15,10 +15,6 @@
  */
 package io.qameta.allure.spock;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import io.qameta.allure.model.Parameter;
@@ -37,7 +33,7 @@
 import io.qameta.allure.spock.samples.TestWithCustomAnnotations;
 import io.qameta.allure.spock.samples.TestWithSteps;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.notification.RunNotifier;
 import org.spockframework.runtime.JUnitDescriptionGenerator;
@@ -225,32 +221,16 @@ void shouldSupportDataDrivenTests() {
     }
 
     protected AllureResults run(final Class<?> clazz) {
-        final AllureResultsWriterStub results = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(results);
+        return RunUtils.runTests(lifecycle -> {
+            final RunNotifier notifier = new RunNotifier();
+            final SpecInfo spec = new SpecInfoBuilder(clazz).build();
+            spec.addListener(new AllureSpock(lifecycle));
 
-        final RunNotifier notifier = new RunNotifier();
-        final SpecInfo spec = new SpecInfoBuilder(clazz).build();
-        spec.addListener(new AllureSpock(lifecycle));
-
-        new JUnitDescriptionGenerator(spec).describeSpecMethods();
-        new JUnitDescriptionGenerator(spec).describeSpec();
-
-        final AllureLifecycle cached = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
+            new JUnitDescriptionGenerator(spec).describeSpecMethods();
+            new JUnitDescriptionGenerator(spec).describeSpec();
 
             RunContext.get().createSpecRunner(spec, notifier).run();
-        } catch (Exception e) {
-            throw new RuntimeException("could not execute sample", e);
-        } finally {
-            Allure.setLifecycle(cached);
-            StepsAspects.setLifecycle(cached);
-            AttachmentsAspects.setLifecycle(cached);
-        }
-
-        return results;
+        });
     }
 
     private static Predicate<TestResult> mutedPredicate() {
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
index a07a47f06..c0ae16674 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -411,7 +411,7 @@ public void intercept(final IMethodInvocation invocation) throws Throwable {
                                 .setStatus(getStatus(throwable).orElse(Status.BROKEN))
                                 .setStatusDetails(getStatusDetails(throwable).orElse(null))
                 );
-                ExceptionUtils.sneakyThrow(throwable);
+                throw ExceptionUtils.sneakyThrow(throwable);
             } finally {
                 getLifecycle().stopFixture(fixtureUuid);
             }
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
index 402a77eef..c5c55f79a 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -15,11 +15,7 @@
  */
 package io.qameta.allure.spock2;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Step;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.model.ExecutableItem;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
@@ -48,7 +44,7 @@
 import io.qameta.allure.spock2.samples.TestsWithIdForFilter;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import io.qameta.allure.testfilter.TestPlan;
 import io.qameta.allure.testfilter.TestPlanV1_0;
 import org.apache.commons.lang3.tuple.Pair;
@@ -607,46 +603,33 @@ public static AllureResults runClasses(final Class<?>... classes) {
 
     @Step("Run classes {classes}")
     public static AllureResults runClasses(final TestPlan testPlan, final Class<?>... classes) {
-        final AllureResultsWriterStub writerStub = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writerStub);
-
-        final ClassSelector[] classSelectors = Stream.of(classes)
-                .map(DiscoverySelectors::selectClass)
-                .toArray(ClassSelector[]::new);
-
-        final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
-                .selectors(classSelectors)
-                .build();
-
-        final RunContext context = RunContext.get();
-        final GlobalExtensionRegistry extensionRegistry = ReflectionUtils
-                .tryToReadFieldValue(RunContext.class, "globalExtensionRegistry", context)
-                .andThenTry(GlobalExtensionRegistry.class::cast)
-                .toOptional()
-                .orElseThrow(() -> new AssertionError("could not access globalExtensionRegistry field of RunContext"));
-        extensionRegistry.getGlobalExtensions().add(new AllureSpock2(lifecycle, testPlan));
-
-        final LauncherConfig config = LauncherConfig.builder()
-                .enableTestEngineAutoRegistration(false)
-                .addTestEngines(new SpockEngine())
-                .enableTestExecutionListenerAutoRegistration(false)
-                .enablePostDiscoveryFilterAutoRegistration(false)
-                .build();
-
-        final Launcher launcher = LauncherFactory.create(config);
-
-        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
+        return RunUtils.runTests(lifecycle -> {
+            final ClassSelector[] classSelectors = Stream.of(classes)
+                    .map(DiscoverySelectors::selectClass)
+                    .toArray(ClassSelector[]::new);
+
+            final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+                    .selectors(classSelectors)
+                    .build();
+
+            final RunContext context = RunContext.get();
+            final GlobalExtensionRegistry extensionRegistry = ReflectionUtils
+                    .tryToReadFieldValue(RunContext.class, "globalExtensionRegistry", context)
+                    .andThenTry(GlobalExtensionRegistry.class::cast)
+                    .toOptional()
+                    .orElseThrow(() -> new AssertionError("could not access globalExtensionRegistry field of RunContext"));
+            extensionRegistry.getGlobalExtensions().add(new AllureSpock2(lifecycle, testPlan));
+
+            final LauncherConfig config = LauncherConfig.builder()
+                    .enableTestEngineAutoRegistration(false)
+                    .addTestEngines(new SpockEngine())
+                    .enableTestExecutionListenerAutoRegistration(false)
+                    .enablePostDiscoveryFilterAutoRegistration(false)
+                    .build();
+
+            final Launcher launcher = LauncherFactory.create(config);
             launcher.execute(request);
-            return writerStub;
-        } finally {
-            Allure.setLifecycle(defaultLifecycle);
-            StepsAspects.setLifecycle(defaultLifecycle);
-            AttachmentsAspects.setLifecycle(defaultLifecycle);
-        }
+        });
     }
 
     private String printSteps(final ExecutableItem item) {
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
index 736564729..7af9c5303 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -15,12 +15,8 @@
  */
 package io.qameta.allure.testng;
 
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.Issue;
 import io.qameta.allure.Step;
-import io.qameta.allure.aspects.AttachmentsAspects;
-import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
@@ -35,7 +31,7 @@
 import io.qameta.allure.model.WithSteps;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
-import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.RunUtils;
 import io.qameta.allure.testfilter.TestPlan;
 import io.qameta.allure.testfilter.TestPlanV1_0;
 import io.qameta.allure.testng.config.AllureTestNgConfig;
@@ -180,7 +176,7 @@ public void testWithTimeout(final XmlSuite.ParallelMode mode, final int threadCo
                 .hasSize(2)
                 .as("Unexpectedly passed status or stage of tests")
                 .allMatch(testResult -> testResult.getStatus().equals(Status.PASSED) &&
-                        testResult.getStage().equals(Stage.FINISHED))
+                                        testResult.getStage().equals(Stage.FINISHED))
                 .extracting(TestResult::getName)
                 .as("Unexpectedly passed name of tests")
                 .containsOnlyElementsOf(asList(
@@ -1106,7 +1102,7 @@ public void shouldDisplayDisabledTests() {
     public void shouldNotDisplayDisabledTests() {
         AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
         allureTestNgConfig.setHideDisabledTests(true);
-        final AllureResults results = runTestNgSuites(allureTestNgConfig,"suites/gh-369.xml");
+        final AllureResults results = runTestNgSuites(allureTestNgConfig, "suites/gh-369.xml");
         assertThat(results.getTestResults())
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsOnly(tuple("enabled", Status.PASSED));
@@ -1253,7 +1249,8 @@ private AllureResults runTestNgSuites(AllureTestNgConfig config, final String...
     }
 
     private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
-                                          final String... suites) {;
+                                          final String... suites) {
+        ;
         return runTestNgSuites(configurer, AllureTestNgConfig.loadConfigProperties(), suites);
     }
 
@@ -1272,29 +1269,17 @@ private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
                 .as("Cannot find all suite xml files")
                 .hasSameSizeAs(suiteFiles);
 
-        final AllureResultsWriterStub results = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(results);
-        final AllureTestNg adapter = new AllureTestNg(lifecycle,
-            new AllureTestNgTestFilter(),
-            config);
-        final TestNG testNg = new TestNG(false);
-        testNg.addListener((ITestNGListener) adapter);
-        testNg.setTestSuites(suiteFiles);
-
-        configurer.accept(testNg);
+        return RunUtils.runTests(lifecycle -> {
+            final AllureTestNg adapter = new AllureTestNg(lifecycle,
+                    new AllureTestNgTestFilter(),
+                    config);
+            final TestNG testNg = new TestNG(false);
+            testNg.addListener((ITestNGListener) adapter);
+            testNg.setTestSuites(suiteFiles);
 
-        final AllureLifecycle cached = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
+            configurer.accept(testNg);
             testNg.run();
-        } finally {
-            Allure.setLifecycle(cached);
-            StepsAspects.setLifecycle(cached);
-            AttachmentsAspects.setLifecycle(cached);
-        }
-        return results;
+        });
     }
 
     protected Consumer<TestNG> parallel(final XmlSuite.ParallelMode mode,
@@ -1329,13 +1314,13 @@ private Predicate<TestResult> hasLinks() {
     @Step("Find flaky")
     private Predicate<TestResult> flakyPredicate() {
         return testResult -> Objects.nonNull(testResult.getStatusDetails())
-                && testResult.getStatusDetails().isFlaky();
+                             && testResult.getStatusDetails().isFlaky();
     }
 
     @Step("Find muted")
     private Predicate<TestResult> mutedPredicate() {
         return testResult -> Objects.nonNull(testResult.getStatusDetails())
-                && testResult.getStatusDetails().isMuted();
+                             && testResult.getStatusDetails().isMuted();
     }
 
     @Step("Get uuids by container name")
@@ -1517,28 +1502,15 @@ public void correctIdIncorrectSelector() {
                 );
     }
 
-    public AllureResultsWriterStub runTestPlan(TestPlan plan, final Class<?>... testClasses) {
-        final AllureResultsWriterStub results = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(results);
-        final AllureTestNg adapter = new AllureTestNg(lifecycle, new AllureTestNgTestFilter(plan));
-        TestNG testNG = new TestNG(false);
-        testNG.addListener((ITestNGListener) adapter);
-        testNG.setTestClasses(testClasses);
-        testNG.setOutputDirectory("build/test-output");
-
-
-        final AllureLifecycle cached = Allure.getLifecycle();
-        try {
-            Allure.setLifecycle(lifecycle);
-            StepsAspects.setLifecycle(lifecycle);
-            AttachmentsAspects.setLifecycle(lifecycle);
+    public AllureResults runTestPlan(final TestPlan plan, final Class<?>... testClasses) {
+        return RunUtils.runTests(lifecycle -> {
+            final AllureTestNg adapter = new AllureTestNg(lifecycle, new AllureTestNgTestFilter(plan));
+            final TestNG testNG = new TestNG(false);
+            testNG.addListener((ITestNGListener) adapter);
+            testNG.setTestClasses(testClasses);
+            testNG.setOutputDirectory("build/test-output");
             testNG.run();
-            return results;
-        } finally {
-            Allure.setLifecycle(cached);
-            StepsAspects.setLifecycle(cached);
-            AttachmentsAspects.setLifecycle(cached);
-        }
+        });
     }
 
     private Integer getOrderParameter(final TestResult result) {

From 6a1fd52e42cf5713306be6d6e7026654ef5c7d71 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 1 Mar 2024 11:26:27 +0000
Subject: [PATCH 073/233] update AUTHORS

---
 AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 0edbd3fb9..8263d9471 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
 The following authors have created the source code of "Allure Java"
-published and distributed by Qameta Software OÜ as the owner:
+published and distributed by Qameta Software Inc as the owner:
 
 * Dmitry Baev           <baev@qameta.io>

From 1c697994c2cbd805ec2fc005b012567085aa91fa Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 1 Mar 2024 17:01:12 +0000
Subject: [PATCH 074/233] fix junit 4 aspect (fixes #975, via #1014)

---
 .../allure/junit4/aspect/AllureJunit4ListenerAspect.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java
index da9e03535..bd351e30e 100644
--- a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java
+++ b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java
@@ -32,8 +32,8 @@ public class AllureJunit4ListenerAspect {
     @After("execution(org.junit.runner.notification.RunNotifier.new())")
     public void addListener(final JoinPoint point) {
         final RunNotifier notifier = (RunNotifier) point.getThis();
-        notifier.removeListener(allure);
-        notifier.addListener(allure);
+        if (RunNotifier.class.equals(notifier.getClass())) {
+            notifier.addListener(allure);
+        }
     }
-
 }

From 44341294f2f5840af9e7fa68aa20134b8d7f1691 Mon Sep 17 00:00:00 2001
From: Maksim <phoenix124@mail.ru>
Date: Tue, 12 Mar 2024 18:07:23 +0300
Subject: [PATCH 075/233] feat(rest-assured): add support for form params (via
 #1016)

---
 .../http/HttpRequestAttachment.java           | 35 +++++++++++++-
 .../src/main/resources/tpl/http-request.ftl   | 47 +++++++++++--------
 .../allure/restassured/AllureRestAssured.java |  4 ++
 .../restassured/AllureRestAssuredTest.java    |  8 +++-
 build.gradle.kts                              |  2 +-
 5 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
index 5d4514140..75cda2e96 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
@@ -18,6 +18,7 @@
 import io.qameta.allure.attachment.AttachmentData;
 import io.qameta.allure.util.ObjectUtils;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -41,9 +42,18 @@ public class HttpRequestAttachment implements AttachmentData {
 
     private final Map<String, String> cookies;
 
+    private final Map<String, String> formParams;
+
     public HttpRequestAttachment(final String name, final String url, final String method,
                                  final String body, final String curl, final Map<String, String> headers,
                                  final Map<String, String> cookies) {
+        this(name, url, method, body, curl, headers, cookies, Collections.emptyMap());
+    }
+
+    @SuppressWarnings("checkstyle:parameternumber")
+    public HttpRequestAttachment(final String name, final String url, final String method,
+                                 final String body, final String curl, final Map<String, String> headers,
+                                 final Map<String, String> cookies, final Map<String, String> formParams) {
         this.name = name;
         this.url = url;
         this.method = method;
@@ -51,6 +61,7 @@ public HttpRequestAttachment(final String name, final String url, final String m
         this.curl = curl;
         this.headers = headers;
         this.cookies = cookies;
+        this.formParams = formParams;
     }
 
     public String getUrl() {
@@ -73,6 +84,10 @@ public Map<String, String> getCookies() {
         return cookies;
     }
 
+    public Map<String, String> getFormParams() {
+        return formParams;
+    }
+
     public String getCurl() {
         return curl;
     }
@@ -90,6 +105,7 @@ public String toString() {
                 + ",\n\tbody=" + this.body
                 + ",\n\theaders=" + ObjectUtils.mapToString(this.headers)
                 + ",\n\tcookies=" + ObjectUtils.mapToString(this.cookies)
+                + ",\n\tformParams=" + ObjectUtils.mapToString(this.formParams)
                 + "\n)";
     }
 
@@ -111,6 +127,8 @@ public static final class Builder {
 
         private final Map<String, String> cookies = new HashMap<>();
 
+        private final Map<String, String> formParams = new HashMap<>();
+
         private Builder(final String name, final String url) {
             Objects.requireNonNull(name, "Name must not be null value");
             Objects.requireNonNull(url, "Url must not be null value");
@@ -160,6 +178,12 @@ public Builder setBody(final String body) {
             return this;
         }
 
+        public Builder setFormParams(final Map<String, String> formParams) {
+            Objects.requireNonNull(formParams, "Form params must not be null value");
+            this.formParams.putAll(formParams);
+            return this;
+        }
+
         /**
          * Use setter method instead.
          * @deprecated scheduled for removal in 3.0 release
@@ -215,7 +239,7 @@ public Builder withBody(final String body) {
         }
 
         public HttpRequestAttachment build() {
-            return new HttpRequestAttachment(name, url, method, body, getCurl(), headers, cookies);
+            return new HttpRequestAttachment(name, url, method, body, getCurl(), headers, cookies, formParams);
         }
 
         private String getCurl() {
@@ -226,6 +250,7 @@ private String getCurl() {
             builder.append(" '").append(url).append('\'');
             headers.forEach((key, value) -> appendHeader(builder, key, value));
             cookies.forEach((key, value) -> appendCookie(builder, key, value));
+            formParams.forEach((key, value) -> appendFormParams(builder, key, value));
 
             if (Objects.nonNull(body)) {
                 builder.append(" -d '").append(body).append('\'');
@@ -248,5 +273,13 @@ private static void appendCookie(final StringBuilder builder, final String key,
                     .append(value)
                     .append('\'');
         }
+
+        private static void appendFormParams(final StringBuilder builder, final String key, final String value) {
+            builder.append(" --form '")
+                    .append(key)
+                    .append('=')
+                    .append(value)
+                    .append('\'');
+        }
     }
 }
diff --git a/allure-attachments/src/main/resources/tpl/http-request.ftl b/allure-attachments/src/main/resources/tpl/http-request.ftl
index b4e31d632..935c1c91a 100644
--- a/allure-attachments/src/main/resources/tpl/http-request.ftl
+++ b/allure-attachments/src/main/resources/tpl/http-request.ftl
@@ -3,36 +3,45 @@
 <div><#if data.method??>${data.method}<#else>GET</#if> to <#if data.url??>${data.url}<#else>Unknown</#if></div>
 
 <#if data.body??>
-<h4>Body</h4>
-<div>
+    <h4>Body</h4>
+    <div>
     <pre class="preformated-text">
     <#t>${data.body}
     </pre>
-</div>
+    </div>
 </#if>
 
 <#if (data.headers)?has_content>
-<h4>Headers</h4>
-<div>
-    <#list data.headers as name, value>
-        <div>${name}: ${value!"null"}</div>
-    </#list>
-</div>
+    <h4>Headers</h4>
+    <div>
+        <#list data.headers as name, value>
+            <div>${name}: ${value!"null"}</div>
+        </#list>
+    </div>
 </#if>
 
 
 <#if (data.cookies)?has_content>
-<h4>Cookies</h4>
-<div>
-    <#list data.cookies as name, value>
-        <div>${name}: ${value!"null"}</div>
-    </#list>
-</div>
+    <h4>Cookies</h4>
+    <div>
+        <#list data.cookies as name, value>
+            <div>${name}: ${value!"null"}</div>
+        </#list>
+    </div>
 </#if>
 
 <#if data.curl??>
-<h4>Curl</h4>
-<div>
-${data.curl}
-</div>
+    <h4>Curl</h4>
+    <div>
+        ${data.curl}
+    </div>
+</#if>
+
+<#if (data.formParams)?has_content>
+    <h4>FormParams</h4>
+    <div>
+        <#list data.formParams as name, value>
+            <div>${name}: ${value!"null"}</div>
+        </#list>
+    </div>
 </#if>
diff --git a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
index 6eebf322c..49b4c203b 100644
--- a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
+++ b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
@@ -98,6 +98,10 @@ public Response filter(final FilterableRequestSpecification requestSpec,
             requestAttachmentBuilder.setBody(prettifier.getPrettifiedBodyIfPossible(requestSpec));
         }
 
+        if (Objects.nonNull(requestSpec.getFormParams())) {
+            requestAttachmentBuilder.setFormParams(requestSpec.getFormParams());
+        }
+
         final HttpRequestAttachment requestAttachment = requestAttachmentBuilder.build();
 
         new DefaultAttachmentProcessor().addAttachment(
diff --git a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
index f38e778af..1a58504c9 100644
--- a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
+++ b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
@@ -24,6 +24,7 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResults;
 import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -143,9 +144,12 @@ protected final AllureResults executeWithStub(ResponseDefinitionBuilder response
             server.start();
             WireMock.configureFor(server.port());
 
-            WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello")).willReturn(responseBuilder));
+            WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form")).willReturn(responseBuilder));
             try {
-                RestAssured.when().get(server.url("/hello")).then().statusCode(statusCode);
+                RestAssured.given()
+                    .contentType(ContentType.URLENC)
+                    .formParams("Allure", "Form")
+                    .get(server.url("/hello")).then().statusCode(statusCode);
             } finally {
                 server.stop();
                 RestAssured.replaceFiltersWith(ImmutableList.of());
diff --git a/build.gradle.kts b/build.gradle.kts
index 82d806791..69a89cf1b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -149,7 +149,7 @@ configure(libs) {
         }
         dependencies {
             dependency("com.github.spotbugs:spotbugs:4.8.3")
-            dependency("com.github.tomakehurst:wiremock:2.27.2")
+            dependency("com.github.tomakehurst:wiremock:3.0.1")
             dependency("com.google.inject:guice:5.1.0")
             dependency("com.google.testing.compile:compile-testing:0.19")
             dependency("com.puppycrawl.tools:checkstyle:10.13.0")

From 0dcd87b78edd4c31cf69840d27b0d68b995ad3b7 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 14 Mar 2024 15:24:43 +0000
Subject: [PATCH 076/233] fix(cucumberjvm): fix Runtime API (fixes #1008, fixes
 #1006, via #1011)

---
 .../cucumber4jvm/AllureCucumber4Jvm.java      | 466 ++++++++++--------
 .../cucumber4jvm/AllureCucumber4JvmTest.java  | 233 ++++++---
 .../cucumber4jvm/samples/RuntimeApiSteps.java |  83 ++++
 .../resources/features/runtimeapi.feature     |  10 +
 allure-cucumber5-jvm/build.gradle.kts         |   2 +
 .../cucumber5jvm/AllureCucumber5Jvm.java      | 376 +++++++-------
 .../cucumber5jvm/AllureCucumber5JvmTest.java  | 227 ++++++---
 .../cucumber5jvm/samples/RuntimeApiSteps.java |  83 ++++
 .../resources/features/runtimeapi.feature     |  10 +
 .../cucumber6jvm/AllureCucumber6Jvm.java      | 304 ++++++------
 .../cucumber6jvm/AllureCucumber6JvmTest.java  | 225 ++++++---
 .../cucumber6jvm/samples/RuntimeApiSteps.java |  83 ++++
 .../resources/features/runtimeapi.feature     |  10 +
 .../cucumber7jvm/AllureCucumber7Jvm.java      | 314 ++++++------
 .../cucumber7jvm/AllureCucumber7JvmTest.java  | 225 ++++++---
 .../cucumber7jvm/samples/RuntimeApiSteps.java |  83 ++++
 .../resources/features/runtimeapi.feature     |  10 +
 .../io/qameta/allure/test/AllureResults.java  |  19 +
 .../allure/test/AllureTestCommonsUtils.java   |  66 ++-
 .../io/qameta/allure/AllureLifecycleTest.java |  18 +
 20 files changed, 1859 insertions(+), 988 deletions(-)
 create mode 100644 allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java
 create mode 100644 allure-cucumber4-jvm/src/test/resources/features/runtimeapi.feature
 create mode 100644 allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java
 create mode 100644 allure-cucumber5-jvm/src/test/resources/features/runtimeapi.feature
 create mode 100644 allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/runtimeapi.feature
 create mode 100644 allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/runtimeapi.feature

diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
index d2ec2204c..8998226d8 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
@@ -17,10 +17,10 @@
 
 import cucumber.api.HookTestStep;
 import cucumber.api.HookType;
-import cucumber.api.PendingException;
 import cucumber.api.PickleStepTestStep;
 import cucumber.api.Result;
 import cucumber.api.TestCase;
+import cucumber.api.TestStep;
 import cucumber.api.event.ConcurrentEventListener;
 import cucumber.api.event.EmbedEvent;
 import cucumber.api.event.EventHandler;
@@ -39,6 +39,7 @@
 import gherkin.ast.TableRow;
 import gherkin.pickles.PickleCell;
 import gherkin.pickles.PickleRow;
+import gherkin.pickles.PickleStep;
 import gherkin.pickles.PickleTable;
 import gherkin.pickles.PickleTag;
 import io.qameta.allure.Allure;
@@ -52,12 +53,14 @@
 import io.qameta.allure.model.TestResultContainer;
 
 import java.io.ByteArrayInputStream;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
@@ -66,6 +69,7 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import static cucumber.api.HookType.Before;
 import static io.qameta.allure.util.ResultsUtils.createParameter;
 import static io.qameta.allure.util.ResultsUtils.getStatus;
 import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
@@ -82,17 +86,12 @@
 })
 public class AllureCucumber4Jvm implements ConcurrentEventListener {
 
+    private static final String COLON = ":";
+
     private final AllureLifecycle lifecycle;
 
-    private final ConcurrentHashMap<String, String> scenarioUuids = new ConcurrentHashMap<>();
     private final TestSourcesModelProxy testSources = new TestSourcesModelProxy();
 
-    private final ThreadLocal<Feature> currentFeature = new InheritableThreadLocal<>();
-    private final ThreadLocal<String> currentFeatureFile = new InheritableThreadLocal<>();
-    private final ThreadLocal<TestCase> currentTestCase = new InheritableThreadLocal<>();
-    private final ThreadLocal<String> currentContainer = new InheritableThreadLocal<>();
-    private final ThreadLocal<Boolean> forbidTestCaseStatusChange = new InheritableThreadLocal<>();
-
     private final EventHandler<TestSourceRead> featureStartedHandler = this::handleFeatureStartedHandler;
     private final EventHandler<TestCaseStarted> caseStartedHandler = this::handleTestCaseStarted;
     private final EventHandler<TestCaseFinished> caseFinishedHandler = this::handleTestCaseFinished;
@@ -101,11 +100,14 @@ public class AllureCucumber4Jvm implements ConcurrentEventListener {
     private final EventHandler<WriteEvent> writeEventHandler = this::handleWriteEvent;
     private final EventHandler<EmbedEvent> embedEventHandler = this::handleEmbedEvent;
 
+    private final Map<TestStep, String> hookStepContainerUuid = new ConcurrentHashMap<>();
+    private final Map<TestCase, String> testCaseUuids = new ConcurrentHashMap<>();
+    private final Map<TestStep, String> stepUuids = new ConcurrentHashMap<>();
+    private final Map<TestStep, String> fixtureUuids = new ConcurrentHashMap<>();
+
     private static final String TXT_EXTENSION = ".txt";
     private static final String TEXT_PLAIN = "text/plain";
-    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().toString();
-    private static final String CLASSPATH_PREFIX = "classpath:";
-    private static final String FILE_PREFIX = "file:";
+    private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().getSchemeSpecificPart();
 
     @SuppressWarnings("unused")
     public AllureCucumber4Jvm() {
@@ -130,39 +132,46 @@ public void setEventPublisher(final EventPublisher publisher) {
         publisher.registerHandlerFor(EmbedEvent.class, embedEventHandler);
     }
 
-    /*
-    Event Handlers
-     */
-
     private void handleFeatureStartedHandler(final TestSourceRead event) {
         testSources.addTestSourceReadEvent(event.uri, event);
     }
 
     private void handleTestCaseStarted(final TestCaseStarted event) {
-        currentFeatureFile.set(event.testCase.getUri());
-        currentFeature.set(testSources.getFeature(currentFeatureFile.get()));
-        currentTestCase.set(event.testCase);
-        currentContainer.set(UUID.randomUUID().toString());
-        forbidTestCaseStatusChange.set(false);
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
 
-        final TestCase testCase = currentTestCase.get();
         final Deque<PickleTag> tags = new LinkedList<>(testCase.getTags());
-
-        final Feature feature = currentFeature.get();
         final LabelBuilder labelBuilder = new LabelBuilder(feature, testCase, tags);
 
         final String name = testCase.getName();
 
+
+        // the same way full name is generated for
+        // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
+        // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
+        final String fullName = String.format("%s:%d",
+                getTestCaseUri(testCase),
+                testCase.getLine()
+        );
+
+        final String testCaseUuid = testCaseUuids
+                .computeIfAbsent(testCase, tc -> UUID.randomUUID().toString());
+
         final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(testCase))
+                .setUuid(testCaseUuid)
+                .setTestCaseId(getTestCaseId(testCase))
                 .setHistoryId(getHistoryId(testCase))
-                .setFullName(getTestCaseUri(testCase) + ":" + testCase.getLine())
+                .setFullName(fullName)
                 .setName(name)
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
 
         final ScenarioDefinition scenarioDefinition =
-                testSources.getScenarioDefinition(currentFeatureFile.get(), testCase.getLine());
+                testSources.getScenarioDefinition(
+                        testCase.getUri(),
+                        testCase.getLine()
+                );
+
         if (scenarioDefinition instanceof ScenarioOutline) {
             result.setParameters(
                     getExamplesAsParameters((ScenarioOutline) scenarioDefinition, testCase)
@@ -178,74 +187,157 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
             result.setDescription(description);
         }
 
-        final TestResultContainer resultContainer = new TestResultContainer()
-                .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
-                .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(testCase)));
-
         lifecycle.scheduleTestCase(result);
-        lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(testCase));
+        lifecycle.startTestCase(testCaseUuid);
     }
 
     private void handleTestCaseFinished(final TestCaseFinished event) {
+        final TestCase testCase = event.getTestCase();
+        final String uuid = testCaseUuids.get(testCase);
+        if (Objects.isNull(uuid)) {
+            return;
+        }
+
+        final Feature feature = testSources.getFeature(testCase.getUri());
+        final Result result = event.result;
+        final Status status = translateTestCaseStatus(result);
+        final StatusDetails statusDetails = getStatusDetails(result.getError())
+                .orElseGet(StatusDetails::new);
+
+        final TagParser tagParser = new TagParser(feature, testCase);
+        statusDetails
+                .setFlaky(tagParser.isFlaky())
+                .setMuted(tagParser.isMuted())
+                .setKnown(tagParser.isKnown());
+
+        lifecycle.updateTestCase(uuid, testResult -> testResult
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
 
-        final String uuid = getTestCaseUuid(event.testCase);
-        final Optional<StatusDetails> details = getStatusDetails(event.result.getError());
-        details.ifPresent(statusDetails -> lifecycle.updateTestCase(
-                uuid,
-                testResult -> testResult.setStatusDetails(statusDetails)
-        ));
         lifecycle.stopTestCase(uuid);
-        lifecycle.stopTestContainer(getTestContainerUuid());
         lifecycle.writeTestCase(uuid);
-        lifecycle.writeTestContainer(getTestContainerUuid());
     }
 
     private void handleTestStepStarted(final TestStepStarted event) {
-        if (event.testStep instanceof PickleStepTestStep) {
-            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.testStep;
-            final String stepKeyword = Optional.ofNullable(
-                    testSources.getKeywordFromSource(currentFeatureFile.get(), pickleStep.getStepLine())
-            ).orElse("UNDEFINED");
-
-            final StepResult stepResult = new StepResult()
-                    .setName(String.format("%s %s", stepKeyword, pickleStep.getPickleStep().getText()))
-                    .setStart(System.currentTimeMillis());
-
-            lifecycle.startStep(getTestCaseUuid(currentTestCase.get()), getStepUuid(pickleStep), stepResult);
-
-            pickleStep.getStepArgument().stream()
-                    .filter(PickleTable.class::isInstance)
-                    .findFirst()
-                    .ifPresent(table -> createDataTableAttachment((PickleTable) table));
-        } else if (event.testStep instanceof HookTestStep) {
-            initHook((HookTestStep) event.testStep);
+        final TestCase testCase = event.getTestCase();
+        if (event.testStep instanceof HookTestStep) {
+            final HookTestStep hook = (HookTestStep) event.testStep;
+
+            if (isFixtureHook(hook)) {
+                handleStartFixtureHook(testCase, hook);
+            } else {
+                handleStartStepHook(testCase, hook);
+            }
+        } else if (event.testStep instanceof PickleStepTestStep) {
+            handleStartPickleStep(testCase, (PickleStepTestStep) event.testStep);
+        }
+    }
+
+    private void handleStartPickleStep(final TestCase testCase,
+                                       final PickleStepTestStep pickleStep) {
+        final String uuid = testCaseUuids.get(testCase);
+        if (Objects.isNull(uuid)) {
+            return;
         }
+
+        final PickleStep step = pickleStep.getPickleStep();
+        final String stepKeyword = Optional
+                .ofNullable(
+                        testSources.getKeywordFromSource(
+                                testCase.getUri(),
+                                pickleStep.getStepLine()
+                        )
+                )
+                .orElse("");
+
+        final StepResult stepResult = new StepResult()
+                .setName(stepKeyword + step.getText())
+                .setStart(System.currentTimeMillis());
+
+        final String stepUuid = stepUuids.computeIfAbsent(
+                pickleStep,
+                cl -> UUID.randomUUID().toString()
+        );
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, stepUuid, stepResult);
+
+        pickleStep.getStepArgument()
+                .stream()
+                .filter(PickleTable.class::isInstance)
+                .map(PickleTable.class::cast)
+                .findFirst()
+                .ifPresent(this::createDataTableAttachment);
+
     }
 
-    private void initHook(final HookTestStep hook) {
+    private void handleStartStepHook(final TestCase testCase,
+                                     final HookTestStep hook) {
+        final String uuid = testCaseUuids.get(testCase);
+        if (Objects.isNull(uuid)) {
+            return;
+        }
 
-        final FixtureResult hookResult = new FixtureResult()
+        final StepResult stepResult = new StepResult()
                 .setName(hook.getCodeLocation())
                 .setStart(System.currentTimeMillis());
 
-        if (hook.getHookType() == HookType.Before) {
-            lifecycle.startPrepareFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
-        } else {
-            lifecycle.startTearDownFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
+        final String stepUuid = stepUuids.computeIfAbsent(
+                hook, unused -> UUID.randomUUID().toString()
+        );
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, stepUuid, stepResult);
+    }
+
+    private void handleStartFixtureHook(final TestCase testCase,
+                                        final HookTestStep hook) {
+        final String uuid = testCaseUuids.get(testCase);
+        if (Objects.isNull(uuid)) {
+            return;
         }
 
+
+        final String containerUuid = hookStepContainerUuid
+                .computeIfAbsent(hook, unused -> UUID.randomUUID().toString());
+
+        lifecycle.startTestContainer(new TestResultContainer()
+                .setUuid(containerUuid)
+                .setChildren(Collections.singletonList(uuid))
+        );
+
+        final FixtureResult hookResult = new FixtureResult()
+                .setName(hook.getCodeLocation());
+
+        final String fixtureUuid = fixtureUuids.computeIfAbsent(
+                hook, unused -> UUID.randomUUID().toString()
+        );
+        if (hook.getHookType() == Before) {
+            lifecycle.startPrepareFixture(containerUuid, fixtureUuid, hookResult);
+        } else {
+            lifecycle.startTearDownFixture(containerUuid, fixtureUuid, hookResult);
+        }
     }
 
     private void handleTestStepFinished(final TestStepFinished event) {
         if (event.testStep instanceof HookTestStep) {
-            handleHookStep(event);
-        } else {
-            handlePickleStep(event);
+            final HookTestStep hook = (HookTestStep) event.testStep;
+            if (isFixtureHook(hook)) {
+                handleStopHookStep(event.result, hook);
+            } else {
+                handleStopStep(event.getTestCase(), event.result, hook);
+            }
+        } else if (event.testStep instanceof PickleStepTestStep) {
+            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.testStep;
+            handleStopStep(event.getTestCase(), event.result, pickleStep);
         }
     }
 
+    private static boolean isFixtureHook(final HookTestStep hook) {
+        return hook.getHookType() == Before || hook.getHookType() == HookType.After;
+    }
+
     private void handleWriteEvent(final WriteEvent event) {
         lifecycle.addAttachment(
                 "Text output",
@@ -256,34 +348,41 @@ private void handleWriteEvent(final WriteEvent event) {
     }
 
     private void handleEmbedEvent(final EmbedEvent event) {
-        lifecycle.addAttachment("Screenshot", null, null, new ByteArrayInputStream(event.data));
+        lifecycle.addAttachment(
+                Objects.isNull(event.name)
+                        ? "Embedding"
+                        : event.name,
+                event.mimeType,
+                null,
+                new ByteArrayInputStream(event.data)
+        );
     }
 
-    /*
-    Utility Methods
-     */
-
-    private String getTestContainerUuid() {
-        return currentContainer.get();
+    private String getHistoryId(final TestCase testCase) {
+        final String testCaseLocation = getTestCaseUri(testCase) + COLON + testCase.getLine();
+        return md5(testCaseLocation);
     }
 
-    private String getTestCaseUuid(final TestCase testCase) {
-        return scenarioUuids.computeIfAbsent(getHistoryId(testCase), it -> UUID.randomUUID().toString());
+    private String getTestCaseId(final TestCase testCase) {
+        final String testCaseId = getTestCaseUri(testCase) + COLON + testCase.getName();
+        return md5(testCaseId);
     }
 
-    private String getStepUuid(final PickleStepTestStep step) {
-        return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-               + step.getPickleStep().getText() + step.getStepLine();
-    }
+    private String getTestCaseUri(final TestCase testCase) {
+        final String testCaseUri = getUriWithoutScheme(testCase);
 
-    private String getHookStepUuid(final HookTestStep step) {
-        return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-               + step.getHookType().toString() + step.getCodeLocation();
+        if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
+            return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
+        }
+        return testCaseUri;
     }
 
-    private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = getTestCaseUri(testCase) + ":" + testCase.getLine();
-        return md5(testCaseLocation);
+    private static String getUriWithoutScheme(final TestCase testCase) {
+        try {
+            return URI.create(testCase.getUri()).getSchemeSpecificPart();
+        } catch (Exception ignored) {
+            return testCase.getUri();
+        }
     }
 
     private Status translateTestCaseStatus(final Result testCaseResult) {
@@ -304,139 +403,116 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(
-            final ScenarioOutline scenarioOutline, final TestCase localCurrentTestCase) {
-        final Optional<Examples> examplesBlock =
-                scenarioOutline.getExamples().stream()
+            final ScenarioOutline scenario,
+            final TestCase localCurrentTestCase) {
+        final Optional<Examples> maybeExample =
+                scenario.getExamples().stream()
                         .filter(example -> example.getTableBody().stream()
-                                .anyMatch(row -> row.getLocation().getLine() == localCurrentTestCase.getLine())
-                        ).findFirst();
-
-        if (examplesBlock.isPresent()) {
-            final TableRow row = examplesBlock.get().getTableBody().stream()
-                    .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLine())
-                    .findFirst().get();
-            return IntStream.range(0, examplesBlock.get().getTableHeader().getCells().size()).mapToObj(index -> {
-                final String name = examplesBlock.get().getTableHeader().getCells().get(index).getValue();
-                final String value = row.getCells().get(index).getValue();
-                return createParameter(name, value);
-            }).collect(Collectors.toList());
-        } else {
+                                .anyMatch(row -> row.getLocation().getLine()
+                                                 == localCurrentTestCase.getLine())
+                        )
+                        .findFirst();
+
+        if (!maybeExample.isPresent()) {
             return Collections.emptyList();
         }
+
+        final Examples examples = maybeExample.get();
+
+        final Optional<TableRow> maybeRow = examples.getTableBody().stream()
+                .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLine())
+                .findFirst();
+
+        if (!maybeRow.isPresent()) {
+            return Collections.emptyList();
+        }
+
+        final TableRow row = maybeRow.get();
+
+        return IntStream.range(0, examples.getTableHeader().getCells().size())
+                .mapToObj(index -> {
+                    final String name = examples.getTableHeader().getCells().get(index).getValue();
+                    final String value = row.getCells().get(index).getValue();
+                    return createParameter(name, value);
+                })
+                .collect(Collectors.toList());
     }
 
     private void createDataTableAttachment(final PickleTable pickleTable) {
         final List<PickleRow> rows = pickleTable.getRows();
 
         final StringBuilder dataTableCsv = new StringBuilder();
-        if (!rows.isEmpty()) {
-            rows.forEach(dataTableRow -> {
-                dataTableCsv.append(
-                        dataTableRow.getCells().stream()
-                                .map(PickleCell::getValue)
-                                .collect(Collectors.joining("\t"))
-                );
-                dataTableCsv.append('\n');
-            });
-
-            final String attachmentSource = lifecycle
-                    .prepareAttachment("Data table", "text/tab-separated-values", "csv");
-            lifecycle.writeAttachment(attachmentSource,
-                    new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
+        for (PickleRow row : rows) {
+            final String rowString = row.getCells().stream()
+                    .map(PickleCell::getValue)
+                    .collect(Collectors.joining("\t", "", "\n"));
+            dataTableCsv.append(rowString);
         }
+        final String attachmentSource = lifecycle
+                .prepareAttachment("Data table", "text/tab-separated-values", "csv");
+        lifecycle.writeAttachment(attachmentSource,
+                new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
     }
 
-    private void handleHookStep(final TestStepFinished event) {
-        final HookTestStep hookStep = (HookTestStep) event.testStep;
-        final String uuid = getHookStepUuid(hookStep);
-        final FixtureResult fixtureResult = new FixtureResult().setStatus(translateTestCaseStatus(event.result));
-
-        if (!Status.PASSED.equals(fixtureResult.getStatus())) {
-            final TestResult testResult = new TestResult().setStatus(translateTestCaseStatus(event.result));
-            final StatusDetails statusDetails = getStatusDetails(event.result.getError())
-                    .orElseGet(StatusDetails::new);
-
-            final String errorMessage = event.result.getError() == null
-                    ? hookStep.getHookType().name() + " is failed."
-                    : hookStep.getHookType().name() + " is failed: "
-                      + event.result.getError().getLocalizedMessage();
-
-            statusDetails.setMessage(errorMessage);
-
-            if (hookStep.getHookType() == HookType.Before) {
-                final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
-                statusDetails
-                        .setFlaky(tagParser.isFlaky())
-                        .setMuted(tagParser.isMuted())
-                        .setKnown(tagParser.isKnown());
-                testResult.setStatus(Status.SKIPPED);
-                updateTestCaseStatus(testResult.getStatus());
-                forbidTestCaseStatusChange.set(true);
-            } else {
-                testResult.setStatus(Status.BROKEN);
-                updateTestCaseStatus(testResult.getStatus());
-            }
-            fixtureResult.setStatusDetails(statusDetails);
+    private void handleStopHookStep(final Result eventResult,
+                                    final HookTestStep hook) {
+        final String containerUuid = hookStepContainerUuid.get(hook);
+        if (Objects.isNull(containerUuid)) {
+            // maybe throw an exception?
+            return;
         }
 
-        lifecycle.updateFixture(uuid, result -> result.setStatus(fixtureResult.getStatus())
-                .setStatusDetails(fixtureResult.getStatusDetails()));
+        final String uuid = fixtureUuids.get(hook);
+        if (Objects.isNull(uuid)) {
+            // maybe throw an exception?
+            return;
+        }
+
+        final Status status = translateTestCaseStatus(eventResult);
+        final StatusDetails statusDetails = getStatusDetails(eventResult.getError())
+                .orElseGet(StatusDetails::new);
+
+        lifecycle.updateFixture(uuid, result -> result
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
         lifecycle.stopFixture(uuid);
+
+        lifecycle.stopTestContainer(containerUuid);
+        lifecycle.writeTestContainer(containerUuid);
     }
 
-    private void handlePickleStep(final TestStepFinished event) {
+    private void handleStopStep(final TestCase testCase,
+                                final Result eventResult,
+                                final TestStep step) {
+        final String stepUuid = stepUuids.get(step);
+        if (Objects.isNull(stepUuid)) {
+            // maybe exception?
+            return;
+        }
 
-        final Status stepStatus = translateTestCaseStatus(event.result);
-        final StatusDetails statusDetails;
-        if (event.result.getStatus() == Result.Type.UNDEFINED) {
-            updateTestCaseStatus(Status.PASSED);
+        final Feature feature = testSources.getFeature(testCase.getUri());
 
-            statusDetails =
-                    getStatusDetails(new PendingException("TODO: implement me"))
-                            .orElse(new StatusDetails());
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase.get()), scenarioResult ->
-                    scenarioResult
-                            .setStatusDetails(statusDetails));
-        } else {
-            statusDetails =
-                    getStatusDetails(event.result.getError())
-                            .orElse(new StatusDetails());
-            updateTestCaseStatus(stepStatus);
-        }
+        final Status stepStatus = translateTestCaseStatus(eventResult);
 
-        if (!Status.PASSED.equals(stepStatus) && stepStatus != null) {
-            forbidTestCaseStatusChange.set(true);
-        }
+        final StatusDetails statusDetails
+                = eventResult.getStatus() == Result.Type.UNDEFINED
+                ? new StatusDetails().setMessage("Undefined Step. Please add step definition")
+                : getStatusDetails(eventResult.getError())
+                        .orElse(new StatusDetails());
 
-        final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
+        final TagParser tagParser = new TagParser(feature, testCase);
         statusDetails
                 .setFlaky(tagParser.isFlaky())
                 .setMuted(tagParser.isMuted())
                 .setKnown(tagParser.isKnown());
 
-        lifecycle.updateStep(getStepUuid((PickleStepTestStep) event.testStep),
-                stepResult -> stepResult.setStatus(stepStatus).setStatusDetails(statusDetails));
-        lifecycle.stopStep(getStepUuid((PickleStepTestStep) event.testStep));
-    }
-
-    private void updateTestCaseStatus(final Status status) {
-        if (!forbidTestCaseStatusChange.get()) {
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase.get()),
-                    result -> result.setStatus(status));
-        }
-    }
-
-    private String getTestCaseUri(final TestCase testCase) {
-        final String testCaseUri = testCase.getUri();
-        if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
-            return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
-        }
-        if (testCaseUri.startsWith(CLASSPATH_PREFIX)) {
-            return testCaseUri.substring(CLASSPATH_PREFIX.length());
-        }
-        if (testCaseUri.startsWith(FILE_PREFIX)) {
-            return testCaseUri.substring(FILE_PREFIX.length());
-        }
-        return testCaseUri;
+        lifecycle.updateStep(
+                stepUuid,
+                stepResult -> stepResult
+                        .setStatus(stepStatus)
+                        .setStatusDetails(statusDetails)
+        );
+        lifecycle.stopStep(stepUuid);
     }
 }
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
index 18940bc83..9cc09bbfc 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
@@ -36,6 +36,7 @@
 import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.RunUtils;
@@ -55,6 +56,7 @@
 import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.SUITE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.TEST_CLASS_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.md5;
 import static java.lang.Thread.currentThread;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
@@ -84,8 +86,10 @@ void shouldSetStatus() {
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
     }
 
     @AllureFeatures.FailedTests
@@ -256,7 +260,7 @@ void shouldAddAttachments() {
                 .extracting(Attachment::getName, Attachment::getType)
                 .containsExactlyInAnyOrder(
                         tuple("Text output", "text/plain"),
-                        tuple("Screenshot", null)
+                        tuple("Embedding", "image/png")
                 );
 
         final List<String> attachmentContents = results.getAttachments().values().stream()
@@ -279,10 +283,10 @@ void shouldAddBackgroundSteps() {
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
                 .containsExactly(
-                        "Given  cat is sad",
-                        "And  cat is murmur",
-                        "When  Pet the cat",
-                        "Then  Cat is happy"
+                        "Given cat is sad",
+                        "And cat is murmur",
+                        "When Pet the cat",
+                        "Then Cat is happy"
                 );
     }
 
@@ -444,15 +448,17 @@ void shouldProcessUndefinedSteps() {
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Step is not defined", null)
+                );
 
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("When  step is undefined", null),
-                        tuple("Then  b is 10", Status.SKIPPED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is undefined", null),
+                        tuple("Then b is 10", Status.SKIPPED)
                 );
     }
 
@@ -470,9 +476,9 @@ void shouldProcessPendingExceptionsInSteps() {
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("When  step is yet to be implemented", Status.SKIPPED),
-                        tuple("Then  b is 10", Status.SKIPPED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is yet to be implemented", Status.SKIPPED),
+                        tuple("Then b is 10", Status.SKIPPED)
                 );
     }
 
@@ -491,10 +497,10 @@ void shouldSupportDryRunForSimpleFeatures() {
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.SKIPPED),
-                        tuple("And  b is 10", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 5", Status.SKIPPED),
+                        tuple("And b is 10", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
     }
 
@@ -505,32 +511,29 @@ void shouldSupportDryRunForHooks() {
         final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .startsWith(
-                        tuple("Simple scenario with Before and After hooks", Status.SKIPPED)
-                );
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
 
-        assertThat(results.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.beforeHook()", Status.SKIPPED)
                 );
 
-        assertThat(results.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.afterHook()", Status.SKIPPED)
                 );
 
-        assertThat(testResults.get(0).getSteps())
+        assertThat(tr1.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.SKIPPED),
-                        tuple("And  b is 8", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 7", Status.SKIPPED),
+                        tuple("And b is 8", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
     }
 
@@ -552,7 +555,7 @@ void shouldPersistHistoryIdForExamples() {
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
-                .containsExactlyInAnyOrder("646aca5d0775cd4f13161e1ea1a68c39", "c0f824814a130048e9f86358363cf23e");
+                .containsExactlyInAnyOrder("c0f824814a130048e9f86358363cf23e", "646aca5d0775cd4f13161e1ea1a68c39");
     }
 
     @AllureFeatures.History
@@ -565,6 +568,42 @@ void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation
                 .isNotEqualTo(results2.getTestResults().get(0).getHistoryId());
     }
 
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForScenarios() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Add a to b",
+                                md5("src/test/resources/features/simple.feature:Add a to b")
+                        )
+                );
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForExamples() {
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        ),
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        )
+                );
+    }
+
     @AllureFeatures.Parallel
     @Test
     void shouldProcessScenariosInParallelMode() {
@@ -576,30 +615,33 @@ void shouldProcessScenariosInParallelMode() {
                 .hasSize(3);
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 1",
-                                "And  b is 3",
-                                "When  I add a to b",
-                                "Then  result is 4")
+                        "Given a is 1",
+                        "And b is 3",
+                        "When I add a to b",
+                        "Then result is 4"
                 );
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 2",
-                                "And  b is 4",
-                                "When  I add a to b",
-                                "Then  result is 6")
+                        "Given a is 2",
+                        "And b is 4",
+                        "When I add a to b",
+                        "Then result is 6"
                 );
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 7",
-                                "And  b is 8",
-                                "When  I add a to b",
-                                "Then  result is 15")
+                        "Given a is 7",
+                        "And b is 8",
+                        "When I add a to b",
+                        "Then result is 15"
                 );
     }
 
@@ -610,64 +652,61 @@ void shouldDisplayHooksAsStages() {
         final AllureResults results = runFeature("features/hooks.feature", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactlyInAnyOrder(
-                        tuple("Simple scenario with Before and After hooks", Status.PASSED),
-                        tuple("Simple scenario with Before hook with Exception", Status.SKIPPED),
-                        tuple("Simple scenario with After hook with Exception", Status.BROKEN)
-                );
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
+        final TestResult tr2 = results.getTestResultByName("Simple scenario with Before hook with Exception");
+        final TestResult tr3 = results.getTestResultByName("Simple scenario with After hook with Exception");
 
-        assertThat(testResults.get(0).getSteps())
+        assertThat(tr1.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
 
-
-        assertThat(results.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(results.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.afterHook()", Status.PASSED)
                 );
 
-        assertThat(testResults.get(1).getSteps())
+        assertThat(tr2.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.SKIPPED),
-                        tuple("And  b is 8", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 7", Status.SKIPPED),
+                        tuple("And b is 8", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
 
 
-        assertThat(results.getTestResultContainers().get(1).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr2))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.beforeHookWithException()", Status.FAILED)
                 );
 
-
-        assertThat(testResults.get(2).getSteps())
+        assertThat(tr3.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
 
-        assertThat(results.getTestResultContainers().get(2).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr3))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("HookSteps.afterHookWithException()", Status.FAILED)
@@ -684,19 +723,19 @@ void shouldHandleAmbigiousStepsExceptions() {
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Simple scenario with ambigious steps", Status.SKIPPED)
+                        tuple("Simple scenario with ambigious steps", null)
                 );
 
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactly(
-                        tuple("When  ambigious step present", null),
-                        tuple("Then  something bad should happen", Status.SKIPPED)
+                        tuple("When ambigious step present", null),
+                        tuple("Then something bad should happen", Status.SKIPPED)
                 );
     }
 
     @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm4-test-provided")
+    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm5-test-provided")
     @Test
     void shouldSupportProvidedLabels() {
         final AllureResults results = runFeature("features/simple.feature");
@@ -707,7 +746,37 @@ void shouldSupportProvidedLabels() {
                 .flatExtracting(TestResult::getLabels)
                 .extracting(Label::getName, Label::getValue)
                 .contains(
-                        tuple("x-provided", "cucumberjvm4-test-provided")
+                        tuple("x-provided", "cucumberjvm5-test-provided")
+                );
+    }
+
+    @Test
+    void shouldSupportRuntimeApiInStepsWhenHooksAreUsed() {
+        final AllureResults results = runFeature("features/runtimeapi.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "When step 1",
+                        "When step 2",
+                        "And step 3",
+                        "Then step 4",
+                        "And step 5"
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName, Link::getUrl)
+                .containsExactly(
+                        tuple("step1", "https://example.org/step1"),
+                        tuple("step2", "https://example.org/step2"),
+                        tuple("step3", "https://example.org/step3"),
+                        tuple("step4", "https://example.org/step4"),
+                        tuple("step5", "https://example.org/step5")
                 );
     }
 
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java
new file mode 100644
index 000000000..41bd4bfa6
--- /dev/null
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java
@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber4jvm.samples;
+
+import io.cucumber.java.Before;
+import io.cucumber.java.en.And;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import io.qameta.allure.Allure;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class RuntimeApiSteps {
+
+    @Before("@beforeScenario")
+    public void beforeScenario(){
+        // nothing
+    }
+
+    @Before("@beforeFeature")
+    public void beforeFeature(){
+        // nothing
+    }
+
+    @When("^step 1$")
+    public void step1() {
+        Allure.step("step1 nested");
+        Allure.link("step1", "https://example.org/step1");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step1: " + uuid);
+        });
+    }
+
+    @When("^step 2$")
+    public void step2() {
+        Allure.step("step2 nested");
+        Allure.link("step2", "https://example.org/step2");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step2: " + uuid);
+        });
+    }
+
+    @And("^step 3$")
+    public void step3() {
+        Allure.step("step3 nested");
+        Allure.link("step3", "https://example.org/step3");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step3: " + uuid);
+        });
+    }
+
+    @Then("^step 4$")
+    public void step4() {
+        Allure.step("step4 nested");
+        Allure.link("step4", "https://example.org/step4");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step4: " + uuid);
+        });
+    }
+
+    @And("^step 5$")
+    public void step5() {
+        Allure.step("step5 nested");
+        Allure.link("step5", "https://example.org/step5");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step5: " + uuid);
+        });
+    }
+}
diff --git a/allure-cucumber4-jvm/src/test/resources/features/runtimeapi.feature b/allure-cucumber4-jvm/src/test/resources/features/runtimeapi.feature
new file mode 100644
index 000000000..ec43eccb7
--- /dev/null
+++ b/allure-cucumber4-jvm/src/test/resources/features/runtimeapi.feature
@@ -0,0 +1,10 @@
+@beforeFeature
+Feature: Should support runtime API in all steps
+
+  @beforeScenario
+  Scenario: Scenario with Runtime API usage
+    When step 1
+    When step 2
+    And step 3
+    Then step 4
+    And step 5
diff --git a/allure-cucumber5-jvm/build.gradle.kts b/allure-cucumber5-jvm/build.gradle.kts
index e39b579e4..0bb513d73 100644
--- a/allure-cucumber5-jvm/build.gradle.kts
+++ b/allure-cucumber5-jvm/build.gradle.kts
@@ -15,7 +15,9 @@ dependencies {
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
index 928fff4d1..546838100 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
@@ -29,11 +29,13 @@
 import io.cucumber.plugin.event.HookType;
 import io.cucumber.plugin.event.PickleStepTestStep;
 import io.cucumber.plugin.event.Result;
+import io.cucumber.plugin.event.Step;
 import io.cucumber.plugin.event.StepArgument;
 import io.cucumber.plugin.event.TestCase;
 import io.cucumber.plugin.event.TestCaseFinished;
 import io.cucumber.plugin.event.TestCaseStarted;
 import io.cucumber.plugin.event.TestSourceRead;
+import io.cucumber.plugin.event.TestStep;
 import io.cucumber.plugin.event.TestStepFinished;
 import io.cucumber.plugin.event.TestStepStarted;
 import io.cucumber.plugin.event.WriteEvent;
@@ -49,13 +51,13 @@
 import io.qameta.allure.model.TestResultContainer;
 
 import java.io.ByteArrayInputStream;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
@@ -80,17 +82,12 @@
 })
 public class AllureCucumber5Jvm implements ConcurrentEventListener {
 
+    private static final String COLON = ":";
+
     private final AllureLifecycle lifecycle;
 
-    private final ConcurrentHashMap<String, String> scenarioUuids = new ConcurrentHashMap<>();
     private final TestSourcesModelProxy testSources = new TestSourcesModelProxy();
 
-    private final ThreadLocal<Feature> currentFeature = new InheritableThreadLocal<>();
-    private final ThreadLocal<URI> currentFeatureFile = new InheritableThreadLocal<>();
-    private final ThreadLocal<TestCase> currentTestCase = new InheritableThreadLocal<>();
-    private final ThreadLocal<String> currentContainer = new InheritableThreadLocal<>();
-    private final ThreadLocal<Boolean> forbidTestCaseStatusChange = new InheritableThreadLocal<>();
-
     private final EventHandler<TestSourceRead> featureStartedHandler = this::handleFeatureStartedHandler;
     private final EventHandler<TestCaseStarted> caseStartedHandler = this::handleTestCaseStarted;
     private final EventHandler<TestCaseFinished> caseFinishedHandler = this::handleTestCaseFinished;
@@ -99,6 +96,10 @@ public class AllureCucumber5Jvm implements ConcurrentEventListener {
     private final EventHandler<WriteEvent> writeEventHandler = this::handleWriteEvent;
     private final EventHandler<EmbedEvent> embedEventHandler = this::handleEmbedEvent;
 
+    private final Map<TestStep, String> hookStepContainerUuid = new ConcurrentHashMap<>();
+    private final Map<TestStep, String> stepUuids = new ConcurrentHashMap<>();
+    private final Map<TestStep, String> fixtureUuids = new ConcurrentHashMap<>();
+
     private static final String TXT_EXTENSION = ".txt";
     private static final String TEXT_PLAIN = "text/plain";
     private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().getSchemeSpecificPart();
@@ -112,9 +113,6 @@ public AllureCucumber5Jvm(final AllureLifecycle lifecycle) {
         this.lifecycle = lifecycle;
     }
 
-    /*
-    Event Handlers
-     */
     @Override
     public void setEventPublisher(final EventPublisher publisher) {
         publisher.registerHandlerFor(TestSourceRead.class, featureStartedHandler);
@@ -134,30 +132,40 @@ private void handleFeatureStartedHandler(final TestSourceRead event) {
     }
 
     private void handleTestCaseStarted(final TestCaseStarted event) {
-        currentFeatureFile.set(event.getTestCase().getUri());
-        currentFeature.set(testSources.getFeature(currentFeatureFile.get()));
-        currentTestCase.set(event.getTestCase());
-        currentContainer.set(UUID.randomUUID().toString());
-        forbidTestCaseStatusChange.set(false);
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
 
-        final TestCase testCase = currentTestCase.get();
         final Deque<String> tags = new LinkedList<>(testCase.getTags());
-
-        final Feature feature = currentFeature.get();
         final LabelBuilder labelBuilder = new LabelBuilder(feature, testCase, tags);
 
         final String name = testCase.getName();
 
+
+        // the same way full name is generated for
+        // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
+        // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
+        final String fullName = String.format("%s:%d",
+                getTestCaseUri(testCase),
+                testCase.getLine()
+        );
+
+        final String testCaseUuid = testCase.getId().toString();
+
         final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(testCase))
+                .setUuid(testCaseUuid)
+                .setTestCaseId(getTestCaseId(testCase))
                 .setHistoryId(getHistoryId(testCase))
-                .setFullName(getTestCaseUri(testCase) + ":" + testCase.getLine())
+                .setFullName(fullName)
                 .setName(name)
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
 
         final ScenarioDefinition scenarioDefinition =
-                testSources.getScenarioDefinition(currentFeatureFile.get(), testCase.getLine());
+                testSources.getScenarioDefinition(
+                        testCase.getUri(),
+                        testCase.getLine()
+                );
+
         if (scenarioDefinition instanceof ScenarioOutline) {
             result.setParameters(
                     getExamplesAsParameters((ScenarioOutline) scenarioDefinition, testCase)
@@ -173,75 +181,131 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
             result.setDescription(description);
         }
 
-        final TestResultContainer resultContainer = new TestResultContainer()
-                .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
-                .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(testCase)));
-
         lifecycle.scheduleTestCase(result);
-        lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(testCase));
+        lifecycle.startTestCase(testCaseUuid);
     }
 
     private void handleTestCaseFinished(final TestCaseFinished event) {
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
+        final String uuid = testCase.getId().toString();
+        final Result result = event.getResult();
+        final Status status = translateTestCaseStatus(result);
+        final StatusDetails statusDetails = getStatusDetails(result.getError())
+                .orElseGet(StatusDetails::new);
+
+        final TagParser tagParser = new TagParser(feature, testCase);
+        statusDetails
+                .setFlaky(tagParser.isFlaky())
+                .setMuted(tagParser.isMuted())
+                .setKnown(tagParser.isKnown());
+
+        lifecycle.updateTestCase(uuid, testResult -> testResult
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
 
-        final String uuid = getTestCaseUuid(event.getTestCase());
-        final Optional<StatusDetails> details = getStatusDetails(event.getResult().getError());
-        details.ifPresent(statusDetails -> lifecycle.updateTestCase(
-                uuid,
-                testResult -> testResult.setStatusDetails(statusDetails)
-        ));
         lifecycle.stopTestCase(uuid);
-        lifecycle.stopTestContainer(getTestContainerUuid());
         lifecycle.writeTestCase(uuid);
-        lifecycle.writeTestContainer(getTestContainerUuid());
     }
 
     private void handleTestStepStarted(final TestStepStarted event) {
-        if (event.getTestStep() instanceof PickleStepTestStep) {
-            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.getTestStep();
-            final String stepKeyword = Optional.ofNullable(
-                    testSources.getKeywordFromSource(currentFeatureFile.get(), pickleStep.getStep().getLine())
-            ).orElse("UNDEFINED");
-
-            final StepResult stepResult = new StepResult()
-                    .setName(String.format("%s %s", stepKeyword, pickleStep.getStep().getText()))
-                    .setStart(System.currentTimeMillis());
-
-            lifecycle.startStep(getTestCaseUuid(currentTestCase.get()), getStepUuid(pickleStep), stepResult);
+        final TestCase testCase = event.getTestCase();
+        if (event.getTestStep() instanceof HookTestStep) {
+            final HookTestStep hook = (HookTestStep) event.getTestStep();
 
-            final StepArgument stepArgument = pickleStep.getStep().getArgument();
-            if (stepArgument instanceof DataTableArgument) {
-                final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
-                createDataTableAttachment(dataTableArgument);
+            if (isFixtureHook(hook)) {
+                handleStartFixtureHook(testCase, hook);
+            } else {
+                handleStartStepHook(testCase, hook);
             }
-        } else if (event.getTestStep() instanceof HookTestStep) {
-            initHook((HookTestStep) event.getTestStep());
+        } else if (event.getTestStep() instanceof PickleStepTestStep) {
+            handleStartPickleStep(testCase, (PickleStepTestStep) event.getTestStep());
         }
     }
 
-    private void initHook(final HookTestStep hook) {
+    private void handleStartPickleStep(final TestCase testCase,
+                                       final PickleStepTestStep pickleStep) {
+        final String uuid = testCase.getId().toString();
+        final Step step = pickleStep.getStep();
 
-        final FixtureResult hookResult = new FixtureResult()
+        final StepResult stepResult = new StepResult()
+                .setName(step.getKeyWord() + step.getText())
+                .setStart(System.currentTimeMillis());
+
+        final String stepUuid = stepUuids.computeIfAbsent(
+                pickleStep,
+                cl -> UUID.randomUUID().toString()
+        );
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, stepUuid, stepResult);
+
+        final StepArgument stepArgument = step.getArgument();
+        if (stepArgument instanceof DataTableArgument) {
+            final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
+            createDataTableAttachment(dataTableArgument);
+        }
+    }
+
+    private void handleStartStepHook(final TestCase testCase,
+                                     final HookTestStep hook) {
+        final String uuid = testCase.getId().toString();
+        final StepResult stepResult = new StepResult()
                 .setName(hook.getCodeLocation())
                 .setStart(System.currentTimeMillis());
 
+        final String stepUuid = stepUuids.computeIfAbsent(
+                hook, unused -> UUID.randomUUID().toString()
+        );
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, stepUuid, stepResult);
+    }
+
+    private void handleStartFixtureHook(final TestCase testCase,
+                                        final HookTestStep hook) {
+        final String uuid = testCase.getId().toString();
+
+        final String containerUuid = hookStepContainerUuid
+                .computeIfAbsent(hook, unused -> UUID.randomUUID().toString());
+
+        lifecycle.startTestContainer(new TestResultContainer()
+                .setUuid(containerUuid)
+                .setChildren(Collections.singletonList(uuid))
+        );
+
+        final FixtureResult hookResult = new FixtureResult()
+                .setName(hook.getCodeLocation());
+
+        final String fixtureUuid = fixtureUuids.computeIfAbsent(
+                hook, unused -> UUID.randomUUID().toString()
+        );
         if (hook.getHookType() == HookType.BEFORE) {
-            lifecycle.startPrepareFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
+            lifecycle.startPrepareFixture(containerUuid, fixtureUuid, hookResult);
         } else {
-            lifecycle.startTearDownFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
+            lifecycle.startTearDownFixture(containerUuid, fixtureUuid, hookResult);
         }
-
     }
 
     private void handleTestStepFinished(final TestStepFinished event) {
         if (event.getTestStep() instanceof HookTestStep) {
-            handleHookStep(event);
-        } else {
-            handlePickleStep(event);
+            final HookTestStep hook = (HookTestStep) event.getTestStep();
+            if (isFixtureHook(hook)) {
+                handleStopHookStep(event.getResult(), hook);
+            } else {
+                handleStopStep(event.getTestCase(), event.getResult(), hook);
+            }
+        } else if (event.getTestStep() instanceof PickleStepTestStep) {
+            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.getTestStep();
+            handleStopStep(event.getTestCase(), event.getResult(), pickleStep);
         }
     }
 
+    private static boolean isFixtureHook(final HookTestStep hook) {
+        return hook.getHookType() == HookType.BEFORE || hook.getHookType() == HookType.AFTER;
+    }
+
     private void handleWriteEvent(final WriteEvent event) {
         lifecycle.addAttachment(
                 "Text output",
@@ -252,36 +316,19 @@ private void handleWriteEvent(final WriteEvent event) {
     }
 
     private void handleEmbedEvent(final EmbedEvent event) {
-        lifecycle.addAttachment("Screenshot", null, null, new ByteArrayInputStream(event.getData()));
-    }
-
-    /*
-    Utility Methods
-     */
-
-    private String getTestContainerUuid() {
-        return currentContainer.get();
-    }
-
-    private String getTestCaseUuid(final TestCase testCase) {
-        return scenarioUuids.computeIfAbsent(getHistoryId(testCase), it -> UUID.randomUUID().toString());
-    }
-
-    private String getStepUuid(final PickleStepTestStep step) {
-        return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-               + step.getStep().getText() + step.getStep().getLine();
-    }
-
-    private String getHookStepUuid(final HookTestStep step) {
-        return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-               + step.getHookType().toString() + step.getCodeLocation();
+        lifecycle.addAttachment(event.name, event.getMediaType(), null, new ByteArrayInputStream(event.getData()));
     }
 
     private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = getTestCaseUri(testCase) + ":" + testCase.getLine();
+        final String testCaseLocation = getTestCaseUri(testCase) + COLON + testCase.getLine();
         return md5(testCaseLocation);
     }
 
+    private String getTestCaseId(final TestCase testCase) {
+        final String testCaseId = getTestCaseUri(testCase) + COLON + testCase.getName();
+        return md5(testCaseId);
+    }
+
     private String getTestCaseUri(final TestCase testCase) {
         final String testCaseUri = testCase.getUri().getSchemeSpecificPart();
         if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
@@ -308,26 +355,39 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(
-            final ScenarioOutline scenarioOutline, final TestCase localCurrentTestCase
-    ) {
-        final Optional<Examples> examplesBlock =
-                scenarioOutline.getExamples().stream()
+            final ScenarioOutline scenario,
+            final TestCase localCurrentTestCase) {
+        final Optional<Examples> maybeExample =
+                scenario.getExamples().stream()
                         .filter(example -> example.getTableBody().stream()
-                                .anyMatch(row -> row.getLocation().getLine() == localCurrentTestCase.getLine())
-                        ).findFirst();
-
-        if (examplesBlock.isPresent()) {
-            final TableRow row = examplesBlock.get().getTableBody().stream()
-                    .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLine())
-                    .findFirst().get();
-            return IntStream.range(0, examplesBlock.get().getTableHeader().getCells().size()).mapToObj(index -> {
-                final String name = examplesBlock.get().getTableHeader().getCells().get(index).getValue();
-                final String value = row.getCells().get(index).getValue();
-                return createParameter(name, value);
-            }).collect(Collectors.toList());
-        } else {
+                                .anyMatch(row -> row.getLocation().getLine()
+                                                 == localCurrentTestCase.getLine())
+                        )
+                        .findFirst();
+
+        if (!maybeExample.isPresent()) {
             return Collections.emptyList();
         }
+
+        final Examples examples = maybeExample.get();
+
+        final Optional<TableRow> maybeRow = examples.getTableBody().stream()
+                .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLine())
+                .findFirst();
+
+        if (!maybeRow.isPresent()) {
+            return Collections.emptyList();
+        }
+
+        final TableRow row = maybeRow.get();
+
+        return IntStream.range(0, examples.getTableHeader().getCells().size())
+                .mapToObj(index -> {
+                    final String name = examples.getTableHeader().getCells().get(index).getValue();
+                    final String value = row.getCells().get(index).getValue();
+                    return createParameter(name, value);
+                })
+                .collect(Collectors.toList());
     }
 
     private void createDataTableAttachment(final DataTableArgument dataTableArgument) {
@@ -352,83 +412,65 @@ private void createDataTableAttachment(final DataTableArgument dataTableArgument
                 new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
     }
 
-    private void handleHookStep(final TestStepFinished event) {
-        final HookTestStep hookStep = (HookTestStep) event.getTestStep();
-        final String uuid = getHookStepUuid(hookStep);
-        final FixtureResult fixtureResult = new FixtureResult().setStatus(translateTestCaseStatus(event.getResult()));
-
-        if (!Status.PASSED.equals(fixtureResult.getStatus())) {
-            final TestResult testResult = new TestResult().setStatus(translateTestCaseStatus(event.getResult()));
-            final StatusDetails statusDetails = getStatusDetails(event.getResult().getError())
-                    .orElseGet(StatusDetails::new);
-
-            final String errorMessage = event.getResult().getError() == null
-                    ? hookStep.getHookType().name() + " is failed."
-                    : hookStep.getHookType().name() + " is failed: "
-                      + event.getResult().getError().getLocalizedMessage();
-
-            statusDetails.setMessage(errorMessage);
-
-            if (hookStep.getHookType() == HookType.BEFORE) {
-                final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
-                statusDetails
-                        .setFlaky(tagParser.isFlaky())
-                        .setMuted(tagParser.isMuted())
-                        .setKnown(tagParser.isKnown());
-                testResult.setStatus(Status.SKIPPED);
-                updateTestCaseStatus(testResult.getStatus());
-                forbidTestCaseStatusChange.set(true);
-            } else {
-                testResult.setStatus(Status.BROKEN);
-                updateTestCaseStatus(testResult.getStatus());
-            }
-            fixtureResult.setStatusDetails(statusDetails);
+    private void handleStopHookStep(final Result eventResult,
+                                    final HookTestStep hook) {
+        final String containerUuid = hookStepContainerUuid.get(hook);
+        if (Objects.isNull(containerUuid)) {
+            // maybe throw an exception?
+            return;
         }
 
-        lifecycle.updateFixture(uuid, result -> result.setStatus(fixtureResult.getStatus())
-                .setStatusDetails(fixtureResult.getStatusDetails()));
+        final String uuid = fixtureUuids.get(hook);
+        if (Objects.isNull(uuid)) {
+            // maybe throw an exception?
+            return;
+        }
+
+        final Status status = translateTestCaseStatus(eventResult);
+        final StatusDetails statusDetails = getStatusDetails(eventResult.getError())
+                .orElseGet(StatusDetails::new);
+
+        lifecycle.updateFixture(uuid, result -> result
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
         lifecycle.stopFixture(uuid);
+
+        lifecycle.stopTestContainer(containerUuid);
+        lifecycle.writeTestContainer(containerUuid);
     }
 
-    private void handlePickleStep(final TestStepFinished event) {
+    private void handleStopStep(final TestCase testCase,
+                                final Result eventResult,
+                                final TestStep step) {
+        final String stepUuid = stepUuids.get(step);
+        if (Objects.isNull(stepUuid)) {
+            // maybe exception?
+            return;
+        }
 
-        final Status stepStatus = translateTestCaseStatus(event.getResult());
-        final StatusDetails statusDetails;
-        if (event.getResult().getStatus() == io.cucumber.plugin.event.Status.UNDEFINED) {
-            updateTestCaseStatus(Status.PASSED);
+        final Feature feature = testSources.getFeature(testCase.getUri());
 
-            statusDetails =
-                    getStatusDetails(new IllegalStateException("Undefined Step. Please add step definition"))
-                            .orElse(new StatusDetails());
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase.get()), scenarioResult ->
-                    scenarioResult
-                            .setStatusDetails(statusDetails));
-        } else {
-            statusDetails =
-                    getStatusDetails(event.getResult().getError())
-                            .orElse(new StatusDetails());
-            updateTestCaseStatus(stepStatus);
-        }
+        final Status stepStatus = translateTestCaseStatus(eventResult);
 
-        if (!Status.PASSED.equals(stepStatus) && stepStatus != null) {
-            forbidTestCaseStatusChange.set(true);
-        }
+        final StatusDetails statusDetails
+                = eventResult.getStatus() == io.cucumber.plugin.event.Status.UNDEFINED
+                ? new StatusDetails().setMessage("Undefined Step. Please add step definition")
+                : getStatusDetails(eventResult.getError())
+                        .orElse(new StatusDetails());
 
-        final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
+        final TagParser tagParser = new TagParser(feature, testCase);
         statusDetails
                 .setFlaky(tagParser.isFlaky())
                 .setMuted(tagParser.isMuted())
                 .setKnown(tagParser.isKnown());
 
-        lifecycle.updateStep(getStepUuid((PickleStepTestStep) event.getTestStep()),
-                stepResult -> stepResult.setStatus(stepStatus).setStatusDetails(statusDetails));
-        lifecycle.stopStep(getStepUuid((PickleStepTestStep) event.getTestStep()));
-    }
-
-    private void updateTestCaseStatus(final Status status) {
-        if (!forbidTestCaseStatusChange.get()) {
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase.get()),
-                    result -> result.setStatus(status));
-        }
+        lifecycle.updateStep(
+                stepUuid,
+                stepResult -> stepResult
+                        .setStatus(stepStatus)
+                        .setStatusDetails(statusDetails)
+        );
+        lifecycle.stopStep(stepUuid);
     }
 }
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
index 988882c27..f4de28513 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
@@ -37,6 +37,7 @@
 import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.RunUtils;
@@ -59,6 +60,7 @@
 import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.SUITE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.TEST_CLASS_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.md5;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
@@ -87,8 +89,10 @@ void shouldSetStatus() {
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
     }
 
     @AllureFeatures.FailedTests
@@ -259,7 +263,7 @@ void shouldAddAttachments() {
                 .extracting(Attachment::getName, Attachment::getType)
                 .containsExactlyInAnyOrder(
                         tuple("Text output", "text/plain"),
-                        tuple("Screenshot", null)
+                        tuple("ImageAttachment", "image/png")
                 );
 
         final List<String> attachmentContents = results.getAttachments().values().stream()
@@ -282,10 +286,10 @@ void shouldAddBackgroundSteps() {
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
                 .containsExactly(
-                        "Given  cat is sad",
-                        "And  cat is murmur",
-                        "When  Pet the cat",
-                        "Then  Cat is happy"
+                        "Given cat is sad",
+                        "And cat is murmur",
+                        "When Pet the cat",
+                        "Then Cat is happy"
                 );
     }
 
@@ -447,15 +451,17 @@ void shouldProcessUndefinedSteps() {
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Step is not defined", null)
+                );
 
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("When  step is undefined", null),
-                        tuple("Then  b is 10", Status.SKIPPED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is undefined", null),
+                        tuple("Then b is 10", Status.SKIPPED)
                 );
     }
 
@@ -473,9 +479,9 @@ void shouldProcessPendingExceptionsInSteps() {
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("When  step is yet to be implemented", Status.SKIPPED),
-                        tuple("Then  b is 10", Status.SKIPPED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is yet to be implemented", Status.SKIPPED),
+                        tuple("Then b is 10", Status.SKIPPED)
                 );
     }
 
@@ -494,10 +500,10 @@ void shouldSupportDryRunForSimpleFeatures() {
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.SKIPPED),
-                        tuple("And  b is 10", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 5", Status.SKIPPED),
+                        tuple("And b is 10", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
     }
 
@@ -508,32 +514,29 @@ void shouldSupportDryRunForHooks() {
         final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .startsWith(
-                        tuple("Simple scenario with Before and After hooks", Status.SKIPPED)
-                );
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
 
-        assertThat(results.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.beforeHook()", Status.SKIPPED)
                 );
 
-        assertThat(results.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.afterHook()", Status.SKIPPED)
                 );
 
-        assertThat(testResults.get(0).getSteps())
+        assertThat(tr1.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.SKIPPED),
-                        tuple("And  b is 8", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 7", Status.SKIPPED),
+                        tuple("And b is 8", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
     }
 
@@ -568,6 +571,42 @@ void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation
                 .isNotEqualTo(results2.getTestResults().get(0).getHistoryId());
     }
 
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForScenarios() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Add a to b",
+                                md5("src/test/resources/features/simple.feature:Add a to b")
+                        )
+                );
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForExamples() {
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        ),
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        )
+                );
+    }
+
     @AllureFeatures.Parallel
     @Test
     void shouldProcessScenariosInParallelMode() {
@@ -579,30 +618,33 @@ void shouldProcessScenariosInParallelMode() {
                 .hasSize(3);
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 1",
-                                "And  b is 3",
-                                "When  I add a to b",
-                                "Then  result is 4")
+                        "Given a is 1",
+                        "And b is 3",
+                        "When I add a to b",
+                        "Then result is 4"
                 );
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 2",
-                                "And  b is 4",
-                                "When  I add a to b",
-                                "Then  result is 6")
+                        "Given a is 2",
+                        "And b is 4",
+                        "When I add a to b",
+                        "Then result is 6"
                 );
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 7",
-                                "And  b is 8",
-                                "When  I add a to b",
-                                "Then  result is 15")
+                        "Given a is 7",
+                        "And b is 8",
+                        "When I add a to b",
+                        "Then result is 15"
                 );
     }
 
@@ -613,64 +655,61 @@ void shouldDisplayHooksAsStages() {
         final AllureResults results = runFeature("features/hooks.feature", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactlyInAnyOrder(
-                        tuple("Simple scenario with Before and After hooks", Status.PASSED),
-                        tuple("Simple scenario with Before hook with Exception", Status.SKIPPED),
-                        tuple("Simple scenario with After hook with Exception", Status.BROKEN)
-                );
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
+        final TestResult tr2 = results.getTestResultByName("Simple scenario with Before hook with Exception");
+        final TestResult tr3 = results.getTestResultByName("Simple scenario with After hook with Exception");
 
-        assertThat(testResults.get(0).getSteps())
+        assertThat(tr1.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
 
-
-        assertThat(results.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(results.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.afterHook()", Status.PASSED)
                 );
 
-        assertThat(testResults.get(1).getSteps())
+        assertThat(tr2.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.SKIPPED),
-                        tuple("And  b is 8", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 7", Status.SKIPPED),
+                        tuple("And b is 8", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
 
 
-        assertThat(results.getTestResultContainers().get(1).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr2))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.beforeHookWithException()", Status.FAILED)
                 );
 
-
-        assertThat(testResults.get(2).getSteps())
+        assertThat(tr3.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
 
-        assertThat(results.getTestResultContainers().get(2).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr3))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber5jvm.samples.HookSteps.afterHookWithException()", Status.FAILED)
@@ -687,14 +726,14 @@ void shouldHandleAmbigiousStepsExceptions() {
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Simple scenario with ambigious steps", Status.SKIPPED)
+                        tuple("Simple scenario with ambigious steps", null)
                 );
 
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactly(
-                        tuple("When  ambigious step present", null),
-                        tuple("Then  something bad should happen", Status.SKIPPED)
+                        tuple("When ambigious step present", null),
+                        tuple("Then something bad should happen", Status.SKIPPED)
                 );
     }
 
@@ -714,6 +753,36 @@ void shouldSupportProvidedLabels() {
                 );
     }
 
+    @Test
+    void shouldSupportRuntimeApiInStepsWhenHooksAreUsed() {
+        final AllureResults results = runFeature("features/runtimeapi.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "When step 1",
+                        "When step 2",
+                        "And step 3",
+                        "Then step 4",
+                        "And step 5"
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName, Link::getUrl)
+                .containsExactly(
+                        tuple("step1", "https://example.org/step1"),
+                        tuple("step2", "https://example.org/step2"),
+                        tuple("step3", "https://example.org/step3"),
+                        tuple("step4", "https://example.org/step4"),
+                        tuple("step5", "https://example.org/step5")
+                );
+    }
+
     @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
     @Step
     private AllureResults runFeature(final String featureResource,
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java
new file mode 100644
index 000000000..20c73a7fa
--- /dev/null
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java
@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber5jvm.samples;
+
+import io.cucumber.java.Before;
+import io.cucumber.java.en.And;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import io.qameta.allure.Allure;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class RuntimeApiSteps {
+
+    @Before("@beforeScenario")
+    public void beforeScenario(){
+        // nothing
+    }
+
+    @Before("@beforeFeature")
+    public void beforeFeature(){
+        // nothing
+    }
+
+    @When("^step 1$")
+    public void step1() {
+        Allure.step("step1 nested");
+        Allure.link("step1", "https://example.org/step1");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step1: " + uuid);
+        });
+    }
+
+    @When("^step 2$")
+    public void step2() {
+        Allure.step("step2 nested");
+        Allure.link("step2", "https://example.org/step2");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step2: " + uuid);
+        });
+    }
+
+    @And("^step 3$")
+    public void step3() {
+        Allure.step("step3 nested");
+        Allure.link("step3", "https://example.org/step3");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step3: " + uuid);
+        });
+    }
+
+    @Then("^step 4$")
+    public void step4() {
+        Allure.step("step4 nested");
+        Allure.link("step4", "https://example.org/step4");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step4: " + uuid);
+        });
+    }
+
+    @And("^step 5$")
+    public void step5() {
+        Allure.step("step5 nested");
+        Allure.link("step5", "https://example.org/step5");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step5: " + uuid);
+        });
+    }
+}
diff --git a/allure-cucumber5-jvm/src/test/resources/features/runtimeapi.feature b/allure-cucumber5-jvm/src/test/resources/features/runtimeapi.feature
new file mode 100644
index 000000000..ec43eccb7
--- /dev/null
+++ b/allure-cucumber5-jvm/src/test/resources/features/runtimeapi.feature
@@ -0,0 +1,10 @@
+@beforeFeature
+Feature: Should support runtime API in all steps
+
+  @beforeScenario
+  Scenario: Scenario with Runtime API usage
+    When step 1
+    When step 2
+    And step 3
+    Then step 4
+    And step 5
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
index fba287315..bb0e513bf 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
@@ -28,6 +28,7 @@
 import io.cucumber.plugin.event.HookType;
 import io.cucumber.plugin.event.PickleStepTestStep;
 import io.cucumber.plugin.event.Result;
+import io.cucumber.plugin.event.Step;
 import io.cucumber.plugin.event.StepArgument;
 import io.cucumber.plugin.event.TestCase;
 import io.cucumber.plugin.event.TestCaseFinished;
@@ -48,13 +49,13 @@
 import io.qameta.allure.model.TestResultContainer;
 
 import java.io.ByteArrayInputStream;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
@@ -78,17 +79,12 @@
 })
 public class AllureCucumber6Jvm implements ConcurrentEventListener {
 
+    private static final String COLON = ":";
+
     private final AllureLifecycle lifecycle;
 
-    private final ConcurrentHashMap<String, String> scenarioUuids = new ConcurrentHashMap<>();
     private final TestSourcesModelProxy testSources = new TestSourcesModelProxy();
 
-    private final ThreadLocal<Feature> currentFeature = new InheritableThreadLocal<>();
-    private final ThreadLocal<URI> currentFeatureFile = new InheritableThreadLocal<>();
-    private final ThreadLocal<TestCase> currentTestCase = new InheritableThreadLocal<>();
-    private final ThreadLocal<String> currentContainer = new InheritableThreadLocal<>();
-    private final ThreadLocal<Boolean> forbidTestCaseStatusChange = new InheritableThreadLocal<>();
-
     private final EventHandler<TestSourceRead> featureStartedHandler = this::handleFeatureStartedHandler;
     private final EventHandler<TestCaseStarted> caseStartedHandler = this::handleTestCaseStarted;
     private final EventHandler<TestCaseFinished> caseFinishedHandler = this::handleTestCaseFinished;
@@ -97,6 +93,8 @@ public class AllureCucumber6Jvm implements ConcurrentEventListener {
     private final EventHandler<WriteEvent> writeEventHandler = this::handleWriteEvent;
     private final EventHandler<EmbedEvent> embedEventHandler = this::handleEmbedEvent;
 
+    private final Map<UUID, String> hookStepContainerUuid = new ConcurrentHashMap<>();
+
     private static final String TXT_EXTENSION = ".txt";
     private static final String TEXT_PLAIN = "text/plain";
     private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().getSchemeSpecificPart();
@@ -110,9 +108,6 @@ public AllureCucumber6Jvm(final AllureLifecycle lifecycle) {
         this.lifecycle = lifecycle;
     }
 
-    /*
-    Event Handlers
-     */
     @Override
     public void setEventPublisher(final EventPublisher publisher) {
         publisher.registerHandlerFor(TestSourceRead.class, featureStartedHandler);
@@ -132,29 +127,28 @@ private void handleFeatureStartedHandler(final TestSourceRead event) {
     }
 
     private void handleTestCaseStarted(final TestCaseStarted event) {
-        currentFeatureFile.set(event.getTestCase().getUri());
-        currentFeature.set(testSources.getFeature(currentFeatureFile.get()));
-        currentTestCase.set(event.getTestCase());
-        currentContainer.set(UUID.randomUUID().toString());
-        forbidTestCaseStatusChange.set(false);
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
 
-        final TestCase testCase = currentTestCase.get();
         final Deque<String> tags = new LinkedList<>(testCase.getTags());
-
-        final Feature feature = currentFeature.get();
         final LabelBuilder labelBuilder = new LabelBuilder(feature, testCase, tags);
 
         final String name = testCase.getName();
+
+
         // the same way full name is generated for
         // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
         // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
         final String fullName = String.format("%s:%d",
-                getTestCaseUri(event.getTestCase()),
-                event.getTestCase().getLocation().getLine()
+                getTestCaseUri(testCase),
+                testCase.getLocation().getLine()
         );
 
+        final String testCaseUuid = testCase.getId().toString();
+
         final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(testCase))
+                .setUuid(testCaseUuid)
+                .setTestCaseId(getTestCaseId(testCase))
                 .setHistoryId(getHistoryId(testCase))
                 .setFullName(fullName)
                 .setName(name)
@@ -163,11 +157,11 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
 
         final Scenario scenarioDefinition =
                 testSources.getScenarioDefinition(
-                        currentFeatureFile.get(),
+                        testCase.getUri(),
                         testCase.getLocation().getLine()
                 );
 
-        if (scenarioDefinition.getExamplesCount() > 0) {
+        if (scenarioDefinition.getExamplesList() != null) {
             result.setParameters(
                     getExamplesAsParameters(scenarioDefinition, testCase)
             );
@@ -182,75 +176,121 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
             result.setDescription(description);
         }
 
-        final TestResultContainer resultContainer = new TestResultContainer()
-                .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
-                .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(testCase)));
-
         lifecycle.scheduleTestCase(result);
-        lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(testCase));
+        lifecycle.startTestCase(testCaseUuid);
     }
 
     private void handleTestCaseFinished(final TestCaseFinished event) {
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
+        final String uuid = testCase.getId().toString();
+        final Result result = event.getResult();
+        final Status status = translateTestCaseStatus(result);
+        final StatusDetails statusDetails = getStatusDetails(result.getError())
+                .orElseGet(StatusDetails::new);
+
+        final TagParser tagParser = new TagParser(feature, testCase);
+        statusDetails
+                .setFlaky(tagParser.isFlaky())
+                .setMuted(tagParser.isMuted())
+                .setKnown(tagParser.isKnown());
+
+        lifecycle.updateTestCase(uuid, testResult -> testResult
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
 
-        final String uuid = getTestCaseUuid(event.getTestCase());
-        final Optional<StatusDetails> details = getStatusDetails(event.getResult().getError());
-        details.ifPresent(statusDetails -> lifecycle.updateTestCase(
-                uuid,
-                testResult -> testResult.setStatusDetails(statusDetails)
-        ));
         lifecycle.stopTestCase(uuid);
-        lifecycle.stopTestContainer(getTestContainerUuid());
         lifecycle.writeTestCase(uuid);
-        lifecycle.writeTestContainer(getTestContainerUuid());
     }
 
     private void handleTestStepStarted(final TestStepStarted event) {
-        if (event.getTestStep() instanceof PickleStepTestStep) {
-            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.getTestStep();
-            final String stepKeyword = Optional.ofNullable(
-                    testSources.getKeywordFromSource(currentFeatureFile.get(), pickleStep.getStep().getLine())
-            ).orElse("UNDEFINED");
-
-            final StepResult stepResult = new StepResult()
-                    .setName(String.format("%s %s", stepKeyword, pickleStep.getStep().getText()))
-                    .setStart(System.currentTimeMillis());
-
-            lifecycle.startStep(getTestCaseUuid(currentTestCase.get()), getStepUuid(pickleStep), stepResult);
+        final TestCase testCase = event.getTestCase();
+        if (event.getTestStep() instanceof HookTestStep) {
+            final HookTestStep hook = (HookTestStep) event.getTestStep();
 
-            final StepArgument stepArgument = pickleStep.getStep().getArgument();
-            if (stepArgument instanceof DataTableArgument) {
-                final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
-                createDataTableAttachment(dataTableArgument);
+            if (isFixtureHook(hook)) {
+                handleStartFixtureHook(testCase, hook);
+            } else {
+                handleStartStepHook(testCase, hook);
             }
-        } else if (event.getTestStep() instanceof HookTestStep) {
-            initHook((HookTestStep) event.getTestStep());
+        } else if (event.getTestStep() instanceof PickleStepTestStep) {
+            handleStartPickleStep(testCase, (PickleStepTestStep) event.getTestStep());
         }
     }
 
-    private void initHook(final HookTestStep hook) {
+    private void handleStartPickleStep(final TestCase testCase,
+                                       final PickleStepTestStep pickleStep) {
+        final String uuid = testCase.getId().toString();
+        final Step step = pickleStep.getStep();
 
-        final FixtureResult hookResult = new FixtureResult()
+        final StepResult stepResult = new StepResult()
+                .setName(step.getKeyword() + step.getText())
+                .setStart(System.currentTimeMillis());
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, pickleStep.getId().toString(), stepResult);
+
+        final StepArgument stepArgument = step.getArgument();
+        if (stepArgument instanceof DataTableArgument) {
+            final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
+            createDataTableAttachment(dataTableArgument);
+        }
+    }
+
+    private void handleStartStepHook(final TestCase testCase,
+                                     final HookTestStep hook) {
+        final String uuid = testCase.getId().toString();
+        final StepResult stepResult = new StepResult()
                 .setName(hook.getCodeLocation())
                 .setStart(System.currentTimeMillis());
 
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, hook.getId().toString(), stepResult);
+    }
+
+    private void handleStartFixtureHook(final TestCase testCase,
+                                        final HookTestStep hook) {
+        final String uuid = testCase.getId().toString();
+
+        final UUID hookId = hook.getId();
+        final String containerUuid = hookStepContainerUuid
+                .computeIfAbsent(hookId, unused -> UUID.randomUUID().toString());
+
+        lifecycle.startTestContainer(new TestResultContainer()
+                .setUuid(containerUuid)
+                .setChildren(Collections.singletonList(uuid))
+        );
+
+        final FixtureResult hookResult = new FixtureResult()
+                .setName(hook.getCodeLocation());
+
+        final String fixtureUuid = hookId.toString();
         if (hook.getHookType() == HookType.BEFORE) {
-            lifecycle.startPrepareFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
+            lifecycle.startPrepareFixture(containerUuid, fixtureUuid, hookResult);
         } else {
-            lifecycle.startTearDownFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
+            lifecycle.startTearDownFixture(containerUuid, fixtureUuid, hookResult);
         }
-
     }
 
     private void handleTestStepFinished(final TestStepFinished event) {
         if (event.getTestStep() instanceof HookTestStep) {
-            handleHookStep(event);
-        } else {
-            handlePickleStep(event);
+            final HookTestStep hook = (HookTestStep) event.getTestStep();
+            if (isFixtureHook(hook)) {
+                handleStopHookStep(event.getResult(), hook);
+            } else {
+                handleStopStep(event.getTestCase(), event.getResult(), hook.getId());
+            }
+        } else if (event.getTestStep() instanceof PickleStepTestStep) {
+            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.getTestStep();
+            handleStopStep(event.getTestCase(), event.getResult(), pickleStep.getId());
         }
     }
 
+    private static boolean isFixtureHook(final HookTestStep hook) {
+        return hook.getHookType() == HookType.BEFORE || hook.getHookType() == HookType.AFTER;
+    }
+
     private void handleWriteEvent(final WriteEvent event) {
         lifecycle.addAttachment(
                 "Text output",
@@ -264,33 +304,16 @@ private void handleEmbedEvent(final EmbedEvent event) {
         lifecycle.addAttachment(event.name, event.getMediaType(), null, new ByteArrayInputStream(event.getData()));
     }
 
-    /*
-    Utility Methods
-     */
-
-    private String getTestContainerUuid() {
-        return currentContainer.get();
-    }
-
-    private String getTestCaseUuid(final TestCase testCase) {
-        return scenarioUuids.computeIfAbsent(getHistoryId(testCase), it -> UUID.randomUUID().toString());
-    }
-
-    private String getStepUuid(final PickleStepTestStep step) {
-        return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-               + step.getStep().getText() + step.getStep().getLine();
-    }
-
-    private String getHookStepUuid(final HookTestStep step) {
-        return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-               + step.getHookType().toString() + step.getCodeLocation();
-    }
-
     private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = getTestCaseUri(testCase) + ":" + testCase.getLocation().getLine();
+        final String testCaseLocation = getTestCaseUri(testCase) + COLON + testCase.getLocation().getLine();
         return md5(testCaseLocation);
     }
 
+    private String getTestCaseId(final TestCase testCase) {
+        final String testCaseId = getTestCaseUri(testCase) + COLON + testCase.getName();
+        return md5(testCaseId);
+    }
+
     private String getTestCaseUri(final TestCase testCase) {
         final String testCaseUri = testCase.getUri().getSchemeSpecificPart();
         if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
@@ -317,8 +340,8 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(
-            final Scenario scenario, final TestCase localCurrentTestCase
-    ) {
+            final Scenario scenario,
+            final TestCase localCurrentTestCase) {
         final Optional<Examples> maybeExample =
                 scenario.getExamplesList().stream()
                         .filter(example -> example.getTableBodyList().stream()
@@ -374,83 +397,56 @@ private void createDataTableAttachment(final DataTableArgument dataTableArgument
                 new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
     }
 
-    private void handleHookStep(final TestStepFinished event) {
-        final HookTestStep hookStep = (HookTestStep) event.getTestStep();
-        final String uuid = getHookStepUuid(hookStep);
-        final FixtureResult fixtureResult = new FixtureResult().setStatus(translateTestCaseStatus(event.getResult()));
-
-        if (!Status.PASSED.equals(fixtureResult.getStatus())) {
-            final TestResult testResult = new TestResult().setStatus(translateTestCaseStatus(event.getResult()));
-            final StatusDetails statusDetails = getStatusDetails(event.getResult().getError())
-                    .orElseGet(StatusDetails::new);
-
-            final String errorMessage = event.getResult().getError() == null
-                    ? hookStep.getHookType().name() + " is failed."
-                    : hookStep.getHookType().name()
-                      + " is failed: "
-                      + event.getResult().getError().getLocalizedMessage();
-            statusDetails.setMessage(errorMessage);
-
-            if (hookStep.getHookType() == HookType.BEFORE) {
-                final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
-                statusDetails
-                        .setFlaky(tagParser.isFlaky())
-                        .setMuted(tagParser.isMuted())
-                        .setKnown(tagParser.isKnown());
-                testResult.setStatus(Status.SKIPPED);
-                updateTestCaseStatus(testResult.getStatus());
-                forbidTestCaseStatusChange.set(true);
-            } else {
-                testResult.setStatus(Status.BROKEN);
-                updateTestCaseStatus(testResult.getStatus());
-            }
-            fixtureResult.setStatusDetails(statusDetails);
+    private void handleStopHookStep(final Result eventResult,
+                                    final HookTestStep hook) {
+        final String containerUuid = hookStepContainerUuid.get(hook.getId());
+        if (Objects.isNull(containerUuid)) {
+            // maybe throw an exception?
+            return;
         }
 
-        lifecycle.updateFixture(uuid, result -> result.setStatus(fixtureResult.getStatus())
-                .setStatusDetails(fixtureResult.getStatusDetails()));
+        final String uuid = hook.getId().toString();
+
+        final Status status = translateTestCaseStatus(eventResult);
+        final StatusDetails statusDetails = getStatusDetails(eventResult.getError())
+                .orElseGet(StatusDetails::new);
+
+        lifecycle.updateFixture(uuid, result -> result
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
         lifecycle.stopFixture(uuid);
-    }
 
-    private void handlePickleStep(final TestStepFinished event) {
+        lifecycle.stopTestContainer(containerUuid);
+        lifecycle.writeTestContainer(containerUuid);
+    }
 
-        final Status stepStatus = translateTestCaseStatus(event.getResult());
-        final StatusDetails statusDetails;
-        if (event.getResult().getStatus() == io.cucumber.plugin.event.Status.UNDEFINED) {
-            updateTestCaseStatus(Status.PASSED);
+    private void handleStopStep(final TestCase testCase,
+                                final Result eventResult,
+                                final UUID stepId) {
+        final Feature feature = testSources.getFeature(testCase.getUri());
 
-            statusDetails =
-                    getStatusDetails(new IllegalStateException("Undefined Step. Please add step definition"))
-                            .orElse(new StatusDetails());
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase.get()), scenarioResult ->
-                    scenarioResult
-                            .setStatusDetails(statusDetails));
-        } else {
-            statusDetails =
-                    getStatusDetails(event.getResult().getError())
-                            .orElse(new StatusDetails());
-            updateTestCaseStatus(stepStatus);
-        }
+        final Status stepStatus = translateTestCaseStatus(eventResult);
 
-        if (!Status.PASSED.equals(stepStatus) && stepStatus != null) {
-            forbidTestCaseStatusChange.set(true);
-        }
+        final StatusDetails statusDetails
+                = eventResult.getStatus() == io.cucumber.plugin.event.Status.UNDEFINED
+                ? new StatusDetails().setMessage("Undefined Step. Please add step definition")
+                : getStatusDetails(eventResult.getError())
+                        .orElse(new StatusDetails());
 
-        final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
+        final TagParser tagParser = new TagParser(feature, testCase);
         statusDetails
                 .setFlaky(tagParser.isFlaky())
                 .setMuted(tagParser.isMuted())
                 .setKnown(tagParser.isKnown());
 
-        lifecycle.updateStep(getStepUuid((PickleStepTestStep) event.getTestStep()),
-                stepResult -> stepResult.setStatus(stepStatus).setStatusDetails(statusDetails));
-        lifecycle.stopStep(getStepUuid((PickleStepTestStep) event.getTestStep()));
-    }
-
-    private void updateTestCaseStatus(final Status status) {
-        if (!forbidTestCaseStatusChange.get()) {
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase.get()),
-                    result -> result.setStatus(status));
-        }
+        final String stepUuid = stepId.toString();
+        lifecycle.updateStep(
+                stepUuid,
+                stepResult -> stepResult
+                        .setStatus(stepStatus)
+                        .setStatusDetails(statusDetails)
+        );
+        lifecycle.stopStep(stepUuid);
     }
 }
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
index e742aeb02..8cfbd31bf 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
@@ -37,6 +37,7 @@
 import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.RunUtils;
@@ -59,6 +60,7 @@
 import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.SUITE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.TEST_CLASS_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.md5;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
@@ -87,8 +89,10 @@ void shouldSetStatus() {
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
     }
 
     @AllureFeatures.FailedTests
@@ -282,10 +286,10 @@ void shouldAddBackgroundSteps() {
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
                 .containsExactly(
-                        "Given  cat is sad",
-                        "And  cat is murmur",
-                        "When  Pet the cat",
-                        "Then  Cat is happy"
+                        "Given cat is sad",
+                        "And cat is murmur",
+                        "When Pet the cat",
+                        "Then Cat is happy"
                 );
     }
 
@@ -447,15 +451,17 @@ void shouldProcessUndefinedSteps() {
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Step is not defined", null)
+                );
 
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("When  step is undefined", null),
-                        tuple("Then  b is 10", Status.SKIPPED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is undefined", null),
+                        tuple("Then b is 10", Status.SKIPPED)
                 );
     }
 
@@ -473,9 +479,9 @@ void shouldProcessPendingExceptionsInSteps() {
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("When  step is yet to be implemented", Status.SKIPPED),
-                        tuple("Then  b is 10", Status.SKIPPED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is yet to be implemented", Status.SKIPPED),
+                        tuple("Then b is 10", Status.SKIPPED)
                 );
     }
 
@@ -494,10 +500,10 @@ void shouldSupportDryRunForSimpleFeatures() {
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("And  b is 10", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("And b is 10", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
     }
 
@@ -508,32 +514,29 @@ void shouldSupportDryRunForHooks() {
         final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .startsWith(
-                        tuple("Simple scenario with Before and After hooks", Status.PASSED)
-                );
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
 
-        assertThat(results.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(results.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHook()", Status.PASSED)
                 );
 
-        assertThat(testResults.get(0).getSteps())
+        assertThat(tr1.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
     }
 
@@ -568,6 +571,42 @@ void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation
                 .isNotEqualTo(results2.getTestResults().get(0).getHistoryId());
     }
 
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForScenarios() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Add a to b",
+                                md5("src/test/resources/features/simple.feature:Add a to b")
+                        )
+                );
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForExamples() {
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        ),
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        )
+                );
+    }
+
     @AllureFeatures.Parallel
     @Test
     void shouldProcessScenariosInParallelMode() {
@@ -579,30 +618,33 @@ void shouldProcessScenariosInParallelMode() {
                 .hasSize(3);
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 1",
-                                "And  b is 3",
-                                "When  I add a to b",
-                                "Then  result is 4")
+                        "Given a is 1",
+                        "And b is 3",
+                        "When I add a to b",
+                        "Then result is 4"
                 );
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 2",
-                                "And  b is 4",
-                                "When  I add a to b",
-                                "Then  result is 6")
+                        "Given a is 2",
+                        "And b is 4",
+                        "When I add a to b",
+                        "Then result is 6"
                 );
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 7",
-                                "And  b is 8",
-                                "When  I add a to b",
-                                "Then  result is 15")
+                        "Given a is 7",
+                        "And b is 8",
+                        "When I add a to b",
+                        "Then result is 15"
                 );
     }
 
@@ -613,64 +655,61 @@ void shouldDisplayHooksAsStages() {
         final AllureResults results = runFeature("features/hooks.feature", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactlyInAnyOrder(
-                        tuple("Simple scenario with Before and After hooks", Status.PASSED),
-                        tuple("Simple scenario with Before hook with Exception", Status.SKIPPED),
-                        tuple("Simple scenario with After hook with Exception", Status.BROKEN)
-                );
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
+        final TestResult tr2 = results.getTestResultByName("Simple scenario with Before hook with Exception");
+        final TestResult tr3 = results.getTestResultByName("Simple scenario with After hook with Exception");
 
-        assertThat(testResults.get(0).getSteps())
+        assertThat(tr1.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
 
-
-        assertThat(results.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(results.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHook()", Status.PASSED)
                 );
 
-        assertThat(testResults.get(1).getSteps())
+        assertThat(tr2.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.SKIPPED),
-                        tuple("And  b is 8", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 7", Status.SKIPPED),
+                        tuple("And b is 8", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
 
 
-        assertThat(results.getTestResultContainers().get(1).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr2))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHookWithException()", Status.FAILED)
                 );
 
-
-        assertThat(testResults.get(2).getSteps())
+        assertThat(tr3.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
 
-        assertThat(results.getTestResultContainers().get(2).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr3))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHookWithException()", Status.FAILED)
@@ -687,14 +726,14 @@ void shouldHandleAmbigiousStepsExceptions() {
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Simple scenario with ambigious steps", Status.SKIPPED)
+                        tuple("Simple scenario with ambigious steps", null)
                 );
 
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactly(
-                        tuple("When  ambigious step present", null),
-                        tuple("Then  something bad should happen", Status.SKIPPED)
+                        tuple("When ambigious step present", null),
+                        tuple("Then something bad should happen", Status.SKIPPED)
                 );
     }
 
@@ -714,6 +753,36 @@ void shouldSupportProvidedLabels() {
                 );
     }
 
+    @Test
+    void shouldSupportRuntimeApiInStepsWhenHooksAreUsed() {
+        final AllureResults results = runFeature("features/runtimeapi.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "When step 1",
+                        "When step 2",
+                        "And step 3",
+                        "Then step 4",
+                        "And step 5"
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName, Link::getUrl)
+                .containsExactly(
+                        tuple("step1", "https://example.org/step1"),
+                        tuple("step2", "https://example.org/step2"),
+                        tuple("step3", "https://example.org/step3"),
+                        tuple("step4", "https://example.org/step4"),
+                        tuple("step5", "https://example.org/step5")
+                );
+    }
+
     @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
     @Step
     private AllureResults runFeature(final String featureResource,
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java
new file mode 100644
index 000000000..c769404ef
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java
@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber6jvm.samples;
+
+import io.cucumber.java.Before;
+import io.cucumber.java.en.And;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import io.qameta.allure.Allure;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class RuntimeApiSteps {
+
+    @Before("@beforeScenario")
+    public void beforeScenario(){
+        // nothing
+    }
+
+    @Before("@beforeFeature")
+    public void beforeFeature(){
+        // nothing
+    }
+
+    @When("^step 1$")
+    public void step1() {
+        Allure.step("step1 nested");
+        Allure.link("step1", "https://example.org/step1");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step1: " + uuid);
+        });
+    }
+
+    @When("^step 2$")
+    public void step2() {
+        Allure.step("step2 nested");
+        Allure.link("step2", "https://example.org/step2");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step2: " + uuid);
+        });
+    }
+
+    @And("^step 3$")
+    public void step3() {
+        Allure.step("step3 nested");
+        Allure.link("step3", "https://example.org/step3");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step3: " + uuid);
+        });
+    }
+
+    @Then("^step 4$")
+    public void step4() {
+        Allure.step("step4 nested");
+        Allure.link("step4", "https://example.org/step4");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step4: " + uuid);
+        });
+    }
+
+    @And("^step 5$")
+    public void step5() {
+        Allure.step("step5 nested");
+        Allure.link("step5", "https://example.org/step5");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step5: " + uuid);
+        });
+    }
+}
diff --git a/allure-cucumber6-jvm/src/test/resources/features/runtimeapi.feature b/allure-cucumber6-jvm/src/test/resources/features/runtimeapi.feature
new file mode 100644
index 000000000..ec43eccb7
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/runtimeapi.feature
@@ -0,0 +1,10 @@
+@beforeFeature
+Feature: Should support runtime API in all steps
+
+  @beforeScenario
+  Scenario: Scenario with Runtime API usage
+    When step 1
+    When step 2
+    And step 3
+    Then step 4
+    And step 5
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
index f5cf815e4..5f85512fd 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
@@ -18,6 +18,7 @@
 import io.cucumber.messages.types.Examples;
 import io.cucumber.messages.types.Feature;
 import io.cucumber.messages.types.Scenario;
+import io.cucumber.messages.types.TableCell;
 import io.cucumber.messages.types.TableRow;
 import io.cucumber.plugin.ConcurrentEventListener;
 import io.cucumber.plugin.event.DataTableArgument;
@@ -28,6 +29,7 @@
 import io.cucumber.plugin.event.HookType;
 import io.cucumber.plugin.event.PickleStepTestStep;
 import io.cucumber.plugin.event.Result;
+import io.cucumber.plugin.event.Step;
 import io.cucumber.plugin.event.StepArgument;
 import io.cucumber.plugin.event.TestCase;
 import io.cucumber.plugin.event.TestCaseFinished;
@@ -48,13 +50,13 @@
 import io.qameta.allure.model.TestResultContainer;
 
 import java.io.ByteArrayInputStream;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
@@ -78,17 +80,12 @@
 })
 public class AllureCucumber7Jvm implements ConcurrentEventListener {
 
+    private static final String COLON = ":";
+
     private final AllureLifecycle lifecycle;
 
-    private final ConcurrentHashMap<String, String> scenarioUuids = new ConcurrentHashMap<>();
     private final TestSourcesModelProxy testSources = new TestSourcesModelProxy();
 
-    private final ThreadLocal<Feature> currentFeature = new InheritableThreadLocal<>();
-    private final ThreadLocal<URI> currentFeatureFile = new InheritableThreadLocal<>();
-    private final ThreadLocal<TestCase> currentTestCase = new InheritableThreadLocal<>();
-    private final ThreadLocal<String> currentContainer = new InheritableThreadLocal<>();
-    private final ThreadLocal<Boolean> forbidTestCaseStatusChange = new InheritableThreadLocal<>();
-
     private final EventHandler<TestSourceRead> featureStartedHandler = this::handleFeatureStartedHandler;
     private final EventHandler<TestCaseStarted> caseStartedHandler = this::handleTestCaseStarted;
     private final EventHandler<TestCaseFinished> caseFinishedHandler = this::handleTestCaseFinished;
@@ -97,6 +94,8 @@ public class AllureCucumber7Jvm implements ConcurrentEventListener {
     private final EventHandler<WriteEvent> writeEventHandler = this::handleWriteEvent;
     private final EventHandler<EmbedEvent> embedEventHandler = this::handleEmbedEvent;
 
+    private final Map<UUID, String> hookStepContainerUuid = new ConcurrentHashMap<>();
+
     private static final String TXT_EXTENSION = ".txt";
     private static final String TEXT_PLAIN = "text/plain";
     private static final String CUCUMBER_WORKING_DIR = Paths.get("").toUri().getSchemeSpecificPart();
@@ -110,9 +109,6 @@ public AllureCucumber7Jvm(final AllureLifecycle lifecycle) {
         this.lifecycle = lifecycle;
     }
 
-    /*
-    Event Handlers
-     */
     @Override
     public void setEventPublisher(final EventPublisher publisher) {
         publisher.registerHandlerFor(TestSourceRead.class, featureStartedHandler);
@@ -132,20 +128,15 @@ private void handleFeatureStartedHandler(final TestSourceRead event) {
     }
 
     private void handleTestCaseStarted(final TestCaseStarted event) {
-        currentFeatureFile.set(event.getTestCase().getUri());
-        currentFeature.set(testSources.getFeature(currentFeatureFile.get()));
-        currentTestCase.set(event.getTestCase());
-        currentContainer.set(UUID.randomUUID().toString());
-        forbidTestCaseStatusChange.set(false);
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
 
-        final TestCase testCase = currentTestCase.get();
         final Deque<String> tags = new LinkedList<>(testCase.getTags());
-
-        final Feature feature = currentFeature.get();
         final LabelBuilder labelBuilder = new LabelBuilder(feature, testCase, tags);
 
         final String name = testCase.getName();
 
+
         // the same way full name is generated for
         // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
         // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
@@ -154,8 +145,11 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
                 testCase.getLocation().getLine()
         );
 
+        final String testCaseUuid = testCase.getId().toString();
+
         final TestResult result = new TestResult()
-                .setUuid(getTestCaseUuid(testCase))
+                .setUuid(testCaseUuid)
+                .setTestCaseId(getTestCaseId(testCase))
                 .setHistoryId(getHistoryId(testCase))
                 .setFullName(fullName)
                 .setName(name)
@@ -164,7 +158,7 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
 
         final Scenario scenarioDefinition =
                 testSources.getScenarioDefinition(
-                        currentFeatureFile.get(),
+                        testCase.getUri(),
                         testCase.getLocation().getLine()
                 );
 
@@ -183,75 +177,121 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
             result.setDescription(description);
         }
 
-        final TestResultContainer resultContainer = new TestResultContainer()
-                .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
-                .setUuid(getTestContainerUuid())
-                .setChildren(Collections.singletonList(getTestCaseUuid(testCase)));
-
         lifecycle.scheduleTestCase(result);
-        lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
-        lifecycle.startTestCase(getTestCaseUuid(testCase));
+        lifecycle.startTestCase(testCaseUuid);
     }
 
     private void handleTestCaseFinished(final TestCaseFinished event) {
+        final TestCase testCase = event.getTestCase();
+        final Feature feature = testSources.getFeature(testCase.getUri());
+        final String uuid = testCase.getId().toString();
+        final Result result = event.getResult();
+        final Status status = translateTestCaseStatus(result);
+        final StatusDetails statusDetails = getStatusDetails(result.getError())
+                .orElseGet(StatusDetails::new);
+
+        final TagParser tagParser = new TagParser(feature, testCase);
+        statusDetails
+                .setFlaky(tagParser.isFlaky())
+                .setMuted(tagParser.isMuted())
+                .setKnown(tagParser.isKnown());
+
+        lifecycle.updateTestCase(uuid, testResult -> testResult
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
 
-        final String uuid = getTestCaseUuid(event.getTestCase());
-        final Optional<StatusDetails> details = getStatusDetails(event.getResult().getError());
-        details.ifPresent(statusDetails -> lifecycle.updateTestCase(
-                uuid,
-                testResult -> testResult.setStatusDetails(statusDetails)
-        ));
         lifecycle.stopTestCase(uuid);
-        lifecycle.stopTestContainer(getTestContainerUuid());
         lifecycle.writeTestCase(uuid);
-        lifecycle.writeTestContainer(getTestContainerUuid());
     }
 
     private void handleTestStepStarted(final TestStepStarted event) {
-        if (event.getTestStep() instanceof PickleStepTestStep) {
-            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.getTestStep();
-            final String stepKeyword = Optional.ofNullable(
-                    testSources.getKeywordFromSource(currentFeatureFile.get(), pickleStep.getStep().getLine())
-            ).orElse("UNDEFINED");
-
-            final StepResult stepResult = new StepResult()
-                    .setName(String.format("%s %s", stepKeyword, pickleStep.getStep().getText()))
-                    .setStart(System.currentTimeMillis());
-
-            lifecycle.startStep(getTestCaseUuid(currentTestCase.get()), getStepUuid(pickleStep), stepResult);
+        final TestCase testCase = event.getTestCase();
+        if (event.getTestStep() instanceof HookTestStep) {
+            final HookTestStep hook = (HookTestStep) event.getTestStep();
 
-            final StepArgument stepArgument = pickleStep.getStep().getArgument();
-            if (stepArgument instanceof DataTableArgument) {
-                final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
-                createDataTableAttachment(dataTableArgument);
+            if (isFixtureHook(hook)) {
+                handleStartFixtureHook(testCase, hook);
+            } else {
+                handleStartStepHook(testCase, hook);
             }
-        } else if (event.getTestStep() instanceof HookTestStep) {
-            initHook((HookTestStep) event.getTestStep());
+        } else if (event.getTestStep() instanceof PickleStepTestStep) {
+            handleStartPickleStep(testCase, (PickleStepTestStep) event.getTestStep());
         }
     }
 
-    private void initHook(final HookTestStep hook) {
+    private void handleStartPickleStep(final TestCase testCase,
+                                       final PickleStepTestStep pickleStep) {
+        final String uuid = testCase.getId().toString();
+        final Step step = pickleStep.getStep();
 
-        final FixtureResult hookResult = new FixtureResult()
+        final StepResult stepResult = new StepResult()
+                .setName(step.getKeyword() + step.getText())
+                .setStart(System.currentTimeMillis());
+
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, pickleStep.getId().toString(), stepResult);
+
+        final StepArgument stepArgument = step.getArgument();
+        if (stepArgument instanceof DataTableArgument) {
+            final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
+            createDataTableAttachment(dataTableArgument);
+        }
+    }
+
+    private void handleStartStepHook(final TestCase testCase,
+                                     final HookTestStep hook) {
+        final String uuid = testCase.getId().toString();
+        final StepResult stepResult = new StepResult()
                 .setName(hook.getCodeLocation())
                 .setStart(System.currentTimeMillis());
 
+        lifecycle.setCurrentTestCase(uuid);
+        lifecycle.startStep(uuid, hook.getId().toString(), stepResult);
+    }
+
+    private void handleStartFixtureHook(final TestCase testCase,
+                                        final HookTestStep hook) {
+        final String uuid = testCase.getId().toString();
+
+        final UUID hookId = hook.getId();
+        final String containerUuid = hookStepContainerUuid
+                .computeIfAbsent(hookId, unused -> UUID.randomUUID().toString());
+
+        lifecycle.startTestContainer(new TestResultContainer()
+                .setUuid(containerUuid)
+                .setChildren(Collections.singletonList(uuid))
+        );
+
+        final FixtureResult hookResult = new FixtureResult()
+                .setName(hook.getCodeLocation());
+
+        final String fixtureUuid = hookId.toString();
         if (hook.getHookType() == HookType.BEFORE) {
-            lifecycle.startPrepareFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
+            lifecycle.startPrepareFixture(containerUuid, fixtureUuid, hookResult);
         } else {
-            lifecycle.startTearDownFixture(getTestContainerUuid(), getHookStepUuid(hook), hookResult);
+            lifecycle.startTearDownFixture(containerUuid, fixtureUuid, hookResult);
         }
-
     }
 
     private void handleTestStepFinished(final TestStepFinished event) {
         if (event.getTestStep() instanceof HookTestStep) {
-            handleHookStep(event);
-        } else {
-            handlePickleStep(event);
+            final HookTestStep hook = (HookTestStep) event.getTestStep();
+            if (isFixtureHook(hook)) {
+                handleStopHookStep(event.getResult(), hook);
+            } else {
+                handleStopStep(event.getTestCase(), event.getResult(), hook.getId());
+            }
+        } else if (event.getTestStep() instanceof PickleStepTestStep) {
+            final PickleStepTestStep pickleStep = (PickleStepTestStep) event.getTestStep();
+            handleStopStep(event.getTestCase(), event.getResult(), pickleStep.getId());
         }
     }
 
+    private static boolean isFixtureHook(final HookTestStep hook) {
+        return hook.getHookType() == HookType.BEFORE || hook.getHookType() == HookType.AFTER;
+    }
+
     private void handleWriteEvent(final WriteEvent event) {
         lifecycle.addAttachment(
                 "Text output",
@@ -265,33 +305,16 @@ private void handleEmbedEvent(final EmbedEvent event) {
         lifecycle.addAttachment(event.name, event.getMediaType(), null, new ByteArrayInputStream(event.getData()));
     }
 
-    /*
-    Utility Methods
-     */
-
-    private String getTestContainerUuid() {
-        return currentContainer.get();
-    }
-
-    private String getTestCaseUuid(final TestCase testCase) {
-        return scenarioUuids.computeIfAbsent(getHistoryId(testCase), it -> UUID.randomUUID().toString());
-    }
-
-    private String getStepUuid(final PickleStepTestStep step) {
-        return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-               + step.getStep().getText() + step.getStep().getLine();
-    }
-
-    private String getHookStepUuid(final HookTestStep step) {
-        return currentFeature.get().getName() + getTestCaseUuid(currentTestCase.get())
-               + step.getHookType().toString() + step.getCodeLocation();
-    }
-
     private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = getTestCaseUri(testCase) + ":" + testCase.getLocation().getLine();
+        final String testCaseLocation = getTestCaseUri(testCase) + COLON + testCase.getLocation().getLine();
         return md5(testCaseLocation);
     }
 
+    private String getTestCaseId(final TestCase testCase) {
+        final String testCaseId = getTestCaseUri(testCase) + COLON + testCase.getName();
+        return md5(testCaseId);
+    }
+
     private String getTestCaseUri(final TestCase testCase) {
         final String testCaseUri = testCase.getUri().getSchemeSpecificPart();
         if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
@@ -318,8 +341,9 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(
-            final Scenario scenario, final TestCase localCurrentTestCase
-    ) {
+            final Scenario scenario,
+            final TestCase localCurrentTestCase) {
+
         final Optional<Examples> maybeExample =
                 scenario.getExamples().stream()
                         .filter(example -> example.getTableBody().stream()
@@ -343,10 +367,21 @@ private List<Parameter> getExamplesAsParameters(
         }
 
         final TableRow row = maybeRow.get();
+        final int size = row.getCells().size();
+
+        final List<String> headerNames = examples.getTableHeader()
+                .map(TableRow::getCells)
+                .map(rows -> rows.stream()
+                        .map(TableCell::getValue)
+                        .collect(Collectors.toList())
+                )
+                .orElse(null);
 
-        return IntStream.range(0, examples.getTableHeader().get().getCells().size())
+        return IntStream.range(0, size)
                 .mapToObj(index -> {
-                    final String name = examples.getTableHeader().get().getCells().get(index).getValue();
+                    final String name = Objects.nonNull(headerNames)
+                            ? headerNames.get(index)
+                            : "arg" + index;
                     final String value = row.getCells().get(index).getValue();
                     return createParameter(name, value);
                 })
@@ -375,83 +410,56 @@ private void createDataTableAttachment(final DataTableArgument dataTableArgument
                 new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
     }
 
-    private void handleHookStep(final TestStepFinished event) {
-        final HookTestStep hookStep = (HookTestStep) event.getTestStep();
-        final String uuid = getHookStepUuid(hookStep);
-        final FixtureResult fixtureResult = new FixtureResult().setStatus(translateTestCaseStatus(event.getResult()));
-
-        if (!Status.PASSED.equals(fixtureResult.getStatus())) {
-            final TestResult testResult = new TestResult().setStatus(translateTestCaseStatus(event.getResult()));
-            final StatusDetails statusDetails = getStatusDetails(event.getResult().getError())
-                    .orElseGet(StatusDetails::new);
-
-            final String errorMessage = event.getResult().getError() == null
-                    ? hookStep.getHookType().name() + " is failed."
-                    : hookStep.getHookType().name()
-                      + " is failed: "
-                      + event.getResult().getError().getLocalizedMessage();
-            statusDetails.setMessage(errorMessage);
-
-            if (hookStep.getHookType() == HookType.BEFORE) {
-                final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
-                statusDetails
-                        .setFlaky(tagParser.isFlaky())
-                        .setMuted(tagParser.isMuted())
-                        .setKnown(tagParser.isKnown());
-                testResult.setStatus(Status.SKIPPED);
-                updateTestCaseStatus(testResult.getStatus());
-                forbidTestCaseStatusChange.set(true);
-            } else {
-                testResult.setStatus(Status.BROKEN);
-                updateTestCaseStatus(testResult.getStatus());
-            }
-            fixtureResult.setStatusDetails(statusDetails);
+    private void handleStopHookStep(final Result eventResult,
+                                    final HookTestStep hook) {
+        final String containerUuid = hookStepContainerUuid.get(hook.getId());
+        if (Objects.isNull(containerUuid)) {
+            // maybe throw an exception?
+            return;
         }
 
-        lifecycle.updateFixture(uuid, result -> result.setStatus(fixtureResult.getStatus())
-                .setStatusDetails(fixtureResult.getStatusDetails()));
+        final String uuid = hook.getId().toString();
+
+        final Status status = translateTestCaseStatus(eventResult);
+        final StatusDetails statusDetails = getStatusDetails(eventResult.getError())
+                .orElseGet(StatusDetails::new);
+
+        lifecycle.updateFixture(uuid, result -> result
+                .setStatus(status)
+                .setStatusDetails(statusDetails)
+        );
         lifecycle.stopFixture(uuid);
-    }
 
-    private void handlePickleStep(final TestStepFinished event) {
+        lifecycle.stopTestContainer(containerUuid);
+        lifecycle.writeTestContainer(containerUuid);
+    }
 
-        final Status stepStatus = translateTestCaseStatus(event.getResult());
-        final StatusDetails statusDetails;
-        if (event.getResult().getStatus() == io.cucumber.plugin.event.Status.UNDEFINED) {
-            updateTestCaseStatus(Status.PASSED);
+    private void handleStopStep(final TestCase testCase,
+                                final Result eventResult,
+                                final UUID stepId) {
+        final Feature feature = testSources.getFeature(testCase.getUri());
 
-            statusDetails =
-                    getStatusDetails(new IllegalStateException("Undefined Step. Please add step definition"))
-                            .orElse(new StatusDetails());
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase.get()), scenarioResult ->
-                    scenarioResult
-                            .setStatusDetails(statusDetails));
-        } else {
-            statusDetails =
-                    getStatusDetails(event.getResult().getError())
-                            .orElse(new StatusDetails());
-            updateTestCaseStatus(stepStatus);
-        }
+        final Status stepStatus = translateTestCaseStatus(eventResult);
 
-        if (!Status.PASSED.equals(stepStatus) && stepStatus != null) {
-            forbidTestCaseStatusChange.set(true);
-        }
+        final StatusDetails statusDetails
+                = eventResult.getStatus() == io.cucumber.plugin.event.Status.UNDEFINED
+                ? new StatusDetails().setMessage("Undefined Step. Please add step definition")
+                : getStatusDetails(eventResult.getError())
+                        .orElse(new StatusDetails());
 
-        final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
+        final TagParser tagParser = new TagParser(feature, testCase);
         statusDetails
                 .setFlaky(tagParser.isFlaky())
                 .setMuted(tagParser.isMuted())
                 .setKnown(tagParser.isKnown());
 
-        lifecycle.updateStep(getStepUuid((PickleStepTestStep) event.getTestStep()),
-                stepResult -> stepResult.setStatus(stepStatus).setStatusDetails(statusDetails));
-        lifecycle.stopStep(getStepUuid((PickleStepTestStep) event.getTestStep()));
-    }
-
-    private void updateTestCaseStatus(final Status status) {
-        if (!forbidTestCaseStatusChange.get()) {
-            lifecycle.updateTestCase(getTestCaseUuid(currentTestCase.get()),
-                    result -> result.setStatus(status));
-        }
+        final String stepUuid = stepId.toString();
+        lifecycle.updateStep(
+                stepUuid,
+                stepResult -> stepResult
+                        .setStatus(stepStatus)
+                        .setStatusDetails(statusDetails)
+        );
+        lifecycle.stopStep(stepUuid);
     }
 }
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
index ff644c18b..45da3d019 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
@@ -37,6 +37,7 @@
 import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.RunUtils;
@@ -59,6 +60,7 @@
 import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.SUITE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.TEST_CLASS_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.md5;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
@@ -87,8 +89,10 @@ void shouldSetStatus() {
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.PASSED);
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
     }
 
     @AllureFeatures.FailedTests
@@ -282,10 +286,10 @@ void shouldAddBackgroundSteps() {
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
                 .containsExactly(
-                        "Given  cat is sad",
-                        "And  cat is murmur",
-                        "When  Pet the cat",
-                        "Then  Cat is happy"
+                        "Given cat is sad",
+                        "And cat is murmur",
+                        "When Pet the cat",
+                        "Then Cat is happy"
                 );
     }
 
@@ -447,15 +451,17 @@ void shouldProcessUndefinedSteps() {
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getStatus)
-                .containsExactlyInAnyOrder(Status.SKIPPED);
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Step is not defined", null)
+                );
 
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("When  step is undefined", null),
-                        tuple("Then  b is 10", Status.SKIPPED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is undefined", null),
+                        tuple("Then b is 10", Status.SKIPPED)
                 );
     }
 
@@ -473,9 +479,9 @@ void shouldProcessPendingExceptionsInSteps() {
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("When  step is yet to be implemented", Status.SKIPPED),
-                        tuple("Then  b is 10", Status.SKIPPED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("When step is yet to be implemented", Status.SKIPPED),
+                        tuple("Then b is 10", Status.SKIPPED)
                 );
     }
 
@@ -494,10 +500,10 @@ void shouldSupportDryRunForSimpleFeatures() {
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 5", Status.PASSED),
-                        tuple("And  b is 10", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 5", Status.PASSED),
+                        tuple("And b is 10", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
     }
 
@@ -508,32 +514,29 @@ void shouldSupportDryRunForHooks() {
         final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .startsWith(
-                        tuple("Simple scenario with Before and After hooks", Status.PASSED)
-                );
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
 
-        assertThat(results.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(results.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.afterHook()", Status.PASSED)
                 );
 
-        assertThat(testResults.get(0).getSteps())
+        assertThat(tr1.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
     }
 
@@ -568,6 +571,42 @@ void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation
                 .isNotEqualTo(results2.getTestResults().get(0).getHistoryId());
     }
 
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForScenarios() {
+        final AllureResults results = runFeature("features/simple.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Add a to b",
+                                md5("src/test/resources/features/simple.feature:Add a to b")
+                        )
+                );
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldSetTestCaseIdForExamples() {
+        final AllureResults results = runFeature("features/examples.feature", "--threads", "2");
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getTestCaseId)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        ),
+                        tuple(
+                                "Scenario with Positive Examples",
+                                md5("src/test/resources/features/examples.feature:Scenario with Positive Examples")
+                        )
+                );
+    }
+
     @AllureFeatures.Parallel
     @Test
     void shouldProcessScenariosInParallelMode() {
@@ -579,30 +618,33 @@ void shouldProcessScenariosInParallelMode() {
                 .hasSize(3);
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 1",
-                                "And  b is 3",
-                                "When  I add a to b",
-                                "Then  result is 4")
+                        "Given a is 1",
+                        "And b is 3",
+                        "When I add a to b",
+                        "Then result is 4"
                 );
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 2",
-                                "And  b is 4",
-                                "When  I add a to b",
-                                "Then  result is 6")
+                        "Given a is 2",
+                        "And b is 4",
+                        "When I add a to b",
+                        "Then result is 6"
                 );
 
         assertThat(testResults)
-                .extracting(testResult -> testResult.getSteps().stream().map(StepResult::getName).collect(Collectors.toList()))
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
                 .containsSubsequence(
-                        Arrays.asList("Given  a is 7",
-                                "And  b is 8",
-                                "When  I add a to b",
-                                "Then  result is 15")
+                        "Given a is 7",
+                        "And b is 8",
+                        "When I add a to b",
+                        "Then result is 15"
                 );
     }
 
@@ -613,64 +655,61 @@ void shouldDisplayHooksAsStages() {
         final AllureResults results = runFeature("features/hooks.feature", "-t",
                 "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
 
-        final List<TestResult> testResults = results.getTestResults();
-        assertThat(testResults)
-                .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactlyInAnyOrder(
-                        tuple("Simple scenario with Before and After hooks", Status.PASSED),
-                        tuple("Simple scenario with Before hook with Exception", Status.SKIPPED),
-                        tuple("Simple scenario with After hook with Exception", Status.BROKEN)
-                );
+        final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
+        final TestResult tr2 = results.getTestResultByName("Simple scenario with Before hook with Exception");
+        final TestResult tr3 = results.getTestResultByName("Simple scenario with After hook with Exception");
 
-        assertThat(testResults.get(0).getSteps())
+        assertThat(tr1.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
 
-
-        assertThat(results.getTestResultContainers().get(0).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.beforeHook()", Status.PASSED)
                 );
 
-        assertThat(results.getTestResultContainers().get(0).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr1))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.afterHook()", Status.PASSED)
                 );
 
-        assertThat(testResults.get(1).getSteps())
+        assertThat(tr2.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.SKIPPED),
-                        tuple("And  b is 8", Status.SKIPPED),
-                        tuple("When  I add a to b", Status.SKIPPED),
-                        tuple("Then  result is 15", Status.SKIPPED)
+                        tuple("Given a is 7", Status.SKIPPED),
+                        tuple("And b is 8", Status.SKIPPED),
+                        tuple("When I add a to b", Status.SKIPPED),
+                        tuple("Then result is 15", Status.SKIPPED)
                 );
 
 
-        assertThat(results.getTestResultContainers().get(1).getBefores())
+        assertThat(results.getTestResultContainersForTestResult(tr2))
+                .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.beforeHookWithException()", Status.FAILED)
                 );
 
-
-        assertThat(testResults.get(2).getSteps())
+        assertThat(tr3.getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Given  a is 7", Status.PASSED),
-                        tuple("And  b is 8", Status.PASSED),
-                        tuple("When  I add a to b", Status.PASSED),
-                        tuple("Then  result is 15", Status.PASSED)
+                        tuple("Given a is 7", Status.PASSED),
+                        tuple("And b is 8", Status.PASSED),
+                        tuple("When I add a to b", Status.PASSED),
+                        tuple("Then result is 15", Status.PASSED)
                 );
 
-        assertThat(results.getTestResultContainers().get(2).getAfters())
+        assertThat(results.getTestResultContainersForTestResult(tr3))
+                .flatExtracting(TestResultContainer::getAfters)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.afterHookWithException()", Status.FAILED)
@@ -687,14 +726,14 @@ void shouldHandleAmbigiousStepsExceptions() {
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Simple scenario with ambigious steps", Status.SKIPPED)
+                        tuple("Simple scenario with ambigious steps", null)
                 );
 
         assertThat(testResults.get(0).getSteps())
                 .extracting(StepResult::getName, StepResult::getStatus)
                 .containsExactly(
-                        tuple("When  ambigious step present", null),
-                        tuple("Then  something bad should happen", Status.SKIPPED)
+                        tuple("When ambigious step present", null),
+                        tuple("Then something bad should happen", Status.SKIPPED)
                 );
     }
 
@@ -714,6 +753,36 @@ void shouldSupportProvidedLabels() {
                 );
     }
 
+    @Test
+    void shouldSupportRuntimeApiInStepsWhenHooksAreUsed() {
+        final AllureResults results = runFeature("features/runtimeapi.feature");
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "When step 1",
+                        "When step 2",
+                        "And step 3",
+                        "Then step 4",
+                        "And step 5"
+                );
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName, Link::getUrl)
+                .containsExactly(
+                        tuple("step1", "https://example.org/step1"),
+                        tuple("step2", "https://example.org/step2"),
+                        tuple("step3", "https://example.org/step3"),
+                        tuple("step4", "https://example.org/step4"),
+                        tuple("step5", "https://example.org/step5")
+                );
+    }
+
     @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
     @Step
     private AllureResults runFeature(final String featureResource,
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java
new file mode 100644
index 000000000..0f66fa87c
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java
@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.cucumber7jvm.samples;
+
+import io.cucumber.java.Before;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import io.cucumber.java.en.And;
+import io.qameta.allure.Allure;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class RuntimeApiSteps {
+
+    @Before("@beforeScenario")
+    public void beforeScenario(){
+        // nothing
+    }
+
+    @Before("@beforeFeature")
+    public void beforeFeature(){
+        // nothing
+    }
+
+    @When("^step 1$")
+    public void step1() {
+        Allure.step("step1 nested");
+        Allure.link("step1", "https://example.org/step1");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step1: " + uuid);
+        });
+    }
+
+    @When("^step 2$")
+    public void step2() {
+        Allure.step("step2 nested");
+        Allure.link("step2", "https://example.org/step2");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step2: " + uuid);
+        });
+    }
+
+    @And("^step 3$")
+    public void step3() {
+        Allure.step("step3 nested");
+        Allure.link("step3", "https://example.org/step3");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step3: " + uuid);
+        });
+    }
+
+    @Then("^step 4$")
+    public void step4() {
+        Allure.step("step4 nested");
+        Allure.link("step4", "https://example.org/step4");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step4: " + uuid);
+        });
+    }
+
+    @And("^step 5$")
+    public void step5() {
+        Allure.step("step5 nested");
+        Allure.link("step5", "https://example.org/step5");
+        Allure.getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
+            System.out.println("step5: " + uuid);
+        });
+    }
+}
diff --git a/allure-cucumber7-jvm/src/test/resources/features/runtimeapi.feature b/allure-cucumber7-jvm/src/test/resources/features/runtimeapi.feature
new file mode 100644
index 000000000..ec43eccb7
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/runtimeapi.feature
@@ -0,0 +1,10 @@
+@beforeFeature
+Feature: Should support runtime API in all steps
+
+  @beforeScenario
+  Scenario: Scenario with Runtime API usage
+    When step 1
+    When step 2
+    And step 3
+    Then step 4
+    And step 5
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
index 621b213ae..a836a04d7 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
@@ -20,6 +20,9 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -32,4 +35,20 @@ public interface AllureResults {
 
     Map<String, byte[]> getAttachments();
 
+    default TestResult getTestResultByName(final String name) {
+        return getTestResults().stream()
+                .filter(tr -> Objects.equals(name, tr.getName()))
+                .findFirst()
+                .orElseThrow(() -> new NoSuchElementException(
+                        "test result with name " + name + " is not found"
+                ));
+    }
+
+    default List<TestResultContainer> getTestResultContainersForTestResult(final TestResult testResult) {
+        return getTestResultContainers().stream()
+                .filter(c -> Objects.nonNull(c.getChildren()))
+                .filter(c -> c.getChildren().contains(testResult.getUuid()))
+                .collect(Collectors.toList());
+    }
+
 }
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
index ae099c33f..e0e65881b 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
@@ -15,16 +15,25 @@
  */
 package io.qameta.allure.test;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import io.qameta.allure.Allure;
 import io.qameta.allure.AllureConstants;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.util.Locale;
 
-import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_DEFAULT;
 import static com.fasterxml.jackson.databind.MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME;
 
 /**
@@ -35,8 +44,13 @@ public final class AllureTestCommonsUtils {
     private static final ObjectWriter WRITER = JsonMapper
             .builder()
             .configure(USE_WRAPPER_NAME_AS_PROPERTY_NAME, true)
-            .serializationInclusion(NON_NULL)
+            .serializationInclusion(NON_DEFAULT)
             .build()
+            .registerModule(new SimpleModule()
+                    .addSerializer(Status.class, new StatusSerializer())
+                    .addSerializer(Stage.class, new StageSerializer())
+                    .addSerializer(Parameter.Mode.class, new ParameterModeSerializer())
+            )
             .writerWithDefaultPrettyPrinter();
 
     private AllureTestCommonsUtils() {
@@ -77,4 +91,52 @@ public static void attach(final AllureResults allureResults) {
         );
     }
 
+    /**
+     * Parameter mode serializer.
+     */
+    private static class ParameterModeSerializer extends StdSerializer<Parameter.Mode> {
+        protected ParameterModeSerializer() {
+            super(Parameter.Mode.class);
+        }
+
+        @Override
+        public void serialize(final Parameter.Mode value,
+                              final JsonGenerator gen,
+                              final SerializerProvider provider) throws IOException {
+            gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
+        }
+    }
+
+    /**
+     * Stage serializer.
+     */
+    private static class StageSerializer extends StdSerializer<Stage> {
+        protected StageSerializer() {
+            super(Stage.class);
+        }
+
+        @Override
+        public void serialize(final Stage value,
+                              final JsonGenerator gen,
+                              final SerializerProvider provider) throws IOException {
+            gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
+        }
+    }
+
+    /**
+     * Status serializer.
+     */
+    private static class StatusSerializer extends StdSerializer<Status> {
+        protected StatusSerializer() {
+            super(Status.class);
+        }
+
+        @Override
+        public void serialize(final Status value,
+                              final JsonGenerator gen,
+                              final SerializerProvider provider) throws IOException {
+            gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
+        }
+    }
+
 }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
index 02a74faa8..0a06dd32b 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
@@ -35,6 +35,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -70,6 +71,23 @@ public void setUp() {
         lifecycle = new AllureLifecycle(writer);
     }
 
+    @Test
+    void shouldReturnCurrentTestCaseId() {
+        final String uuid = randomId();
+        final String name = randomName();
+        final TestResult result = new TestResult().setUuid(uuid).setName(name);
+        lifecycle.scheduleTestCase(result);
+        lifecycle.startTestCase(uuid);
+
+        final String stepUuid = randomId();
+        lifecycle.startStep(uuid, stepUuid, new StepResult().setName(randomName()));
+
+        final Optional<String> currentTestCase = lifecycle.getCurrentTestCase();
+        assertThat(currentTestCase)
+                .isPresent()
+                .hasValue(uuid);
+    }
+
     @Test
     void shouldCreateTest() {
         final String uuid = randomId();

From e99e265fdef294ec60d905bb43db5c69edfb3dab Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 18 Mar 2024 12:28:14 +0000
Subject: [PATCH 077/233] release 2.26.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 3f8ca07ec..da7d49fc5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.26-SNAPSHOT
+version=2.26.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 1f490e2108af08575cf7dca5a3adf44f80780acb Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 18 Mar 2024 12:28:15 +0000
Subject: [PATCH 078/233] set next development version 2.27

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index da7d49fc5..e297ce891 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.26.0
+version=2.27-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 5591a12728041e1d779171d0bb2c466c28d27740 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 18 Mar 2024 16:38:38 +0000
Subject: [PATCH 079/233] feat(junit-platform): add annotations from outer
 classes (fixes #391, via #1019)

---
 .../junitplatform/AllureJunitPlatform.java    | 11 +++-
 .../AllureJunitPlatformTest.java              | 51 +++++++++++++++
 .../junitplatform/features/NestedTests.java   | 62 +++++++++++++++++++
 3 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java

diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index e48ee7713..5bd8211d9 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -553,7 +553,16 @@ private void startTestCase(final TestIdentifier testIdentifier) {
 
         result.getLabels().add(getJUnitPlatformUniqueId(testIdentifier));
 
-        testClass.map(AnnotationUtils::getLabels).ifPresent(result.getLabels()::addAll);
+        // add annotations from outer classes (support for @Nested tests in JUnit 5)
+        testClass.ifPresent(clazz -> {
+            Class<?> clazz1 = clazz;
+            do {
+                final Set<Label> labels = AnnotationUtils.getLabels(clazz1);
+                result.getLabels().addAll(labels);
+                clazz1 = clazz1.getDeclaringClass();
+            } while (Objects.nonNull(clazz1));
+        });
+
         testMethod.map(AnnotationUtils::getLabels).ifPresent(result.getLabels()::addAll);
 
         testClass.map(AnnotationUtils::getLinks).ifPresent(result.getLinks()::addAll);
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
index ceccd76b3..9e9c1b82a 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -28,6 +28,7 @@
 import io.qameta.allure.junitplatform.features.FailedTests;
 import io.qameta.allure.junitplatform.features.JupiterUniqueIdTest;
 import io.qameta.allure.junitplatform.features.MarkerAnnotationSupport;
+import io.qameta.allure.junitplatform.features.NestedTests;
 import io.qameta.allure.junitplatform.features.OneTest;
 import io.qameta.allure.junitplatform.features.OwnerTest;
 import io.qameta.allure.junitplatform.features.ParallelTests;
@@ -873,4 +874,54 @@ void shouldSetDifferentUuidsInDifferentRuns() {
 
     }
 
+    @Test
+    void shouldSupportNestedClasses() {
+        final AllureResults allureResults = runClasses(NestedTests.class);
+
+        assertThat(allureResults.getTestResults())
+                .extracting(TestResult::getName)
+                .containsExactlyInAnyOrder(
+                        "parentTest()",
+                        "feature1Test()",
+                        "feature2Test()",
+                        "story1Test()"
+                );
+
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "parentTest()")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "Parent epic"),
+                        tuple("feature", "Parent feature")
+                );
+
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "feature1Test()")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "Parent epic"),
+                        tuple("feature", "Feature 1")
+                );
+
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "feature2Test()")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "Parent epic"),
+                        tuple("feature", "Feature 2")
+                );
+
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "story1Test()")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "Parent epic"),
+                        tuple("feature", "Feature 2"),
+                        tuple("story", "Story 1")
+                );
+    }
 }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java
new file mode 100644
index 000000000..55069931f
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java
@@ -0,0 +1,62 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform.features;
+
+import io.qameta.allure.Epic;
+import io.qameta.allure.Feature;
+import io.qameta.allure.Story;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@Epic("Parent epic")
+public class NestedTests {
+
+    @Feature("Parent feature")
+    @Test
+    void parentTest() {
+    }
+
+    @Feature("Feature 1")
+    @Nested
+    class Feature1 {
+
+        @Test
+        void feature1Test() {
+        }
+    }
+
+    @Feature("Feature 2")
+    @Nested
+    class Feature2 {
+
+        @Test
+        void feature2Test() {
+        }
+
+        @Story("Story 1")
+        @Nested
+        class Story1 {
+
+            @Test
+            void story1Test() {
+            }
+
+        }
+    }
+}

From ed837de9008b36a503ff04995694db433c36bb3a Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 18 Mar 2024 16:38:55 +0000
Subject: [PATCH 080/233] fix(allure-karate): add history id (fixes #938, via
 #1018)

---
 .../io/qameta/allure/karate/AllureKarate.java | 39 ++++++++++++-------
 .../allure/karate/AllureKarateTest.java       | 32 ++++++++++-----
 2 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
index a300f0ecd..310d6c75d 100644
--- a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
+++ b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
@@ -57,6 +57,7 @@
 import static io.qameta.allure.util.ResultsUtils.createLabel;
 import static io.qameta.allure.util.ResultsUtils.createLink;
 import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.md5;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -89,19 +90,22 @@ public AllureKarate(final AllureLifecycle lifecycle) {
     public boolean beforeScenario(final ScenarioRuntime sr) {
         final Feature feature = sr.featureRuntime.result.getFeature();
         final String featureName = feature.getName();
-        final String featureNameQualified = feature.getPackageQualifiedName();
+        final String featureNameQualified = feature.getResource().getRelativePath();
         final Scenario scenario = sr.scenario;
-        final String scenarioName = scenario.getName();
 
         final String uuid = UUID.randomUUID().toString();
         sr.magicVariables.put(ALLURE_UUID, uuid);
 
+        final String nameOrLine = getName(scenario, String.valueOf(scenario.getLine()));
+        final String testCaseId = md5(String.format("%s:%s", featureNameQualified, nameOrLine));
+        final String fullName = String.format("%s:%d", featureNameQualified, scenario.getLine());
         final TestResult result = new TestResult()
                 .setUuid(uuid)
-                .setFullName(String.format("%s | %s", featureNameQualified, scenarioName))
-                .setName(scenarioName)
+                .setFullName(fullName)
+                .setName(getName(scenario, fullName))
                 .setDescription(scenario.getDescription())
-                .setTestCaseId(scenario.getUniqueId())
+                .setTestCaseId(testCaseId)
+                .setHistoryId(md5(scenario.getUniqueId()))
                 .setStage(Stage.RUNNING);
 
         final List<String> labels = sr.tags.getTags();
@@ -119,6 +123,15 @@ public boolean beforeScenario(final ScenarioRuntime sr) {
         return true;
     }
 
+    private static String getName(final Scenario scenario, final String defaultValue) {
+        if (Objects.isNull(scenario.getName())) {
+            return defaultValue;
+        }
+        final boolean blank = scenario.getName().chars()
+                .allMatch(Character::isWhitespace);
+        return blank ? defaultValue : scenario.getName().trim();
+    }
+
     @Override
     public void afterScenario(final ScenarioRuntime sr) {
         final String uuid = (String) sr.magicVariables.get(ALLURE_UUID);
@@ -131,9 +144,9 @@ public void afterScenario(final ScenarioRuntime sr) {
         final Status status = !sr.isFailed()
                 ? Status.PASSED
                 : maybeResult
-                .map(ScenarioResult::getError)
-                .flatMap(ResultsUtils::getStatus)
-                .orElse(null);
+                        .map(ScenarioResult::getError)
+                        .flatMap(ResultsUtils::getStatus)
+                        .orElse(null);
 
         final StatusDetails statusDetails = maybeResult
                 .map(ScenarioResult::getError)
@@ -193,9 +206,9 @@ public void afterStep(final StepResult result,
         final Status status = !stepResult.isFailed()
                 ? Status.PASSED
                 : Optional.of(stepResult)
-                .map(Result::getError)
-                .flatMap(ResultsUtils::getStatus)
-                .orElse(null);
+                        .map(Result::getError)
+                        .flatMap(ResultsUtils::getStatus)
+                        .orElse(null);
 
         final StatusDetails statusDetails = Optional.of(stepResult)
                 .map(Result::getError)
@@ -209,8 +222,8 @@ public void afterStep(final StepResult result,
         lifecycle.stopStep(uuid);
 
         if (stepResult.isFailed()
-                && sr.engine.getConfig().getDriverOptions() != null
-                && (Boolean) sr.engine.getConfig().getDriverOptions().get("screenshotOnFailure")
+            && sr.engine.getConfig().getDriverOptions() != null
+            && (Boolean) sr.engine.getConfig().getDriverOptions().get("screenshotOnFailure")
         ) {
             addToStepsAndTcUuids(uuid, lifecycle.getCurrentTestCase().get());
             addToStepAndUuids(uuid, step);
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
index 21fba0ecf..a1cf77b39 100644
--- a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
@@ -28,6 +28,7 @@
 
 import static io.qameta.allure.model.Status.BROKEN;
 import static io.qameta.allure.model.Status.PASSED;
+import static io.qameta.allure.util.ResultsUtils.md5;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 
@@ -46,11 +47,11 @@ void shouldCreateNameAndFullName() {
                 .containsExactlyInAnyOrder(
                         tuple(
                                 "Some api* request # comment 1",
-                                "testdata.description-and-name | Some api* request # comment 1"
+                                "testdata/description-and-name.feature:3"
                         ),
                         tuple(
-                                "",
-                                "testdata.description-and-name | "
+                                "testdata/description-and-name.feature:8",
+                                "testdata/description-and-name.feature:8"
                         )
                 );
     }
@@ -135,8 +136,8 @@ void shouldCreateTestCaseIdAndName() {
         assertThat(results.getTestResults())
                 .extracting(TestResult::getTestCaseId, TestResult::getTestCaseName)
                 .containsExactlyInAnyOrder(
-                        tuple("testdata.description-and-name_1", null),
-                        tuple("testdata.description-and-name_2", null)
+                        tuple(md5("testdata/description-and-name.feature:Some api* request # comment 1"), null),
+                        tuple(md5("testdata/description-and-name.feature:8"), null)
                 );
     }
 
@@ -147,9 +148,9 @@ void shouldCreateTestCaseIdAndNamesOfParametrizedTest() {
         assertThat(results.getTestResults())
                 .extracting(TestResult::getName, TestResult::getTestCaseId)
                 .containsExactlyInAnyOrder(
-                        tuple("/login should return 200", "testdata.parametrized-test_1_1"),
-                        tuple("/user should return 301", "testdata.parametrized-test_1_2"),
-                        tuple("/pages should return 404", "testdata.parametrized-test_1_3")
+                        tuple("/login should return 200", md5("testdata/parametrized-test.feature:/login should return 200")),
+                        tuple("/user should return 301", md5("testdata/parametrized-test.feature:/user should return 301")),
+                        tuple("/pages should return 404", md5("testdata/parametrized-test.feature:/pages should return 404"))
                 );
     }
 
@@ -164,7 +165,20 @@ void shouldCreateParamsForParametrizedTest() {
                 .containsExactlyInAnyOrder(
                         tuple("path", "login"),
                         tuple("status", "200")
-        );
+                );
+    }
+
+    @Test
+    void shouldCreateHistoryIdAndNamesOfParametrizedTest() {
+        final AllureResults results = runApi("classpath:testdata/parametrized-test.feature");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getHistoryId)
+                .containsExactlyInAnyOrder(
+                        tuple("/login should return 200", md5("testdata.parametrized-test_1_1")),
+                        tuple("/user should return 301", md5("testdata.parametrized-test_1_2")),
+                        tuple("/pages should return 404", md5("testdata.parametrized-test_1_3"))
+                );
     }
 
     @Test

From 6ff650ceaea205a825494f71d9704d2f1ee799ec Mon Sep 17 00:00:00 2001
From: Anton Filichkin <41286257+antonfilichkin@users.noreply.github.com>
Date: Fri, 22 Mar 2024 11:53:55 +0200
Subject: [PATCH 081/233] feat(rest-assured): add support for headers blacklist
 (via #1007)

---
 .../allure/restassured/AllureRestAssured.java | 20 ++++--
 .../restassured/AllureRestAssuredTest.java    | 64 ++++++++++++++++---
 2 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
index 49b4c203b..9e166c309 100644
--- a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
+++ b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
@@ -28,8 +28,11 @@
 import io.restassured.specification.FilterableResponseSpecification;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
+import java.util.TreeSet;
 
 import static io.qameta.allure.attachment.http.HttpRequestAttachment.Builder.create;
 import static io.qameta.allure.attachment.http.HttpResponseAttachment.Builder.create;
@@ -40,6 +43,8 @@
  */
 public class AllureRestAssured implements OrderedFilter {
 
+    private static final String HIDDEN_PLACEHOLDER = "[ BLACKLISTED ]";
+
     private String requestTemplatePath = "http-request.ftl";
     private String responseTemplatePath = "http-response.ftl";
     private String requestAttachmentName = "Request";
@@ -89,10 +94,14 @@ public Response filter(final FilterableRequestSpecification requestSpec,
                            final FilterContext filterContext) {
         final Prettifier prettifier = new Prettifier();
         final String url = requestSpec.getURI();
+
+        final Set<String> hiddenHeaders = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+        hiddenHeaders.addAll(Objects.requireNonNull(requestSpec.getConfig().getLogConfig().blacklistedHeaders()));
+
         final HttpRequestAttachment.Builder requestAttachmentBuilder = create(requestAttachmentName, url)
                 .setMethod(requestSpec.getMethod())
-                .setHeaders(toMapConverter(requestSpec.getHeaders()))
-                .setCookies(toMapConverter(requestSpec.getCookies()));
+                .setHeaders(toMapConverter(requestSpec.getHeaders(), hiddenHeaders))
+                .setCookies(toMapConverter(requestSpec.getCookies(), new HashSet<>()));
 
         if (Objects.nonNull(requestSpec.getBody())) {
             requestAttachmentBuilder.setBody(prettifier.getPrettifiedBodyIfPossible(requestSpec));
@@ -116,7 +125,7 @@ public Response filter(final FilterableRequestSpecification requestSpec,
 
         final HttpResponseAttachment responseAttachment = create(attachmentName)
                 .setResponseCode(response.getStatusCode())
-                .setHeaders(toMapConverter(response.getHeaders()))
+                .setHeaders(toMapConverter(response.getHeaders(), hiddenHeaders))
                 .setBody(prettifier.getPrettifiedBodyIfPossible(response, response.getBody()))
                 .build();
 
@@ -128,9 +137,10 @@ public Response filter(final FilterableRequestSpecification requestSpec,
         return response;
     }
 
-    private static Map<String, String> toMapConverter(final Iterable<? extends NameAndValue> items) {
+    private static Map<String, String> toMapConverter(final Iterable<? extends NameAndValue> items,
+                                                      final Set<String> toHide) {
         final Map<String, String> result = new HashMap<>();
-        items.forEach(h -> result.put(h.getName(), h.getValue()));
+        items.forEach(h -> result.put(h.getName(), toHide.contains(h.getName()) ? HIDDEN_PLACEHOLDER : h.getValue()));
         return result;
     }
 
diff --git a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
index 1a58504c9..61e2b4e85 100644
--- a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
+++ b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
@@ -24,7 +24,11 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResults;
 import io.restassured.RestAssured;
+import io.restassured.config.LogConfig;
+import io.restassured.config.RestAssuredConfig;
 import io.restassured.http.ContentType;
+import io.restassured.specification.RequestSpecification;
+import java.nio.charset.StandardCharsets;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -32,9 +36,9 @@
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -55,10 +59,27 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
     }
 }
 
+class HiddenHeadersArgumentProvider implements ArgumentsProvider {
+    @Override
+    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+
+        final String hiddenHeader = "Authorization";
+        final String header = "Accept";
+        final String headerValue = "value";
+
+        final Map<String, String> headers = Map.of(hiddenHeader, headerValue, header, headerValue);
+        final List<String> expectedHeaders = List.of(hiddenHeader + ": [ BLACKLISTED ]", header + ": " + headerValue);
+
+        return Stream.of(
+                arguments(headers, hiddenHeader, expectedHeaders, new AllureRestAssured()),
+                arguments(headers, hiddenHeader.toUpperCase(), expectedHeaders, new AllureRestAssured())
+        );
+    }
+}
+
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("unchecked")
 class AllureRestAssuredTest {
 
     @ParameterizedTest
@@ -72,7 +93,7 @@ void shouldCreateAttachment(final List<String> attachmentNames, final AllureRest
                 .map(TestResult::getAttachments)
                 .flatMap(Collection::stream)
                 .map(Attachment::getName))
-                .isEqualTo(attachmentNames);
+                .containsExactlyElementsOf(attachmentNames);
     }
 
     @Test
@@ -122,21 +143,46 @@ void shouldCatchAttachmentBody(final List<String> attachmentNames, final AllureR
                 .collect(Collectors.toList());
 
         assertThat(actualAttachments)
-                .flatExtracting(Attachment::getName)
-                .isEqualTo(attachmentNames)
+                .map(Attachment::getName)
+                .containsExactlyElementsOf(attachmentNames)
                 .doesNotContainNull();
 
         assertThat(actualAttachments)
-                .flatExtracting(Attachment::getSource)
-                .containsExactlyInAnyOrderElementsOf(new ArrayList<>(results.getAttachments().keySet()))
+                .map(Attachment::getSource)
+                .containsExactlyInAnyOrderElementsOf(results.getAttachments().keySet())
                 .doesNotContainNull();
     }
 
+    @ParameterizedTest
+    @ArgumentsSource(HiddenHeadersArgumentProvider.class)
+    void shouldHideHeadersInAttachments(final Map<String, String> headers,
+                                        final String hiddenHeader,
+                                        final List<String> expectedValues,
+                                        final AllureRestAssured filter) {
+
+        final ResponseDefinitionBuilder responseBuilder = WireMock.aResponse().withStatus(200);
+        headers.forEach(responseBuilder::withHeader);
+
+        RestAssured.config = new RestAssuredConfig().logConfig(LogConfig.logConfig().blacklistHeaders(List.of(hiddenHeader)));
+        RestAssured.replaceFiltersWith(filter);
+
+        final AllureResults results = executeWithStub(responseBuilder, RestAssured.with().headers(headers));
+
+        assertThat(results.getAttachments().values())
+                .hasSize(2)
+                .map(at -> new String(at, StandardCharsets.UTF_8))
+                .allSatisfy(at -> expectedValues.forEach(ev -> assertThat(at).contains(ev)));
+    }
+
     protected final AllureResults execute() {
         return executeWithStub(WireMock.aResponse().withBody("some body"));
     }
 
     protected final AllureResults executeWithStub(ResponseDefinitionBuilder responseBuilder) {
+        return executeWithStub(responseBuilder, RestAssured.given());
+    }
+
+    protected final AllureResults executeWithStub(ResponseDefinitionBuilder responseBuilder, RequestSpecification spec) {
         final WireMockServer server = new WireMockServer(WireMockConfiguration.options().dynamicPort());
         final int statusCode = responseBuilder.build().getStatus();
 
@@ -146,13 +192,13 @@ protected final AllureResults executeWithStub(ResponseDefinitionBuilder response
 
             WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form")).willReturn(responseBuilder));
             try {
-                RestAssured.given()
-                    .contentType(ContentType.URLENC)
+                spec.contentType(ContentType.URLENC)
                     .formParams("Allure", "Form")
                     .get(server.url("/hello")).then().statusCode(statusCode);
             } finally {
                 server.stop();
                 RestAssured.replaceFiltersWith(ImmutableList.of());
+                RestAssured.config = new RestAssuredConfig();
             }
         });
     }

From c2268cb5659c1e236d1751cd80755c00280fd093 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Tue, 26 Mar 2024 13:45:54 +0400
Subject: [PATCH 082/233] fix jbehave runtime api (via #1022)

---
 .../allure/jbehave5/AllureJbehave5.java       |  7 ++-
 .../allure/jbehave5/AllureJbehave5Test.java   | 47 ++++++++++++++++++-
 .../jbehave5/samples/RuntimeApiSteps.java     | 34 ++++++++++++++
 .../test/resources/stories/runtimeapi.story   |  3 ++
 4 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java
 create mode 100644 allure-jbehave5/src/test/resources/stories/runtimeapi.story

diff --git a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
index 266fbf626..5ef296db8 100644
--- a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
+++ b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
@@ -24,6 +24,7 @@
 import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
+import io.qameta.allure.util.ResultsUtils;
 import org.jbehave.core.failures.UUIDExceptionWrapper;
 import org.jbehave.core.model.ExamplesTable;
 import org.jbehave.core.model.Scenario;
@@ -227,13 +228,15 @@ protected void startTestCase(final String uuid,
                 .map(entry -> createParameter(entry.getKey(), entry.getValue()))
                 .collect(Collectors.toList());
 
-        final List<Label> labels = Arrays.asList(
+        final List<Label> labels = new ArrayList<>(Arrays.asList(
                 createStoryLabel(story.getName()),
                 createHostLabel(),
                 createThreadLabel(),
                 createFrameworkLabel("jbehave"),
                 createLanguageLabel("java")
-        );
+        ));
+
+        labels.addAll(ResultsUtils.getProvidedLabels());
 
         final String historyId = getHistoryId(fullName, parameters);
 
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
index 387f94557..54bff8ab3 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
@@ -17,7 +17,10 @@
 
 import io.qameta.allure.Issue;
 import io.qameta.allure.jbehave5.samples.BrokenStorySteps;
+import io.qameta.allure.jbehave5.samples.RuntimeApiSteps;
 import io.qameta.allure.jbehave5.samples.SimpleStorySteps;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Parameter;
 import io.qameta.allure.model.Stage;
 import io.qameta.allure.model.Status;
@@ -259,6 +262,47 @@ void shouldNotFailIfGivenStoriesSpecified() {
 
     }
 
+    @Test
+    void shouldSupportRuntimeApiInSteps() {
+        final AllureResults results = runStories("stories/runtimeapi.story");
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactly(tuple("Runtime API", Status.PASSED));
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Runtime API")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("jbehave-test-label", "some-value")
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Runtime API")
+                .flatExtracting(TestResult::getSteps)
+                .filteredOn("name", "Given runtime api")
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactlyInAnyOrder("sub step 1", "sub step 2");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Runtime API")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("test param", "param value")
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "Runtime API")
+                .flatExtracting(TestResult::getSteps)
+                .filteredOn("name", "Given runtime api")
+                .flatExtracting(StepResult::getAttachments)
+                .extracting(Attachment::getName)
+                .containsExactlyInAnyOrder("some attachment");
+    }
+
     private AllureResults runStories(final String... storyResources) {
         return RunUtils.runTests(lifecycle -> {
             final Embedder embedder = new Embedder();
@@ -283,7 +327,8 @@ private AllureResults runStories(final String... storyResources) {
             final InjectableStepsFactory stepsFactory = new InstanceStepsFactory(
                     embedder.configuration(),
                     new SimpleStorySteps(),
-                    new BrokenStorySteps()
+                    new BrokenStorySteps(),
+                    new RuntimeApiSteps()
             );
             embedder.useStepsFactory(stepsFactory);
             embedder.runStoriesAsPaths(Arrays.asList(storyResources));
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java
new file mode 100644
index 000000000..9711b4caf
--- /dev/null
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java
@@ -0,0 +1,34 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jbehave5.samples;
+
+import io.qameta.allure.Allure;
+import org.jbehave.core.annotations.Given;
+
+public class RuntimeApiSteps {
+
+    @Given("runtime api")
+    public void given() {
+        Allure.label("jbehave-test-label", "some-value");
+        Allure.parameter("test param", "param value");
+        Allure.step("sub step 1");
+        Allure.step("sub step 2", () -> {
+        });
+
+        Allure.addAttachment("some attachment", "some content");
+    }
+
+}
diff --git a/allure-jbehave5/src/test/resources/stories/runtimeapi.story b/allure-jbehave5/src/test/resources/stories/runtimeapi.story
new file mode 100644
index 000000000..305c5ae1c
--- /dev/null
+++ b/allure-jbehave5/src/test/resources/stories/runtimeapi.story
@@ -0,0 +1,3 @@
+Scenario: Runtime API
+
+Given runtime api

From 852a7baecb0193e2fdf45642d69443bb40856c71 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 3 Apr 2024 14:37:33 +0100
Subject: [PATCH 083/233] fix(jbehave5): enable step & attachment aspects (via
 #1026)

---
 allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml

diff --git a/allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml b/allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 000000000..09e38300c
--- /dev/null
+++ b/allure-jbehave5/src/main/resources/META-INF/aop-ajc.xml
@@ -0,0 +1,7 @@
+<aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
+    <aspects>
+        <aspect name="io.qameta.allure.aspects.StepsAspects"/>
+        <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
+    </aspects>
+</aspectj>

From 397ea0a7cd1c15208e75abaac56fafcee3534889 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 8 Apr 2024 15:19:05 +0000
Subject: [PATCH 084/233] release 2.27.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index e297ce891..c5f5a795d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.27-SNAPSHOT
+version=2.27.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From a9c128d2b26bfecca407035c306247df753a7cba Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 8 Apr 2024 15:19:06 +0000
Subject: [PATCH 085/233] set next development version 2.28

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index c5f5a795d..872642fb0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.27.0
+version=2.28-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 732399ad75afedcb7a845c8a2105408811929e16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 15:23:45 +0100
Subject: [PATCH 086/233] bump com.google.inject:guice from 5.1.0 to 7.0.0 (via
 #1003)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 69a89cf1b..64c58eec5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -150,7 +150,7 @@ configure(libs) {
         dependencies {
             dependency("com.github.spotbugs:spotbugs:4.8.3")
             dependency("com.github.tomakehurst:wiremock:3.0.1")
-            dependency("com.google.inject:guice:5.1.0")
+            dependency("com.google.inject:guice:7.0.0")
             dependency("com.google.testing.compile:compile-testing:0.19")
             dependency("com.puppycrawl.tools:checkstyle:10.13.0")
             dependency("com.squareup.retrofit2:retrofit:2.9.0")

From d960678b221f2bfaf92a553acd312c3b52bfdae0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 15:24:20 +0100
Subject: [PATCH 087/233] bump protobufVersion from 3.22.4 to 4.26.1 (via
 #1027)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 1205a6caf..bcba01f3a 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -9,7 +9,7 @@ description = "Allure gRPC Integration"
 val agent: Configuration by configurations.creating
 
 val grpcVersion = "1.57.2"
-val protobufVersion = "3.22.4"
+val protobufVersion = "4.26.1"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From a438edc848802beb4fbd058b50a6e59e8d1df212 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 15:24:54 +0100
Subject: [PATCH 088/233] bump orgSlf4jVersion from 1.7.36 to 2.0.7 (via #903)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 64c58eec5..cded9ca9b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -139,7 +139,7 @@ configure(libs) {
     apply(plugin = "java")
     apply(plugin = "java-library")
 
-    val orgSlf4jVersion = "1.7.36"
+    val orgSlf4jVersion = "2.0.7"
     val assertJVersion = "1.9.9.1"
 
     dependencyManagement {

From e874ee26e5efef4b175d98ac58174ce0739c1047 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 May 2024 13:50:42 +0100
Subject: [PATCH 089/233] bump io.rest-assured:rest-assured from 5.3.1 to 5.4.0
 (via #1043)

---
 allure-rest-assured/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-rest-assured/build.gradle.kts b/allure-rest-assured/build.gradle.kts
index ba734a063..9fa2af59e 100644
--- a/allure-rest-assured/build.gradle.kts
+++ b/allure-rest-assured/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Rest-Assured Integration"
 
-val restAssuredVersion = "5.3.1"
+val restAssuredVersion = "5.4.0"
 
 dependencies {
     api(project(":allure-attachments"))

From cdd7b9b09e3cb6b91733f70030ac5de35d137dc3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 May 2024 13:51:03 +0100
Subject: [PATCH 090/233] bump org.postgresql:postgresql from 42.7.1 to 42.7.3
 (via #1041)

---
 allure-jooq/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
index d7aeab402..ef7c35168 100644
--- a/allure-jooq/build.gradle.kts
+++ b/allure-jooq/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testRuntimeOnly("org.postgresql:postgresql:42.7.1")
+    testRuntimeOnly("org.postgresql:postgresql:42.7.3")
 }
 
 java {

From c5ec96adf5147e0ba4b62a6c124b1b7bc891534a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 May 2024 13:51:22 +0100
Subject: [PATCH 091/233] bump orgSlf4jVersion from 2.0.7 to 2.0.13 (via #1042)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index cded9ca9b..c16b50178 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -139,7 +139,7 @@ configure(libs) {
     apply(plugin = "java")
     apply(plugin = "java-library")
 
-    val orgSlf4jVersion = "2.0.7"
+    val orgSlf4jVersion = "2.0.13"
     val assertJVersion = "1.9.9.1"
 
     dependencyManagement {

From aae1a575776a78fd55b0f7eeaa326dfc58d71358 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 12:32:14 +0100
Subject: [PATCH 092/233] bump com.google.protobuf from 0.9.1 to 0.9.4 (via
 #1048)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 487d5b0ad..6ad3ae343 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -56,7 +56,7 @@ pluginManagement {
         id("io.qameta.allure-download") version "2.11.2"
         id("io.qameta.allure-report") version "2.11.2"
         id("io.spring.dependency-management") version "1.1.0"
-        id("com.google.protobuf") version "0.9.1"
+        id("com.google.protobuf") version "0.9.4"
         id("com.github.spotbugs") version "6.0.6"
         kotlin("jvm") version "1.7.10"
     }

From fad5f02f8d550cb90e79eac5751c067a432bd398 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 15:55:31 +0100
Subject: [PATCH 093/233] bump org.apache.httpcomponents:httpclient from 4.5.13
 to 4.5.14 (via #1046)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c16b50178..c5becb4c4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -160,7 +160,7 @@ configure(libs) {
             dependency("javax.annotation:javax.annotation-api:1.3.2")
             dependency("net.sourceforge.pmd:pmd-java:6.55.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")
-            dependency("org.apache.httpcomponents:httpclient:4.5.13")
+            dependency("org.apache.httpcomponents:httpclient:4.5.14")
             dependency("org.apache.httpcomponents.client5:httpclient5:5.2.1")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")

From 781ab098a8effb2338444d4143100ac9a7870f4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 15:55:50 +0100
Subject: [PATCH 094/233] bump io.spring.dependency-management from 1.1.0 to
 1.1.5 (via #1047)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6ad3ae343..1428a47d6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -55,7 +55,7 @@ pluginManagement {
         id("io.qameta.allure-aggregate-report") version "2.11.2"
         id("io.qameta.allure-download") version "2.11.2"
         id("io.qameta.allure-report") version "2.11.2"
-        id("io.spring.dependency-management") version "1.1.0"
+        id("io.spring.dependency-management") version "1.1.5"
         id("com.google.protobuf") version "0.9.4"
         id("com.github.spotbugs") version "6.0.6"
         kotlin("jvm") version "1.7.10"

From ca68113c7ba8fcd2a733463bb6e99e77a9a4e4ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 10:55:26 +0100
Subject: [PATCH 095/233] bump org.awaitility:awaitility from 4.2.0 to 4.2.1
 (via #1050)

---
 allure-awaitility/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-awaitility/build.gradle.kts b/allure-awaitility/build.gradle.kts
index 2426a93bc..587ca0308 100644
--- a/allure-awaitility/build.gradle.kts
+++ b/allure-awaitility/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Awaitlity Integration"
 
 val agent: Configuration by configurations.creating
 
-val awaitilityVersion = "4.2.0"
+val awaitilityVersion = "4.2.1"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From a85d0e3d10ca76553db53df44bfb020a81a92bb1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 12:46:38 +0100
Subject: [PATCH 096/233] bump org.mockito:mockito-core from 5.10.0 to 5.12.0
 (via #1054)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c5becb4c4..d5edada83 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -170,7 +170,7 @@ configure(libs) {
             dependency("org.hamcrest:hamcrest:2.2")
             dependency("org.jboss.resteasy:resteasy-client:6.2.1.Final")
             dependency("org.mock-server:mockserver-netty:5.15.0")
-            dependency("org.mockito:mockito-core:5.10.0")
+            dependency("org.mockito:mockito-core:5.12.0")
             dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")
             dependency("org.slf4j:slf4j-nop:${orgSlf4jVersion}")
             dependency("org.slf4j:slf4j-simple:${orgSlf4jVersion}")

From 7f798f37321bb0c234276291d0b79b2acd28649e Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 5 Jul 2024 16:09:15 +0100
Subject: [PATCH 097/233] fix(allure-karate): remove the code that causes the
 process to hang (fixes #1040, via #1065)

---
 .../io/qameta/allure/karate/AllureKarate.java | 85 -------------------
 1 file changed, 85 deletions(-)

diff --git a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
index 310d6c75d..2c629a9f2 100644
--- a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
+++ b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
@@ -26,7 +26,6 @@
 import com.intuit.karate.core.StepResult;
 import io.qameta.allure.Allure;
 import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import io.qameta.allure.model.Parameter;
@@ -50,8 +49,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.stream.Collectors;
 
 import static io.qameta.allure.util.ResultsUtils.createLabel;
@@ -71,11 +68,6 @@ public class AllureKarate implements RuntimeHook {
 
     private final AllureLifecycle lifecycle;
 
-    private final ReadWriteLock lock = new ReentrantReadWriteLock();
-
-    private final Map<String, String> stepsAndTcUuids = new HashMap<>();
-    private final Map<String, Step> stepAndUuids = new HashMap<>();
-
     private final List<String> tcUuids = new ArrayList<>();
 
     public AllureKarate() {
@@ -221,14 +213,6 @@ public void afterStep(final StepResult result,
         });
         lifecycle.stopStep(uuid);
 
-        if (stepResult.isFailed()
-            && sr.engine.getConfig().getDriverOptions() != null
-            && (Boolean) sr.engine.getConfig().getDriverOptions().get("screenshotOnFailure")
-        ) {
-            addToStepsAndTcUuids(uuid, lifecycle.getCurrentTestCase().get());
-            addToStepAndUuids(uuid, step);
-        }
-
         if (Objects.nonNull(result.getEmbeds())) {
             result.getEmbeds().forEach(embed -> {
                 try (InputStream is = new BufferedInputStream(Files.newInputStream(embed.getFile().toPath()))) {
@@ -248,30 +232,6 @@ public void afterStep(final StepResult result,
 
     @Override
     public void afterFeature(final FeatureRuntime fr) {
-
-        if (!stepsAndTcUuids.isEmpty()) {
-            fr.result.getScenarioResults()
-                    .forEach(sc -> {
-                        if (Objects.nonNull(sc.getFailedStep())) {
-                            getKeySetFromStepAndUuids().forEach(uuid -> {
-                                if (getValueFromStepAndUuids(uuid) == sc.getFailedStep().getStep()) {
-                                    final List<Attachment> attachments = new ArrayList<>();
-                                    sc.getFailedStep().getEmbeds().forEach(e -> attachments.add(
-                                                    new Attachment()
-                                                            .setSource(e.getFile().getPath())
-                                                            .setType(e.getResourceType().contentType)
-                                                            .setName(e.getFile().getName())
-                                            )
-                                    );
-                                    lifecycle.updateTestCase(getValueFromStepsAndTcUuids(uuid), result ->
-                                            result.setAttachments(attachments)
-                                    );
-                                }
-                            });
-                        }
-                    });
-        }
-
         tcUuids.forEach(lifecycle::writeTestCase);
     }
 
@@ -321,49 +281,4 @@ private List<Link> getLinks(final List<String> labels) {
         }
         return allureLinks;
     }
-
-    private void addToStepsAndTcUuids(final String stepUuid, final String tcUuid) {
-        lock.writeLock().lock();
-        try {
-            stepsAndTcUuids.put(stepUuid, tcUuid);
-        } finally {
-            lock.writeLock().unlock();
-        }
-    }
-
-    private void addToStepAndUuids(final String stepUuid, final Step step) {
-        lock.writeLock().lock();
-        try {
-            stepAndUuids.put(stepUuid, step);
-        } finally {
-            lock.writeLock().unlock();
-        }
-    }
-
-    private String getValueFromStepsAndTcUuids(final String stepUuid) {
-        lock.readLock().lock();
-        try {
-            return stepsAndTcUuids.get(stepUuid);
-        } finally {
-            lock.readLock().unlock();
-        }
-    }
-
-    private Step getValueFromStepAndUuids(final String stepUuid) {
-        lock.readLock().lock();
-        try {
-            return stepAndUuids.get(stepUuid);
-        } finally {
-            lock.readLock().unlock();
-        }
-    }
-
-    private Set<String> getKeySetFromStepAndUuids() {
-        lock.readLock().lock();
-        try {
-            return stepAndUuids.keySet();
-        } finally {
-            lock.readLock().unlock();
-        }
-    }
 }

From 71ec65c00035a0b7602715aef2bf52d879e98e6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 17:18:30 +0100
Subject: [PATCH 098/233] bump io.github.gradle-nexus.publish-plugin from 1.1.0
 to 2.0.0 (via #1057)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1428a47d6..8d3f7a004 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -50,7 +50,7 @@ pluginManagement {
         id("com.diffplug.spotless") version "6.11.0"
         id("com.github.johnrengelman.shadow") version "8.1.1"
         id("com.gradle.enterprise") version "3.12.5"
-        id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+        id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
         id("io.qameta.allure-adapter") version "2.11.2"
         id("io.qameta.allure-aggregate-report") version "2.11.2"
         id("io.qameta.allure-download") version "2.11.2"

From 5649230a11acbb3f83a5726fc59552fcc5e84929 Mon Sep 17 00:00:00 2001
From: Valery Yatsynovich <valery_yatsynovich@epam.com>
Date: Fri, 5 Jul 2024 19:19:24 +0300
Subject: [PATCH 099/233] chore(allure-jsonunit): deprecate
 `AllureConfigurableJsonMatcher` in favor of `ConfigurableJsonMatcher` (via
 #1060)

---
 .../qameta/allure/jsonunit/AbstractJsonPatchMatcher.java | 9 ++++++++-
 .../allure/jsonunit/AllureConfigurableJsonMatcher.java   | 2 ++
 .../java/io/qameta/allure/jsonunit/JsonPatchMatcher.java | 7 ++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
index 6a940d4dc..329dbc6c8 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
@@ -20,13 +20,15 @@
 import org.hamcrest.Matcher;
 
 import net.javacrumbs.jsonunit.core.Configuration;
+import net.javacrumbs.jsonunit.core.ConfigurationWhen.ApplicableForPath;
+import net.javacrumbs.jsonunit.core.ConfigurationWhen.PathsParam;
 import net.javacrumbs.jsonunit.core.Option;
 import net.javacrumbs.jsonunit.core.internal.Diff;
 import net.javacrumbs.jsonunit.core.internal.Options;
 import net.javacrumbs.jsonunit.core.listener.DifferenceListener;
 
 /**
- * Сontains basic matcher functionality and implementation of methods for matching configuration.
+ * Contains basic matcher functionality and implementation of methods for matching configuration.
  *
  * @param <T> the type
  */
@@ -54,6 +56,11 @@ public T when(final Option first, final Option... next) {
         return (T) this;
     }
 
+    public T when(final PathsParam pathsParam, final ApplicableForPath... applicableForPaths) {
+        this.configuration = this.configuration.when(pathsParam, applicableForPaths);
+        return (T) this;
+    }
+
     public T withOptions(final Options options) {
         this.configuration = configuration.withOptions(options);
         return (T) this;
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
index 07851666f..3b95e3348 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
@@ -25,7 +25,9 @@
 /**
  * @param <T> the type of matcher
  * @see net.javacrumbs.jsonunit.ConfigurableJsonMatcher
+ * @deprecated Use {@link net.javacrumbs.jsonunit.ConfigurableJsonMatcher}
  */
+@Deprecated
 public interface AllureConfigurableJsonMatcher<T> extends Matcher<T> {
 
     AllureConfigurableJsonMatcher<T> withTolerance(BigDecimal tolerance);
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
index b9f53b131..78bed71ed 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
@@ -17,6 +17,7 @@
 
 import io.qameta.allure.attachment.DefaultAttachmentProcessor;
 import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
+import net.javacrumbs.jsonunit.ConfigurableJsonMatcher;
 import net.javacrumbs.jsonunit.core.listener.DifferenceListener;
 
 import org.hamcrest.Description;
@@ -28,8 +29,8 @@
  * @param <T> the type
  */
 @SuppressWarnings("unused")
-public final class JsonPatchMatcher<T> extends AbstractJsonPatchMatcher<AllureConfigurableJsonMatcher<T>>
-        implements AllureConfigurableJsonMatcher<T> {
+public final class JsonPatchMatcher<T> extends AbstractJsonPatchMatcher<ConfigurableJsonMatcher<T>>
+        implements ConfigurableJsonMatcher<T> {
 
     private final Object expected;
 
@@ -37,7 +38,7 @@ private JsonPatchMatcher(final Object expected) {
         this.expected = expected;
     }
 
-    public static <T> AllureConfigurableJsonMatcher<T> jsonEquals(final Object expected) {
+    public static <T> ConfigurableJsonMatcher<T> jsonEquals(final Object expected) {
         return new JsonPatchMatcher<T>(expected);
     }
 

From 5edb2e29801b3390317461c952332d32bff4c563 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 17:52:52 +0100
Subject: [PATCH 100/233] bump net.sourceforge.pmd:pmd-java from 6.55.0 to
 7.3.0 (via #1062)

---
 .../awaitility/AllureAwaitilityListener.java  |  7 +++---
 .../allure/awaitility/TemporalDuration.java   |  5 +---
 .../qameta/allure/cucumber4jvm/TagParser.java |  8 +++----
 .../cucumber5jvm/AllureCucumber5Jvm.java      | 11 ++-------
 .../qameta/allure/cucumber5jvm/TagParser.java |  8 +++----
 .../cucumber6jvm/AllureCucumber6Jvm.java      | 11 ++-------
 .../qameta/allure/cucumber6jvm/TagParser.java |  8 +++----
 .../cucumber7jvm/AllureCucumber7Jvm.java      | 11 ++-------
 .../qameta/allure/cucumber7jvm/TagParser.java |  8 +++----
 .../testsourcemodel/TestSourcesModel.java     |  2 +-
 .../JavaDocDescriptionsProcessor.java         |  2 +-
 .../io/qameta/allure/grpc/AllureGrpc.java     | 23 ++++++++-----------
 .../httpclient5/AllureHttpClient5Request.java |  5 ++--
 .../AllureHttpClient5Response.java            |  5 ++--
 .../allure/internal/AllureThreadContext.java  | 13 ++++++-----
 .../junitplatform/AllureJunitPlatform.java    |  1 +
 .../io/qameta/allure/junit4/AllureJunit4.java |  1 -
 .../allure/junit4/AllureJunit4Utils.java      |  5 +---
 .../io/qameta/allure/junit5/AllureJunit5.java |  1 +
 .../java/io/qameta/allure/model/Stage.java    |  2 +-
 .../java/io/qameta/allure/model/Status.java   |  2 +-
 .../allure/selenide/AllureSelenide.java       | 12 +++++-----
 build.gradle.kts                              |  2 +-
 .../quality-configs/checkstyle/checkstyle.xml | 14 ++++++-----
 gradle/quality-configs/pmd/pmd.xml            | 13 ++++-------
 25 files changed, 77 insertions(+), 103 deletions(-)

diff --git a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
index 93f6c0ee8..01b793cf5 100644
--- a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
+++ b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
@@ -77,7 +77,8 @@ public class AllureAwaitilityListener implements ConditionEvaluationListener<Obj
 
     private String currentConditionStepUUID;
 
-    private static InheritableThreadLocal<AllureLifecycle> lifecycle = new InheritableThreadLocal<AllureLifecycle>() {
+    private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE
+            = new InheritableThreadLocal<AllureLifecycle>() {
         @Override
         protected AllureLifecycle initialValue() {
             return Allure.getLifecycle();
@@ -85,7 +86,7 @@ protected AllureLifecycle initialValue() {
     };
 
     public static AllureLifecycle getLifecycle() {
-        return lifecycle.get();
+        return LIFECYCLE.get();
     }
 
     /**
@@ -250,7 +251,7 @@ public void exceptionIgnored(final IgnoredException ignoredException) {
      * @param allure allure lifecycle to set
      */
     public static void setLifecycle(final AllureLifecycle allure) {
-        lifecycle.set(allure);
+        LIFECYCLE.set(allure);
     }
 
 }
diff --git a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
index b9f58879d..d549ee811 100644
--- a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
+++ b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
@@ -60,10 +60,7 @@ public class TemporalDuration implements TemporalAccessor {
 
     @Override
     public boolean isSupported(final TemporalField field) {
-        if (!temporal.isSupported(field)) {
-            return false;
-        }
-        return temporal.getLong(field) - BASE.getLong(field) != 0L;
+        return temporal.isSupported(field) && temporal.getLong(field) - BASE.getLong(field) != 0L;
     }
 
     @Override
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
index 0c7417c05..0c6f76e44 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
@@ -52,13 +52,13 @@ public boolean isKnown() {
 
     private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName))
-                || feature.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName))
+               || feature.getTags().stream()
+                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
     public boolean isResultTag(final PickleTag tag) {
-        return Arrays.asList(new String[]{FLAKY, KNOWN, MUTED})
+        return Arrays.asList(FLAKY, KNOWN, MUTED)
                 .contains(tag.getName().toUpperCase());
     }
 
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
index 546838100..f7fc242e7 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
@@ -395,15 +395,8 @@ private void createDataTableAttachment(final DataTableArgument dataTableArgument
         final StringBuilder dataTableCsv = new StringBuilder();
         for (List<String> columns : rowsInTable) {
             if (!columns.isEmpty()) {
-                for (int i = 0; i < columns.size(); i++) {
-                    if (i == columns.size() - 1) {
-                        dataTableCsv.append(columns.get(i));
-                    } else {
-                        dataTableCsv.append(columns.get(i));
-                        dataTableCsv.append('\t');
-                    }
-                }
-                dataTableCsv.append('\n');
+                final String rowValue = columns.stream().collect(Collectors.joining("\t", "", "\n"));
+                dataTableCsv.append(rowValue);
             }
         }
         final String attachmentSource = lifecycle
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
index 211939586..ced0a37f1 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
@@ -51,13 +51,13 @@ public boolean isKnown() {
 
     private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
-                .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
-                || feature.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+                       .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
+               || feature.getTags().stream()
+                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
     public boolean isResultTag(final String tag) {
-        return Arrays.asList(new String[]{FLAKY, KNOWN, MUTED})
+        return Arrays.asList(FLAKY, KNOWN, MUTED)
                 .contains(tag.toUpperCase());
     }
 
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
index bb0e513bf..6dd1dacfb 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
@@ -380,15 +380,8 @@ private void createDataTableAttachment(final DataTableArgument dataTableArgument
         final StringBuilder dataTableCsv = new StringBuilder();
         for (List<String> columns : rowsInTable) {
             if (!columns.isEmpty()) {
-                for (int i = 0; i < columns.size(); i++) {
-                    if (i == columns.size() - 1) {
-                        dataTableCsv.append(columns.get(i));
-                    } else {
-                        dataTableCsv.append(columns.get(i));
-                        dataTableCsv.append('\t');
-                    }
-                }
-                dataTableCsv.append('\n');
+                final String rowValue = columns.stream().collect(Collectors.joining("\t", "", "\n"));
+                dataTableCsv.append(rowValue);
             }
         }
         final String attachmentSource = lifecycle
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
index a594d97d9..ada27215b 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
@@ -51,13 +51,13 @@ public boolean isKnown() {
 
     private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
-                .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
-                || feature.getTagsList().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+                       .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
+               || feature.getTagsList().stream()
+                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
     public boolean isResultTag(final String tag) {
-        return Arrays.asList(new String[]{FLAKY, KNOWN, MUTED})
+        return Arrays.asList(FLAKY, KNOWN, MUTED)
                 .contains(tag.toUpperCase());
     }
 
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
index 5f85512fd..9d7c89b34 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
@@ -393,15 +393,8 @@ private void createDataTableAttachment(final DataTableArgument dataTableArgument
         final StringBuilder dataTableCsv = new StringBuilder();
         for (List<String> columns : rowsInTable) {
             if (!columns.isEmpty()) {
-                for (int i = 0; i < columns.size(); i++) {
-                    if (i == columns.size() - 1) {
-                        dataTableCsv.append(columns.get(i));
-                    } else {
-                        dataTableCsv.append(columns.get(i));
-                        dataTableCsv.append('\t');
-                    }
-                }
-                dataTableCsv.append('\n');
+                final String rowValue = columns.stream().collect(Collectors.joining("\t", "", "\n"));
+                dataTableCsv.append(rowValue);
             }
         }
         final String attachmentSource = lifecycle
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
index 8efb825a4..a20ad07bf 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
@@ -51,13 +51,13 @@ public boolean isKnown() {
 
     private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
-                .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
-                || feature.getTags().stream()
-                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+                       .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
+               || feature.getTags().stream()
+                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
     public boolean isResultTag(final String tag) {
-        return Arrays.asList(new String[]{FLAKY, KNOWN, MUTED})
+        return Arrays.asList(FLAKY, KNOWN, MUTED)
                 .contains(tag.toUpperCase());
     }
 
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
index 37d2fb7ff..8b3533d65 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
@@ -124,7 +124,7 @@ private void processScenarioDefinition(
         for (Step step : child.getSteps()) {
             nodeMap.put(step.getLocation().getLine(), createAstNode(step, childNode));
         }
-        if (child.getExamples().size() > 0) {
+        if (!child.getExamples().isEmpty()) {
             processScenarioOutlineExamples(nodeMap, child, childNode);
         }
     }
diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
index b4487310e..320ffe841 100644
--- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
@@ -82,7 +82,7 @@ public boolean process(final Set<? extends TypeElement> annotations, final Round
             }
 
             final String docs = rawDocs.trim();
-            if ("".equals(docs)) {
+            if (docs.isEmpty()) {
                 return;
             }
 
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
index 1217dcf92..caf8612d5 100644
--- a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
@@ -85,22 +85,21 @@ public AllureGrpc interceptResponseMetadata(final boolean value) {
         return this;
     }
 
-    @SuppressWarnings({"PMD.MethodArgumentCouldBeFinal", "PMD.NPathComplexity"})
+    @SuppressWarnings({"PMD.NPathComplexity"})
     @Override
-    public <T, A> ClientCall<T, A> interceptCall(MethodDescriptor<T, A> method,
-                                                 CallOptions callOptions,
-                                                 Channel next) {
+    public <T, A> ClientCall<T, A> interceptCall(final MethodDescriptor<T, A> method,
+                                                 final CallOptions callOptions,
+                                                 final Channel next) {
         final AttachmentProcessor<AttachmentData> processor = new DefaultAttachmentProcessor();
 
         return new ForwardingClientCall.SimpleForwardingClientCall<T, A>(
                 next.newCall(method, callOptions.withoutWaitForReady())) {
 
             private String stepUuid;
-            private List<String> parsedResponses = new ArrayList<>();
+            private final List<String> parsedResponses = new ArrayList<>();
 
-            @SuppressWarnings("PMD.MethodArgumentCouldBeFinal")
             @Override
-            public void sendMessage(T message) {
+            public void sendMessage(final T message) {
                 stepUuid = UUID.randomUUID().toString();
                 Allure.getLifecycle().startStep(stepUuid, (new StepResult()).setName(
                         "Send gRPC request to "
@@ -126,18 +125,17 @@ public void sendMessage(T message) {
                 }
             }
 
-            @SuppressWarnings("PMD.MethodArgumentCouldBeFinal")
+            @SuppressWarnings({"PMD.NcssCount"})
             @Override
-            public void start(Listener<A> responseListener, Metadata headers) {
+            public void start(final Listener<A> responseListener, final Metadata headers) {
                 final ClientCall.Listener<A> listener = new ForwardingClientCallListener<A>() {
                     @Override
                     protected Listener<A> delegate() {
                         return responseListener;
                     }
 
-                    @SuppressWarnings({"PMD.MethodArgumentCouldBeFinal", "PMD.AvoidLiteralsInIfCondition"})
                     @Override
-                    public void onClose(io.grpc.Status status, Metadata trailers) {
+                    public void onClose(final io.grpc.Status status, final Metadata trailers) {
                         GrpcResponseAttachment.Builder responseAttachmentBuilder = null;
 
                         if (parsedResponses.size() == 1) {
@@ -183,9 +181,8 @@ public void onClose(io.grpc.Status status, Metadata trailers) {
                         super.onClose(status, trailers);
                     }
 
-                    @SuppressWarnings("PMD.MethodArgumentCouldBeFinal")
                     @Override
-                    public void onMessage(A message) {
+                    public void onMessage(final A message) {
                         try {
                             parsedResponses.add(JSON_PRINTER.print((MessageOrBuilder) message));
                             super.onMessage(message);
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
index 2e4ab5584..14167a41d 100644
--- a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
@@ -34,7 +34,6 @@
 /**
  * @author a-simeshin (Simeshin Artem)
  */
-@SuppressWarnings("PMD.MethodArgumentCouldBeFinal")
 public class AllureHttpClient5Request implements HttpRequestInterceptor {
 
     private final AttachmentRenderer<AttachmentData> renderer;
@@ -62,7 +61,9 @@ public AllureHttpClient5Request(final AttachmentRenderer<AttachmentData> rendere
      * @param context the HTTP context
      */
     @Override
-    public void process(HttpRequest request, EntityDetails entity, HttpContext context) {
+    public void process(final HttpRequest request,
+                        final EntityDetails entity,
+                        final HttpContext context) {
         final String attachmentName = getAttachmentName(request);
         final HttpRequestAttachment.Builder builder = create(attachmentName, request.getRequestUri());
         builder.setMethod(request.getMethod());
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
index bf5bff643..f4e53c931 100644
--- a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
@@ -39,7 +39,6 @@
  */
 @SuppressWarnings({
         "checkstyle:ParameterAssignment",
-        "PMD.MethodArgumentCouldBeFinal",
         "PMD.AvoidReassigningParameters"})
 public class AllureHttpClient5Response implements HttpResponseInterceptor {
     private final AttachmentRenderer<AttachmentData> renderer;
@@ -69,7 +68,9 @@ public AllureHttpClient5Response(final AttachmentRenderer<AttachmentData> render
      * @throws IOException if an I/O error occurs
      */
     @Override
-    public void process(HttpResponse response, EntityDetails entity, HttpContext context) throws IOException {
+    public void process(final HttpResponse response,
+                        EntityDetails entity,
+                        final HttpContext context) throws IOException {
         final HttpResponseAttachment.Builder builder = create("Response");
         builder.setResponseCode(response.getCode());
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
index bbf94fd4e..e052c8d11 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
@@ -15,6 +15,7 @@
  */
 package io.qameta.allure.internal;
 
+import java.util.Deque;
 import java.util.LinkedList;
 import java.util.Objects;
 import java.util.Optional;
@@ -32,7 +33,7 @@ public class AllureThreadContext {
      * Returns last (most recent) uuid.
      */
     public Optional<String> getCurrent() {
-        final LinkedList<String> uuids = context.get();
+        final Deque<String> uuids = context.get();
         return uuids.isEmpty()
                 ? Optional.empty()
                 : Optional.of(uuids.getFirst());
@@ -42,7 +43,7 @@ public Optional<String> getCurrent() {
      * Returns first (oldest) uuid.
      */
     public Optional<String> getRoot() {
-        final LinkedList<String> uuids = context.get();
+        final Deque<String> uuids = context.get();
         return uuids.isEmpty()
                 ? Optional.empty()
                 : Optional.of(uuids.getLast());
@@ -62,7 +63,7 @@ public void start(final String uuid) {
      * @return removed uuid.
      */
     public Optional<String> stop() {
-        final LinkedList<String> uuids = context.get();
+        final Deque<String> uuids = context.get();
         if (!uuids.isEmpty()) {
             return Optional.of(uuids.pop());
         }
@@ -79,15 +80,15 @@ public void clear() {
     /**
      * Thread local context that stores information about not finished tests and steps.
      */
-    private static final class Context extends InheritableThreadLocal<LinkedList<String>> {
+    private static final class Context extends InheritableThreadLocal<Deque<String>> {
 
         @Override
-        public LinkedList<String> initialValue() {
+        public Deque<String> initialValue() {
             return new LinkedList<>();
         }
 
         @Override
-        protected LinkedList<String> childValue(final LinkedList<String> parentStepContext) {
+        protected Deque<String> childValue(final Deque<String> parentStepContext) {
             return new LinkedList<>(parentStepContext);
         }
 
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index 5bd8211d9..137e24df5 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -310,6 +310,7 @@ public void reportingEntryPublished(final TestIdentifier testIdentifier,
 
     }
 
+    @SuppressWarnings("PMD.InefficientEmptyStringCheck")
     private Map<String, String> unwrap(final Map<String, String> data) {
         final Map<String, String> res = new HashMap<>();
         data.forEach((key, value) -> {
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index ed594591b..b652feb08 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -180,7 +180,6 @@ private Optional<String> getDisplayName(final Description result) {
                 .map(DisplayName::value);
     }
 
-    @SuppressWarnings("PMD.AvoidLiteralsInIfCondition")
     private Optional<String> getDescription(final Description result) {
         final io.qameta.allure.Description annotation = result
                 .getAnnotation(io.qameta.allure.Description.class);
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
index ebe87e56b..24fa2a8a2 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
@@ -78,10 +78,7 @@ static class CucumberCheck implements Serializable {
 
         @Override
         public boolean equals(final Object obj) {
-            if (Objects.isNull(obj)) {
-                return false;
-            }
-            return "io.cucumber.junit.PickleRunners.PickleId"
+            return !Objects.isNull(obj) && "io.cucumber.junit.PickleRunners.PickleId"
                     .equals(obj.getClass().getCanonicalName());
         }
 
diff --git a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
index 6ede30ed2..7413d70a2 100644
--- a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
+++ b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
@@ -187,6 +187,7 @@ public Map<String, String> buildFailureEvent(final String type,
         return map;
     }
 
+    @SuppressWarnings("PMD.InefficientEmptyStringCheck")
     public Map<String, String> wrap(final Map<String, String> data) {
         final Map<String, String> res = new HashMap<>();
         data.forEach((key, value) -> {
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Stage.java b/allure-model/src/main/java/io/qameta/allure/model/Stage.java
index 697478122..ff08a6149 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Stage.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Stage.java
@@ -57,7 +57,7 @@ public enum Stage {
      * @return the stage
      */
     public static Stage fromValue(final String v) {
-        for (Stage c : Stage.values()) {
+        for (Stage c : values()) {
             if (c.value.equals(v)) {
                 return c;
             }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Status.java b/allure-model/src/main/java/io/qameta/allure/model/Status.java
index 15c275bd2..37ed668f2 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Status.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Status.java
@@ -54,7 +54,7 @@ public enum Status {
      * @return the status
      */
     public static Status fromValue(final String v) {
-        for (Status c : Status.values()) {
+        for (Status c : values()) {
             if (c.value.equals(v)) {
                 return c;
             }
diff --git a/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java b/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
index ca06a32b4..1f320f68b 100644
--- a/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
+++ b/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
@@ -31,7 +31,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
@@ -52,7 +52,7 @@ public class AllureSelenide implements LogEventListener {
     private boolean saveScreenshots = true;
     private boolean savePageHtml = true;
     private boolean includeSelenideLocatorsSteps = true;
-    private final Map<LogType, Level> logTypesToSave = new HashMap<>();
+    private final Map<LogType, Level> logTypesToSave = new EnumMap<>(LogType.class);
     private final AllureLifecycle lifecycle;
 
     public AllureSelenide() {
@@ -93,8 +93,8 @@ public AllureSelenide disableLogs(final LogType logType) {
     private static Optional<byte[]> getScreenshotBytes() {
         try {
             return WebDriverRunner.hasWebDriverStarted()
-                ? Optional.of(((TakesScreenshot) WebDriverRunner.getWebDriver()).getScreenshotAs(OutputType.BYTES))
-                : Optional.empty();
+                    ? Optional.of(((TakesScreenshot) WebDriverRunner.getWebDriver()).getScreenshotAs(OutputType.BYTES))
+                    : Optional.empty();
         } catch (WebDriverException e) {
             LOGGER.warn("Could not get screen shot", e);
             return Optional.empty();
@@ -104,8 +104,8 @@ private static Optional<byte[]> getScreenshotBytes() {
     private static Optional<byte[]> getPageSourceBytes() {
         try {
             return WebDriverRunner.hasWebDriverStarted()
-                ? Optional.of(WebDriverRunner.getWebDriver().getPageSource().getBytes(UTF_8))
-                : Optional.empty();
+                    ? Optional.of(WebDriverRunner.getWebDriver().getPageSource().getBytes(UTF_8))
+                    : Optional.empty();
         } catch (WebDriverException e) {
             LOGGER.warn("Could not get page source", e);
             return Optional.empty();
diff --git a/build.gradle.kts b/build.gradle.kts
index d5edada83..3b3738097 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -158,7 +158,7 @@ configure(libs) {
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.6.0")
             dependency("javax.annotation:javax.annotation-api:1.3.2")
-            dependency("net.sourceforge.pmd:pmd-java:6.55.0")
+            dependency("net.sourceforge.pmd:pmd-java:7.3.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.14")
             dependency("org.apache.httpcomponents.client5:httpclient5:5.2.1")
diff --git a/gradle/quality-configs/checkstyle/checkstyle.xml b/gradle/quality-configs/checkstyle/checkstyle.xml
index f1bbd4945..8e3f80a29 100644
--- a/gradle/quality-configs/checkstyle/checkstyle.xml
+++ b/gradle/quality-configs/checkstyle/checkstyle.xml
@@ -44,7 +44,7 @@
         <module name="EmptyBlock"/>
         <module name="EmptyCatchBlock"/>
         <module name="LeftCurly"/>
-<!--        <module name="NeedBraces"/>-->
+        <!--        <module name="NeedBraces"/>-->
         <module name="RightCurly"/>
 
 
@@ -86,7 +86,9 @@
         <!--<module name="MissingCtor"/>-->
         <module name="MissingSwitchDefault"/>
         <module name="ModifiedControlVariable"/>
-        <module name="MultipleStringLiterals"/>
+        <module name="MultipleStringLiterals">
+            <property name="ignoreStringsRegexp" value='^(("")|(", ")|("\\n")|("\\t")|(" "))$'/>
+        </module>
         <module name="MultipleVariableDeclarations"/>
         <module name="NestedForDepth">
             <property name="max" value="2"/>
@@ -152,10 +154,10 @@
 
         <!-- Metrics (http://checkstyle.sourceforge.net/config_metrics.html) -->
         <module name="BooleanExpressionComplexity"/>
-<!--        <module name="ClassDataAbstractionCoupling"/>-->
-<!--        <module name="ClassFanOutComplexity"/>-->
+        <!--        <module name="ClassDataAbstractionCoupling"/>-->
+        <!--        <module name="ClassFanOutComplexity"/>-->
         <module name="CyclomaticComplexity"/>
-<!--        <module name="JavaNCSS"/>-->
+        <!--        <module name="JavaNCSS"/>-->
         <module name="NPathComplexity"/>
 
 
@@ -211,7 +213,7 @@
 
         <!-- Size Violations (http://checkstyle.sourceforge.net/config_sizes.html) -->
         <module name="AnonInnerLength"/>
-<!--        <module name="ExecutableStatementCount"/>-->
+        <!--        <module name="ExecutableStatementCount"/>-->
         <module name="MethodCount"/>
         <module name="MethodLength"/>
         <module name="OuterTypeNumber"/>
diff --git a/gradle/quality-configs/pmd/pmd.xml b/gradle/quality-configs/pmd/pmd.xml
index 7a26c293e..adc57b64f 100644
--- a/gradle/quality-configs/pmd/pmd.xml
+++ b/gradle/quality-configs/pmd/pmd.xml
@@ -26,9 +26,7 @@
 
     <!-- Code style (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_codestyle.html) -->
     <rule ref="category/java/codestyle.xml">
-        <exclude name="AbstractNaming"/>
         <exclude name="AtLeastOneConstructor"/>
-        <exclude name="AvoidFinalLocalVariable"/>
         <exclude name="CallSuperInConstructor"/>
         <exclude name="ClassNamingConventions"/>
         <exclude name="CommentDefaultAccessModifier"/>
@@ -45,6 +43,7 @@
         <exclude name="ShortMethodName"/>
         <exclude name="ShortVariable"/>
         <exclude name="TooManyStaticImports"/>
+        <exclude name="UseDiamondOperator"/> <!-- to many false positives on java 8 -->
         <exclude name="UselessParentheses"/>
     </rule>
 
@@ -57,17 +56,15 @@
     <!-- Design (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_design.html) -->
     <rule ref="category/java/design.xml">
         <exclude name="AvoidCatchingGenericException"/>
+        <exclude name="ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
         <exclude name="CognitiveComplexity"/>
+        <exclude name="CouplingBetweenObjects"/>
         <exclude name="DataClass"/>
-        <exclude name="ExcessiveClassLength"/> <!-- replaced by NcssCount -->
         <exclude name="ExcessiveImports"/>
-        <exclude name="ExcessiveMethodLength"/> <!-- replaced by NcssCount -->
         <exclude name="GodClass"/>
         <exclude name="LawOfDemeter"/>
         <exclude name="LoosePackageCoupling"/>
-        <exclude name="ModifiedCyclomaticComplexity"/>
         <exclude name="SignatureDeclareThrowsException"/>
-        <exclude name="StdCyclomaticComplexity"/>
         <exclude name="TooManyFields"/>
     </rule>
     <rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts">
@@ -112,13 +109,13 @@
         <exclude name="AvoidAccessibilityAlteration"/> <!-- earlier j2ee group-->
         <exclude name="AvoidCatchingThrowable"/>
         <exclude name="AvoidFieldNameMatchingMethodName"/>
-        <exclude name="DataflowAnomalyAnalysis"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="ConstructorCallsOverridableMethod"/>
         <exclude name="EmptyFinalizer"/>
         <exclude name="FinalizeDoesNotCallSuperFinalize"/>
         <exclude name="FinalizeOnlyCallsSuperFinalize"/>
         <exclude name="JUnitSpelling"/>
         <exclude name="JUnitStaticSuite"/>
-        <exclude name="LoggerIsNotStaticFinal"/>
         <exclude name="MissingSerialVersionUID"/>
         <exclude name="NullAssignment"/> <!-- disabled due to false positive for initialization with ternary operator -->
         <exclude name="OverrideBothEqualsAndHashcode"/> <!-- duplicated by EqualsHashCode rule in Checkstyle -->

From 12948ee81f7b18f99468966494ae4280049883d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:22:36 +0100
Subject: [PATCH 101/233] bump org.junit:junit-bom from 5.9.2 to 5.10.3 (via
 #1069)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3b3738097..d25878cbd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -145,7 +145,7 @@ configure(libs) {
     dependencyManagement {
         imports {
             mavenBom("com.fasterxml.jackson:jackson-bom:2.14.1")
-            mavenBom("org.junit:junit-bom:5.9.2")
+            mavenBom("org.junit:junit-bom:5.10.3")
         }
         dependencies {
             dependency("com.github.spotbugs:spotbugs:4.8.3")

From 4069e34ce3bbbbd561db27a6c541581b25bc62cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:22:49 +0100
Subject: [PATCH 102/233] bump com.puppycrawl.tools:checkstyle from 10.13.0 to
 10.17.0 (via #1067)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d25878cbd..382f13635 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -152,7 +152,7 @@ configure(libs) {
             dependency("com.github.tomakehurst:wiremock:3.0.1")
             dependency("com.google.inject:guice:7.0.0")
             dependency("com.google.testing.compile:compile-testing:0.19")
-            dependency("com.puppycrawl.tools:checkstyle:10.13.0")
+            dependency("com.puppycrawl.tools:checkstyle:10.17.0")
             dependency("com.squareup.retrofit2:retrofit:2.9.0")
             dependency("commons-io:commons-io:2.11.0")
             dependency("io.github.benas:random-beans:3.9.0")

From 540c2aa5ac015205d089127d5fe56ff4d2468276 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:23:06 +0100
Subject: [PATCH 103/233] bump org.freemarker:freemarker from 2.3.31 to 2.3.33
 (via #1070)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 382f13635..a3092b534 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -165,7 +165,7 @@ configure(libs) {
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")
             dependency("org.assertj:assertj-core:3.23.1")
-            dependency("org.freemarker:freemarker:2.3.31")
+            dependency("org.freemarker:freemarker:2.3.33")
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.hamcrest:hamcrest:2.2")
             dependency("org.jboss.resteasy:resteasy-client:6.2.1.Final")

From 4e692964eba52a0e5ef043712e087ac086342d74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:23:18 +0100
Subject: [PATCH 104/233] bump protobufVersion from 4.26.1 to 4.27.2 (via
 #1066)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index bcba01f3a..cd1ddfd34 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -9,7 +9,7 @@ description = "Allure gRPC Integration"
 val agent: Configuration by configurations.creating
 
 val grpcVersion = "1.57.2"
-val protobufVersion = "4.26.1"
+val protobufVersion = "4.27.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 2e9de5b499fa052a4b779e8ae9fa83269c573ddb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:34:23 +0100
Subject: [PATCH 105/233] bump com.diffplug.spotless from 6.11.0 to 6.25.0 (via
 #1071)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8d3f7a004..97a47fa33 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -47,7 +47,7 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("com.diffplug.spotless") version "6.11.0"
+        id("com.diffplug.spotless") version "6.25.0"
         id("com.github.johnrengelman.shadow") version "8.1.1"
         id("com.gradle.enterprise") version "3.12.5"
         id("io.github.gradle-nexus.publish-plugin") version "2.0.0"

From 80435797a61b070ce6d38098e9408120ffbd0da2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:34:37 +0100
Subject: [PATCH 106/233] bump com.squareup.retrofit2:retrofit from 2.9.0 to
 2.11.0 (via #1068)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a3092b534..7e8ef508b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -153,7 +153,7 @@ configure(libs) {
             dependency("com.google.inject:guice:7.0.0")
             dependency("com.google.testing.compile:compile-testing:0.19")
             dependency("com.puppycrawl.tools:checkstyle:10.17.0")
-            dependency("com.squareup.retrofit2:retrofit:2.9.0")
+            dependency("com.squareup.retrofit2:retrofit:2.11.0")
             dependency("commons-io:commons-io:2.11.0")
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.6.0")

From 9c55fc583409a32ca1ad00c6d9febfe8b7b960b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:34:56 +0100
Subject: [PATCH 107/233] bump com.intuit.karate:karate-core from 1.4.0 to
 1.4.1 (via #1073)

---
 allure-karate/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-karate/build.gradle.kts b/allure-karate/build.gradle.kts
index f300ed9fd..f30a20467 100644
--- a/allure-karate/build.gradle.kts
+++ b/allure-karate/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Karate Integration"
 
-val karateVersion = "1.4.0"
+val karateVersion = "1.4.1"
 
 configurations {
     testImplementation {

From 68eeb8cc8e0bdaf199a5420d390aa6fd03bdd754 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:35:13 +0100
Subject: [PATCH 108/233] bump org.jooq:jooq from 3.18.4 to 3.19.10 (via #1074)

---
 allure-jooq/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
index ef7c35168..5f557fbaf 100644
--- a/allure-jooq/build.gradle.kts
+++ b/allure-jooq/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure JOOQ Integration"
 
-val jooqVersion = "3.18.4"
+val jooqVersion = "3.19.10"
 
 dependencies {
     api(project(":allure-java-commons"))

From a3417ac15985b1001d9317c289a6b41f6b296d3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:48:33 +0100
Subject: [PATCH 109/233] bump org.apache.httpcomponents.client5:httpclient5
 from 5.2.1 to 5.3.1 (via #1079)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7e8ef508b..c405c8f93 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -161,7 +161,7 @@ configure(libs) {
             dependency("net.sourceforge.pmd:pmd-java:7.3.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.14")
-            dependency("org.apache.httpcomponents.client5:httpclient5:5.2.1")
+            dependency("org.apache.httpcomponents.client5:httpclient5:5.3.1")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")
             dependency("org.assertj:assertj-core:3.23.1")

From 64857eac65606c4c623169c91565cdf3fa7b52d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:48:53 +0100
Subject: [PATCH 110/233] bump io.rest-assured:rest-assured from 5.4.0 to 5.5.0
 (via #1078)

---
 allure-rest-assured/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-rest-assured/build.gradle.kts b/allure-rest-assured/build.gradle.kts
index 9fa2af59e..809f433b5 100644
--- a/allure-rest-assured/build.gradle.kts
+++ b/allure-rest-assured/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Rest-Assured Integration"
 
-val restAssuredVersion = "5.4.0"
+val restAssuredVersion = "5.5.0"
 
 dependencies {
     api(project(":allure-attachments"))

From 3ceb6651f32236f322af3504a0d70649f8ab6a7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:49:11 +0100
Subject: [PATCH 111/233] bump commons-io:commons-io from 2.11.0 to 2.16.1 (via
 #1075)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c405c8f93..b62e426d1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -154,7 +154,7 @@ configure(libs) {
             dependency("com.google.testing.compile:compile-testing:0.19")
             dependency("com.puppycrawl.tools:checkstyle:10.17.0")
             dependency("com.squareup.retrofit2:retrofit:2.11.0")
-            dependency("commons-io:commons-io:2.11.0")
+            dependency("commons-io:commons-io:2.16.1")
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.6.0")
             dependency("javax.annotation:javax.annotation-api:1.3.2")

From 7fc6768a941121435424ad1a66fd8cc57fe7632f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:49:30 +0100
Subject: [PATCH 112/233] bump org.jboss.resteasy:resteasy-client from
 6.2.1.Final to 6.2.9.Final (via #1076)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b62e426d1..9ef0be4b0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -168,7 +168,7 @@ configure(libs) {
             dependency("org.freemarker:freemarker:2.3.33")
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.hamcrest:hamcrest:2.2")
-            dependency("org.jboss.resteasy:resteasy-client:6.2.1.Final")
+            dependency("org.jboss.resteasy:resteasy-client:6.2.9.Final")
             dependency("org.mock-server:mockserver-netty:5.15.0")
             dependency("org.mockito:mockito-core:5.12.0")
             dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")

From b88b72aa163f24f875d9c8fd48f2202aa1893bb2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:49:49 +0100
Subject: [PATCH 113/233] bump
 io.zonky.test.postgres:embedded-postgres-binaries-bom from 15.3.0 to 16.2.0
 (via #1077)

---
 allure-jooq/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
index 5f557fbaf..51a655673 100644
--- a/allure-jooq/build.gradle.kts
+++ b/allure-jooq/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
-    testImplementation(platform("io.zonky.test.postgres:embedded-postgres-binaries-bom:15.3.0"))
+    testImplementation(platform("io.zonky.test.postgres:embedded-postgres-binaries-bom:16.2.0"))
     testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))

From 213b22155a67dfbe20472076feeb5bccee9673c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 19:06:16 +0100
Subject: [PATCH 114/233] bump org.springframework:spring-web from 5.3.20 to
 5.3.37 (via #1080)

---
 allure-spring-web/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-spring-web/build.gradle.kts b/allure-spring-web/build.gradle.kts
index 5d7d4fcda..07f258185 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Spring Web Integration"
 
-val springWebVersion = "5.3.20"
+val springWebVersion = "5.3.37"
 
 dependencies {
     api(project(":allure-attachments"))

From 77b0001e339fad5090f10424eb93fb9b587e070f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 19:06:35 +0100
Subject: [PATCH 115/233] bump assertJVersion from 1.9.9.1 to 1.9.22.1 (via
 #1082)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9ef0be4b0..3b1f22340 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -140,7 +140,7 @@ configure(libs) {
     apply(plugin = "java-library")
 
     val orgSlf4jVersion = "2.0.13"
-    val assertJVersion = "1.9.9.1"
+    val assertJVersion = "1.9.22.1"
 
     dependencyManagement {
         imports {

From f1c8ab638629ebf751905c5bd3526cbb9fc279b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 19:07:00 +0100
Subject: [PATCH 116/233] bump com.gradle.enterprise from 3.12.5 to 3.17.5 (via
 #1084)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 97a47fa33..43beb9018 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -49,7 +49,7 @@ pluginManagement {
     plugins {
         id("com.diffplug.spotless") version "6.25.0"
         id("com.github.johnrengelman.shadow") version "8.1.1"
-        id("com.gradle.enterprise") version "3.12.5"
+        id("com.gradle.enterprise") version "3.17.5"
         id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
         id("io.qameta.allure-adapter") version "2.11.2"
         id("io.qameta.allure-aggregate-report") version "2.11.2"

From f5fd60063ca493ebb97a2bca2108e99237c94394 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 19:08:34 +0100
Subject: [PATCH 117/233] bump com.google.testing.compile:compile-testing from
 0.19 to 0.21.0 (via #1083)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3b1f22340..bb4c056e7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -151,7 +151,7 @@ configure(libs) {
             dependency("com.github.spotbugs:spotbugs:4.8.3")
             dependency("com.github.tomakehurst:wiremock:3.0.1")
             dependency("com.google.inject:guice:7.0.0")
-            dependency("com.google.testing.compile:compile-testing:0.19")
+            dependency("com.google.testing.compile:compile-testing:0.21.0")
             dependency("com.puppycrawl.tools:checkstyle:10.17.0")
             dependency("com.squareup.retrofit2:retrofit:2.11.0")
             dependency("commons-io:commons-io:2.16.1")

From be4c07fa943b053c1ffef7955b2d37392be10a2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 19:34:31 +0100
Subject: [PATCH 118/233] bump io.zonky.test:embedded-postgres from 2.0.4 to
 2.0.7 (via #1087)

---
 allure-jooq/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
index 51a655673..b0b1c7884 100644
--- a/allure-jooq/build.gradle.kts
+++ b/allure-jooq/build.gradle.kts
@@ -5,7 +5,7 @@ val jooqVersion = "3.19.10"
 dependencies {
     api(project(":allure-java-commons"))
     implementation("org.jooq:jooq:${jooqVersion}")
-    testImplementation("io.zonky.test:embedded-postgres:2.0.4")
+    testImplementation("io.zonky.test:embedded-postgres:2.0.7")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")

From 36ebd1b2a0dabf0e461c46d5740bb815a54f6fca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 20:20:12 +0100
Subject: [PATCH 119/233] bump jvm from 1.7.10 to 2.0.0 (via #1089)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 43beb9018..9ca480190 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -58,7 +58,7 @@ pluginManagement {
         id("io.spring.dependency-management") version "1.1.5"
         id("com.google.protobuf") version "0.9.4"
         id("com.github.spotbugs") version "6.0.6"
-        kotlin("jvm") version "1.7.10"
+        kotlin("jvm") version "2.0.0"
     }
 }
 

From 43e38eae723ffa7c6ad1faf3389e71f598b20633 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 5 Jul 2024 20:47:27 +0100
Subject: [PATCH 120/233] build with java 21 (via #1090)

---
 .github/workflows/build.yml       | 12 ++++--------
 .github/workflows/publish.yml     |  4 ++--
 allure-scalatest/build.gradle.kts | 12 +++++-------
 allure-spock/build.gradle.kts     |  2 +-
 allure-spock2/build.gradle.kts    |  2 +-
 build.gradle.kts                  |  2 +-
 settings.gradle.kts               |  9 +++++----
 7 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ad77feb7d..cb14edb6f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,22 +14,18 @@ jobs:
   build:
     name: "Build"
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java-version: [ '17.0.x' ]
     steps:
       - uses: actions/checkout@v4.1.1
 
-      - name: Set up JDK ${{ matrix.java-version }}
+      - name: "Set up JDK"
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: ${{ matrix.java-version }}
+          java-version: 21
 
-      - name: Build with Gradle
+      - name: "Build with Gradle"
         run: ./gradlew build -x test --scan
 
-      - name: Run tests
+      - name: "Run tests"
         if: always()
         run: ./gradlew --no-build-cache cleanTest test
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 75b78957e..28af62d51 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -10,11 +10,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.1
 
-      - name: "Set up JDK 17.0.x"
+      - name: "Set up JDK"
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '17.0.x'
+          java-version: '21'
 
       - name: Set up GPG
         run: echo -n "${GPG_PRIVATE_KEY}" | base64 --decode > ${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg
diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts
index 910d28ad2..2aa0f8d31 100644
--- a/allure-scalatest/build.gradle.kts
+++ b/allure-scalatest/build.gradle.kts
@@ -4,17 +4,15 @@ description = "Allure ScalaTest Integration"
 
 apply(plugin = "scala")
 
-val availableScalaVersions = listOf("2.11", "2.12", "2.13")
-val defaultScala211Version = "2.11.12"
-val defaultScala212Version = "2.12.8"
-val defaultScala213Version = "2.13.1"
+val availableScalaVersions = listOf("2.12", "2.13")
+val defaultScala212Version = "2.12.19"
+val defaultScala213Version = "2.13.14"
 
 var selectedScalaVersion = defaultScala213Version
 
 if (hasProperty("scalaVersion")) {
     val scalaVersion: String by project
     selectedScalaVersion = when (scalaVersion) {
-        "2.11" -> defaultScala211Version
         "2.12" -> defaultScala212Version
         "2.13" -> defaultScala213Version
         else -> scalaVersion
@@ -80,8 +78,8 @@ val installAll by tasks.creating {
 
 dependencies {
     api(project(":allure-java-commons"))
-    implementation("org.scalatest:scalatest_$baseScalaVersion:3.1.1")
-    implementation("org.scala-lang.modules:scala-collection-compat_$baseScalaVersion:2.1.4")
+    implementation("org.scalatest:scalatest_$baseScalaVersion:3.2.19")
+    implementation("org.scala-lang.modules:scala-collection-compat_$baseScalaVersion:2.12.0")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
diff --git a/allure-spock/build.gradle.kts b/allure-spock/build.gradle.kts
index 9fbbe98ae..f65503f4d 100644
--- a/allure-spock/build.gradle.kts
+++ b/allure-spock/build.gradle.kts
@@ -3,7 +3,7 @@ description = "Allure Spock Framework Integration"
 apply(plugin = "groovy")
 
 val spockFrameworkVersion = "1.3-groovy-2.5"
-val groovyVersion = "2.5.19"
+val groovyVersion = "2.5.23"
 
 dependencies {
     api(project(":allure-java-commons"))
diff --git a/allure-spock2/build.gradle.kts b/allure-spock2/build.gradle.kts
index 50c5c4ba9..fbbe45a55 100644
--- a/allure-spock2/build.gradle.kts
+++ b/allure-spock2/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 val spockFrameworkVersion = "2.3-groovy-3.0"
-val groovyVersion = "3.0.13"
+val groovyVersion = "3.0.22"
 
 dependencies {
     api(project(":allure-java-commons"))
diff --git a/build.gradle.kts b/build.gradle.kts
index bb4c056e7..8232a0d34 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,7 +27,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9ca480190..6e1af8fd9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -63,16 +63,17 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gradle.enterprise")
+    id("com.gradle.develocity") version "3.17.5" apply false
 }
 
 val isCiServer = System.getenv().containsKey("CI")
 
 if (isCiServer) {
-    gradleEnterprise {
+    apply(plugin = "com.gradle.develocity")
+    develocity {
         buildScan {
-            termsOfServiceUrl = "https://gradle.com/terms-of-service"
-            termsOfServiceAgree = "yes"
+            termsOfUseUrl = "https://gradle.com/terms-of-service"
+            termsOfUseAgree = "yes"
             tag("CI")
         }
     }

From b416eaa98cba174fd166fc7c601724550b54c518 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 22:29:44 +0100
Subject: [PATCH 121/233] bump com.fasterxml.jackson:jackson-bom from 2.14.1 to
 2.17.2 (#1086)

---
 allure-java-commons/build.gradle.kts | 2 +-
 allure-test-filter/build.gradle.kts  | 2 +-
 build.gradle.kts                     | 3 ++-
 settings.gradle.kts                  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts
index 65c5ae82d..34a9a2ed3 100644
--- a/allure-java-commons/build.gradle.kts
+++ b/allure-java-commons/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.github.johnrengelman.shadow")
+    id("io.github.goooler.shadow")
 }
 
 description = "Allure Java Commons"
diff --git a/allure-test-filter/build.gradle.kts b/allure-test-filter/build.gradle.kts
index 547df0125..b2198ce39 100644
--- a/allure-test-filter/build.gradle.kts
+++ b/allure-test-filter/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.github.johnrengelman.shadow")
+    id("io.github.goooler.shadow")
 }
 
 description = "Allure Test Filter"
diff --git a/build.gradle.kts b/build.gradle.kts
index 8232a0d34..33e53ac4a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -144,7 +144,7 @@ configure(libs) {
 
     dependencyManagement {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.14.1")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.17.2")
             mavenBom("org.junit:junit-bom:5.10.3")
         }
         dependencies {
@@ -193,6 +193,7 @@ configure(libs) {
 
     tasks {
         compileJava {
+            options.compilerArgs.add("-Xlint:-options")
             if (JavaVersion.current().isJava8) {
                 java.targetCompatibility = JavaVersion.VERSION_1_8
             } else {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6e1af8fd9..3b27fe7cd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -48,7 +48,7 @@ pluginManagement {
     }
     plugins {
         id("com.diffplug.spotless") version "6.25.0"
-        id("com.github.johnrengelman.shadow") version "8.1.1"
+        id("io.github.goooler.shadow") version "8.1.8"
         id("com.gradle.enterprise") version "3.17.5"
         id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
         id("io.qameta.allure-adapter") version "2.11.2"

From 97f0e9c51c7ebddc3f3aa42cbc39eef6e34c9a2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 22:30:44 +0100
Subject: [PATCH 122/233] bump org.assertj:assertj-core from 3.23.1 to 3.26.0
 (#1092)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 33e53ac4a..e1d28ee2a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -164,7 +164,7 @@ configure(libs) {
             dependency("org.apache.httpcomponents.client5:httpclient5:5.3.1")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")
-            dependency("org.assertj:assertj-core:3.23.1")
+            dependency("org.assertj:assertj-core:3.26.0")
             dependency("org.freemarker:freemarker:2.3.33")
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.hamcrest:hamcrest:2.2")

From 5cdb7b4f98da0829c85766fc8b4e89921264a456 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 22:40:00 +0100
Subject: [PATCH 123/233] bump com.github.spotbugs from 6.0.6 to 6.0.18 (via
 #1091)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3b27fe7cd..c0b6759d8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -57,7 +57,7 @@ pluginManagement {
         id("io.qameta.allure-report") version "2.11.2"
         id("io.spring.dependency-management") version "1.1.5"
         id("com.google.protobuf") version "0.9.4"
-        id("com.github.spotbugs") version "6.0.6"
+        id("com.github.spotbugs") version "6.0.18"
         kotlin("jvm") version "2.0.0"
     }
 }

From 1a5306b682ba0c05c179c9ca3954648ecf3a8eab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 12:45:47 +0100
Subject: [PATCH 124/233] bump org.apache.commons:commons-lang3 from 3.12.0 to
 3.14.0 (via #1093)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e1d28ee2a..bffc86331 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -159,7 +159,7 @@ configure(libs) {
             dependency("io.github.glytching:junit-extensions:2.6.0")
             dependency("javax.annotation:javax.annotation-api:1.3.2")
             dependency("net.sourceforge.pmd:pmd-java:7.3.0")
-            dependency("org.apache.commons:commons-lang3:3.12.0")
+            dependency("org.apache.commons:commons-lang3:3.14.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.14")
             dependency("org.apache.httpcomponents.client5:httpclient5:5.3.1")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")

From d552349bb66474916fa1ebeb05cb5efff7fba944 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 13:11:12 +0100
Subject: [PATCH 125/233] build(deps): bump io.spring.dependency-management
 from 1.1.5 to 1.1.6 (via #1094)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index c0b6759d8..4bc95c3d9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -55,7 +55,7 @@ pluginManagement {
         id("io.qameta.allure-aggregate-report") version "2.11.2"
         id("io.qameta.allure-download") version "2.11.2"
         id("io.qameta.allure-report") version "2.11.2"
-        id("io.spring.dependency-management") version "1.1.5"
+        id("io.spring.dependency-management") version "1.1.6"
         id("com.google.protobuf") version "0.9.4"
         id("com.github.spotbugs") version "6.0.18"
         kotlin("jvm") version "2.0.0"

From 9dee4443b318f7b046ff4590ea3e9b760379d1ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 13:11:34 +0100
Subject: [PATCH 126/233] bump com.github.spotbugs:spotbugs from 4.8.3 to 4.8.6
 (via #1081)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index bffc86331..d4b5d1fd9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -148,7 +148,7 @@ configure(libs) {
             mavenBom("org.junit:junit-bom:5.10.3")
         }
         dependencies {
-            dependency("com.github.spotbugs:spotbugs:4.8.3")
+            dependency("com.github.spotbugs:spotbugs:4.8.6")
             dependency("com.github.tomakehurst:wiremock:3.0.1")
             dependency("com.google.inject:guice:7.0.0")
             dependency("com.google.testing.compile:compile-testing:0.21.0")

From 515752a5a689228d1f1c06c35bd118f2a398af51 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 16:24:36 +0100
Subject: [PATCH 127/233] bump com.codeborne:selenide from 6.17.1 to 7.3.3 (via
 #1088)

---
 allure-selenide/build.gradle.kts | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts
index 39ca99aa1..9e086e1d8 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Selenide Integration"
 
-val selenideVersion = "6.17.1"
+val selenideVersion = "7.3.3"
 
 dependencies {
     api(project(":allure-java-commons"))
@@ -15,14 +15,23 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.jar {
-    manifest {
-        attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.selenide"
-        ))
+tasks {
+    compileJava {
+        options.release.set(17)
+    }
+    compileTestJava {
+        options.release.set(17)
+    }
+    jar {
+        manifest {
+            attributes(
+                mapOf(
+                    "Automatic-Module-Name" to "io.qameta.allure.selenide"
+                )
+            )
+        }
+    }
+    test {
+        useJUnitPlatform()
     }
-}
-
-tasks.test {
-    useJUnitPlatform()
 }

From 254d2f2b1ffd69f4505f0f520d0cc6099a0d18f8 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Tue, 9 Jul 2024 09:40:45 +0000
Subject: [PATCH 128/233] release 2.28.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 872642fb0..ff0fe585e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.28-SNAPSHOT
+version=2.28.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 9620a5a9ffa7e516053268e236c4982dac473410 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Tue, 9 Jul 2024 09:40:46 +0000
Subject: [PATCH 129/233] set next development version 2.29

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ff0fe585e..1bdb57a6e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.28.0
+version=2.29-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From faa5d9b834fa7721c479f27bfed91b0e5a7e091d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 11:20:39 +0100
Subject: [PATCH 130/233] bump org.assertj:assertj-core from 3.26.0 to 3.26.3
 (via #1097)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d4b5d1fd9..72078aed7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -164,7 +164,7 @@ configure(libs) {
             dependency("org.apache.httpcomponents.client5:httpclient5:5.3.1")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")
-            dependency("org.assertj:assertj-core:3.26.0")
+            dependency("org.assertj:assertj-core:3.26.3")
             dependency("org.freemarker:freemarker:2.3.33")
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.hamcrest:hamcrest:2.2")

From 8f8cde929b1d554be59029ef2b9a36cbb85eb590 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 17:00:07 +0100
Subject: [PATCH 131/233] bump org.apache.commons:commons-lang3 from 3.14.0 to
 3.15.0 (via #1102)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 72078aed7..2fb93b6c8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -159,7 +159,7 @@ configure(libs) {
             dependency("io.github.glytching:junit-extensions:2.6.0")
             dependency("javax.annotation:javax.annotation-api:1.3.2")
             dependency("net.sourceforge.pmd:pmd-java:7.3.0")
-            dependency("org.apache.commons:commons-lang3:3.14.0")
+            dependency("org.apache.commons:commons-lang3:3.15.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.14")
             dependency("org.apache.httpcomponents.client5:httpclient5:5.3.1")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")

From 558373ccb8dc3209c2b7a23e5b00d260df4abcd3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 17:00:29 +0100
Subject: [PATCH 132/233] bump com.github.spotbugs from 6.0.18 to 6.0.19 (via
 #1099)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4bc95c3d9..063c8ebcc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -57,7 +57,7 @@ pluginManagement {
         id("io.qameta.allure-report") version "2.11.2"
         id("io.spring.dependency-management") version "1.1.6"
         id("com.google.protobuf") version "0.9.4"
-        id("com.github.spotbugs") version "6.0.18"
+        id("com.github.spotbugs") version "6.0.19"
         kotlin("jvm") version "2.0.0"
     }
 }

From 7948193cf7316a4b8a0884c6ee46fc55b3701f75 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 31 Jul 2024 13:00:18 +0100
Subject: [PATCH 133/233] fix(allure-scalatest): cross-build for scala 2.12 and
 2.13 (via #1107)

---
 allure-scalatest/build.gradle.kts           | 115 +++++++++-----------
 build.gradle.kts                            |  16 +--
 gradle/quality-configs/spotbugs/exclude.xml |   3 +
 3 files changed, 63 insertions(+), 71 deletions(-)

diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts
index 2aa0f8d31..039f8bb3a 100644
--- a/allure-scalatest/build.gradle.kts
+++ b/allure-scalatest/build.gradle.kts
@@ -2,84 +2,78 @@ import org.gradle.jvm.tasks.Jar
 
 description = "Allure ScalaTest Integration"
 
-apply(plugin = "scala")
+plugins {
+    scala
+    id("com.github.prokod.gradle-crossbuild") version "0.16.0"
+}
 
-val availableScalaVersions = listOf("2.12", "2.13")
-val defaultScala212Version = "2.12.19"
-val defaultScala213Version = "2.13.14"
+val scala212 = "2.12"
+val scala213 = "2.13"
 
-var selectedScalaVersion = defaultScala213Version
+project.base.archivesName.set("allure-scalatest")
 
-if (hasProperty("scalaVersion")) {
-    val scalaVersion: String by project
-    selectedScalaVersion = when (scalaVersion) {
-        "2.12" -> defaultScala212Version
-        "2.13" -> defaultScala213Version
-        else -> scalaVersion
+crossBuild {
+    scalaVersionsCatalog = mapOf(
+        scala212 to "2.12.19",
+        scala213 to "2.13.14"
+    )
+    builds {
+        register("scala") {
+            scalaVersions = setOf(scala212, scala213)
+        }
     }
 }
 
-val baseScalaVersion = selectedScalaVersion.substring(0, selectedScalaVersion.lastIndexOf("."))
-project.base.archivesName.set("allure-scalatest_$baseScalaVersion")
-
-for (sv in availableScalaVersions) {
-    val taskSuffix = sv.replace('.', '_')
+val crossBuildScala_212Jar by tasks.getting
+val crossBuildScala_213Jar by tasks.getting
 
-    tasks.create("jarScala_$taskSuffix", GradleBuild::class) {
-        startParameter = project.gradle.startParameter.newInstance()
-        startParameter.projectProperties["scalaVersion"] = sv
-        tasks = listOf("jar")
-    }
+val scaladocJar by tasks.creating(Jar::class) {
+    from(tasks.getByName("scaladoc"))
+    archiveClassifier.set("scaladoc")
+}
 
-    tasks.create("testScala_$taskSuffix", GradleBuild::class) {
-        startParameter = project.gradle.startParameter.newInstance()
-        startParameter.projectProperties["scalaVersion"] = sv
-        tasks = listOf("test")
+tasks.withType<PublishToMavenLocal>().configureEach {
+    val predicate = provider {
+        publication != publishing.publications["maven"]
     }
-
-    tasks.create("sourceJarScala_$taskSuffix", GradleBuild::class) {
-        startParameter = project.gradle.startParameter.newInstance()
-        startParameter.projectProperties["scalaVersion"] = sv
-        tasks = listOf("sourceJar")
+    onlyIf("disable default maven publication") {
+        predicate.get()
     }
+}
 
-    tasks.create("scaladocJarScala_$taskSuffix", GradleBuild::class) {
-        startParameter = project.gradle.startParameter.newInstance()
-        startParameter.projectProperties["scalaVersion"] = sv
-        tasks = listOf("scaladocJar")
+tasks.withType<PublishToMavenRepository>().configureEach {
+    val predicate = provider {
+        publication != publishing.publications["maven"]
     }
-
-    tasks.create("installScala_$taskSuffix", GradleBuild::class) {
-        startParameter = project.gradle.startParameter.newInstance()
-        startParameter.projectProperties["scalaVersion"] = sv
-        tasks = listOf("install")
+    onlyIf("disable default maven publication") {
+        predicate.get()
     }
 }
 
-val jarAll by tasks.creating {
-    dependsOn(availableScalaVersions.map { "jarScala_${it.replace('.', '_')}" })
-}
-
-val testAll by tasks.creating {
-    dependsOn(availableScalaVersions.map { "testScala_${it.replace('.', '_')}" })
-}
-
-val sourceJarAll by tasks.creating {
-    dependsOn(availableScalaVersions.map { "sourceJarScala_${it.replace('.', '_')}" })
-}
-
-val scaladocJarAll by tasks.creating {
-    dependsOn(availableScalaVersions.map { "scaladocJarScala_${it.replace('.', '_')}" })
+publishing {
+    publications {
+        create<MavenPublication>("crossBuildScala_212") {
+            from(components["crossBuildScala_212"])
+            artifact(scaladocJar)
+            artifact(tasks.sourcesJar)
+        }
+        create<MavenPublication>("crossBuildScala_213") {
+            from(components["crossBuildScala_213"])
+            artifact(scaladocJar)
+            artifact(tasks.sourcesJar)
+        }
+    }
 }
 
-val installAll by tasks.creating {
-    dependsOn(availableScalaVersions.map { "installScala_${it.replace('.', '_')}" })
+signing {
+    sign(publishing.publications["crossBuildScala_212"])
+    sign(publishing.publications["crossBuildScala_213"])
 }
 
 dependencies {
     api(project(":allure-java-commons"))
-    implementation("org.scalatest:scalatest_$baseScalaVersion:3.2.19")
-    implementation("org.scala-lang.modules:scala-collection-compat_$baseScalaVersion:2.12.0")
+    implementation("org.scalatest:scalatest_$scala213:3.2.19")
+    implementation("org.scala-lang.modules:scala-collection-compat_$scala213:2.12.0")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
@@ -92,13 +86,6 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-val scaladocJar by tasks.creating(Jar::class) {
-    from(tasks.getByName("scaladoc"))
-    archiveClassifier.set("scaladoc")
-}
-
-artifacts.add("archives", scaladocJar)
-
 tasks.jar {
     manifest {
         attributes(mapOf(
diff --git a/build.gradle.kts b/build.gradle.kts
index 2fb93b6c8..ce3370c87 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -56,13 +56,7 @@ configure(subprojects) {
 
     publishing {
         publications {
-            create<MavenPublication>("maven") {
-                suppressAllPomMetadataWarnings()
-                versionMapping {
-                    allVariants {
-                        fromResolutionResult()
-                    }
-                }
+            withType<MavenPublication>().configureEach {
                 pom {
                     name.set(project.name)
                     description.set("Module ${project.name} of Allure Framework.")
@@ -106,6 +100,14 @@ configure(subprojects) {
                     }
                 }
             }
+            create<MavenPublication>("maven") {
+                suppressAllPomMetadataWarnings()
+                versionMapping {
+                    allVariants {
+                        fromResolutionResult()
+                    }
+                }
+            }
         }
     }
 
diff --git a/gradle/quality-configs/spotbugs/exclude.xml b/gradle/quality-configs/spotbugs/exclude.xml
index 0b8a2de89..f942c310b 100644
--- a/gradle/quality-configs/spotbugs/exclude.xml
+++ b/gradle/quality-configs/spotbugs/exclude.xml
@@ -6,6 +6,9 @@
     <Match>
         <Source name="~.*\.groovy"/>
     </Match>
+    <Match>
+        <Source name="~.*\.scala"/>
+    </Match>
 
     <!-- Disable check -->
     <Match>

From 9de28ad45f774dffdf01ae50f1f4cd5ad64ebb6e Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 31 Jul 2024 18:46:16 +0100
Subject: [PATCH 134/233] fix(scalatest): resolve issues with crossbuild
 signing (via #1111)

---
 allure-scalatest/build.gradle.kts | 77 ++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 32 deletions(-)

diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts
index 039f8bb3a..6de0e41c4 100644
--- a/allure-scalatest/build.gradle.kts
+++ b/allure-scalatest/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.gradle.jvm.tasks.Jar
-
 description = "Allure ScalaTest Integration"
 
 plugins {
@@ -24,50 +22,63 @@ crossBuild {
     }
 }
 
-val crossBuildScala_212Jar by tasks.getting
-val crossBuildScala_213Jar by tasks.getting
-
-val scaladocJar by tasks.creating(Jar::class) {
-    from(tasks.getByName("scaladoc"))
-    archiveClassifier.set("scaladoc")
+tasks.publishMavenPublicationToMavenLocal {
+    enabled = false
 }
-
-tasks.withType<PublishToMavenLocal>().configureEach {
-    val predicate = provider {
-        publication != publishing.publications["maven"]
-    }
-    onlyIf("disable default maven publication") {
-        predicate.get()
-    }
+tasks.publishMavenPublicationToSonatypeRepository {
+    enabled = false
 }
-
-tasks.withType<PublishToMavenRepository>().configureEach {
-    val predicate = provider {
-        publication != publishing.publications["maven"]
-    }
-    onlyIf("disable default maven publication") {
-        predicate.get()
-    }
+tasks.signMavenPublication {
+    enabled = false
+}
+tasks.sourcesJar {
+    enabled = false
 }
 
 publishing {
     publications {
         create<MavenPublication>("crossBuildScala_212") {
             from(components["crossBuildScala_212"])
-            artifact(scaladocJar)
-            artifact(tasks.sourcesJar)
+
+            val crossBuildScala_212SourcesJar by tasks.creating(Jar::class) {
+                from(sourceSets["crossBuildScala_212"].allSource)
+                archiveBaseName.set("allure-scalatest_$scala212")
+                archiveClassifier.set("sources")
+            }
+            artifact(crossBuildScala_212SourcesJar)
+
+            val crossBuildScala_212ScaladocJar by tasks.creating(Jar::class) {
+                from(tasks.scaladoc)
+                archiveBaseName.set("allure-scalatest_$scala212")
+                archiveClassifier.set("scaladoc")
+            }
+            artifact(crossBuildScala_212ScaladocJar)
         }
         create<MavenPublication>("crossBuildScala_213") {
             from(components["crossBuildScala_213"])
-            artifact(scaladocJar)
-            artifact(tasks.sourcesJar)
+
+            val crossBuildScala_213SourcesJar by tasks.creating(Jar::class) {
+                from(sourceSets["crossBuildScala_213"].allSource)
+                archiveBaseName.set("allure-scalatest_$scala213")
+                archiveClassifier.set("sources")
+            }
+            artifact(crossBuildScala_213SourcesJar)
+
+            val crossBuildScala_213ScaladocJar by tasks.creating(Jar::class) {
+                from(tasks.scaladoc)
+                archiveBaseName.set("allure-scalatest_$scala213")
+                archiveClassifier.set("scaladoc")
+            }
+            artifact(crossBuildScala_213ScaladocJar)
         }
     }
 }
 
 signing {
-    sign(publishing.publications["crossBuildScala_212"])
-    sign(publishing.publications["crossBuildScala_213"])
+    sign(
+        publishing.publications["crossBuildScala_212"],
+        publishing.publications["crossBuildScala_213"]
+    )
 }
 
 dependencies {
@@ -88,9 +99,11 @@ dependencies {
 
 tasks.jar {
     manifest {
-        attributes(mapOf(
+        attributes(
+            mapOf(
                 "Automatic-Module-Name" to "io.qameta.allure.scalatest"
-        ))
+            )
+        )
     }
 }
 

From b40acffa5d4de4257f7420152b050b60c5e15828 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Wed, 31 Jul 2024 19:16:33 +0100
Subject: [PATCH 135/233] fix(allure-scalatest): rename scaladoc to javadoc

---
 allure-scalatest/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts
index 6de0e41c4..aae6abbc4 100644
--- a/allure-scalatest/build.gradle.kts
+++ b/allure-scalatest/build.gradle.kts
@@ -50,7 +50,7 @@ publishing {
             val crossBuildScala_212ScaladocJar by tasks.creating(Jar::class) {
                 from(tasks.scaladoc)
                 archiveBaseName.set("allure-scalatest_$scala212")
-                archiveClassifier.set("scaladoc")
+                archiveClassifier.set("javadoc")
             }
             artifact(crossBuildScala_212ScaladocJar)
         }
@@ -67,7 +67,7 @@ publishing {
             val crossBuildScala_213ScaladocJar by tasks.creating(Jar::class) {
                 from(tasks.scaladoc)
                 archiveBaseName.set("allure-scalatest_$scala213")
-                archiveClassifier.set("scaladoc")
+                archiveClassifier.set("javadoc")
             }
             artifact(crossBuildScala_213ScaladocJar)
         }

From 8f7278f93da98e6e07527621e607f4bcd605fd02 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Wed, 31 Jul 2024 18:17:16 +0000
Subject: [PATCH 136/233] release 2.28.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 1bdb57a6e..23a27d98f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.29-SNAPSHOT
+version=2.28.1
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From a2f252eb0b16ac4b3027ecc1057a98db8cf6fb94 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Wed, 31 Jul 2024 18:17:17 +0000
Subject: [PATCH 137/233] set next development version 2.29

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 23a27d98f..1bdb57a6e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.28.1
+version=2.29-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 702b526c9215b599a7dfbb14be1003e743d6fc4f Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 1 Aug 2024 11:53:58 +0100
Subject: [PATCH 138/233] chore(build): fix used jdk (fixes #1105, via #1112)

---
 allure-jooq/build.gradle.kts | 6 ++----
 build.gradle.kts             | 6 +-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
index b0b1c7884..00ff3b0d8 100644
--- a/allure-jooq/build.gradle.kts
+++ b/allure-jooq/build.gradle.kts
@@ -18,10 +18,8 @@ dependencies {
     testRuntimeOnly("org.postgresql:postgresql:42.7.3")
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
+tasks.compileJava {
+    options.release.set(17)
 }
 
 tasks.jar {
diff --git a/build.gradle.kts b/build.gradle.kts
index ce3370c87..8c59bb7bb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -196,11 +196,7 @@ configure(libs) {
     tasks {
         compileJava {
             options.compilerArgs.add("-Xlint:-options")
-            if (JavaVersion.current().isJava8) {
-                java.targetCompatibility = JavaVersion.VERSION_1_8
-            } else {
-                options.release.set(8)
-            }
+            options.release.set(8)
         }
 
         compileTestJava {

From 2bc8a104ab16f24ffcf695f44383c74a7716ae82 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 2 Aug 2024 11:46:21 +0100
Subject: [PATCH 139/233] move dependencies to compileOnly to exclude them from
 classpath (via #1095)

---
 allure-awaitility/build.gradle.kts            |   5 +-
 allure-cucumber4-jvm/build.gradle.kts         |   6 +-
 allure-cucumber5-jvm/build.gradle.kts         |   6 +-
 allure-cucumber6-jvm/build.gradle.kts         |   2 +-
 allure-cucumber7-jvm/build.gradle.kts         |   2 +-
 allure-grpc/build.gradle.kts                  |  15 +-
 allure-hamcrest/build.gradle.kts              |   5 +-
 allure-httpclient/build.gradle.kts            |   5 +-
 allure-httpclient5/build.gradle.kts           |   7 +-
 allure-java-migration/build.gradle.kts        |  35 ---
 .../allure/aspects/Allure1Annotations.java    | 131 ----------
 .../allure/aspects/Allure1AttachAspects.java  |  90 -------
 .../aspects/Allure1ParametersAspects.java     |  78 ------
 .../allure/aspects/Allure1StepsAspects.java   | 117 ---------
 .../aspects/Allure1TestCaseAspects.java       |  72 ------
 .../qameta/allure/aspects/Allure1Utils.java   | 182 --------------
 .../allure/annotations/Attachment.java        |  55 ----
 .../allure/annotations/Description.java       |  47 ----
 .../qatools/allure/annotations/Features.java  |  51 ----
 .../qatools/allure/annotations/Issue.java     |  40 ---
 .../qatools/allure/annotations/Issues.java    |  44 ----
 .../qatools/allure/annotations/Parameter.java |  52 ----
 .../qatools/allure/annotations/Severity.java  |  39 ---
 .../qatools/allure/annotations/Step.java      |  43 ----
 .../qatools/allure/annotations/Stories.java   |  50 ----
 .../allure/annotations/TestCaseId.java        |  40 ---
 .../qatools/allure/annotations/Title.java     |  37 ---
 .../qatools/allure/model/DescriptionType.java |  39 ---
 .../qatools/allure/model/SeverityLevel.java   |  43 ----
 .../src/main/resources/META-INF/aop-ajc.xml   |   9 -
 .../aspects/Allure1AttachAspectsTest.java     |  92 -------
 .../aspects/Allure1StepsAspectsTest.java      |  79 ------
 .../aspects/Allure1TestCaseAspectsTest.java   | 237 ------------------
 .../src/test/resources/allure.properties      |   2 -
 allure-jax-rs/build.gradle.kts                |   3 +-
 allure-jbehave/build.gradle.kts               |   3 +-
 allure-jbehave5/build.gradle.kts              |   3 +-
 allure-jooq/build.gradle.kts                  |   3 +-
 allure-jsonunit/build.gradle.kts              |   4 +-
 .../allure/jsonunit/JsonPatchListener.java    |   5 +-
 allure-junit4-aspect/build.gradle.kts         |   4 +-
 allure-junit4/build.gradle.kts                |   3 +-
 allure-junit5-assert/build.gradle.kts         |   3 +-
 allure-junit5/build.gradle.kts                |   5 +-
 allure-karate/build.gradle.kts                |   7 +-
 allure-okhttp/build.gradle.kts                |   3 +-
 allure-okhttp3/build.gradle.kts               |   5 +-
 allure-rest-assured/build.gradle.kts          |   3 +-
 allure-scalatest/build.gradle.kts             |   6 +-
 allure-servlet-api/build.gradle.kts           |   3 +-
 allure-spock/build.gradle.kts                 |   3 +-
 allure-spock2/build.gradle.kts                |   3 +-
 allure-spring-web/build.gradle.kts            |   3 +-
 allure-testng/build.gradle.kts                |   3 +-
 build.gradle.kts                              |   6 +-
 settings.gradle.kts                           |   1 -
 56 files changed, 82 insertions(+), 1757 deletions(-)
 delete mode 100644 allure-java-migration/build.gradle.kts
 delete mode 100644 allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java
 delete mode 100644 allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java
 delete mode 100644 allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1ParametersAspects.java
 delete mode 100644 allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1StepsAspects.java
 delete mode 100644 allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1TestCaseAspects.java
 delete mode 100644 allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Utils.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Attachment.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Description.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Features.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issue.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issues.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Parameter.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Severity.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Step.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Stories.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/TestCaseId.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Title.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/DescriptionType.java
 delete mode 100644 allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/SeverityLevel.java
 delete mode 100644 allure-java-migration/src/main/resources/META-INF/aop-ajc.xml
 delete mode 100644 allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java
 delete mode 100644 allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1StepsAspectsTest.java
 delete mode 100644 allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1TestCaseAspectsTest.java
 delete mode 100644 allure-java-migration/src/test/resources/allure.properties

diff --git a/allure-awaitility/build.gradle.kts b/allure-awaitility/build.gradle.kts
index 587ca0308..e7afac938 100644
--- a/allure-awaitility/build.gradle.kts
+++ b/allure-awaitility/build.gradle.kts
@@ -7,9 +7,10 @@ val awaitilityVersion = "4.2.1"
 dependencies {
     agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
-    implementation("org.awaitility:awaitility:$awaitilityVersion")
+    compileOnly("org.awaitility:awaitility:$awaitilityVersion")
     testImplementation("javax.annotation:javax.annotation-api")
     testImplementation("org.assertj:assertj-core")
+    testImplementation("org.awaitility:awaitility:$awaitilityVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-java-commons-test"))
@@ -27,4 +28,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-}
\ No newline at end of file
+}
diff --git a/allure-cucumber4-jvm/build.gradle.kts b/allure-cucumber4-jvm/build.gradle.kts
index 37b660454..26b244ee0 100644
--- a/allure-cucumber4-jvm/build.gradle.kts
+++ b/allure-cucumber4-jvm/build.gradle.kts
@@ -4,9 +4,11 @@ val cucumberVersion = "4.8.0"
 
 dependencies {
     api(project(":allure-java-commons"))
-    implementation("io.cucumber:cucumber-core:$cucumberVersion")
-    implementation("io.cucumber:cucumber-java:$cucumberVersion")
+    compileOnly("io.cucumber:cucumber-core:$cucumberVersion")
+    compileOnly("io.cucumber:cucumber-java:$cucumberVersion")
     testImplementation("commons-io:commons-io")
+    testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
+    testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
diff --git a/allure-cucumber5-jvm/build.gradle.kts b/allure-cucumber5-jvm/build.gradle.kts
index 0bb513d73..4e0d44c9d 100644
--- a/allure-cucumber5-jvm/build.gradle.kts
+++ b/allure-cucumber5-jvm/build.gradle.kts
@@ -6,11 +6,11 @@ val cucumberGherkinVersion = "5.1.0"
 dependencies {
     api(project(":allure-java-commons"))
     compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
-    implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
-    testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
+    compileOnly("io.cucumber:gherkin:$cucumberGherkinVersion")
+    testImplementation("commons-io:commons-io")
     testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
     testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
-    testImplementation("commons-io:commons-io")
+    testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
diff --git a/allure-cucumber6-jvm/build.gradle.kts b/allure-cucumber6-jvm/build.gradle.kts
index e0a1922ab..cbe2c710c 100644
--- a/allure-cucumber6-jvm/build.gradle.kts
+++ b/allure-cucumber6-jvm/build.gradle.kts
@@ -6,7 +6,7 @@ val cucumberGherkinVersion = "18.0.0"
 dependencies {
     api(project(":allure-java-commons"))
     compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
-    implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
+    compileOnly("io.cucumber:gherkin:$cucumberGherkinVersion")
     testImplementation("commons-io:commons-io")
     testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
     testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
diff --git a/allure-cucumber7-jvm/build.gradle.kts b/allure-cucumber7-jvm/build.gradle.kts
index 4b33f0eaf..2a1f44c98 100644
--- a/allure-cucumber7-jvm/build.gradle.kts
+++ b/allure-cucumber7-jvm/build.gradle.kts
@@ -6,7 +6,7 @@ val cucumberGherkinVersion = "26.2.0"
 dependencies {
     api(project(":allure-java-commons"))
     compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
-    implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
+    compileOnly("io.cucumber:gherkin:$cucumberGherkinVersion")
     testImplementation("commons-io:commons-io")
     testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
     testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index cd1ddfd34..54ed3b5da 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -14,16 +14,17 @@ val protobufVersion = "4.27.2"
 dependencies {
     agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
-    implementation("io.grpc:grpc-core:$grpcVersion")
-    implementation("com.google.protobuf:protobuf-java-util:$protobufVersion")
-
-    testImplementation("io.grpc:grpc-stub:$grpcVersion")
-    testImplementation("io.grpc:grpc-protobuf:$grpcVersion")
-    testImplementation("io.grpc:grpc-netty-shaded:$grpcVersion")
+    compileOnly("com.google.protobuf:protobuf-java-util:$protobufVersion")
+    compileOnly("io.grpc:grpc-core:$grpcVersion")
+    testImplementation("com.google.protobuf:protobuf-java-util:$protobufVersion")
     testImplementation("com.google.protobuf:protobuf-java:$protobufVersion")
-    testImplementation("org.grpcmock:grpcmock-junit5")
+    testImplementation("io.grpc:grpc-core:$grpcVersion")
+    testImplementation("io.grpc:grpc-netty-shaded:$grpcVersion")
+    testImplementation("io.grpc:grpc-protobuf:$grpcVersion")
+    testImplementation("io.grpc:grpc-stub:$grpcVersion")
     testImplementation("javax.annotation:javax.annotation-api")
     testImplementation("org.assertj:assertj-core")
+    testImplementation("org.grpcmock:grpcmock-junit5")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-java-commons-test"))
diff --git a/allure-hamcrest/build.gradle.kts b/allure-hamcrest/build.gradle.kts
index 8ccb0ee47..6b0e5dd3a 100644
--- a/allure-hamcrest/build.gradle.kts
+++ b/allure-hamcrest/build.gradle.kts
@@ -3,11 +3,12 @@ description = "Allure Hamcrest Assertions Integration"
 dependencies {
     api(project(":allure-java-commons"))
     compileOnly("org.aspectj:aspectjrt")
-    implementation("org.hamcrest:hamcrest")
+    compileOnly("org.hamcrest:hamcrest")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.hamcrest:hamcrest")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
-    testImplementation("org.assertj:assertj-core")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-java-commons-test"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
diff --git a/allure-httpclient/build.gradle.kts b/allure-httpclient/build.gradle.kts
index 087e00bfb..9f3b4c554 100644
--- a/allure-httpclient/build.gradle.kts
+++ b/allure-httpclient/build.gradle.kts
@@ -1,10 +1,13 @@
 description = "Allure Apache HttpClient Integration"
 
+val httpClient4Version = "4.5.14";
+
 dependencies {
     api(project(":allure-attachments"))
-    implementation("org.apache.httpcomponents:httpclient")
+    compileOnly("org.apache.httpcomponents:httpclient:$httpClient4Version")
     testImplementation("com.github.tomakehurst:wiremock")
     testImplementation("io.github.glytching:junit-extensions")
+    testImplementation("org.apache.httpcomponents:httpclient:$httpClient4Version")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
diff --git a/allure-httpclient5/build.gradle.kts b/allure-httpclient5/build.gradle.kts
index eb42ad2da..aa6d53179 100644
--- a/allure-httpclient5/build.gradle.kts
+++ b/allure-httpclient5/build.gradle.kts
@@ -1,10 +1,13 @@
 description = "Allure Apache HttpClient5 Integration"
 
+val httpClient5Version = "5.3.1";
+
 dependencies {
     api(project(":allure-attachments"))
-    implementation("org.apache.httpcomponents.client5:httpclient5")
+    compileOnly("org.apache.httpcomponents.client5:httpclient5:$httpClient5Version")
     testImplementation("com.github.tomakehurst:wiremock")
     testImplementation("io.github.glytching:junit-extensions")
+    testImplementation("org.apache.httpcomponents.client5:httpclient5:$httpClient5Version")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
@@ -24,4 +27,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-}
\ No newline at end of file
+}
diff --git a/allure-java-migration/build.gradle.kts b/allure-java-migration/build.gradle.kts
deleted file mode 100644
index f6a0f755e..000000000
--- a/allure-java-migration/build.gradle.kts
+++ /dev/null
@@ -1,35 +0,0 @@
-description = "Allure Java Migration Utils"
-
-val junitVersion = "4.13.2"
-val testNgVersion = "6.14.3"
-
-dependencies {
-    api("org.apache.commons:commons-lang3")
-    api("org.aspectj:aspectjrt")
-    api(project(":allure-java-commons"))
-    implementation("junit:junit:$junitVersion")
-    implementation("org.testng:testng:$testNgVersion")
-    testImplementation("io.github.glytching:junit-extensions")
-    testImplementation("junit:junit:$junitVersion")
-    testImplementation("org.assertj:assertj-core")
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("org.junit.jupiter:junit-jupiter-params")
-    testImplementation("org.mockito:mockito-core")
-    testImplementation("org.slf4j:slf4j-simple")
-    testImplementation("org.testng:testng:$testNgVersion")
-    testImplementation(project(":allure-java-commons-test"))
-    testImplementation(project(":allure-junit-platform"))
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-}
-
-tasks.jar {
-    manifest {
-        attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.migration"
-        ))
-    }
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java
deleted file mode 100644
index 1232ea19a..000000000
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.TestResult;
-import org.aspectj.lang.reflect.MethodSignature;
-import ru.yandex.qatools.allure.annotations.Description;
-import ru.yandex.qatools.allure.annotations.Features;
-import ru.yandex.qatools.allure.annotations.Issue;
-import ru.yandex.qatools.allure.annotations.Issues;
-import ru.yandex.qatools.allure.annotations.Severity;
-import ru.yandex.qatools.allure.annotations.Stories;
-import ru.yandex.qatools.allure.annotations.TestCaseId;
-import ru.yandex.qatools.allure.annotations.Title;
-import ru.yandex.qatools.allure.model.DescriptionType;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static io.qameta.allure.util.ResultsUtils.createParameter;
-
-/**
- * Allure labels utils.
- */
-final class Allure1Annotations {
-
-    private static final String SUITE_LABEL = "suite";
-
-    private final MethodSignature signature;
-
-    private final Object[] args;
-
-    Allure1Annotations(final MethodSignature signature, final Object... args) {
-        this.args = Arrays.copyOf(args, args.length);
-        this.signature = signature;
-    }
-
-    public void updateTitle(final TestResult result) {
-        final Method method = getMethod();
-        if (method.isAnnotationPresent(Title.class)) {
-            final Title title = method.getAnnotation(Title.class);
-            result.setName(title.value());
-        }
-        final Class<?> type = getType();
-        if (type.isAnnotationPresent(Title.class)) {
-            final Title title = type.getAnnotation(Title.class);
-            final List<Label> labels = result.getLabels().stream()
-                    .filter(label -> !SUITE_LABEL.equals(label.getName()))
-                    .collect(Collectors.toList());
-            labels.add(new Label().setName(SUITE_LABEL).setValue(title.value()));
-            result.setLabels(labels);
-        }
-    }
-
-    public void updateDescription(final TestResult result) {
-        final Method method = getMethod();
-        if (method.isAnnotationPresent(Description.class)) {
-            final Description description = method.getAnnotation(Description.class);
-            if (description.type().equals(DescriptionType.HTML)) {
-                result.setDescriptionHtml(description.value());
-            } else {
-                result.setDescription(description.value());
-            }
-        }
-    }
-
-    public void updateLabels(final TestResult result) {
-        result.getLabels().addAll(getLabels());
-    }
-
-    public void updateLinks(final TestResult result) {
-        result.getLinks().addAll(getLinks());
-    }
-
-    public void updateParameters(final TestResult result) {
-        result.getParameters().addAll(getMethodParameters());
-    }
-
-    private List<Parameter> getMethodParameters() {
-        final String[] parameterNames = signature.getParameterNames();
-        return IntStream.range(0, parameterNames.length)
-                .mapToObj(index -> createParameter(parameterNames[index], args[index]))
-                .collect(Collectors.toList());
-    }
-
-    private Class<?> getType() {
-        return signature.getMethod().getDeclaringClass();
-    }
-
-    private Method getMethod() {
-        return signature.getMethod();
-    }
-
-    private List<Label> getLabels() {
-        final Method method = getMethod();
-        final List<Label> labels = new ArrayList<>();
-        labels.addAll(Allure1Utils.getLabels(method, Severity.class, Allure1Utils::createLabels));
-        labels.addAll(Allure1Utils.getLabels(method, Stories.class, Allure1Utils::createLabels));
-        labels.addAll(Allure1Utils.getLabels(method, Features.class, Allure1Utils::createLabels));
-        return labels;
-    }
-
-    public List<Link> getLinks() {
-        final Method method = getMethod();
-        final List<Link> links = new ArrayList<>();
-        links.addAll(Allure1Utils.getLinks(method, TestCaseId.class, Allure1Utils::createLinks));
-        links.addAll(Allure1Utils.getLinks(method, Issue.class, Allure1Utils::createLinks));
-        links.addAll(Allure1Utils.getLinks(method, Issues.class, Allure1Utils::createLinks));
-        return links;
-    }
-}
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java
deleted file mode 100644
index b575be44e..000000000
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import ru.yandex.qatools.allure.annotations.Attachment;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Objects;
-
-/**
- * Aspects (AspectJ) for handling {@link Attachment}.
- */
-@Aspect
-public class Allure1AttachAspects {
-
-    private static AllureLifecycle lifecycle;
-
-    /**
-     * Pointcut for things annotated with {@link ru.yandex.qatools.allure.annotations.Attachment}.
-     */
-    @Pointcut("@annotation(ru.yandex.qatools.allure.annotations.Attachment)")
-    public void withAttachmentAnnotation() {
-        //pointcut body, should be empty
-    }
-
-    /**
-     * Pointcut for any methods.
-     */
-    @Pointcut("execution(* *(..))")
-    public void anyMethod() {
-        //pointcut body, should be empty
-    }
-
-    /**
-     * Process data returned from method annotated with {@link ru.yandex.qatools.allure.annotations.Attachment}
-     * If returned data is not a byte array, then use toString() method, and get bytes from it using.
-     */
-    @AfterReturning(pointcut = "anyMethod() && withAttachmentAnnotation()", returning = "result")
-    public void attachment(final JoinPoint joinPoint, final Object result) {
-        final MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
-        final Attachment attachment = methodSignature.getMethod().getAnnotation(Attachment.class);
-
-        final String title = Allure1Utils.getTitle(
-                attachment.value(),
-                methodSignature.getName(),
-                joinPoint.getThis(),
-                joinPoint.getArgs()
-        );
-
-        final byte[] bytes = (result instanceof byte[])
-                ? (byte[]) result : Objects.toString(result).getBytes(StandardCharsets.UTF_8);
-        getLifecycle().addAttachment(title, attachment.type(), "", bytes);
-    }
-
-    /**
-     * For tests only.
-     */
-    public static void setLifecycle(final AllureLifecycle lifecycle) {
-        Allure1AttachAspects.lifecycle = lifecycle;
-    }
-
-    public static AllureLifecycle getLifecycle() {
-        if (Objects.isNull(lifecycle)) {
-            lifecycle = Allure.getLifecycle();
-        }
-        return lifecycle;
-    }
-
-
-}
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1ParametersAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1ParametersAspects.java
deleted file mode 100644
index c80e556aa..000000000
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1ParametersAspects.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.FieldSignature;
-import ru.yandex.qatools.allure.annotations.Parameter;
-
-import java.util.Objects;
-
-import static io.qameta.allure.util.ResultsUtils.createParameter;
-
-/**
- * Aspects for Allure1 Parameters.
- */
-@SuppressWarnings("all")
-@Aspect
-public class Allure1ParametersAspects {
-
-    private static AllureLifecycle lifecycle;
-
-    @Pointcut("@annotation(ru.yandex.qatools.allure.annotations.Parameter)")
-    public void withParameterAnnotation() {
-        //pointcut body, should be empty
-    }
-
-    @Pointcut("set(* *)")
-    public void setValueToAnyField() {
-        //pointcut body, should be empty
-    }
-
-    @After("setValueToAnyField() && withParameterAnnotation()")
-    public void parameterValueChanged(JoinPoint joinPoint) {
-        try {
-            FieldSignature fieldSignature = (FieldSignature) joinPoint.getSignature();
-            Parameter parameter = fieldSignature.getField().getAnnotation(Parameter.class);
-            String name = parameter.value().isEmpty() ? fieldSignature.getName() : parameter.value();
-            String value = Objects.toString(joinPoint.getArgs()[0]);
-
-            getLifecycle().updateTestCase(testResult ->
-                    testResult.getParameters().add(createParameter(name, value))
-            );
-        } catch (Exception ignored) {
-        }
-    }
-
-    /**
-     * For tests only.
-     */
-    public static void setLifecycle(final AllureLifecycle allure) {
-        lifecycle = allure;
-    }
-
-    public static AllureLifecycle getLifecycle() {
-        if (Objects.isNull(lifecycle)) {
-            lifecycle = Allure.getLifecycle();
-        }
-        return lifecycle;
-    }
-}
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1StepsAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1StepsAspects.java
deleted file mode 100644
index 9fcfd8531..000000000
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1StepsAspects.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StepResult;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import ru.yandex.qatools.allure.annotations.Step;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static io.qameta.allure.aspects.Allure1Utils.getName;
-import static io.qameta.allure.aspects.Allure1Utils.getTitle;
-import static io.qameta.allure.util.ResultsUtils.createParameter;
-import static io.qameta.allure.util.ResultsUtils.getStatus;
-import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
-
-/**
- * Aspects (AspectJ) for handling {@link Step}.
- */
-@Aspect
-@SuppressWarnings("unused")
-public class Allure1StepsAspects {
-
-    private static AllureLifecycle lifecycle;
-
-    @Pointcut("@annotation(ru.yandex.qatools.allure.annotations.Step)")
-    public void withStepAnnotation() {
-        //pointcut body, should be empty
-    }
-
-    @Pointcut("execution(* *(..))")
-    public void anyMethod() {
-        //pointcut body, should be empty
-    }
-
-    @Before("anyMethod() && withStepAnnotation()")
-    public void stepStart(final JoinPoint joinPoint) {
-        final MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
-        final String uuid = UUID.randomUUID().toString();
-        final StepResult result = new StepResult()
-                .setName(createTitle(joinPoint))
-                .setParameters(getParameters(methodSignature, joinPoint.getArgs()));
-
-        getLifecycle().startStep(uuid, result);
-    }
-
-    @AfterThrowing(pointcut = "anyMethod() && withStepAnnotation()", throwing = "e")
-    public void stepFailed(final JoinPoint joinPoint, final Throwable e) {
-        getLifecycle().updateStep(result -> result
-                .setStatus(getStatus(e).orElse(Status.BROKEN))
-                .setStatusDetails(getStatusDetails(e).orElse(null)));
-        getLifecycle().stopStep();
-    }
-
-    @AfterReturning(pointcut = "anyMethod() && withStepAnnotation()", returning = "result")
-    public void stepStop(final JoinPoint joinPoint, final Object result) {
-        getLifecycle().updateStep(step -> step.setStatus(Status.PASSED));
-        getLifecycle().stopStep();
-    }
-
-    public String createTitle(final JoinPoint joinPoint) {
-        final MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
-        final Step step = methodSignature.getMethod().getAnnotation(Step.class);
-        return step.value().isEmpty()
-                ? getName(methodSignature.getName(), joinPoint.getArgs())
-                : getTitle(step.value(), methodSignature.getName(), joinPoint.getThis(), joinPoint.getArgs());
-    }
-
-    private static List<Parameter> getParameters(final MethodSignature signature, final Object... args) {
-        return IntStream.range(0, args.length)
-                .mapToObj(index -> createParameter(signature.getParameterNames()[index], args[index]))
-                .collect(Collectors.toList());
-    }
-
-
-    /**
-     * For tests only.
-     */
-    public static void setLifecycle(final AllureLifecycle allure) {
-        lifecycle = allure;
-    }
-
-    public static AllureLifecycle getLifecycle() {
-        if (Objects.isNull(lifecycle)) {
-            lifecycle = Allure.getLifecycle();
-        }
-        return lifecycle;
-    }
-
-}
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1TestCaseAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1TestCaseAspects.java
deleted file mode 100644
index 3267b3bdf..000000000
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1TestCaseAspects.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.reflect.MethodSignature;
-
-import java.util.Objects;
-
-/**
- * Allure junit aspects.
- */
-@Aspect
-public class Allure1TestCaseAspects {
-
-    private static AllureLifecycle lifecycle;
-
-    @Before("execution(@org.junit.Test * *.*(..))")
-    public void junitTestStart(final JoinPoint joinPoint) {
-        updateTestCase(joinPoint);
-    }
-
-    @Before("execution(@org.testng.annotations.Test * *.*(..))")
-    public void testNgTestStart(final JoinPoint joinPoint) {
-        updateTestCase(joinPoint);
-    }
-
-    private void updateTestCase(final JoinPoint joinPoint) {
-        final MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        final Object[] args = joinPoint.getArgs();
-        final Allure1Annotations annotations = new Allure1Annotations(signature, args);
-        getLifecycle().getCurrentTestCase().ifPresent(uuid -> {
-            getLifecycle().updateTestCase(uuid, annotations::updateTitle);
-            getLifecycle().updateTestCase(uuid, annotations::updateDescription);
-            getLifecycle().updateTestCase(uuid, annotations::updateParameters);
-            getLifecycle().updateTestCase(uuid, annotations::updateLabels);
-            getLifecycle().updateTestCase(uuid, annotations::updateLinks);
-        });
-    }
-
-    /**
-     * For tests only.
-     */
-    public static void setLifecycle(final AllureLifecycle lifecycle) {
-        Allure1TestCaseAspects.lifecycle = lifecycle;
-    }
-
-    public static AllureLifecycle getLifecycle() {
-        if (Objects.isNull(lifecycle)) {
-            lifecycle = Allure.getLifecycle();
-        }
-        return lifecycle;
-    }
-
-}
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Utils.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Utils.java
deleted file mode 100644
index a80c9ba36..000000000
--- a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Utils.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.util.ResultsUtils;
-import ru.yandex.qatools.allure.annotations.Features;
-import ru.yandex.qatools.allure.annotations.Issue;
-import ru.yandex.qatools.allure.annotations.Issues;
-import ru.yandex.qatools.allure.annotations.Severity;
-import ru.yandex.qatools.allure.annotations.Stories;
-import ru.yandex.qatools.allure.annotations.TestCaseId;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * Some utils that help process steps and attachments names and titles.
- */
-final class Allure1Utils {
-
-    private static final String SEVERITY_LABEL = "severity";
-
-    private static final String FEATURE_LABEL = "feature";
-
-    private static final String STORY_LABEL = "story";
-
-    /**
-     * Don't instance this class.
-     */
-    private Allure1Utils() {
-    }
-
-    /**
-     * Generate method in the following format: {methodName}[{param1}, {param2}, ...].
-     */
-    public static String getName(final String methodName, final Object... parameters) {
-        return methodName + getParametersAsString(parameters);
-    }
-
-    /**
-     * Convert array of given parameters to sting.
-     */
-    public static String getParametersAsString(final Object... parameters) {
-        if (parameters == null || parameters.length == 0) {
-            return "";
-        }
-        final StringBuilder builder = new StringBuilder();
-        builder.append('[');
-        for (int i = 0; i < parameters.length; i++) {
-            builder.append(arrayToString(parameters[i]));
-            if (i < parameters.length - 1) {
-                builder.append(", ");
-            }
-        }
-        return builder.append(']').toString();
-    }
-
-    /**
-     * Generate title using name pattern. First step all "{method}" substrings will be replaced
-     * with given method name. Then replace all "{i}" substrings with i-th parameter.
-     */
-    public static String getTitle(final String namePattern, final String methodName,
-                                  final Object instance, final Object... parameters) {
-        final String finalPattern = namePattern
-                .replaceAll("\\{method}", methodName)
-                .replaceAll("\\{this}", String.valueOf(instance));
-        final int paramsCount = parameters == null ? 0 : parameters.length;
-        final Object[] results = new Object[paramsCount];
-        for (int i = 0; i < paramsCount; i++) {
-            results[i] = arrayToString(parameters[i]);
-        }
-
-        return MessageFormat.format(finalPattern, results);
-    }
-
-    /**
-     * {@link Arrays#toString(Object[])} with {@link Arrays#toString(Object[])} for array elements.
-     */
-    public static Object arrayToString(final Object obj) {
-        if (obj != null && obj.getClass().isArray()) {
-            final int len = Array.getLength(obj);
-            final String[] strings = new String[len];
-            for (int i = 0; i < len; i++) {
-                strings[i] = String.valueOf(Array.get(obj, i));
-            }
-            return Arrays.toString(strings);
-        } else {
-            return obj;
-        }
-    }
-
-    public static <T extends Annotation> List<Label> getLabels(final Method method, final Class<T> annotation,
-                                                               final Function<T, List<Label>> extractor) {
-        final List<Label> labels = new ArrayList<>();
-        labels.addAll(getLabels((AnnotatedElement) method, annotation, extractor));
-        labels.addAll(getLabels(method.getDeclaringClass(), annotation, extractor));
-        return labels;
-    }
-
-    private static <T extends Annotation> List<Label> getLabels(final AnnotatedElement element,
-                                                                final Class<T> annotation,
-                                                                final Function<T, List<Label>> extractor) {
-        return element.isAnnotationPresent(annotation)
-                ? extractor.apply(element.getAnnotation(annotation))
-                : Collections.emptyList();
-    }
-
-    public static <T extends Annotation> List<Link> getLinks(final Method method, final Class<T> annotation,
-                                                             final Function<T, List<Link>> extractor) {
-        final List<Link> labels = new ArrayList<>();
-        labels.addAll(getLinks((AnnotatedElement) method, annotation, extractor));
-        labels.addAll(getLinks(method.getDeclaringClass(), annotation, extractor));
-        return labels;
-    }
-
-    private static <T extends Annotation> List<Link> getLinks(final AnnotatedElement element,
-                                                              final Class<T> annotation,
-                                                              final Function<T, List<Link>> extractor) {
-        return element.isAnnotationPresent(annotation)
-                ? extractor.apply(element.getAnnotation(annotation))
-                : Collections.emptyList();
-    }
-
-    public static List<Label> createLabels(final Stories stories) {
-        return Arrays.stream(stories.value())
-                .map(value -> new Label().setName(STORY_LABEL).setValue(value))
-                .collect(Collectors.toList());
-    }
-
-    public static List<Label> createLabels(final Features features) {
-        return Arrays.stream(features.value())
-                .map(value -> new Label().setName(FEATURE_LABEL).setValue(value))
-                .collect(Collectors.toList());
-    }
-
-    public static List<Label> createLabels(final Severity severity) {
-        return Collections.singletonList(new Label().setName(SEVERITY_LABEL).setValue(severity.value().value()));
-    }
-
-    public static List<Link> createLinks(final Issues issues) {
-        return Arrays.stream(issues.value())
-                .map(Allure1Utils::createLink)
-                .collect(Collectors.toList());
-    }
-
-    public static List<Link> createLinks(final Issue issue) {
-        return Collections.singletonList(createLink(issue));
-    }
-
-    public static List<Link> createLinks(final TestCaseId issue) {
-        return Collections.singletonList(ResultsUtils.createTmsLink(issue.value()));
-    }
-
-    private static Link createLink(final Issue issue) {
-        return ResultsUtils.createIssueLink(issue.value());
-    }
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Attachment.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Attachment.java
deleted file mode 100644
index 108904979..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Attachment.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- *  A file with additional information captured during a test such
- *  as log, screenshot, log file, dump, server response and so on.
- *  When some test fails attachments help to understand the reason
- *  of failure faster.
- *  <p/>
- *  An attachment is simply a method annotated with
- *  {@link ru.yandex.qatools.allure.annotations.Attachment} returns
- *  either String or byte array which should be added to report:
- *  <p/>
- *  <pre>
- *  &#064;Attachment(value = "Page screenshot", type = "image/png")
- *  public byte[] saveScreenshot(byte[] screenShot) {
- *      return screenShot;
- *  }
- *  </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Attachment {
-
-    /**
-     *  Attachment name.
-     */
-    String value() default "{method}";
-
-    /**
-     * Valid attachment MimeType, for example "text/plain" or "application/json".
-     */
-    String type() default "";
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Description.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Description.java
deleted file mode 100644
index f3a9fcc38..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Description.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import ru.yandex.qatools.allure.model.DescriptionType;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Using this annotation you can add some text description
- * to test suite or test case.
- * <pre>
- * &#064;Test
- * &#064;Description("This is an example of my test")
- * public void myTest() throws Exception {
- *      ...
- * }
- * </pre>
- * @see ru.yandex.qatools.allure.model.DescriptionType
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Description {
-
-    String value();
-
-    DescriptionType type() default DescriptionType.TEXT;
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Features.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Features.java
deleted file mode 100644
index 71659ddbe..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Features.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * In order to group your tests by features simply annotate test suite
- * or test case with {@link ru.yandex.qatools.allure.annotations.Features}
- * annotation. This annotation can take either one string or a string
- * array because one test case can relate to several features:
- * <p/>
- * <pre>
- * &#064;Features({"Feature1", "Feature2"})
- * &#064;Test
- * public void myTest() {
- *     ...
- * }
- *
- * &#064;Features("Feature")
- * &#064;Test
- * public void myTest() {
- *     ...
- * }
- * </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Features {
-
-    String[] value();
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issue.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issue.java
deleted file mode 100644
index cbd576255..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issue.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to link a single issue from issue tracker to test cases and test suites. Usage:
- * <pre>
- * &#064;Issue("MYPROJECT-1")
- * public void myTest() {
- *     ...
- * }
- * </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Issue {
-
-    String value();
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issues.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issues.java
deleted file mode 100644
index e77ec28fc..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Issues.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to link multiple issues from issue tracker to test cases and test suites. Usage:
- * <p/>
- * <pre>
- * &#064;Issues({
- *     &#064;Issue("MYPROJECT-1"),
- *     &#064;Issue("MYPROJECT-2")
- * })
- * public void myTest(){
- *     ...
- * }
- * </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Issues {
-
-    Issue[] value();
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Parameter.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Parameter.java
deleted file mode 100644
index 8642fee4a..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Parameter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * You can use this annotation to add parameters to your tests:
- * <pre>
- * &#064;Parameter("My Param")
- * private String myParameter;
- *
- * &#064;Test
- * public void myTest() throws Exception {
- *      myParameter = "first";
- *      myParameter = "second";
- *      myParameter = "third";
- * }
- * </pre>
- * All three values will be added to report
- *
- * Note that the initializations of constant fields (static final fields
- * where the initializer is a constant string object or primitive value)
- * are not join points, since Java requires their references to be inlined.
- *
- * value - it's name of parameter, field name by default
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.PARAMETER})
-public @interface Parameter {
-
-    String value() default "";
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Severity.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Severity.java
deleted file mode 100644
index 2b8013ffc..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Severity.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import ru.yandex.qatools.allure.model.SeverityLevel;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Each test has severity level. You can change test case severity
- * label using this annotation.
- *
- * @see ru.yandex.qatools.allure.model.SeverityLevel
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Severity {
-
-    SeverityLevel value();
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Step.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Step.java
deleted file mode 100644
index 993f11ccb..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Step.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * In order to define steps you need to annotate respective methods
- * with @Step annotation. When not specified step name equals to
- * annotated method name converted to human readable format. To
- * define explicit step name:
- * <pre>
- * &#064;Step("Open '{0}' page.")
- * public void openPageByAddress(String pageAddress) {
- *     ...
- * }
- * </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Step {
-
-    String value() default "";
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Stories.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Stories.java
deleted file mode 100644
index bff28bd3e..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Stories.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * In order to group your tests by stories simply annotate test suite
- * or test case with {@link ru.yandex.qatools.allure.annotations.Stories}
- * annotation. This annotation can take either one string or a string
- * array because one test case can relate to several stories:
- * <pre>
- * &#064;Stories({"Story1", "Story2"})
- * &#064;Test
- * public void myTest() {
- *     ...
- * }
- *
- * &#064;Stories("Story")
- * &#064;Test
- * public void myTest() {
- *     ...
- * }
- * </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Stories {
-
-    String[] value();
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/TestCaseId.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/TestCaseId.java
deleted file mode 100644
index 3f3d010b9..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/TestCaseId.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to link a test method with a test case in Test Management System (TMS). Usage:
- * <pre>
- * &#064;TestCaseId("MYPROJECT-1")
- * public void myTest() {
- *     ...
- * }
- * </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface TestCaseId {
-
-    String value();
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Title.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Title.java
deleted file mode 100644
index b24e62303..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/annotations/Title.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to set test suite and test case title.
- * Title overrides default name in report.
- *
- * @author Dmitry Baev charlie@yandex-team.ru
- *         Date: 10.24.13
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Title {
-
-    String value();
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/DescriptionType.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/DescriptionType.java
deleted file mode 100644
index 8fb2988c2..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/DescriptionType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.model;
-
-/**
- * Description type.
- */
-public enum DescriptionType {
-
-    MARKDOWN("markdown"),
-
-    TEXT("text"),
-
-    HTML("html");
-
-    private final String value;
-
-    DescriptionType(final String value) {
-        this.value = value;
-    }
-
-    public String value() {
-        return value;
-    }
-
-}
diff --git a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/SeverityLevel.java b/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/SeverityLevel.java
deleted file mode 100644
index 0f0f50044..000000000
--- a/allure-java-migration/src/main/java/ru/yandex/qatools/allure/model/SeverityLevel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package ru.yandex.qatools.allure.model;
-
-/**
- * Severity level.
- */
-public enum SeverityLevel {
-
-    BLOCKER("blocker"),
-
-    CRITICAL("critical"),
-
-    NORMAL("normal"),
-
-    MINOR("minor"),
-
-    TRIVIAL("trivial");
-
-    private final String value;
-
-    SeverityLevel(final String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-}
diff --git a/allure-java-migration/src/main/resources/META-INF/aop-ajc.xml b/allure-java-migration/src/main/resources/META-INF/aop-ajc.xml
deleted file mode 100644
index cd3df04f5..000000000
--- a/allure-java-migration/src/main/resources/META-INF/aop-ajc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<aspectj>
-    <weaver options="-warn:none -Xlint:ignore"/>
-    <aspects>
-        <aspect name="io.qameta.allure.aspects.Allure1TestCaseAspects"/>
-        <aspect name="io.qameta.allure.aspects.Allure1StepsAspects"/>
-        <aspect name="io.qameta.allure.aspects.Allure1AttachAspects"/>
-        <aspect name="io.qameta.allure.aspects.Allure1ParametersAspects"/>
-    </aspects>
-</aspectj>
diff --git a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java
deleted file mode 100644
index 96734ba5b..000000000
--- a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.test.AllureResults;
-import org.junit.jupiter.api.Test;
-import ru.yandex.qatools.allure.annotations.Attachment;
-
-import static io.qameta.allure.test.RunUtils.runWithinTestContext;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-
-/**
- * eroshenkoam
- * 30.04.17
- */
-class Allure1AttachAspectsTest {
-
-    @Test
-    void shouldSetupAttachmentTitleFromAnnotation() {
-        final AllureResults results = runWithinTestContext(
-                () -> attachmentWithTitleAndType("parameter value"),
-                Allure1AttachAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getAttachments)
-                .extracting("name", "type")
-                .containsExactly(tuple("attachment with parameter value", "text/plain"));
-
-    }
-
-    @Test
-    void shouldSetupAttachmentTitleFromMethodSignature() {
-        final AllureResults results = runWithinTestContext(
-                this::attachmentWithoutTitle,
-                Allure1AttachAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getAttachments)
-                .extracting("name", "type")
-                .containsExactly(tuple("attachmentWithoutTitle", null));
-
-    }
-
-    @Test
-    void shouldProcessNullAttachment() {
-        final AllureResults results = runWithinTestContext(
-                this::attachmentWithNullValue,
-                Allure1AttachAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getAttachments)
-                .extracting("name", "type")
-                .containsExactly(tuple("attachmentWithNullValue", null));
-    }
-
-    @SuppressWarnings("all")
-    @Attachment
-    byte[] attachmentWithNullValue() {
-        return null;
-    }
-
-    @SuppressWarnings("all")
-    @Attachment
-    byte[] attachmentWithoutTitle() {
-        return new byte[]{};
-    }
-
-    @SuppressWarnings({"all"})
-    @Attachment(value = "attachment with {0}", type = "text/plain")
-    byte[] attachmentWithTitleAndType(String parameter) {
-        return new byte[]{};
-    }
-
-}
diff --git a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1StepsAspectsTest.java b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1StepsAspectsTest.java
deleted file mode 100644
index f62082a0c..000000000
--- a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1StepsAspectsTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.test.AllureResults;
-import org.junit.jupiter.api.Test;
-import ru.yandex.qatools.allure.annotations.Step;
-
-import static io.qameta.allure.test.RunUtils.runWithinTestContext;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-
-public class Allure1StepsAspectsTest {
-
-    @Test
-    void shouldSetupStepTitleFromAnnotation() {
-        final AllureResults results = runWithinTestContext(
-                () -> stepWithTitleAndWithParameter("parameter value"),
-                Allure1StepsAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getSteps)
-                .extracting(StepResult::getName)
-                .containsExactly("step with title and parameter [parameter value]");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getSteps)
-                .flatExtracting(StepResult::getParameters)
-                .extracting("name", "value")
-                .containsExactly(tuple("parameter", "parameter value"));
-    }
-
-    @Test
-    void shouldSetupStepTitleFromMethodSignature() {
-        final AllureResults results = runWithinTestContext(
-                () -> stepWithoutTitleAndWithParameter("parameter value"),
-                Allure1StepsAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getSteps)
-                .extracting(StepResult::getName)
-                .containsExactly("stepWithoutTitleAndWithParameter[parameter value]");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getSteps)
-                .flatExtracting(StepResult::getParameters)
-                .extracting("name", "value")
-                .containsExactly(tuple("parameter", "parameter value"));
-    }
-
-    @SuppressWarnings("all")
-    @Step
-    void stepWithoutTitleAndWithParameter(String parameter) {
-
-    }
-
-    @SuppressWarnings("all")
-    @Step("step with title and parameter [{0}]")
-    void stepWithTitleAndWithParameter(String parameter) {
-    }
-
-}
diff --git a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1TestCaseAspectsTest.java b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1TestCaseAspectsTest.java
deleted file mode 100644
index 03c0b2071..000000000
--- a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1TestCaseAspectsTest.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *  Copyright 2016-2024 Qameta Software Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package io.qameta.allure.aspects;
-
-import io.qameta.allure.model.Label;
-import io.qameta.allure.model.Link;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.test.AllureResults;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import ru.yandex.qatools.allure.annotations.Description;
-import ru.yandex.qatools.allure.annotations.Features;
-import ru.yandex.qatools.allure.annotations.Issue;
-import ru.yandex.qatools.allure.annotations.Issues;
-import ru.yandex.qatools.allure.annotations.Parameter;
-import ru.yandex.qatools.allure.annotations.Severity;
-import ru.yandex.qatools.allure.annotations.Stories;
-import ru.yandex.qatools.allure.annotations.TestCaseId;
-import ru.yandex.qatools.allure.annotations.Title;
-import ru.yandex.qatools.allure.model.SeverityLevel;
-
-import java.util.stream.Stream;
-
-import static io.qameta.allure.test.RunUtils.runWithinTestContext;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-
-/**
- * eroshenkoam
- * 30.04.17
- */
-class Allure1TestCaseAspectsTest {
-
-    static Stream<SimpleTest> testClassesProvider() {
-        return Stream.of(new JunitTest(), new TestNgTest());
-    }
-
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessFeaturesAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .filteredOn(label -> label.getName().equals("feature"))
-                .extracting(Label::getValue)
-                .containsExactlyInAnyOrder("feature1", "feature2");
-    }
-
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessStoriesAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .filteredOn(label -> label.getName().equals("story"))
-                .extracting(Label::getValue)
-                .containsExactlyInAnyOrder("story1", "story2");
-
-    }
-
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessSeverityAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .filteredOn(label -> label.getName().equals("severity"))
-                .extracting(Label::getValue)
-                .containsExactlyInAnyOrder(SeverityLevel.CRITICAL.value());
-
-    }
-
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessIssuesAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLinks)
-                .extracting(Link::getName)
-                .containsExactlyInAnyOrder("ISSUE-1", "ISSUE-11", "ISSUE-2", "ISSUE-22", "TEST-1");
-
-    }
-
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessTitleAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getName)
-                .containsExactlyInAnyOrder("testcase");
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getLabels)
-                .filteredOn(label -> label.getName().equals("suite"))
-                .extracting(Label::getValue)
-                .containsExactlyInAnyOrder("testsuite");
-    }
-
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessDescriptionAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getDescription)
-                .containsExactlyInAnyOrder("testcase description");
-
-    }
-
-    @SuppressWarnings("unchecked")
-    @Issue("206")
-    @ParameterizedTest
-    @MethodSource("testClassesProvider")
-    void shouldProcessParameterAnnotation(final SimpleTest simpleTest) {
-        final AllureResults results = runWithinTestContext(
-                simpleTest::testSomething,
-                Allure1TestCaseAspects::setLifecycle,
-                Allure1ParametersAspects::setLifecycle
-        );
-
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getParameters)
-                .extracting(io.qameta.allure.model.Parameter::getName, io.qameta.allure.model.Parameter::getValue)
-                .containsExactlyInAnyOrder(
-                        tuple("parameterWithoutName", "testValue1"),
-                        tuple("customParameterName", "testValue2")
-                );
-    }
-
-    public interface SimpleTest {
-
-        void testSomething();
-
-    }
-
-    @Title("testsuite")
-    @Issue("ISSUE-1")
-    @Issues(@Issue("ISSUE-11"))
-    @Stories("story1")
-    @Features("feature1")
-    public static class TestNgTest implements SimpleTest {
-
-        @Parameter
-        public String parameterWithoutName;
-        @Parameter("customParameterName")
-        private String parameterWithName;
-        @Parameter
-        private String uninitializedParameter;
-
-        @Title("testcase")
-        @Description("testcase description")
-        @Issue("ISSUE-2")
-        @Issues(@Issue("ISSUE-22"))
-        @TestCaseId("TEST-1")
-        @Stories("story2")
-        @Features("feature2")
-        @Severity(SeverityLevel.CRITICAL)
-        @org.testng.annotations.Test
-        public void testSomething() {
-            parameterWithoutName = "testValue1";
-            parameterWithName = "testValue2";
-        }
-
-    }
-
-    @Title("testsuite")
-    @Issue("ISSUE-1")
-    @Issues(@Issue("ISSUE-11"))
-    @Stories("story1")
-    @Features("feature1")
-    public static class JunitTest implements SimpleTest {
-
-        @Parameter
-        private String parameterWithoutName;
-        @Parameter("customParameterName")
-        private String parameterWithName;
-        @Parameter
-        private String uninitializedParameter;
-
-        @Title("testcase")
-        @Description("testcase description")
-        @Issue("ISSUE-2")
-        @Issues(@Issue("ISSUE-22"))
-        @TestCaseId("TEST-1")
-        @Stories("story2")
-        @Features("feature2")
-        @Severity(SeverityLevel.CRITICAL)
-        @org.junit.Test
-        public void testSomething() {
-            parameterWithoutName = "testValue1";
-            parameterWithName = "testValue2";
-        }
-
-    }
-}
diff --git a/allure-java-migration/src/test/resources/allure.properties b/allure-java-migration/src/test/resources/allure.properties
deleted file mode 100644
index 9c0b0a2d7..000000000
--- a/allure-java-migration/src/test/resources/allure.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-allure.results.directory=build/allure-results
-allure.label.epic=#project.description#
diff --git a/allure-jax-rs/build.gradle.kts b/allure-jax-rs/build.gradle.kts
index 4e1e965e8..acf1b19c9 100644
--- a/allure-jax-rs/build.gradle.kts
+++ b/allure-jax-rs/build.gradle.kts
@@ -4,7 +4,8 @@ val javaxWsRsApiVersion = "2.1.1"
 
 dependencies {
     api(project(":allure-attachments"))
-    implementation("javax.ws.rs:javax.ws.rs-api:$javaxWsRsApiVersion")
+    compileOnly("javax.ws.rs:javax.ws.rs-api:$javaxWsRsApiVersion")
+    testImplementation("javax.ws.rs:javax.ws.rs-api:$javaxWsRsApiVersion")
     testImplementation("com.github.tomakehurst:wiremock")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.jboss.resteasy:resteasy-client")
diff --git a/allure-jbehave/build.gradle.kts b/allure-jbehave/build.gradle.kts
index 160a03e87..3be58500b 100644
--- a/allure-jbehave/build.gradle.kts
+++ b/allure-jbehave/build.gradle.kts
@@ -4,8 +4,9 @@ val jbehaveVersion = "4.8.3"
 
 dependencies {
     api(project(":allure-java-commons"))
-    implementation("org.jbehave:jbehave-core:$jbehaveVersion")
+    compileOnly("org.jbehave:jbehave-core:$jbehaveVersion")
     testImplementation("org.assertj:assertj-core")
+    testImplementation("org.jbehave:jbehave-core:$jbehaveVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
diff --git a/allure-jbehave5/build.gradle.kts b/allure-jbehave5/build.gradle.kts
index 256e5af6d..bdd27f73d 100644
--- a/allure-jbehave5/build.gradle.kts
+++ b/allure-jbehave5/build.gradle.kts
@@ -4,8 +4,9 @@ val jbehaveVersion = "5.1.1"
 
 dependencies {
     api(project(":allure-java-commons"))
-    implementation("org.jbehave:jbehave-core:$jbehaveVersion")
+    compileOnly("org.jbehave:jbehave-core:$jbehaveVersion")
     testImplementation("org.assertj:assertj-core")
+    testImplementation("org.jbehave:jbehave-core:$jbehaveVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
index 00ff3b0d8..673e96cb2 100644
--- a/allure-jooq/build.gradle.kts
+++ b/allure-jooq/build.gradle.kts
@@ -4,9 +4,10 @@ val jooqVersion = "3.19.10"
 
 dependencies {
     api(project(":allure-java-commons"))
-    implementation("org.jooq:jooq:${jooqVersion}")
+    compileOnly("org.jooq:jooq:${jooqVersion}")
     testImplementation("io.zonky.test:embedded-postgres:2.0.7")
     testImplementation("org.assertj:assertj-core")
+    testImplementation("org.jooq:jooq:${jooqVersion}")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts
index b449271cd..ab22c0f6e 100644
--- a/allure-jsonunit/build.gradle.kts
+++ b/allure-jsonunit/build.gradle.kts
@@ -4,9 +4,9 @@ val jsonUnitVersion = "2.35.0"
 
 dependencies {
     api(project(":allure-attachments"))
+    compileOnly("net.javacrumbs.json-unit:json-unit:$jsonUnitVersion")
     implementation("com.fasterxml.jackson.core:jackson-databind")
-    implementation("net.javacrumbs.json-unit:json-unit:$jsonUnitVersion")
-    implementation("org.apache.commons:commons-lang3")
+    testImplementation("net.javacrumbs.json-unit:json-unit:$jsonUnitVersion")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
index 1a92c20f0..ea1aaf899 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
@@ -20,7 +20,6 @@
 import net.javacrumbs.jsonunit.core.listener.Difference;
 import net.javacrumbs.jsonunit.core.listener.DifferenceContext;
 import net.javacrumbs.jsonunit.core.listener.DifferenceListener;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.UncheckedIOException;
 import java.util.ArrayList;
@@ -124,7 +123,7 @@ public String getJsonPatch() {
             final String field = getPath(difference);
             Map<String, Object> currentMap = jsonDiffPatch;
 
-            final String fieldWithDots = StringUtils.replace(field, "[", ".");
+            final String fieldWithDots = field.replace('[', '.');
             final int len = fieldWithDots.length();
             int left = 0;
             int right = 0;
@@ -134,7 +133,7 @@ public String getJsonPatch() {
                     right = len;
                 }
                 String fieldName = fieldWithDots.substring(left, right);
-                fieldName = StringUtils.remove(fieldName, "]");
+                fieldName = fieldName.replaceAll("]", "");
 
                 if (right != len) {
                     if (!fieldName.isEmpty()) {
diff --git a/allure-junit4-aspect/build.gradle.kts b/allure-junit4-aspect/build.gradle.kts
index 3f9bb39c6..79d3bc537 100644
--- a/allure-junit4-aspect/build.gradle.kts
+++ b/allure-junit4-aspect/build.gradle.kts
@@ -4,8 +4,8 @@ val junitVersion = "4.13.2"
 
 dependencies {
     api(project(":allure-junit4"))
-    implementation("junit:junit:$junitVersion")
-    implementation("org.aspectj:aspectjrt")
+    compileOnly("junit:junit:$junitVersion")
+    compileOnly("org.aspectj:aspectjrt")
 }
 
 tasks.jar {
diff --git a/allure-junit4/build.gradle.kts b/allure-junit4/build.gradle.kts
index d8117ef55..065302c88 100644
--- a/allure-junit4/build.gradle.kts
+++ b/allure-junit4/build.gradle.kts
@@ -4,9 +4,10 @@ val junitVersion = "4.13.2"
 
 dependencies {
     api(project(":allure-java-commons"))
-    implementation("junit:junit:$junitVersion")
+    compileOnly("junit:junit:$junitVersion")
     implementation(project(":allure-test-filter"))
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    testImplementation("junit:junit:$junitVersion")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
diff --git a/allure-junit5-assert/build.gradle.kts b/allure-junit5-assert/build.gradle.kts
index 047084bd4..dd5410151 100644
--- a/allure-junit5-assert/build.gradle.kts
+++ b/allure-junit5-assert/build.gradle.kts
@@ -3,9 +3,10 @@ description = "Allure Junit5 Assertions Integration"
 dependencies {
     api(project(":allure-junit5"))
     compileOnly("org.aspectj:aspectjrt")
-    implementation("org.junit.jupiter:junit-jupiter-api")
+    compileOnly("org.junit.jupiter:junit-jupiter-api")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-java-commons-test"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
diff --git a/allure-junit5/build.gradle.kts b/allure-junit5/build.gradle.kts
index 7b15f0fd4..372885809 100644
--- a/allure-junit5/build.gradle.kts
+++ b/allure-junit5/build.gradle.kts
@@ -2,13 +2,14 @@ description = "Allure JUnit 5 Integration"
 
 dependencies {
     api(project(":allure-junit-platform"))
-    implementation("org.junit.jupiter:junit-jupiter-api")
-    implementation("org.junit.platform:junit-platform-launcher")
+    compileOnly("org.junit.jupiter:junit-jupiter-api")
+    compileOnly("org.junit.platform:junit-platform-launcher")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.junit.platform:junit-platform-launcher")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
diff --git a/allure-karate/build.gradle.kts b/allure-karate/build.gradle.kts
index f30a20467..3a2c1ea7b 100644
--- a/allure-karate/build.gradle.kts
+++ b/allure-karate/build.gradle.kts
@@ -10,18 +10,19 @@ configurations {
 
 dependencies {
     api(project(":allure-java-commons"))
-    implementation("com.intuit.karate:karate-core:${karateVersion}")
+    compileOnly("com.intuit.karate:karate-core:${karateVersion}")
     implementation(project(":allure-test-filter"))
     testAnnotationProcessor("org.slf4j:slf4j-simple")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    testImplementation("com.intuit.karate:karate-core:${karateVersion}")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.mock-server:mockserver-netty:5.15.0")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-java-commons-test"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testImplementation("org.mock-server:mockserver-netty:5.15.0")
 }
 
 tasks.jar {
@@ -52,4 +53,4 @@ publishing {
             artifact(spiOffJar)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/allure-okhttp/build.gradle.kts b/allure-okhttp/build.gradle.kts
index 7a4f3a92f..8d4bf1655 100644
--- a/allure-okhttp/build.gradle.kts
+++ b/allure-okhttp/build.gradle.kts
@@ -4,8 +4,9 @@ val okhttpVersion = "2.7.5"
 
 dependencies {
     api(project(":allure-attachments"))
-    implementation("com.squareup.okhttp:okhttp:$okhttpVersion")
+    compileOnly("com.squareup.okhttp:okhttp:$okhttpVersion")
     testImplementation("com.github.tomakehurst:wiremock")
+    testImplementation("com.squareup.okhttp:okhttp:$okhttpVersion")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.jboss.resteasy:resteasy-client")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
diff --git a/allure-okhttp3/build.gradle.kts b/allure-okhttp3/build.gradle.kts
index b6a123e5f..6a1558f48 100644
--- a/allure-okhttp3/build.gradle.kts
+++ b/allure-okhttp3/build.gradle.kts
@@ -1,11 +1,12 @@
 description = "Allure OkHttp3 Integration"
 
-val okhttpVersion = "3.14.9"
+val okhttpVersion = "4.12.0"
 
 dependencies {
     api(project(":allure-attachments"))
-    implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
+    compileOnly("com.squareup.okhttp3:okhttp:$okhttpVersion")
     testImplementation("com.github.tomakehurst:wiremock")
+    testImplementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.jboss.resteasy:resteasy-client")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
diff --git a/allure-rest-assured/build.gradle.kts b/allure-rest-assured/build.gradle.kts
index 809f433b5..d454c364a 100644
--- a/allure-rest-assured/build.gradle.kts
+++ b/allure-rest-assured/build.gradle.kts
@@ -4,8 +4,9 @@ val restAssuredVersion = "5.5.0"
 
 dependencies {
     api(project(":allure-attachments"))
-    implementation("io.rest-assured:rest-assured:$restAssuredVersion")
+    compileOnly("io.rest-assured:rest-assured:$restAssuredVersion")
     testImplementation("com.github.tomakehurst:wiremock")
+    testImplementation("io.rest-assured:rest-assured:$restAssuredVersion")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.jboss.resteasy:resteasy-client")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts
index aae6abbc4..188e8d80e 100644
--- a/allure-scalatest/build.gradle.kts
+++ b/allure-scalatest/build.gradle.kts
@@ -83,13 +83,15 @@ signing {
 
 dependencies {
     api(project(":allure-java-commons"))
-    implementation("org.scalatest:scalatest_$scala213:3.2.19")
-    implementation("org.scala-lang.modules:scala-collection-compat_$scala213:2.12.0")
+    compileOnly("org.scalatest:scalatest_$scala213:3.2.19")
+    compileOnly("org.scala-lang.modules:scala-collection-compat_$scala213:2.12.0")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.scalatest:scalatest_$scala213:3.2.19")
+    testImplementation("org.scala-lang.modules:scala-collection-compat_$scala213:2.12.0")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
diff --git a/allure-servlet-api/build.gradle.kts b/allure-servlet-api/build.gradle.kts
index 91d9ac61a..55c4bdcdf 100644
--- a/allure-servlet-api/build.gradle.kts
+++ b/allure-servlet-api/build.gradle.kts
@@ -4,7 +4,8 @@ var servletApiVersion = "4.0.1"
 
 dependencies {
     api(project(":allure-attachments"))
-    implementation("javax.servlet:javax.servlet-api:$servletApiVersion")
+    compileOnly("javax.servlet:javax.servlet-api:$servletApiVersion")
+    testImplementation("javax.servlet:javax.servlet-api:$servletApiVersion")
 }
 
 tasks.jar {
diff --git a/allure-spock/build.gradle.kts b/allure-spock/build.gradle.kts
index f65503f4d..669bf14b7 100644
--- a/allure-spock/build.gradle.kts
+++ b/allure-spock/build.gradle.kts
@@ -7,12 +7,13 @@ val groovyVersion = "2.5.23"
 
 dependencies {
     api(project(":allure-java-commons"))
-    implementation("org.spockframework:spock-core:$spockFrameworkVersion")
+    compileOnly("org.spockframework:spock-core:$spockFrameworkVersion")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.codehaus.groovy:groovy-all:${groovyVersion}")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation("org.spockframework:spock-core:$spockFrameworkVersion")
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
diff --git a/allure-spock2/build.gradle.kts b/allure-spock2/build.gradle.kts
index fbbe45a55..1a1226597 100644
--- a/allure-spock2/build.gradle.kts
+++ b/allure-spock2/build.gradle.kts
@@ -9,8 +9,8 @@ val groovyVersion = "3.0.22"
 
 dependencies {
     api(project(":allure-java-commons"))
-    implementation("org.spockframework:spock-core:$spockFrameworkVersion")
     compileOnly("org.aspectj:aspectjrt")
+    compileOnly("org.spockframework:spock-core:$spockFrameworkVersion")
     implementation(project(":allure-test-filter"))
     testAnnotationProcessor("org.slf4j:slf4j-simple")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
@@ -22,6 +22,7 @@ dependencies {
     testImplementation("org.junit.platform:junit-platform-launcher")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation("org.spockframework:spock-core:$spockFrameworkVersion")
     testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))
diff --git a/allure-spring-web/build.gradle.kts b/allure-spring-web/build.gradle.kts
index 07f258185..4b9412226 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -4,7 +4,7 @@ val springWebVersion = "5.3.37"
 
 dependencies {
     api(project(":allure-attachments"))
-    implementation("org.springframework:spring-web:$springWebVersion")
+    compileOnly("org.springframework:spring-web:$springWebVersion")
     testImplementation("com.github.tomakehurst:wiremock")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.jboss.resteasy:resteasy-client")
@@ -12,6 +12,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation("org.springframework:spring-web:$springWebVersion")
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
diff --git a/allure-testng/build.gradle.kts b/allure-testng/build.gradle.kts
index 54b744093..f471e9f7f 100644
--- a/allure-testng/build.gradle.kts
+++ b/allure-testng/build.gradle.kts
@@ -4,7 +4,7 @@ val testNgVersion = "6.14.3"
 
 dependencies {
     api(project(":allure-java-commons"))
-    implementation("org.testng:testng:$testNgVersion")
+    compileOnly("org.testng:testng:$testNgVersion")
     implementation(project(":allure-test-filter"))
     testAnnotationProcessor("org.slf4j:slf4j-simple")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
@@ -12,6 +12,7 @@ dependencies {
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation("org.testng:testng:$testNgVersion")
     testImplementation(project(":allure-java-commons-test"))
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 8c59bb7bb..b12330a82 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -162,8 +162,6 @@ configure(libs) {
             dependency("javax.annotation:javax.annotation-api:1.3.2")
             dependency("net.sourceforge.pmd:pmd-java:7.3.0")
             dependency("org.apache.commons:commons-lang3:3.15.0")
-            dependency("org.apache.httpcomponents:httpclient:4.5.14")
-            dependency("org.apache.httpcomponents.client5:httpclient5:5.3.1")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")
             dependency("org.assertj:assertj-core:3.26.3")
@@ -374,6 +372,10 @@ configure(libs) {
             from(components["java"])
         }
     }
+
+    val allDepsInsight by tasks.creating(DependencyInsightReportTask::class) {
+        showingAllVariants.set(true)
+    }
 }
 
 allure {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 063c8ebcc..9eead326c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,6 @@ include("allure-httpclient")
 include("allure-httpclient5")
 include("allure-java-commons")
 include("allure-java-commons-test")
-include("allure-java-migration")
 include("allure-jax-rs")
 include("allure-jbehave")
 include("allure-jbehave5")

From 3c9cc859963498cc6c0ab6cb77f061c207021109 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Aug 2024 11:58:15 +0100
Subject: [PATCH 140/233] bump net.sourceforge.pmd:pmd-java from 7.3.0 to 7.4.0
 (via #1109)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b12330a82..2a0c0151c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -160,7 +160,7 @@ configure(libs) {
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.6.0")
             dependency("javax.annotation:javax.annotation-api:1.3.2")
-            dependency("net.sourceforge.pmd:pmd-java:7.3.0")
+            dependency("net.sourceforge.pmd:pmd-java:7.4.0")
             dependency("org.apache.commons:commons-lang3:3.15.0")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")

From 39ea2605b3160ddab16b874d86c6b41fe149eaa9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Aug 2024 12:20:22 +0100
Subject: [PATCH 141/233] bump com.codeborne:selenide from 7.3.3 to 7.4.1 (via
 #1110)

---
 allure-selenide/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts
index 9e086e1d8..2ff19ced2 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Selenide Integration"
 
-val selenideVersion = "7.3.3"
+val selenideVersion = "7.4.1"
 
 dependencies {
     api(project(":allure-java-commons"))

From 309315a6721f725726aff616c0609332e8bb75ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 11:31:30 +0100
Subject: [PATCH 142/233] build(deps): bump org.hamcrest:hamcrest from 2.2 to
 3.0 (via #1117)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2a0c0151c..c910c789b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -167,7 +167,7 @@ configure(libs) {
             dependency("org.assertj:assertj-core:3.26.3")
             dependency("org.freemarker:freemarker:2.3.33")
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
-            dependency("org.hamcrest:hamcrest:2.2")
+            dependency("org.hamcrest:hamcrest:3.0")
             dependency("org.jboss.resteasy:resteasy-client:6.2.9.Final")
             dependency("org.mock-server:mockserver-netty:5.15.0")
             dependency("org.mockito:mockito-core:5.12.0")

From bf9993c625c2ed9d6c1b080e1be80223a6c46d10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 11:32:02 +0100
Subject: [PATCH 143/233] build(deps): bump gradle/actions from 3 to 4 (via
 #1116)

---
 .github/workflows/dependency-submission.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index bb93c2eb2..79b0496d0 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.github/workflows/dependency-submission.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v4
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@v3
+        uses: gradle/actions/dependency-submission@v4
         env:
           DEPENDENCY_GRAPH_EXCLUDE_PROJECTS: ':allure-java-commons-test'
           DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS: 'runtimeClasspath'

From c924dd690d4ab611bccdb3abd698c5bfeddcb263 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 5 Aug 2024 10:37:46 +0000
Subject: [PATCH 144/233] release 2.29.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 1bdb57a6e..fdf2460f9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.29-SNAPSHOT
+version=2.29.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 2afeae1d702486523b11cf0be52b7a9f35d905c5 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 5 Aug 2024 10:37:47 +0000
Subject: [PATCH 145/233] set next development version 2.30

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index fdf2460f9..3d3a262a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.29.0
+version=2.30-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 3d361dd2a7666926b54f678f05859a56dd97a22c Mon Sep 17 00:00:00 2001
From: Dinesh Kumar R A <37109896+DineshKumarRA@users.noreply.github.com>
Date: Mon, 5 Aug 2024 12:02:07 +0100
Subject: [PATCH 146/233] update allure-cucumber7-jvm dependencies (via #1115)

---
 allure-cucumber7-jvm/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/allure-cucumber7-jvm/build.gradle.kts b/allure-cucumber7-jvm/build.gradle.kts
index 2a1f44c98..55e1a88fc 100644
--- a/allure-cucumber7-jvm/build.gradle.kts
+++ b/allure-cucumber7-jvm/build.gradle.kts
@@ -1,7 +1,7 @@
 description = "Allure CucumberJVM 7.0"
 
-val cucumberVersion = "7.13.0"
-val cucumberGherkinVersion = "26.2.0"
+val cucumberVersion = "7.18.1"
+val cucumberGherkinVersion = "28.0.0"
 
 dependencies {
     api(project(":allure-java-commons"))

From 547c624def9b0ee02ea14ab20b0f350be98e855d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2024 13:42:17 +0000
Subject: [PATCH 147/233] build(deps): bump protobufVersion from 4.27.2 to
 4.27.3 (via #1120)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 54ed3b5da..4bc8d3567 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -9,7 +9,7 @@ description = "Allure gRPC Integration"
 val agent: Configuration by configurations.creating
 
 val grpcVersion = "1.57.2"
-val protobufVersion = "4.27.2"
+val protobufVersion = "4.27.3"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From af64da0f016cb9fb48c5c7bb2bff0be990301bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Cmit=20=C3=96zdemir?=
 <38186111+umitozdemirf@users.noreply.github.com>
Date: Fri, 29 Nov 2024 13:32:19 +0300
Subject: [PATCH 148/233] =?UTF-8?q?fix(allure-karate):=20fix=20duplicate?=
 =?UTF-8?q?=20scenarios=20when=20call=20or=20callonce=20keywords=20are=20u?=
 =?UTF-8?q?sed=20(fixes=C2=A0#1143,=20via=20#1144)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/qameta/allure/karate/AllureKarate.java  |  8 ++++++++
 .../io/qameta/allure/karate/AllureKarateTest.java   | 10 ++++++++++
 .../test/resources/testdata/call-callonce.feature   | 13 +++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 allure-karate/src/test/resources/testdata/call-callonce.feature

diff --git a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
index 2c629a9f2..6fa4e1cb8 100644
--- a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
+++ b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
@@ -173,6 +173,10 @@ public boolean beforeStep(final Step step,
             return true;
         }
 
+        if (step.getText().startsWith("call") || step.getText().startsWith("callonce")) {
+            return true;
+        }
+
         final String uuid = parentUuid + "-" + step.getIndex();
         final io.qameta.allure.model.StepResult stepResult = new io.qameta.allure.model.StepResult()
                 .setName(step.getText());
@@ -191,6 +195,10 @@ public void afterStep(final StepResult result,
         }
 
         final Step step = result.getStep();
+        if (step.getText().startsWith("call") || step.getText().startsWith("callonce")) {
+            return;
+        }
+
         final String uuid = parentUuid + "-" + step.getIndex();
 
         final Result stepResult = result.getResult();
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
index a1cf77b39..fedbd276f 100644
--- a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
@@ -322,6 +322,16 @@ void shouldCreateAttachments() {
                 .isGreaterThan(Long.parseLong(firstAttachmentDateCreated));
     }
 
+    @Test
+    void shouldSkipCallAndCallOnceStepsInBeforeStep() {
+        final AllureResults results = runApi("classpath:testdata/call-callonce.feature");
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .doesNotContain("call", "callonce");
+    }
+
     @Test
     void buildTest() {
         Runner.builder()
diff --git a/allure-karate/src/test/resources/testdata/call-callonce.feature b/allure-karate/src/test/resources/testdata/call-callonce.feature
new file mode 100644
index 000000000..e64bbf049
--- /dev/null
+++ b/allure-karate/src/test/resources/testdata/call-callonce.feature
@@ -0,0 +1,13 @@
+Feature: Call & Call once Feature
+  This feature calls another feature and demonstrates Allure reporting issue.
+
+  @smoke
+  Scenario: Main Scenario with a call
+    Given url 'https://jsonplaceholder.typicode.com'
+    When method GET
+    Then status 200
+
+    * call read('classpath:testdata/apiResponse.feature')
+    * callonce read('classpath:testdata/api.feature')
+
+    Then print 'Main scenario completed.'

From be7a0084a2282e0f0cb029a00db9f374b3bc4aca Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Fri, 29 Nov 2024 10:36:30 +0000
Subject: [PATCH 149/233] release 2.29.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 3d3a262a4..2fc004697 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.30-SNAPSHOT
+version=2.29.1
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 5dc185e97f6caa041b3e0e07d5cf648e29280a44 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Fri, 29 Nov 2024 10:36:30 +0000
Subject: [PATCH 150/233] set next development version 2.30

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 2fc004697..3d3a262a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.29.1
+version=2.30-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 893dd4dfd518a444285af75c01eb386a6b011551 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jul 2025 14:47:21 +0100
Subject: [PATCH 151/233] build(deps): bump net.sourceforge.pmd:pmd-java from
 7.4.0 to 7.15.0 (via #1166)

---
 .../allure/attachment/AttachmentData.java     |  1 +
 .../attachment/AttachmentProcessor.java       |  1 +
 .../allure/attachment/AttachmentRenderer.java |  1 +
 .../http/HttpRequestAttachment.java           |  1 -
 .../http/HttpResponseAttachment.java          |  1 -
 .../cucumber4jvm/AllureCucumber4Jvm.java      |  1 -
 .../allure/cucumber4jvm/LabelBuilder.java     | 28 ++++----
 .../cucumber5jvm/AllureCucumber5Jvm.java      |  1 -
 .../allure/cucumber5jvm/LabelBuilder.java     | 26 ++++----
 .../cucumber6jvm/AllureCucumber6Jvm.java      |  1 -
 .../allure/cucumber6jvm/LabelBuilder.java     | 26 ++++----
 .../cucumber7jvm/AllureCucumber7Jvm.java      |  1 -
 .../allure/cucumber7jvm/LabelBuilder.java     | 28 ++++----
 .../io/qameta/allure/grpc/AllureGrpc.java     |  3 -
 .../allure/grpc/GrpcRequestAttachment.java    |  1 -
 .../allure/grpc/GrpcResponseAttachment.java   |  1 -
 .../AllureHttpClient5Response.java            |  1 +
 .../httpclient5/AllureHttpEntityUtils.java    |  2 +-
 .../io/qameta/allure/test/AllureFeatures.java |  2 +-
 .../qameta/allure/test/AllurePredicates.java  |  1 -
 .../main/java/io/qameta/allure/Allure.java    |  2 -
 .../io/qameta/allure/AllureConstants.java     |  2 +-
 .../io/qameta/allure/AllureLifecycle.java     |  3 +-
 .../allure/internal/Allure2ModelJackson.java  |  1 -
 .../qameta/allure/internal/AllureStorage.java |  6 +-
 .../allure/listener/LifecycleNotifier.java    |  1 -
 .../qameta/allure/util/AnnotationUtils.java   |  2 -
 .../io/qameta/allure/util/NamingUtils.java    |  1 +
 .../io/qameta/allure/util/ObjectUtils.java    |  2 -
 .../io/qameta/allure/util/ResultsUtils.java   |  2 -
 .../junitplatform/AllureJunitPlatform.java    |  6 +-
 .../aspect/AllureJunit4FilterAspect.java      |  1 -
 .../io/qameta/allure/junit4/AllureJunit4.java |  2 +-
 .../io/qameta/allure/junit5/AllureJunit5.java |  2 +-
 .../io/qameta/allure/model/TestResult.java    |  1 -
 .../allure/model/TestResultContainer.java     |  1 -
 .../qameta/allure/model/WithAttachments.java  |  1 +
 .../io/qameta/allure/model/WithLinks.java     |  1 +
 .../qameta/allure/model/WithParameters.java   |  1 +
 .../io/qameta/allure/model/WithStatus.java    |  1 +
 .../io/qameta/allure/model/WithSteps.java     |  1 +
 .../io/qameta/allure/okhttp/AllureOkHttp.java | 20 +++---
 .../qameta/allure/okhttp3/AllureOkHttp3.java  |  8 ++-
 .../HttpServletAttachmentBuilder.java         |  2 -
 .../io/qameta/allure/spock/AllureSpock.java   |  3 -
 .../io/qameta/allure/spock2/AllureSpock2.java |  3 -
 .../allure/testfilter/TestPlanV1_0.java       |  2 +-
 .../io/qameta/allure/testng/AllureTestNg.java |  8 +--
 build.gradle.kts                              |  2 +-
 gradle/quality-configs/pmd/pmd.xml            | 64 ++++++-------------
 50 files changed, 112 insertions(+), 168 deletions(-)

diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java
index e097b8815..5c6d09f34 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java
+++ b/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();
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java
index 467261139..99129f89a 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java
+++ b/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);
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
index 355f6d782..2b6f5b1a5 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
+++ b/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;
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
index 75cda2e96..a51052cf7 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
+++ b/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;
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
index 2369e10f8..d606af57e 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
@@ -90,7 +90,6 @@ public String toString() {
     /**
      * Builder for HttpRequestAttachment.
      */
-    @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName")
     public static final class Builder {
 
         private final String name;
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
index 8998226d8..b5a5d429d 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
@@ -82,7 +82,6 @@
         "ClassDataAbstractionCoupling",
         "ClassFanOutComplexity",
         "MultipleStringLiterals",
-        "PMD.ExcessiveImports",
 })
 public class AllureCucumber4Jvm implements ConcurrentEventListener {
 
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
index a0ed3c28b..fbcbb3f10 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
@@ -49,8 +49,8 @@
 /**
  * Scenario labels and links builder.
  */
-@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount", "MultipleStringLiterals"})
-class LabelBuilder {
+@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"})
+final class LabelBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
     private static final String COMPOSITE_TAG_DELIMITER = "=";
 
@@ -89,34 +89,34 @@ class LabelBuilder {
 
                 switch (tagKey) {
                     case SEVERITY:
-                        getScenarioLabels().add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
+                        scenarioLabels.add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
                         break;
                     case TMS_LINK:
-                        getScenarioLinks().add(ResultsUtils.createTmsLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createTmsLink(tagValue));
                         break;
                     case ISSUE_LINK:
-                        getScenarioLinks().add(ResultsUtils.createIssueLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createIssueLink(tagValue));
                         break;
                     case PLAIN_LINK:
-                        getScenarioLinks().add(ResultsUtils.createLink(null, tagValue, tagValue, null));
+                        scenarioLinks.add(ResultsUtils.createLink(null, tagValue, tagValue, null));
                         break;
                     default:
                         LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey);
-                        getScenarioLabels().add(getTagLabel(tag));
+                        scenarioLabels.add(getTagLabel(tag));
                         break;
                 }
             } else if (tagParser.isPureSeverityTag(tag)) {
-                getScenarioLabels().add(ResultsUtils.createSeverityLabel(tagString.substring(1)));
+                scenarioLabels.add(ResultsUtils.createSeverityLabel(tagString.substring(1)));
             } else if (!tagParser.isResultTag(tag)) {
-                getScenarioLabels().add(getTagLabel(tag));
+                scenarioLabels.add(getTagLabel(tag));
             }
         }
 
         final String featureName = feature.getName();
         final String uri = scenario.getUri();
 
-        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
-        getScenarioLabels().addAll(Arrays.asList(
+        scenarioLabels.addAll(ResultsUtils.getProvidedLabels());
+        scenarioLabels.addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
                 createFeatureLabel(featureName),
@@ -130,7 +130,7 @@ class LabelBuilder {
 
         featurePackage(uri, featureName)
                 .map(ResultsUtils::createPackageLabel)
-                .ifPresent(getScenarioLabels()::add);
+                .ifPresent(scenarioLabels::add);
     }
 
     public List<Label> getScenarioLabels() {
@@ -151,13 +151,13 @@ private Label getTagLabel(final PickleTag tag) {
      * @param tagString Full tag name and value
      */
     private void tryHandleNamedLink(final String tagString) {
-        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+(-|_)?)+";
+        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+([-_])?)+";
         final Pattern namedLinkPattern = Pattern.compile(namedLinkPatternString, Pattern.CASE_INSENSITIVE);
 
         if (namedLinkPattern.matcher(tagString).matches()) {
             final String type = tagString.split(COMPOSITE_TAG_DELIMITER)[0].split("[.]")[1];
             final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
-            getScenarioLinks().add(ResultsUtils.createLink(null, name, null, type));
+            scenarioLinks.add(ResultsUtils.createLink(null, name, null, type));
         } else {
             LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
                     namedLinkPatternString);
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
index f7fc242e7..7b7a0f0e9 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
@@ -78,7 +78,6 @@
         "ClassDataAbstractionCoupling",
         "ClassFanOutComplexity",
         "MultipleStringLiterals",
-        "PMD.ExcessiveImports",
 })
 public class AllureCucumber5Jvm implements ConcurrentEventListener {
 
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
index 645487621..95d11ab57 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
@@ -48,7 +48,7 @@
 /**
  * Scenario labels and links builder.
  */
-@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount", "MultipleStringLiterals"})
+@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"})
 class LabelBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
     private static final String COMPOSITE_TAG_DELIMITER = "=";
@@ -86,34 +86,34 @@ class LabelBuilder {
 
                 switch (tagKey) {
                     case SEVERITY:
-                        getScenarioLabels().add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
+                        scenarioLabels.add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
                         break;
                     case TMS_LINK:
-                        getScenarioLinks().add(ResultsUtils.createTmsLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createTmsLink(tagValue));
                         break;
                     case ISSUE_LINK:
-                        getScenarioLinks().add(ResultsUtils.createIssueLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createIssueLink(tagValue));
                         break;
                     case PLAIN_LINK:
-                        getScenarioLinks().add(ResultsUtils.createLink(null, tagValue, tagValue, null));
+                        scenarioLinks.add(ResultsUtils.createLink(null, tagValue, tagValue, null));
                         break;
                     default:
                         LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey);
-                        getScenarioLabels().add(getTagLabel(tag));
+                        scenarioLabels.add(getTagLabel(tag));
                         break;
                 }
             } else if (tagParser.isPureSeverityTag(tag)) {
-                getScenarioLabels().add(ResultsUtils.createSeverityLabel(tag.substring(1)));
+                scenarioLabels.add(ResultsUtils.createSeverityLabel(tag.substring(1)));
             } else if (!tagParser.isResultTag(tag)) {
-                getScenarioLabels().add(getTagLabel(tag));
+                scenarioLabels.add(getTagLabel(tag));
             }
         }
 
         final String featureName = feature.getName();
         final URI uri = scenario.getUri();
 
-        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
-        getScenarioLabels().addAll(Arrays.asList(
+        scenarioLabels.addAll(ResultsUtils.getProvidedLabels());
+        scenarioLabels.addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
                 createFeatureLabel(featureName),
@@ -127,7 +127,7 @@ class LabelBuilder {
 
         featurePackage(uri.toString(), featureName)
                 .map(ResultsUtils::createPackageLabel)
-                .ifPresent(getScenarioLabels()::add);
+                .ifPresent(scenarioLabels::add);
     }
 
     public List<Label> getScenarioLabels() {
@@ -148,13 +148,13 @@ private Label getTagLabel(final String tag) {
      * @param tagString Full tag name and value
      */
     private void tryHandleNamedLink(final String tagString) {
-        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+(-|_)?)+";
+        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+([-_])?)+";
         final Pattern namedLinkPattern = Pattern.compile(namedLinkPatternString, Pattern.CASE_INSENSITIVE);
 
         if (namedLinkPattern.matcher(tagString).matches()) {
             final String type = tagString.split(COMPOSITE_TAG_DELIMITER)[0].split("[.]")[1];
             final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
-            getScenarioLinks().add(ResultsUtils.createLink(null, name, null, type));
+            scenarioLinks.add(ResultsUtils.createLink(null, name, null, type));
         } else {
             LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
                     namedLinkPatternString);
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
index 6dd1dacfb..19e1fbb1a 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
@@ -75,7 +75,6 @@
 @SuppressWarnings({
         "ClassDataAbstractionCoupling",
         "ClassFanOutComplexity",
-        "PMD.ExcessiveImports",
 })
 public class AllureCucumber6Jvm implements ConcurrentEventListener {
 
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
index 94247a990..0ac417ea1 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
@@ -48,7 +48,7 @@
 /**
  * Scenario labels and links builder.
  */
-@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount", "MultipleStringLiterals"})
+@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"})
 class LabelBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
     private static final String COMPOSITE_TAG_DELIMITER = "=";
@@ -86,34 +86,34 @@ class LabelBuilder {
 
                 switch (tagKey) {
                     case SEVERITY:
-                        getScenarioLabels().add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
+                        scenarioLabels.add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
                         break;
                     case TMS_LINK:
-                        getScenarioLinks().add(ResultsUtils.createTmsLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createTmsLink(tagValue));
                         break;
                     case ISSUE_LINK:
-                        getScenarioLinks().add(ResultsUtils.createIssueLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createIssueLink(tagValue));
                         break;
                     case PLAIN_LINK:
-                        getScenarioLinks().add(ResultsUtils.createLink(null, tagValue, tagValue, null));
+                        scenarioLinks.add(ResultsUtils.createLink(null, tagValue, tagValue, null));
                         break;
                     default:
                         LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey);
-                        getScenarioLabels().add(getTagLabel(tag));
+                        scenarioLabels.add(getTagLabel(tag));
                         break;
                 }
             } else if (tagParser.isPureSeverityTag(tag)) {
-                getScenarioLabels().add(ResultsUtils.createSeverityLabel(tag.substring(1)));
+                scenarioLabels.add(ResultsUtils.createSeverityLabel(tag.substring(1)));
             } else if (!tagParser.isResultTag(tag)) {
-                getScenarioLabels().add(getTagLabel(tag));
+                scenarioLabels.add(getTagLabel(tag));
             }
         }
 
         final String featureName = feature.getName();
         final URI uri = scenario.getUri();
 
-        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
-        getScenarioLabels().addAll(Arrays.asList(
+        scenarioLabels.addAll(ResultsUtils.getProvidedLabels());
+        scenarioLabels.addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
                 createFeatureLabel(featureName),
@@ -127,7 +127,7 @@ class LabelBuilder {
 
         featurePackage(uri.toString(), featureName)
                 .map(ResultsUtils::createPackageLabel)
-                .ifPresent(getScenarioLabels()::add);
+                .ifPresent(scenarioLabels::add);
     }
 
     public List<Label> getScenarioLabels() {
@@ -148,13 +148,13 @@ private Label getTagLabel(final String tag) {
      * @param tagString Full tag name and value
      */
     private void tryHandleNamedLink(final String tagString) {
-        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+(-|_)?)+";
+        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+([-_])?)+";
         final Pattern namedLinkPattern = Pattern.compile(namedLinkPatternString, Pattern.CASE_INSENSITIVE);
 
         if (namedLinkPattern.matcher(tagString).matches()) {
             final String type = tagString.split(COMPOSITE_TAG_DELIMITER)[0].split("[.]")[1];
             final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
-            getScenarioLinks().add(ResultsUtils.createLink(null, name, null, type));
+            scenarioLinks.add(ResultsUtils.createLink(null, name, null, type));
         } else {
             LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
                     namedLinkPatternString);
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
index 9d7c89b34..cbb3e7246 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
@@ -76,7 +76,6 @@
 @SuppressWarnings({
         "ClassDataAbstractionCoupling",
         "ClassFanOutComplexity",
-        "PMD.ExcessiveImports",
 })
 public class AllureCucumber7Jvm implements ConcurrentEventListener {
 
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
index a5ffd0948..03585b090 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
@@ -48,7 +48,7 @@
 /**
  * Scenario labels and links builder.
  */
-@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount", "MultipleStringLiterals"})
+@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"})
 class LabelBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
     private static final String COMPOSITE_TAG_DELIMITER = "=";
@@ -87,37 +87,37 @@ class LabelBuilder {
 
                 switch (tagKey) {
                     case SEVERITY:
-                        getScenarioLabels().add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
+                        scenarioLabels.add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
                         break;
                     case TMS_LINK:
-                        getScenarioLinks().add(ResultsUtils.createTmsLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createTmsLink(tagValue));
                         break;
                     case ISSUE_LINK:
-                        getScenarioLinks().add(ResultsUtils.createIssueLink(tagValue));
+                        scenarioLinks.add(ResultsUtils.createIssueLink(tagValue));
                         break;
                     case PLAIN_LINK:
-                        getScenarioLinks().add(ResultsUtils.createLink(null, tagValue, tagValue, null));
+                        scenarioLinks.add(ResultsUtils.createLink(null, tagValue, tagValue, null));
                         break;
                     case OWNER:
-                        getScenarioLabels().add(ResultsUtils.createOwnerLabel(tagValue));
+                        scenarioLabels.add(ResultsUtils.createOwnerLabel(tagValue));
                         break;
                     default:
                         LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey);
-                        getScenarioLabels().add(getTagLabel(tag));
+                        scenarioLabels.add(getTagLabel(tag));
                         break;
                 }
             } else if (tagParser.isPureSeverityTag(tag)) {
-                getScenarioLabels().add(ResultsUtils.createSeverityLabel(tag.substring(1)));
+                scenarioLabels.add(ResultsUtils.createSeverityLabel(tag.substring(1)));
             } else if (!tagParser.isResultTag(tag)) {
-                getScenarioLabels().add(getTagLabel(tag));
+                scenarioLabels.add(getTagLabel(tag));
             }
         }
 
         final String featureName = feature.getName();
         final URI uri = scenario.getUri();
 
-        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
-        getScenarioLabels().addAll(Arrays.asList(
+        scenarioLabels.addAll(ResultsUtils.getProvidedLabels());
+        scenarioLabels.addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
                 createFeatureLabel(featureName),
@@ -131,7 +131,7 @@ class LabelBuilder {
 
         featurePackage(uri.toString(), featureName)
                 .map(ResultsUtils::createPackageLabel)
-                .ifPresent(getScenarioLabels()::add);
+                .ifPresent(scenarioLabels::add);
     }
 
     public List<Label> getScenarioLabels() {
@@ -152,13 +152,13 @@ private Label getTagLabel(final String tag) {
      * @param tagString Full tag name and value
      */
     private void tryHandleNamedLink(final String tagString) {
-        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+(-|_)?)+";
+        final String namedLinkPatternString = PLAIN_LINK + "\\.(\\w+-?)+=(\\w+([-_])?)+";
         final Pattern namedLinkPattern = Pattern.compile(namedLinkPatternString, Pattern.CASE_INSENSITIVE);
 
         if (namedLinkPattern.matcher(tagString).matches()) {
             final String type = tagString.split(COMPOSITE_TAG_DELIMITER)[0].split("[.]")[1];
             final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
-            getScenarioLinks().add(ResultsUtils.createLink(null, name, null, type));
+            scenarioLinks.add(ResultsUtils.createLink(null, name, null, type));
         } else {
             LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
                     namedLinkPatternString);
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
index caf8612d5..35fc4977e 100644
--- a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
@@ -49,7 +49,6 @@
  * @author dtuchs (Dmitry Tuchs).
  */
 @SuppressWarnings({
-        "PMD.AvoidFieldNameMatchingMethodName",
         "checkstyle:ClassFanOutComplexity",
         "checkstyle:AnonInnerLength",
         "checkstyle:JavaNCSS"
@@ -85,7 +84,6 @@ public AllureGrpc interceptResponseMetadata(final boolean value) {
         return this;
     }
 
-    @SuppressWarnings({"PMD.NPathComplexity"})
     @Override
     public <T, A> ClientCall<T, A> interceptCall(final MethodDescriptor<T, A> method,
                                                  final CallOptions callOptions,
@@ -125,7 +123,6 @@ public void sendMessage(final T message) {
                 }
             }
 
-            @SuppressWarnings({"PMD.NcssCount"})
             @Override
             public void start(final Listener<A> responseListener, final Metadata headers) {
                 final ClientCall.Listener<A> listener = new ForwardingClientCallListener<A>() {
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
index 39eeb7213..4d05ead6d 100644
--- a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
@@ -47,7 +47,6 @@ public String getName() {
     /**
      * Builder for GrpcRequestAttachment.
      */
-    @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName")
     static final class Builder {
 
         private final String name;
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
index ffd2a9b33..15d4629ec 100644
--- a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
@@ -58,7 +58,6 @@ public String getName() {
     /**
      * Builder for GrpcResponseAttachment.
      */
-    @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName")
     static final class Builder {
 
         private final String name;
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
index f4e53c931..eb515ea3a 100644
--- a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
@@ -67,6 +67,7 @@ public AllureHttpClient5Response(final AttachmentRenderer<AttachmentData> render
      * @param context  the HTTP context
      * @throws IOException if an I/O error occurs
      */
+    @SuppressWarnings("PMD.CloseResource")
     @Override
     public void process(final HttpResponse response,
                         EntityDetails entity,
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
index 43297a28c..de2cdd03d 100644
--- a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
@@ -30,7 +30,7 @@
 /**
  * Utility class for working with HTTP entity in Allure framework.
  */
-@SuppressWarnings({"checkstyle:ParameterAssignment", "PMD.AssignmentInOperand"})
+@SuppressWarnings({"checkstyle:ParameterAssignment"})
 public final class AllureHttpEntityUtils {
 
     private AllureHttpEntityUtils() {
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java
index 9ea66a2fb..d059716fc 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java
@@ -27,7 +27,7 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings({"JavadocType", "PMD.MissingStaticMethodInNonInstantiatableClass"})
+@SuppressWarnings({"JavadocType"})
 @Target({})
 public @interface AllureFeatures {
 
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java
index 4cd1ce35d..ba96ddd3c 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java
@@ -25,7 +25,6 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings({"PMD.ClassNamingConventions", "PMD.LinguisticNaming"})
 public final class AllurePredicates {
 
     private AllurePredicates() {
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
index 445d8b2c4..141488990 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
@@ -45,7 +45,6 @@
 /**
  * The class contains some useful methods to work with {@link AllureLifecycle}.
  */
-@SuppressWarnings({"PMD.ClassNamingConventions", "PMD.ExcessivePublicCount", "PMD.TooManyMethods"})
 public final class Allure {
 
     private static final String TXT_EXTENSION = ".txt";
@@ -453,7 +452,6 @@ public static void addAttachment(final String name, final InputStream content) {
         getLifecycle().addAttachment(name, null, null, content);
     }
 
-    @SuppressWarnings("PMD.UseObjectForClearerAPI")
     public static void addAttachment(final String name, final String type,
                                      final InputStream content, final String fileExtension) {
         getLifecycle().addAttachment(name, type, fileExtension, content);
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java
index 8b3b8cdc8..f436de66e 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java
@@ -19,7 +19,7 @@
  * @author @author charlie (Dmitry Baev baev@qameta.io)
  * @since 1.0-BETA1
  */
-@SuppressWarnings({"unused", "PMD.ClassNamingConventions"})
+@SuppressWarnings({"unused"})
 public final class AllureConstants {
 
     public static final String TEST_RESULT_FILE_SUFFIX = "-result.json";
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
index bea1d4dce..b6b6c4fb3 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
@@ -49,7 +49,7 @@
 /**
  * The class contains Allure context and methods to change it.
  */
-@SuppressWarnings({"PMD.TooManyMethods", "unused"})
+@SuppressWarnings("PMD.AvoidSynchronizedStatement")
 public class AllureLifecycle {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureLifecycle.class);
@@ -596,7 +596,6 @@ public void addAttachment(final String name, final String type,
      * @param fileExtension the attachment file extension
      * @return the source of added attachment
      */
-    @SuppressWarnings({"PMD.NullAssignment", "PMD.UseObjectForClearerAPI"})
     public String prepareAttachment(final String name, final String type, final String fileExtension) {
         final String extension = Optional.ofNullable(fileExtension)
                 .filter(ext -> !ext.isEmpty())
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
index b3e490bf8..765aa1421 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
@@ -37,7 +37,6 @@
  *
  * @author baev (Dmitry Baev).
  */
-@SuppressWarnings("PMD.ClassNamingConventions")
 public final class Allure2ModelJackson {
 
     public static final String INDENT_OUTPUT_PROPERTY_NAME = "allure.results.indentOutput";
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java
index 5ae89b1e1..3f1c72392 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java
@@ -55,9 +55,9 @@ public Optional<StepResult> getStep(final String uuid) {
     }
 
     public <T> Optional<T> get(final String uuid, final Class<T> clazz) {
+        Objects.requireNonNull(uuid, "Can't get item from storage: uuid can't be null");
         lock.readLock().lock();
         try {
-            Objects.requireNonNull(uuid, "Can't get item from storage: uuid can't be null");
             return Optional.ofNullable(storage.get(uuid))
                     .filter(clazz::isInstance)
                     .map(clazz::cast);
@@ -67,9 +67,9 @@ public <T> Optional<T> get(final String uuid, final Class<T> clazz) {
     }
 
     public <T> T put(final String uuid, final T item) {
+        Objects.requireNonNull(uuid, "Can't put item to storage: uuid can't be null");
         lock.writeLock().lock();
         try {
-            Objects.requireNonNull(uuid, "Can't put item to storage: uuid can't be null");
             storage.put(uuid, item);
             return item;
         } finally {
@@ -78,9 +78,9 @@ public <T> T put(final String uuid, final T item) {
     }
 
     public void remove(final String uuid) {
+        Objects.requireNonNull(uuid, "Can't remove item from storage: uuid can't be null");
         lock.writeLock().lock();
         try {
-            Objects.requireNonNull(uuid, "Can't remove item from storage: uuid can't be null");
             storage.remove(uuid);
         } finally {
             lock.writeLock().unlock();
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
index d74a3107d..d082a4bc3 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
@@ -28,7 +28,6 @@
 /**
  * @since 2.0
  */
-@SuppressWarnings("PMD.TooManyMethods")
 public class LifecycleNotifier implements ContainerLifecycleListener,
         TestLifecycleListener, FixtureLifecycleListener, StepLifecycleListener {
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
index d241a4683..efc966051 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
@@ -206,8 +206,6 @@ private static Stream<String> callValueMethod(final Annotation annotation) {
     @SuppressWarnings({
             "CyclomaticComplexity",
             "ReturnCount",
-            "PMD.NcssCount",
-            "PMD.CyclomaticComplexity"
     })
     private static Stream<String> objectToStringStream(final Object object) {
         if (Objects.nonNull(object) && object.getClass().isArray()) {
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
index ba129a460..5b68c1d0d 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
@@ -123,6 +123,7 @@ private static Object extractField(final Object object, final String part, final
         }
     }
 
+    @SuppressWarnings("PMD.AvoidAccessibilityAlteration")
     private static Object fieldValue(final Object object, final Field field) throws IllegalAccessException {
         try {
             return field.get(object);
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
index f20f935e8..e38c7f361 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
@@ -46,8 +46,6 @@ private ObjectUtils() {
     @SuppressWarnings({
             "CyclomaticComplexity",
             "ReturnCount",
-            "PMD.NcssCount",
-            "PMD.CyclomaticComplexity"
     })
     public static String toString(final Object object) {
         try {
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index 8d8acd47c..3c9a2cfb8 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -62,8 +62,6 @@
 @SuppressWarnings({
         "ClassFanOutComplexity",
         "ClassDataAbstractionCoupling",
-        "PMD.ExcessiveImports",
-        "PMD.TooManyMethods",
 })
 public final class ResultsUtils {
 
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index 137e24df5..352cf2a42 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -88,9 +88,6 @@
         "ClassDataAbstractionCoupling",
         "ClassFanOutComplexity",
         "MultipleStringLiterals",
-        "PMD.CyclomaticComplexity",
-        "PMD.NcssCount",
-        "PMD.TooManyMethods",
 })
 public class AllureJunitPlatform implements TestExecutionListener {
 
@@ -281,7 +278,7 @@ public void executionSkipped(final TestIdentifier testIdentifier,
         );
     }
 
-    @SuppressWarnings({"ReturnCount", "PMD.NcssCount", "CyclomaticComplexity"})
+    @SuppressWarnings({"ReturnCount", "CyclomaticComplexity"})
     @Override
     public void reportingEntryPublished(final TestIdentifier testIdentifier,
                                         final ReportEntry entry) {
@@ -504,7 +501,6 @@ private void stopFixture(final Map<String, String> keyValue) {
         getLifecycle().stopFixture(uuid);
     }
 
-    @SuppressWarnings("PMD.NcssCount")
     private void startTestCase(final TestIdentifier testIdentifier) {
         final String uuid = getOrCreateTest(testIdentifier);
 
diff --git a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
index 166933c16..348f7c971 100644
--- a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
+++ b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
@@ -28,7 +28,6 @@
 @Aspect
 public class AllureJunit4FilterAspect {
 
-    @SuppressWarnings("PMD.SystemPrintln")
     @AfterReturning(
             value = "execution(public org.junit.runner.Runner org.junit.runner.Request+.getRunner())",
             returning = "runner"
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index b652feb08..e2eee4396 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -59,7 +59,7 @@
  * Allure Junit4 listener.
  */
 @RunListener.ThreadSafe
-@SuppressWarnings({"PMD.ExcessiveImports", "PMD.CouplingBetweenObjects", "checkstyle:ClassFanOutComplexity"})
+@SuppressWarnings({"checkstyle:ClassFanOutComplexity"})
 public class AllureJunit4 extends RunListener {
 
     private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH
diff --git a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
index 7413d70a2..8b785649f 100644
--- a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
+++ b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
@@ -80,7 +80,7 @@ private void sendParameterEvent(final ReflectiveInvocationContext<Method> invoca
                     .ifPresent(param -> {
                         Stream.of(param.value(), param.name())
                                 .map(String::trim)
-                                .filter(name -> name.length() > 0)
+                                .filter(name -> !name.isEmpty())
                                 .findFirst()
                                 .ifPresent(name -> map.put(ALLURE_PARAMETER, name));
 
diff --git a/allure-model/src/main/java/io/qameta/allure/model/TestResult.java b/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
index f6eb0f1f1..ac5688a43 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
@@ -34,7 +34,6 @@
  * @see io.qameta.allure.model.WithSteps
  * @since 2.0
  */
-@SuppressWarnings({"PMD.TooManyMethods", "PMD.ExcessivePublicCount"})
 public class TestResult implements Serializable, ExecutableItem, WithLinks {
 
     private static final long serialVersionUID = 1L;
diff --git a/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java b/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java
index b83500026..b4645051d 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java
@@ -33,7 +33,6 @@
  * @see io.qameta.allure.model.WithLinks
  * @since 2.0
  */
-@SuppressWarnings("PMD.ExcessivePublicCount")
 public class TestResultContainer implements Serializable, WithLinks {
 
     private static final long serialVersionUID = 1L;
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java b/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java
index 772228218..6b773b11e 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java
@@ -27,6 +27,7 @@
  * @see ExecutableItem
  * @since 2.0
  */
+@FunctionalInterface
 public interface WithAttachments {
 
     /**
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java b/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java
index 63d640788..050518333 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java
@@ -27,6 +27,7 @@
  * @see ExecutableItem
  * @since 2.0
  */
+@FunctionalInterface
 public interface WithLinks {
 
     /**
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java b/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java
index 4b043d412..92f0be89d 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java
@@ -27,6 +27,7 @@
  * @see ExecutableItem
  * @since 2.0
  */
+@FunctionalInterface
 public interface WithParameters {
 
     /**
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java b/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java
index 8fdd95234..645e03fcb 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java
@@ -25,6 +25,7 @@
  * @see ExecutableItem
  * @since 2.0
  */
+@FunctionalInterface
 public interface WithStatus {
 
     /**
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java b/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java
index c225a6c27..52caf387c 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java
@@ -27,6 +27,7 @@
  * @see ExecutableItem
  * @since 2.0
  */
+@FunctionalInterface
 public interface WithSteps {
 
     /**
diff --git a/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java b/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
index 4826eb0ea..b8f72ad76 100644
--- a/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
+++ b/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
@@ -15,17 +15,18 @@
  */
 package io.qameta.allure.okhttp;
 
+import com.squareup.okhttp.Interceptor;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.RequestBody;
+import com.squareup.okhttp.Response;
+import com.squareup.okhttp.ResponseBody;
 import io.qameta.allure.attachment.AttachmentData;
 import io.qameta.allure.attachment.AttachmentProcessor;
 import io.qameta.allure.attachment.DefaultAttachmentProcessor;
 import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
 import io.qameta.allure.attachment.http.HttpRequestAttachment;
 import io.qameta.allure.attachment.http.HttpResponseAttachment;
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
-import com.squareup.okhttp.ResponseBody;
+import okio.Buffer;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -33,7 +34,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import okio.Buffer;
 
 /**
  * Allure interceptor logger for OkHttp.
@@ -71,6 +71,7 @@ public AllureOkHttp withResponseTemplate(final String templatePath) {
         return setResponseTemplate(templatePath);
     }
 
+    @SuppressWarnings("PMD.CloseResource")
     @Override
     public Response intercept(final Chain chain) throws IOException {
         final AttachmentProcessor<AttachmentData> processor = new DefaultAttachmentProcessor();
@@ -118,8 +119,9 @@ private static Map<String, String> toMapConverter(final Map<String, List<String>
     }
 
     private static String readRequestBody(final RequestBody requestBody) throws IOException {
-        final Buffer buffer = new Buffer();
-        requestBody.writeTo(buffer);
-        return buffer.readString(StandardCharsets.UTF_8);
+        try (Buffer buffer = new Buffer()) {
+            requestBody.writeTo(buffer);
+            return buffer.readString(StandardCharsets.UTF_8);
+        }
     }
 }
diff --git a/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java b/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
index bb784fb00..6cdfcc226 100644
--- a/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
+++ b/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
@@ -71,6 +71,7 @@ public AllureOkHttp3 withResponseTemplate(final String templatePath) {
         return setResponseTemplate(templatePath);
     }
 
+    @SuppressWarnings("PMD.CloseResource")
     @Override
     public Response intercept(final Chain chain) throws IOException {
         final AttachmentProcessor<AttachmentData> processor = new DefaultAttachmentProcessor();
@@ -118,8 +119,9 @@ private static Map<String, String> toMapConverter(final Map<String, List<String>
     }
 
     private static String readRequestBody(final RequestBody requestBody) throws IOException {
-        final Buffer buffer = new Buffer();
-        requestBody.writeTo(buffer);
-        return buffer.readString(StandardCharsets.UTF_8);
+        try (Buffer buffer = new Buffer()) {
+            requestBody.writeTo(buffer);
+            return buffer.readString(StandardCharsets.UTF_8);
+        }
     }
 }
diff --git a/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java b/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
index 5822a102a..a6434ea28 100644
--- a/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
+++ b/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
@@ -33,7 +33,6 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("PMD.ClassNamingConventions")
 public final class HttpServletAttachmentBuilder {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HttpServletAttachmentBuilder.class);
@@ -74,7 +73,6 @@ public static String getBody(final HttpServletRequest request) {
         return sb.toString();
     }
 
-    @SuppressWarnings("PMD.AssignmentInOperand")
     public static void readBody(final StringBuilder sb,
                                 final BufferedReader reader) throws IOException {
         String line;
diff --git a/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java b/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
index 6ef5a51dd..f29578ddc 100644
--- a/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
+++ b/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
@@ -72,10 +72,7 @@
  * @author charlie (Dmitry Baev).
  */
 @SuppressWarnings({
-        "PMD.UnnecessaryFullyQualifiedName",
-        "PMD.ExcessiveImports",
         "ClassFanOutComplexity",
-        "PMD.CouplingBetweenObjects"
 })
 public class AllureSpock extends AbstractRunListener implements IGlobalExtension {
 
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
index c0ae16674..8798e1f40 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -80,9 +80,6 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings({
-        "PMD.NcssCount"
-})
 public class AllureSpock2 extends AbstractRunListener implements IGlobalExtension {
 
     private final ThreadLocal<String> testResults = new InheritableThreadLocal<String>() {
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
index c282ce882..2ccd7b413 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
@@ -26,7 +26,7 @@
  * @author charlie (Dmitry Baev).
  */
 @JsonTypeName("1.0")
-@SuppressWarnings({"TypeName", "PMD.CyclomaticComplexity"})
+@SuppressWarnings({"TypeName"})
 public class TestPlanV1_0 implements TestPlan, Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
index ebbc0a63e..41b7c362c 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
@@ -104,11 +104,6 @@
 @SuppressWarnings({
         "ClassDataAbstractionCoupling",
         "ClassFanOutComplexity",
-        "PMD.CyclomaticComplexity",
-        "PMD.ExcessiveClassLength",
-        "PMD.ExcessiveImports",
-        "PMD.NcssCount",
-        "PMD.TooManyMethods",
 })
 public class AllureTestNg implements
         ISuiteListener,
@@ -341,7 +336,7 @@ protected void startTestCase(final ITestResult testResult,
         );
     }
 
-    @SuppressWarnings({"Indentation", "PMD.ExcessiveMethodLength"})
+    @SuppressWarnings({"Indentation"})
     protected void startTestCase(final ITestContext context,
                                  final ITestNGMethod method,
                                  final IClass iClass,
@@ -743,6 +738,7 @@ private String getUniqueUuid(final IAttributes suite) {
         return Objects.toString(suite.getAttribute(ALLURE_UUID));
     }
 
+    @SuppressWarnings("PMD.AvoidAccessibilityAlteration")
     private List<Parameter> getParameters(final ITestContext context,
                                           final ITestNGMethod method,
                                           final Object... parameters) {
diff --git a/build.gradle.kts b/build.gradle.kts
index c910c789b..5487fa1a8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -160,7 +160,7 @@ configure(libs) {
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.6.0")
             dependency("javax.annotation:javax.annotation-api:1.3.2")
-            dependency("net.sourceforge.pmd:pmd-java:7.4.0")
+            dependency("net.sourceforge.pmd:pmd-java:7.15.0")
             dependency("org.apache.commons:commons-lang3:3.15.0")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")
diff --git a/gradle/quality-configs/pmd/pmd.xml b/gradle/quality-configs/pmd/pmd.xml
index adc57b64f..a3c7ca8bf 100644
--- a/gradle/quality-configs/pmd/pmd.xml
+++ b/gradle/quality-configs/pmd/pmd.xml
@@ -15,12 +15,8 @@
         <exclude name="AccessorMethodGeneration"/>
         <exclude name="ArrayIsStoredDirectly"/>
         <exclude name="GuardLogStatement"/>
-        <exclude name="JUnitAssertionsShouldIncludeMessage"/>
-        <exclude name="JUnit4SuitesShouldUseSuiteAnnotation"/>
-        <exclude name="JUnitTestsShouldIncludeAssert"/>
-        <exclude name="JUnit4TestShouldUseBeforeAnnotation"/>
-        <exclude name="JUnit4TestShouldUseAfterAnnotation"/>
-        <exclude name="JUnit4TestShouldUseTestAnnotation"/>
+        <!--  Doesn't work with Java 8 switch clause  -->
+        <exclude name="ExhaustiveSwitchHasDefault"/>
     </rule>
 
 
@@ -28,9 +24,10 @@
     <rule ref="category/java/codestyle.xml">
         <exclude name="AtLeastOneConstructor"/>
         <exclude name="CallSuperInConstructor"/>
-        <exclude name="ClassNamingConventions"/>
         <exclude name="CommentDefaultAccessModifier"/>
         <exclude name="ConfusingTernary"/>
+        <exclude name="GenericsNaming"/>
+        <exclude name="LinguisticNaming"/>
         <exclude name="LocalHomeNamingConvention"/> <!-- earlier j2ee group-->
         <exclude name="LocalInterfaceSessionNamingConvention"/> <!-- earlier j2ee group-->
         <exclude name="LocalVariableCouldBeFinal"/>
@@ -43,59 +40,41 @@
         <exclude name="ShortMethodName"/>
         <exclude name="ShortVariable"/>
         <exclude name="TooManyStaticImports"/>
-        <exclude name="UseDiamondOperator"/> <!-- to many false positives on java 8 -->
+        <exclude name="UnnecessaryAnnotationValueElement"/>
+        <exclude name="UseDiamondOperator"/>
         <exclude name="UselessParentheses"/>
-    </rule>
-
-    <rule ref="category/java/codestyle.xml/LinguisticNaming">
-        <properties>
-            <property name="checkSetters" value="false"/>
-        </properties>
+        <exclude name="BooleanGetMethodName"/>
+        <exclude name="ClassNamingConventions"/>
     </rule>
 
     <!-- Design (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_design.html) -->
     <rule ref="category/java/design.xml">
         <exclude name="AvoidCatchingGenericException"/>
-        <exclude name="ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
-        <exclude name="CognitiveComplexity"/>
         <exclude name="CouplingBetweenObjects"/>
         <exclude name="DataClass"/>
         <exclude name="ExcessiveImports"/>
-        <exclude name="GodClass"/>
         <exclude name="LawOfDemeter"/>
+        <exclude name="CyclomaticComplexity"/> <!-- disabled in favour of checkstyle's CyclomaticComplexity check -->
         <exclude name="LoosePackageCoupling"/>
         <exclude name="SignatureDeclareThrowsException"/>
         <exclude name="TooManyFields"/>
+        <exclude name="GodClass"/>
+        <exclude name="CognitiveComplexity"/>
+        <exclude name="NcssCount"/>
+        <exclude name="ExcessivePublicCount"/>
+        <exclude name="TooManyMethods"/>
+        <exclude name="ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
     </rule>
     <rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts">
         <properties>
             <property name="problemDepth" value="4"/>
         </properties>
     </rule>
-    <rule ref="category/java/design.xml/CyclomaticComplexity">
-        <properties>
-            <property name="cycloOptions" value="ignoreBooleanPaths"/>
-            <property name="classReportLevel" value="81"/>
-            <property name="methodReportLevel" value="11"/>
-        </properties>
-    </rule>
-    <rule ref="category/java/design.xml/NcssCount">
-        <properties>
-            <property name="methodReportLevel" value="30"/>
-            <property name="classReportLevel" value="300"/>
-        </properties>
-    </rule>
     <rule ref="category/java/design.xml/NPathComplexity">
         <properties>
             <property name="reportLevel" value="201"/>
         </properties>
     </rule>
-    <rule ref="category/java/design.xml/TooManyMethods" message="Avoid classes longer than 20 methods">
-        <properties>
-            <property name="maxmethods" value="20"/>
-        </properties>
-    </rule>
-
 
     <!-- Documentation (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_documentation.html) -->
     <rule ref="category/java/documentation.xml">
@@ -106,19 +85,18 @@
 
     <!-- Error prone (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_errorprone.html) -->
     <rule ref="category/java/errorprone.xml">
-        <exclude name="AvoidAccessibilityAlteration"/> <!-- earlier j2ee group-->
         <exclude name="AvoidCatchingThrowable"/>
         <exclude name="AvoidFieldNameMatchingMethodName"/>
+        <exclude name="AssignmentInOperand"/>  <!-- duplicate of checkstyle check AssignmentInOperand -->
         <exclude name="AvoidLiteralsInIfCondition"/>
-        <exclude name="ConstructorCallsOverridableMethod"/>
         <exclude name="EmptyFinalizer"/>
         <exclude name="FinalizeDoesNotCallSuperFinalize"/>
         <exclude name="FinalizeOnlyCallsSuperFinalize"/>
         <exclude name="JUnitSpelling"/>
         <exclude name="JUnitStaticSuite"/>
         <exclude name="MissingSerialVersionUID"/>
-        <exclude name="NullAssignment"/> <!-- disabled due to false positive for initialization with ternary operator -->
-        <exclude name="OverrideBothEqualsAndHashcode"/> <!-- duplicated by EqualsHashCode rule in Checkstyle -->
+        <exclude
+                name="NullAssignment"/> <!-- disabled due to false positive for initialization with ternary operator -->
         <exclude name="StaticEJBFieldShouldBeFinal"/> <!-- earlier j2ee group-->
         <exclude name="TestClassWithoutTestCases"/>
         <exclude name="UseCorrectExceptionLogging"/>
@@ -130,11 +108,6 @@
             <property name="skipAnnotations" value="true"/>
         </properties>
     </rule>
-    <rule ref="category/java/errorprone.xml/CloseResource">
-        <properties>
-            <property name="types" value="java.sql.Connection,java.sql.Statement,java.sql.ResultSet"/>
-        </properties>
-    </rule>
 
 
     <!-- Error prone (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_multithreading.html) -->
@@ -149,7 +122,6 @@
         <exclude name="AvoidInstantiatingObjectsInLoops"/>
     </rule>
 
-
     <!-- Security (no rules) -->
     <rule ref="category/java/security.xml"/>
 

From 250eee85493f3a6f6b51067c613f42fa7b1e7dc7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jul 2025 15:10:19 +0100
Subject: [PATCH 152/233] build(deps): bump io.qameta.allure-download from
 2.11.2 to 2.12.0 (via #1118)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9eead326c..20eaaa8e7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -52,7 +52,7 @@ pluginManagement {
         id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
         id("io.qameta.allure-adapter") version "2.11.2"
         id("io.qameta.allure-aggregate-report") version "2.11.2"
-        id("io.qameta.allure-download") version "2.11.2"
+        id("io.qameta.allure-download") version "2.12.0"
         id("io.qameta.allure-report") version "2.11.2"
         id("io.spring.dependency-management") version "1.1.6"
         id("com.google.protobuf") version "0.9.4"

From 85b6b854d4000da856b4e6c0ccd355dc417040bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jul 2025 15:26:05 +0100
Subject: [PATCH 153/233] build(deps): bump org.assertj:assertj-core from
 3.26.3 to 3.27.3 (via #1170)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5487fa1a8..8865f0865 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -164,7 +164,7 @@ configure(libs) {
             dependency("org.apache.commons:commons-lang3:3.15.0")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")
-            dependency("org.assertj:assertj-core:3.26.3")
+            dependency("org.assertj:assertj-core:3.27.3")
             dependency("org.freemarker:freemarker:2.3.33")
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.hamcrest:hamcrest:3.0")

From 68b9efb5380c6badb198cbfdc4357fe400059561 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jul 2025 15:26:25 +0100
Subject: [PATCH 154/233] build(deps): bump com.github.spotbugs:spotbugs from
 4.8.6 to 4.9.3 (via #1171)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8865f0865..e86b2c085 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -150,7 +150,7 @@ configure(libs) {
             mavenBom("org.junit:junit-bom:5.10.3")
         }
         dependencies {
-            dependency("com.github.spotbugs:spotbugs:4.8.6")
+            dependency("com.github.spotbugs:spotbugs:4.9.3")
             dependency("com.github.tomakehurst:wiremock:3.0.1")
             dependency("com.google.inject:guice:7.0.0")
             dependency("com.google.testing.compile:compile-testing:0.21.0")

From aa0b98526304691a9c968f9545e2c46f64d7183b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 10:15:28 +0100
Subject: [PATCH 155/233] build(deps): bump com.squareup.retrofit2:retrofit
 from 2.11.0 to 3.0.0 (via #1174)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e86b2c085..3b4fdf7a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -155,7 +155,7 @@ configure(libs) {
             dependency("com.google.inject:guice:7.0.0")
             dependency("com.google.testing.compile:compile-testing:0.21.0")
             dependency("com.puppycrawl.tools:checkstyle:10.17.0")
-            dependency("com.squareup.retrofit2:retrofit:2.11.0")
+            dependency("com.squareup.retrofit2:retrofit:3.0.0")
             dependency("commons-io:commons-io:2.16.1")
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.6.0")

From 315b2c9ff2da40c92029d2359b0da4fbdd73acda Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 10:15:46 +0100
Subject: [PATCH 156/233] build(deps): bump org.postgresql:postgresql from
 42.7.3 to 42.7.7 (via #1173)

---
 allure-jooq/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
index 673e96cb2..22d515bad 100644
--- a/allure-jooq/build.gradle.kts
+++ b/allure-jooq/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testRuntimeOnly("org.postgresql:postgresql:42.7.3")
+    testRuntimeOnly("org.postgresql:postgresql:42.7.7")
 }
 
 tasks.compileJava {

From 15a70fb1ec1bfaaf688e1944a0b02802ca11733d Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 11 Jul 2025 12:46:02 +0100
Subject: [PATCH 157/233] fix workflow does not contain permissions (via #1172)

---
 .github/workflows/build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cb14edb6f..924413679 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,8 @@
 name: Build
 
+permissions:
+  contents: read
+
 on:
   workflow_dispatch:
   pull_request:

From aad46382a51e305162f0bb09eb064f5aa8cf2ae5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 13:08:09 +0100
Subject: [PATCH 158/233] build(deps): bump orgSlf4jVersion from 2.0.13 to
 2.0.17 (via #1175)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3b4fdf7a3..16114e71e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -141,7 +141,7 @@ configure(libs) {
     apply(plugin = "java")
     apply(plugin = "java-library")
 
-    val orgSlf4jVersion = "2.0.13"
+    val orgSlf4jVersion = "2.0.17"
     val assertJVersion = "1.9.22.1"
 
     dependencyManagement {

From eafc1b39c8d6ba802bfe5edd72e47e83dbf3302f Mon Sep 17 00:00:00 2001
From: Yaroslav Serhieiev <yaroslavs@wix.com>
Date: Wed, 10 Sep 2025 14:57:53 +0300
Subject: [PATCH 159/233] feat(allure-model): add optional attachment size (via
 #1182)

---
 .../io/qameta/allure/AllureLifecycleTest.java |  4 ++++
 .../io/qameta/allure/model/Attachment.java    | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
index 0a06dd32b..bd2c079b7 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
@@ -344,6 +344,10 @@ void shouldAttachAsync() {
                         tuple(attachment2Name, "text/plain")
                 );
 
+        assertThat(attachments)
+                .extracting(io.qameta.allure.model.Attachment::getSize)
+                .containsOnlyNulls();
+
         final String[] sources = attachments.stream()
                 .map(io.qameta.allure.model.Attachment::getSource)
                 .toArray(String[]::new);
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Attachment.java b/allure-model/src/main/java/io/qameta/allure/model/Attachment.java
index dc5b36e7c..ef938f240 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Attachment.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Attachment.java
@@ -32,6 +32,7 @@ public class Attachment implements Serializable {
     private String name;
     private String source;
     private String type;
+    private Long size;
 
     /**
      * Gets name.
@@ -93,4 +94,24 @@ public Attachment setType(final String value) {
         return this;
     }
 
+    /**
+     * Gets size.
+     *
+     * @return the size
+     */
+    public Long getSize() {
+        return size;
+    }
+
+    /**
+     * Sets size.
+     *
+     * @param value the value
+     * @return self for method chaining
+     */
+    public Attachment setSize(final Long value) {
+        this.size = value;
+        return this;
+    }
+
 }

From 5aeae3f7bd47d933b8ed416f0c73832bc35a63de Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Mon, 15 Sep 2025 09:59:09 +0100
Subject: [PATCH 160/233] publish using sonatype staging api

---
 .github/workflows/publish.yml | 2 +-
 build.gradle.kts              | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 28af62d51..f40f2ee35 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -27,7 +27,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
diff --git a/build.gradle.kts b/build.gradle.kts
index 16114e71e..5a2545385 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -43,7 +43,10 @@ configure(listOf(rootProject)) {
 
 nexusPublishing {
     repositories {
-        sonatype()
+        sonatype {
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
+        }
     }
 }
 

From 4f50994754cb8f3dad7a1be42886ac2cfb756005 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Sep 2025 10:55:04 +0100
Subject: [PATCH 161/233] build(deps): bump actions/setup-java from 4 to 5 (via
 #1186)

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/publish.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 924413679..c4368021f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
 
       - name: "Set up JDK"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f40f2ee35..eaf8f7432 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
 
       - name: "Set up JDK"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '21'

From a8561b7ffe5aa6ae1f875f9e7446a81417610962 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Sep 2025 10:59:54 +0100
Subject: [PATCH 162/233] build(deps): bump actions/checkout from 4 to 5 (via
 #1183)

---
 .github/workflows/build.yml                 | 2 +-
 .github/workflows/dependency-submission.yml | 2 +-
 .github/workflows/publish.yml               | 2 +-
 .github/workflows/release.yml               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c4368021f..0cfd23757 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ 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@v5
diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index 79b0496d0..9cb408169 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.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:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index eaf8f7432..f98763d24 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ 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@v5
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1f8821c29..5e31f9b54 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
       - 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 }}
 

From 4b3fed753a23fcca7e68cf45a24d108b1657c737 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Sep 2025 12:24:37 +0100
Subject: [PATCH 163/233] build(deps): bump commons-io:commons-io from 2.16.1
 to 2.20.0 (via #1190)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5a2545385..dcddf1664 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -159,7 +159,7 @@ configure(libs) {
             dependency("com.google.testing.compile:compile-testing:0.21.0")
             dependency("com.puppycrawl.tools:checkstyle:10.17.0")
             dependency("com.squareup.retrofit2:retrofit:3.0.0")
-            dependency("commons-io:commons-io:2.16.1")
+            dependency("commons-io:commons-io:2.20.0")
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.6.0")
             dependency("javax.annotation:javax.annotation-api:1.3.2")

From 105caf52729b219c4a1ccee865fb8e43228ce118 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Sep 2025 12:24:59 +0100
Subject: [PATCH 164/233] build(deps): bump com.puppycrawl.tools:checkstyle
 from 10.17.0 to 11.0.1 (via #1189)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index dcddf1664..525bbe6c8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -157,7 +157,7 @@ configure(libs) {
             dependency("com.github.tomakehurst:wiremock:3.0.1")
             dependency("com.google.inject:guice:7.0.0")
             dependency("com.google.testing.compile:compile-testing:0.21.0")
-            dependency("com.puppycrawl.tools:checkstyle:10.17.0")
+            dependency("com.puppycrawl.tools:checkstyle:11.0.1")
             dependency("com.squareup.retrofit2:retrofit:3.0.0")
             dependency("commons-io:commons-io:2.20.0")
             dependency("io.github.benas:random-beans:3.9.0")

From 2a616df2eba0e79b20262661e5255f0e69152cdd Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 15 Sep 2025 12:20:05 +0000
Subject: [PATCH 165/233] release 2.30.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 3d3a262a4..01f88f2c8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.30-SNAPSHOT
+version=2.30.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 9f50f7bcea5ee205a84cdf84fce1c679013fd7ec Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 15 Sep 2025 12:20:06 +0000
Subject: [PATCH 166/233] set next development version 2.31

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 01f88f2c8..0ce9c63c1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.30.0
+version=2.31-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 0206bdc433f1b778e0cc6332629da436720f772f Mon Sep 17 00:00:00 2001
From: epszaw <konstantin@epishev.me>
Date: Wed, 17 Sep 2025 11:13:44 +0200
Subject: [PATCH 167/233] Add workflow-wide gh actions permissions (#1187)

Co-authored-by: Maksim Stepanov <17935127+delatrie@users.noreply.github.com>
---
 .github/workflows/labeler.yml       | 5 +++++
 .github/workflows/labels-verify.yml | 5 +++++
 .github/workflows/publish.yml       | 3 +++
 .github/workflows/release.yml       | 5 +++++
 4 files changed, 18 insertions(+)

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index e0d99fc81..f49976b59 100644
--- a/.github/workflows/labeler.yml
+++ b/.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:
diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml
index 0c18ecb77..7315a905a 100644
--- a/.github/workflows/labels-verify.yml
+++ b/.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:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f98763d24..97d4d7fbd 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -4,6 +4,9 @@ on:
   release:
     types: [ published ]
 
+permissions:
+  contents: read 
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5e31f9b54..6b08eb0e4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,9 +11,14 @@ 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: |

From 1bf17c4c3c1fab8ae80544ebafa655dac6f89153 Mon Sep 17 00:00:00 2001
From: skuznetsov-al <skuznetsov@qameta.io>
Date: Tue, 14 Oct 2025 12:34:06 +0300
Subject: [PATCH 168/233] rework grpc module (via #1199)

---
 allure-grpc/build.gradle.kts                  |   8 +-
 .../io/qameta/allure/grpc/AllureGrpc.java     | 541 +++++++++++++-----
 .../io/qameta/allure/grpc/AllureGrpcTest.java | 344 +++++++++--
 allure-grpc/src/test/proto/api.proto          |   2 +
 4 files changed, 697 insertions(+), 198 deletions(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 4bc8d3567..259fc7e3d 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -8,14 +8,16 @@ description = "Allure gRPC Integration"
 
 val agent: Configuration by configurations.creating
 
-val grpcVersion = "1.57.2"
-val protobufVersion = "4.27.3"
+val grpcVersion = "1.75.0"
+val protobufVersion = "4.32.1"
+val jacksonVersion = "2.17.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
+    compileOnly("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
     compileOnly("com.google.protobuf:protobuf-java-util:$protobufVersion")
-    compileOnly("io.grpc:grpc-core:$grpcVersion")
+    compileOnly("io.grpc:grpc-api:$grpcVersion")
     testImplementation("com.google.protobuf:protobuf-java-util:$protobufVersion")
     testImplementation("com.google.protobuf:protobuf-java:$protobufVersion")
     testImplementation("io.grpc:grpc-core:$grpcVersion")
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
index 35fc4977e..6518f5341 100644
--- a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
@@ -27,21 +27,23 @@
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.attachment.AttachmentData;
-import io.qameta.allure.attachment.AttachmentProcessor;
-import io.qameta.allure.attachment.DefaultAttachmentProcessor;
+import io.qameta.allure.attachment.AttachmentRenderer;
 import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
+import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StepResult;
-import io.qameta.allure.util.ResultsUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.UUID;
-
-import static java.util.Objects.requireNonNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Allure interceptor logger for gRPC.
@@ -49,158 +51,433 @@
  * @author dtuchs (Dmitry Tuchs).
  */
 @SuppressWarnings({
-        "checkstyle:ClassFanOutComplexity",
-        "checkstyle:AnonInnerLength",
-        "checkstyle:JavaNCSS"
+    "checkstyle:ClassFanOutComplexity",
+    "checkstyle:AnonInnerLength",
+    "checkstyle:JavaNCSS"
 })
 public class AllureGrpc implements ClientInterceptor {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureGrpc.class);
-    private static final JsonFormat.Printer JSON_PRINTER = JsonFormat.printer();
-
-    private String requestTemplatePath = "grpc-request.ftl";
-    private String responseTemplatePath = "grpc-response.ftl";
+    private static final String UNKNOWN = "unknown";
+    private static final String JSON_SUFFIX = " (json)";
+    private static final JsonFormat.Printer GRPC_TO_JSON_PRINTER = JsonFormat.printer();
 
-    private boolean markStepFailedOnNonZeroCode = true;
-    private boolean interceptResponseMetadata;
-
-    public AllureGrpc setRequestTemplate(final String templatePath) {
-        this.requestTemplatePath = templatePath;
-        return this;
-    }
+    private final AllureLifecycle lifecycle;
+    private final boolean markStepFailedOnNonZeroCode;
+    private final boolean interceptResponseMetadata;
+    private final String requestTemplatePath;
+    private final String responseTemplatePath;
 
-    public AllureGrpc setResponseTemplate(final String templatePath) {
-        this.responseTemplatePath = templatePath;
-        return this;
+    public AllureGrpc() {
+        this(Allure.getLifecycle(), true, false,
+            "grpc-request.ftl", "grpc-response.ftl");
     }
 
-    public AllureGrpc markStepFailedOnNonZeroCode(final boolean value) {
-        this.markStepFailedOnNonZeroCode = value;
-        return this;
-    }
-
-    public AllureGrpc interceptResponseMetadata(final boolean value) {
-        this.interceptResponseMetadata = value;
-        return this;
+    public AllureGrpc(
+        final AllureLifecycle lifecycle,
+        final boolean markStepFailedOnNonZeroCode,
+        final boolean interceptResponseMetadata,
+        final String requestTemplatePath,
+        final String responseTemplatePath
+    ) {
+        this.lifecycle = lifecycle;
+        this.markStepFailedOnNonZeroCode = markStepFailedOnNonZeroCode;
+        this.interceptResponseMetadata = interceptResponseMetadata;
+        this.requestTemplatePath = requestTemplatePath;
+        this.responseTemplatePath = responseTemplatePath;
     }
 
     @Override
-    public <T, A> ClientCall<T, A> interceptCall(final MethodDescriptor<T, A> method,
-                                                 final CallOptions callOptions,
-                                                 final Channel next) {
-        final AttachmentProcessor<AttachmentData> processor = new DefaultAttachmentProcessor();
+    public <T, R> ClientCall<T, R> interceptCall(
+        final MethodDescriptor<T, R> methodDescriptor,
+        final CallOptions callOptions,
+        final Channel nextChannel
+    ) {
+        final AllureLifecycle current = lifecycle;
+        final String parent = current.getCurrentTestCaseOrStep().orElse(null);
+        final String stepUuid = UUID.randomUUID().toString();
+        final List<String> clientMessages = new ArrayList<>();
+        final List<String> serverMessages = new ArrayList<>();
+        final Map<String, String> initialHeaders = new LinkedHashMap<>();
+        final Map<String, String> trailers = new LinkedHashMap<>();
 
-        return new ForwardingClientCall.SimpleForwardingClientCall<T, A>(
-                next.newCall(method, callOptions.withoutWaitForReady())) {
+        final String stepName = buildStepName(nextChannel, methodDescriptor);
+        if (parent != null) {
+            current.startStep(parent, stepUuid, new StepResult().setName(stepName));
+        } else {
+            current.startStep(stepUuid, new StepResult().setName(stepName));
+        }
 
-            private String stepUuid;
-            private final List<String> parsedResponses = new ArrayList<>();
-
-            @Override
-            public void sendMessage(final T message) {
-                stepUuid = UUID.randomUUID().toString();
-                Allure.getLifecycle().startStep(stepUuid, (new StepResult()).setName(
-                        "Send gRPC request to "
-                                + next.authority()
-                                + trimGrpcMethodName(method.getFullMethodName())
-                ));
-                try {
-                    final GrpcRequestAttachment rpcRequestAttach = GrpcRequestAttachment.Builder
-                            .create("gRPC request", method.getFullMethodName())
-                            .setBody(JSON_PRINTER.print((MessageOrBuilder) message))
-                            .build();
-                    processor.addAttachment(rpcRequestAttach, new FreemarkerAttachmentRenderer(requestTemplatePath));
-                    super.sendMessage(message);
-                } catch (InvalidProtocolBufferException e) {
-                    LOGGER.warn("Can`t parse gRPC request", e);
-                } catch (Throwable e) {
-                    Allure.getLifecycle().updateStep(stepResult ->
-                            stepResult.setStatus(ResultsUtils.getStatus(e).orElse(Status.BROKEN))
-                                    .setStatusDetails(ResultsUtils.getStatusDetails(e).orElse(null))
-                    );
-                    Allure.getLifecycle().stopStep(stepUuid);
-                    stepUuid = null;
-                }
-            }
+        final StepContext<T, R> stepContext = new StepContext<>(
+            stepUuid, methodDescriptor, current, clientMessages,
+            serverMessages, initialHeaders, trailers
+        );
 
+        return new ForwardingClientCall.SimpleForwardingClientCall<T, R>(
+            nextChannel.newCall(methodDescriptor, callOptions)
+        ) {
             @Override
-            public void start(final Listener<A> responseListener, final Metadata headers) {
-                final ClientCall.Listener<A> listener = new ForwardingClientCallListener<A>() {
+            public void start(final Listener<R> responseListener, final Metadata requestHeaders) {
+                final Listener<R> forwardingListener = new ForwardingClientCallListener<R>() {
                     @Override
-                    protected Listener<A> delegate() {
+                    protected Listener<R> delegate() {
                         return responseListener;
                     }
 
                     @Override
-                    public void onClose(final io.grpc.Status status, final Metadata trailers) {
-                        GrpcResponseAttachment.Builder responseAttachmentBuilder = null;
-
-                        if (parsedResponses.size() == 1) {
-                            responseAttachmentBuilder = GrpcResponseAttachment.Builder
-                                    .create("gRPC response")
-                                    .setBody(parsedResponses.iterator().next());
-                        } else if (parsedResponses.size() > 1) {
-                            responseAttachmentBuilder = GrpcResponseAttachment.Builder
-                                    .create("gRPC response (collection of elements from Server stream)")
-                                    .setBody("[" + String.join(",\n", parsedResponses) + "]");
-                        }
-                        if (!status.isOk()) {
-                            String description = status.getDescription();
-                            if (description == null) {
-                                description = "No description provided";
-                            }
-                            responseAttachmentBuilder = GrpcResponseAttachment.Builder
-                                    .create(status.getCode().name())
-                                    .setStatus(description);
-                        }
-
-                        requireNonNull(responseAttachmentBuilder).setStatus(status.toString());
-                        if (interceptResponseMetadata) {
-                            for (String key : headers.keys()) {
-                                requireNonNull(responseAttachmentBuilder).setMetadata(
-                                        key,
-                                        headers.get(Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER))
-                                );
-                            }
-                        }
-                        processor.addAttachment(
-                                requireNonNull(responseAttachmentBuilder).build(),
-                                new FreemarkerAttachmentRenderer(responseTemplatePath)
-                        );
-
-                        if (status.isOk() || !markStepFailedOnNonZeroCode) {
-                            Allure.getLifecycle().updateStep(stepUuid, step -> step.setStatus(Status.PASSED));
-                        } else {
-                            Allure.getLifecycle().updateStep(stepUuid, step -> step.setStatus(Status.FAILED));
-                        }
-                        Allure.getLifecycle().stopStep(stepUuid);
-                        stepUuid = null;
-                        super.onClose(status, trailers);
+                    public void onHeaders(final Metadata headers) {
+                        handleHeaders(headers, stepContext.getInitialHeaders());
+                        super.onHeaders(headers);
+                    }
+
+                    @Override
+                    public void onMessage(final R message) {
+                        handleServerMessage(message, stepContext.getServerMessages());
+                        super.onMessage(message);
                     }
 
                     @Override
-                    public void onMessage(final A message) {
-                        try {
-                            parsedResponses.add(JSON_PRINTER.print((MessageOrBuilder) message));
-                            super.onMessage(message);
-                        } catch (InvalidProtocolBufferException e) {
-                            LOGGER.warn("Can`t parse gRPC response", e);
-                        } catch (Throwable e) {
-                            Allure.getLifecycle().updateStep(step ->
-                                    step.setStatus(ResultsUtils.getStatus(e).orElse(Status.BROKEN))
-                                            .setStatusDetails(ResultsUtils.getStatusDetails(e).orElse(null))
-                            );
-                            Allure.getLifecycle().stopStep(stepUuid);
-                            stepUuid = null;
-                        }
+                    public void onClose(final io.grpc.Status status, final Metadata responseTrailers) {
+                        handleClose(status, responseTrailers, stepContext);
+                        super.onClose(status, responseTrailers);
                     }
                 };
-                super.start(listener, headers);
+                super.start(forwardingListener, requestHeaders);
             }
 
-            private String trimGrpcMethodName(final String source) {
-                return source.substring(source.lastIndexOf('/'));
+            @Override
+            public void sendMessage(final T message) {
+                handleClientMessage(message, stepContext.getClientMessages());
+                super.sendMessage(message);
             }
         };
     }
+
+    private void addRawJsonAttachment(
+        final String stepUuid,
+        final String attachmentName,
+        final String jsonBody,
+        final AllureLifecycle lifecycle
+    ) {
+        if (jsonBody == null || jsonBody.isEmpty()) {
+            return;
+        }
+        final String source = UUID.randomUUID() + ".json";
+        lifecycle.updateStep(stepUuid, step -> step.getAttachments().add(
+            new Attachment()
+                .setName(attachmentName)
+                .setSource(source)
+                .setType("application/json")
+        ));
+        lifecycle.writeAttachment(
+            source,
+            new ByteArrayInputStream(jsonBody.getBytes(StandardCharsets.UTF_8))
+        );
+    }
+
+    private void handleClose(
+        final io.grpc.Status status,
+        final Metadata responseTrailers,
+        final StepContext<?, ?> stepContext
+    ) {
+        try {
+            if (interceptResponseMetadata && responseTrailers != null) {
+                copyAsciiResponseMetadata(responseTrailers, stepContext.getTrailers());
+            }
+            attachRequestIfPresent(
+                stepContext.getStepUuid(),
+                stepContext.getMethodDescriptor(),
+                stepContext.getClientMessages(),
+                stepContext.getLifecycle()
+            );
+            attachResponse(
+                stepContext.getStepUuid(),
+                stepContext.getServerMessages(),
+                status,
+                stepContext.getInitialHeaders(),
+                stepContext.getTrailers(),
+                stepContext.getLifecycle()
+            );
+            stepContext.getLifecycle().updateStep(
+                stepContext.getStepUuid(),
+                step -> step.setStatus(convertStatus(status))
+            );
+        } catch (Throwable throwable) {
+            LOGGER.error("Failed to finalize Allure step for gRPC call", throwable);
+            stepContext.getLifecycle().updateStep(
+                stepContext.getStepUuid(),
+                step -> step.setStatus(Status.BROKEN)
+            );
+        } finally {
+            stopStepSafely(stepContext.getLifecycle(), stepContext.getStepUuid());
+        }
+    }
+
+    private void handleHeaders(final Metadata headers, final Map<String, String> destination) {
+        try {
+            if (interceptResponseMetadata && headers != null) {
+                copyAsciiResponseMetadata(headers, destination);
+            }
+        } catch (Throwable throwable) {
+            LOGGER.warn("Failed to capture response headers", throwable);
+        }
+    }
+
+    private <T> void handleClientMessage(final T message, final List<String> destination) {
+        try {
+            destination.add(GRPC_TO_JSON_PRINTER.print((MessageOrBuilder) message));
+        } catch (InvalidProtocolBufferException e) {
+            LOGGER.error("Could not serialize gRPC request message to JSON", e);
+        } catch (Throwable throwable) {
+            LOGGER.error("Unexpected error while serializing gRPC request message", throwable);
+        }
+    }
+
+    private <R> void handleServerMessage(final R message, final List<String> destination) {
+        try {
+            destination.add(GRPC_TO_JSON_PRINTER.print((MessageOrBuilder) message));
+        } catch (InvalidProtocolBufferException e) {
+            LOGGER.error("Could not serialize gRPC response message to JSON", e);
+        } catch (Throwable throwable) {
+            LOGGER.error("Unexpected error while serializing gRPC response message", throwable);
+        }
+    }
+
+    private <T, R> void attachRequestIfPresent(
+        final String stepUuid,
+        final MethodDescriptor<T, R> methodDescriptor,
+        final List<String> clientMessages,
+        final AllureLifecycle lifecycle
+    ) {
+        final String body = toJsonBody(clientMessages);
+        if (body == null) {
+            return;
+        }
+        final String name = clientMessages.size() > 1
+            ? "gRPC request (collection of elements from Client stream)"
+            : "gRPC request";
+        final GrpcRequestAttachment requestAttachment = GrpcRequestAttachment.Builder
+            .create(name, methodDescriptor.getFullMethodName())
+            .setBody(body)
+            .build();
+
+        addRenderedAttachmentToStep(
+            stepUuid,
+            requestAttachment.getName(),
+            requestAttachment,
+            requestTemplatePath,
+            lifecycle
+        );
+        addRawJsonAttachment(stepUuid, name + JSON_SUFFIX, body, lifecycle);
+    }
+
+    private void attachResponse(
+        final String stepUuid,
+        final List<String> serverMessages,
+        final io.grpc.Status status,
+        final Map<String, String> initialHeaders,
+        final Map<String, String> trailers,
+        final AllureLifecycle lifecycle
+    ) {
+        final String body = toJsonBody(serverMessages);
+        final String name = serverMessages.size() > 1
+            ? "gRPC response (collection of elements from Server stream)"
+            : "gRPC response";
+
+        final Map<String, String> metadata = new LinkedHashMap<>();
+        if (interceptResponseMetadata) {
+            metadata.putAll(initialHeaders);
+            metadata.putAll(trailers);
+        }
+
+        final GrpcResponseAttachment.Builder builder = GrpcResponseAttachment.Builder
+            .create(name)
+            .setStatus(status.toString());
+
+        if (body != null) {
+            builder.setBody(body);
+        }
+        if (!metadata.isEmpty()) {
+            builder.addMetadata(metadata);
+        }
+
+        final GrpcResponseAttachment responseAttachment = builder.build();
+        addRenderedAttachmentToStep(
+            stepUuid,
+            responseAttachment.getName(),
+            responseAttachment,
+            responseTemplatePath,
+            lifecycle
+        );
+        if (body != null) {
+            addRawJsonAttachment(stepUuid, name + JSON_SUFFIX, body, lifecycle);
+        }
+    }
+
+    private void stopStepSafely(final AllureLifecycle lifecycle, final String stepUuid) {
+        try {
+            lifecycle.stopStep(stepUuid);
+        } catch (Throwable throwable) {
+            LOGGER.warn("Failed to stop Allure step {}", stepUuid, throwable);
+        }
+    }
+
+    private Status convertStatus(final io.grpc.Status grpcStatus) {
+        if (grpcStatus.isOk() || !markStepFailedOnNonZeroCode) {
+            return Status.PASSED;
+        }
+        return Status.FAILED;
+    }
+
+    private static String buildStepName(
+        final Channel channel,
+        final MethodDescriptor<?, ?> methodDescriptor
+    ) {
+        final String authority = channel != null ? channel.authority() : null;
+        final String safeAuthority = authority != null ? authority : UNKNOWN;
+        final String type = toSnakeCase(methodDescriptor.getType());
+        return "Send " + type + " gRPC request to "
+            + safeAuthority + "/" + methodDescriptor.getFullMethodName();
+    }
+
+    private static String toSnakeCase(final MethodDescriptor.MethodType methodType) {
+        if (methodType == null) {
+            return UNKNOWN;
+        }
+        return methodType.name().toLowerCase(Locale.ROOT);
+    }
+
+    private void addRenderedAttachmentToStep(
+        final String stepUuid,
+        final String attachmentName,
+        final AttachmentData data,
+        final String templatePath,
+        final AllureLifecycle lifecycle
+    ) {
+        final AttachmentRenderer<AttachmentData> renderer =
+            new FreemarkerAttachmentRenderer(templatePath);
+        final io.qameta.allure.attachment.AttachmentContent content;
+        try {
+            content = renderer.render(data);
+        } catch (Throwable throwable) {
+            LOGGER.warn(
+                "Could not render attachment '{}' using template '{}'",
+                attachmentName, templatePath, throwable
+            );
+            return;
+        }
+        if (content == null || content.getContent() == null) {
+            LOGGER.warn("Rendered attachment '{}' is empty; skipping", attachmentName);
+            return;
+        }
+        String fileExtension = content.getFileExtension();
+        if (fileExtension == null || fileExtension.isEmpty()) {
+            fileExtension = ".html";
+        }
+        final String source = UUID.randomUUID() + fileExtension;
+        lifecycle.updateStep(
+            stepUuid,
+            step -> step.getAttachments().add(
+                new Attachment()
+                    .setName(attachmentName)
+                    .setSource(source)
+                    .setType(
+                        content.getContentType() != null
+                            ? content.getContentType()
+                            : "text/html"
+                    )
+            )
+        );
+        lifecycle.writeAttachment(
+            source,
+            new ByteArrayInputStream(content.getContent().getBytes(StandardCharsets.UTF_8))
+        );
+    }
+
+    private static String toJsonBody(final List<String> items) {
+        if (items == null || items.isEmpty()) {
+            return null;
+        }
+        if (items.size() == 1) {
+            return items.get(0);
+        }
+        final String joined = String.join(",\n", items);
+        return "[" + joined + "]";
+    }
+
+    private static void copyAsciiResponseMetadata(
+        final Metadata source,
+        final Map<String, String> target
+    ) {
+        for (String key : source.keys()) {
+            if (key == null) {
+                continue;
+            }
+            if (key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
+                continue;
+            }
+            final Metadata.Key<String> keyAscii =
+                Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
+            final String value = source.get(keyAscii);
+            if (value != null) {
+                target.put(key, value);
+            }
+        }
+    }
+
+    private static final class StepContext<T, R> {
+        private final String stepUuid;
+        private final MethodDescriptor<T, R> methodDescriptor;
+        private final AllureLifecycle lifecycle;
+        private final List<String> clientMessages;
+        private final List<String> serverMessages;
+        private final Map<String, String> initialHeaders;
+        private final Map<String, String> trailers;
+
+        StepContext(
+            final String stepUuid,
+            final MethodDescriptor<T, R> methodDescriptor,
+            final AllureLifecycle lifecycle,
+            final List<String> clientMessages,
+            final List<String> serverMessages,
+            final Map<String, String> initialHeaders,
+            final Map<String, String> trailers
+        ) {
+            this.stepUuid = stepUuid;
+            this.methodDescriptor = methodDescriptor;
+            this.lifecycle = lifecycle;
+            this.clientMessages = clientMessages;
+            this.serverMessages = serverMessages;
+            this.initialHeaders = initialHeaders;
+            this.trailers = trailers;
+        }
+
+        String getStepUuid() {
+            return stepUuid;
+        }
+
+        MethodDescriptor<T, R> getMethodDescriptor() {
+            return methodDescriptor;
+        }
+
+        AllureLifecycle getLifecycle() {
+            return lifecycle;
+        }
+
+        List<String> getClientMessages() {
+            return clientMessages;
+        }
+
+        List<String> getServerMessages() {
+            return serverMessages;
+        }
+
+        Map<String, String> getInitialHeaders() {
+            return initialHeaders;
+        }
+
+        Map<String, String> getTrailers() {
+            return trailers;
+        }
+    }
 }
diff --git a/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java b/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
index 6c83b9f03..e316fc75a 100644
--- a/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
+++ b/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
@@ -15,12 +15,17 @@
  */
 package io.qameta.allure.grpc;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
+import io.grpc.stub.StreamObserver;
+import io.qameta.allure.Allure;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResults;
 import org.grpcmock.GrpcMock;
 import org.grpcmock.junit5.GrpcMockExtension;
@@ -29,135 +34,348 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.grpcmock.GrpcMock.bidiStreamingMethod;
+import static org.grpcmock.GrpcMock.clientStreamingMethod;
 import static org.grpcmock.GrpcMock.serverStreamingMethod;
 import static org.grpcmock.GrpcMock.unaryMethod;
 
-/**
- * @author dtuchs (Dmitry Tuchs).
- */
 @ExtendWith(GrpcMockExtension.class)
 class AllureGrpcTest {
 
     private static final String RESPONSE_MESSAGE = "Hello world!";
+    private static final ObjectMapper JSON = new ObjectMapper();
 
-    private ManagedChannel channel;
-    private TestServiceGrpc.TestServiceBlockingStub blockingStub;
+    private ManagedChannel managedChannel;
 
     @BeforeEach
-    void configureMock() {
-        channel = ManagedChannelBuilder.forAddress("localhost", GrpcMock.getGlobalPort())
-                .usePlaintext()
-                .build();
-        blockingStub = TestServiceGrpc.newBlockingStub(channel)
-                .withInterceptors(new AllureGrpc());
+    void configureMockServer() {
+        managedChannel = ManagedChannelBuilder
+            .forAddress("localhost", GrpcMock.getGlobalPort())
+            .usePlaintext()
+            .directExecutor()
+            .build();
 
         GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod())
-                .willReturn(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build()));
+            .willReturn(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build()));
+
         GrpcMock.stubFor(serverStreamingMethod(TestServiceGrpc.getCalculateServerStreamMethod())
-                .willReturn(asList(
-                        Response.newBuilder().setMessage(RESPONSE_MESSAGE).build(),
-                        Response.newBuilder().setMessage(RESPONSE_MESSAGE).build()
-                )));
+            .willReturn(asList(
+                Response.newBuilder().setMessage(RESPONSE_MESSAGE).build(),
+                Response.newBuilder().setMessage(RESPONSE_MESSAGE).build()
+            )));
+
+        GrpcMock.stubFor(clientStreamingMethod(TestServiceGrpc.getCalculateClientStreamMethod())
+            .willReturn(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build()));
+
+        GrpcMock.stubFor(bidiStreamingMethod(TestServiceGrpc.getCalculateBidiStreamMethod())
+            .willProxyTo(responseObserver -> new StreamObserver<Request>() {
+                @Override
+                public void onNext(Request request) {
+                    responseObserver.onNext(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build());
+                }
+                @Override
+                public void onError(Throwable throwable) {
+                }
+                @Override
+                public void onCompleted() {
+                    responseObserver.onCompleted();
+                }
+            }));
     }
 
     @AfterEach
     void shutdownChannel() {
-        Optional.ofNullable(channel).ifPresent(ManagedChannel::shutdownNow);
+        Optional.ofNullable(managedChannel).ifPresent(ManagedChannel::shutdown);
     }
 
     @Test
     void shouldCreateRequestAttachment() {
-        final Request request = Request.newBuilder()
-                .setTopic("1")
-                .build();
+        Request request = Request.newBuilder()
+            .setTopic("1")
+            .build();
+
+        Status errorStatus = Status.NOT_FOUND;
+        GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod()).willReturn(errorStatus));
 
-        final AllureResults results = execute(request);
+        AllureResults allureResults = executeUnaryExpectingException(request);
 
-        assertThat(results.getTestResults().get(0).getSteps())
-                .flatExtracting(StepResult::getAttachments)
-                .extracting(Attachment::getName)
-                .contains("gRPC request");
+        assertThat(allureResults.getTestResults().get(0).getSteps().get(0).getStatus())
+            .isEqualTo(io.qameta.allure.model.Status.FAILED);
+
+        assertThat(allureResults.getTestResults().get(0).getSteps())
+            .flatExtracting(StepResult::getAttachments)
+            .extracting(Attachment::getName)
+            .contains("gRPC request", "gRPC response");
     }
 
     @Test
     void shouldCreateResponseAttachment() {
-        final Request request = Request.newBuilder()
-                .setTopic("1")
-                .build();
+        Request request = Request.newBuilder()
+            .setTopic("1")
+            .build();
 
-        final AllureResults results = execute(request);
+        AllureResults allureResults = executeUnary(request);
 
-        assertThat(results.getTestResults().get(0).getSteps())
-                .flatExtracting(StepResult::getAttachments)
-                .extracting(Attachment::getName)
-                .contains("gRPC response");
+        assertThat(allureResults.getTestResults().get(0).getSteps())
+            .flatExtracting(StepResult::getAttachments)
+            .extracting(Attachment::getName)
+            .contains("gRPC response");
     }
 
     @Test
     void shouldCreateResponseAttachmentForServerStreamingResponse() {
-        final Request request = Request.newBuilder()
-                .setTopic("1")
-                .build();
+        Request request = Request.newBuilder()
+            .setTopic("1")
+            .build();
 
-        final AllureResults results = executeStreaming(request);
+        AllureResults allureResults = executeServerStreaming(request);
 
-        assertThat(results.getTestResults().get(0).getSteps())
-                .flatExtracting(StepResult::getAttachments)
-                .extracting(Attachment::getName)
-                .contains("gRPC response (collection of elements from Server stream)");
+        assertThat(allureResults.getTestResults().get(0).getSteps())
+            .flatExtracting(StepResult::getAttachments)
+            .extracting(Attachment::getName)
+            .contains("gRPC response (collection of elements from Server stream)");
     }
 
     @Test
     void shouldCreateResponseAttachmentOnStatusException() {
-        final Status status = Status.NOT_FOUND;
+        Status notFoundStatus = Status.NOT_FOUND;
+        GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod()).willReturn(notFoundStatus));
+
+        Request request = Request.newBuilder()
+            .setTopic("2")
+            .build();
+
+        AllureResults allureResults = executeUnaryExpectingException(request);
+
+        assertThat(allureResults.getTestResults().get(0).getSteps().get(0).getStatus())
+            .isEqualTo(io.qameta.allure.model.Status.FAILED);
+
+        assertThat(allureResults.getTestResults().get(0).getSteps())
+            .flatExtracting(StepResult::getAttachments)
+            .extracting(Attachment::getName)
+            .contains("gRPC response");
+    }
+
+    @Test
+    void shouldCreateAttachmentsForClientStreamingWithAsynchronousStub() {
+        Request firstClientRequest = Request.newBuilder().setTopic("A").build();
+        Request secondClientRequest = Request.newBuilder().setTopic("B").build();
+
+        runWithinTestContext(() -> {
+            TestServiceGrpc.TestServiceStub asynchronousStub =
+                TestServiceGrpc.newStub(managedChannel).withInterceptors(new AllureGrpc());
+
+            final List<Response> receivedResponses = new ArrayList<Response>();
+
+            Allure.step("async-root-client-stream", () -> {
+                StreamObserver<Response> responseObserver = new StreamObserver<Response>() {
+                    @Override
+                    public void onNext(Response value) {
+                        receivedResponses.add(value);
+                    }
+                    @Override
+                    public void onError(Throwable throwable) {
+                    }
+                    @Override
+                    public void onCompleted() {
+                    }
+                };
+
+                StreamObserver<Request> requestObserver = asynchronousStub.calculateClientStream(responseObserver);
+                requestObserver.onNext(firstClientRequest);
+                requestObserver.onNext(secondClientRequest);
+                requestObserver.onCompleted();
+            });
+
+            assertThat(receivedResponses).hasSize(1);
+            assertThat(receivedResponses.get(0).getMessage()).isEqualTo(RESPONSE_MESSAGE);
+        });
+    }
+
+    @Test
+    void shouldCreateAttachmentsForBidirectionalStreamingWithAsynchronousStub() {
+        Request firstBidirectionalRequest = Request.newBuilder().setTopic("C").build();
+        Request secondBidirectionalRequest = Request.newBuilder().setTopic("D").build();
+
+        runWithinTestContext(() -> {
+            TestServiceGrpc.TestServiceStub asynchronousStub =
+                TestServiceGrpc.newStub(managedChannel).withInterceptors(new AllureGrpc());
+
+            List<Response> receivedResponses = new ArrayList<>();
+
+            Allure.step("async-root-bidi-stream", () -> {
+                StreamObserver<Response> responseObserver = new StreamObserver<Response>() {
+                    @Override public void onNext(Response value) { receivedResponses.add(value); }
+                    @Override public void onError(Throwable throwable) { }
+                    @Override public void onCompleted() { }
+                };
+
+                StreamObserver<Request> requestObserver = asynchronousStub.calculateBidiStream(responseObserver);
+                requestObserver.onNext(firstBidirectionalRequest);
+                requestObserver.onNext(secondBidirectionalRequest);
+                requestObserver.onCompleted();
+            });
+
+            assertThat(receivedResponses).hasSize(2);
+            assertThat(receivedResponses.get(0).getMessage()).isEqualTo(RESPONSE_MESSAGE);
+            assertThat(receivedResponses.get(1).getMessage()).isEqualTo(RESPONSE_MESSAGE);
+        });
+    }
+
+    @Test
+    void unaryRequestBodyIsCapturedAsJsonObject() throws Exception {
+        GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod())
+            .willReturn(Response.newBuilder().setMessage("ok").build()));
+
+        Request request = Request.newBuilder().setTopic("topic-1").build();
+
+        AllureResults allureResults = runWithinTestContext(() -> {
+            TestServiceGrpc.TestServiceBlockingStub stub =
+                TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+            Response response = stub.calculate(request);
+            assertThat(response.getMessage()).isEqualTo("ok");
+        });
+
+        String jsonPayload = readJsonAttachmentByName(allureResults, "gRPC request (json)");
+        JsonNode actualJsonNode = JSON.readTree(jsonPayload);
+        JsonNode expectedJsonNode = JSON.createObjectNode().put("topic", "topic-1");
+
+        assertThat(actualJsonNode).isEqualTo(expectedJsonNode);
+    }
+
+    @Test
+    void unaryResponseBodyIsCapturedAsJsonObject() throws Exception {
         GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod())
-                .willReturn(status));
+            .willReturn(Response.newBuilder().setMessage("hello-world").build()));
 
-        final Request request = Request.newBuilder()
-                .setTopic("2")
-                .build();
+        Request request = Request.newBuilder().setTopic("x").build();
 
-        final AllureResults results = executeException(request);
+        AllureResults allureResults = runWithinTestContext(() -> {
+            TestServiceGrpc.TestServiceBlockingStub stub =
+                TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+            Response response = stub.calculate(request);
+            assertThat(response.getMessage()).isEqualTo("hello-world");
+        });
+
+        String jsonPayload = readJsonAttachmentByName(allureResults, "gRPC response (json)");
+        JsonNode actualJsonNode = JSON.readTree(jsonPayload);
+        JsonNode expectedJsonNode = JSON.createObjectNode().put("message", "hello-world");
 
-        assertThat(results.getTestResults().get(0).getSteps())
-                .flatExtracting(StepResult::getAttachments)
-                .extracting(Attachment::getName)
-                .contains(status.getCode().name());
+        assertThat(actualJsonNode).isEqualTo(expectedJsonNode);
     }
 
-    protected final AllureResults execute(final Request request) {
+    @Test
+    void serverStreamingResponseBodyIsJsonArrayInOrder() throws Exception {
+        GrpcMock.stubFor(serverStreamingMethod(TestServiceGrpc.getCalculateServerStreamMethod())
+            .willReturn(asList(
+                Response.newBuilder().setMessage("first").build(),
+                Response.newBuilder().setMessage("second").build()
+            )));
+
+        Request request = Request.newBuilder().setTopic("stream-topic").build();
+
+        AllureResults allureResults = runWithinTestContext(() -> {
+            TestServiceGrpc.TestServiceBlockingStub stub =
+                TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+            Iterator<Response> responseIterator = stub.calculateServerStream(request);
+            assertThat(responseIterator.hasNext()).isTrue();
+            assertThat(responseIterator.next().getMessage()).isEqualTo("first");
+            assertThat(responseIterator.hasNext()).isTrue();
+            assertThat(responseIterator.next().getMessage()).isEqualTo("second");
+            assertThat(responseIterator.hasNext()).isFalse();
+        });
+
+        String jsonPayload = readJsonAttachmentByName(
+            allureResults, "gRPC response (collection of elements from Server stream) (json)"
+        );
+        JsonNode actualJsonArray = JSON.readTree(jsonPayload);
+
+        assertThat(actualJsonArray.isArray()).isTrue();
+        assertThat(actualJsonArray.size()).isEqualTo(2);
+        assertThat(actualJsonArray.get(0)).isEqualTo(JSON.createObjectNode().put("message", "first"));
+        assertThat(actualJsonArray.get(1)).isEqualTo(JSON.createObjectNode().put("message", "second"));
+    }
+    private static String readJsonAttachmentByName(AllureResults allureResults, String jsonAttachmentName) {
+        TestResult test = allureResults.getTestResults().get(0);
+
+        Attachment matchedAttachment = flattenSteps(test.getSteps()).stream()
+            .flatMap(step -> step.getAttachments().stream())
+            .filter(attachment -> jsonAttachmentName.equals(attachment.getName()))
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException("Attachment not found: " + jsonAttachmentName));
+
+        String attachmentSourceKey = matchedAttachment.getSource();
+        Map<String, byte[]> attachmentsContent = allureResults.getAttachments();
+        byte[] rawAttachmentContent = attachmentsContent.get(attachmentSourceKey);
+        if (rawAttachmentContent == null) {
+            throw new IllegalStateException("Attachment content not found by source: " + attachmentSourceKey);
+        }
+        return new String(rawAttachmentContent, StandardCharsets.UTF_8);
+    }
+
+    protected final AllureResults executeUnary(Request request) {
         return runWithinTestContext(() -> {
             try {
-                final Response response = blockingStub.calculate(request);
+                TestServiceGrpc.TestServiceBlockingStub stub =
+                    TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+                Response response = stub.calculate(request);
                 assertThat(response.getMessage()).isEqualTo(RESPONSE_MESSAGE);
-            } catch (Exception e) {
-                throw new RuntimeException("Could not execute request " + request, e);
+            } catch (Exception exception) {
+                throw new RuntimeException("Could not execute request " + request, exception);
             }
         });
     }
-    protected final AllureResults executeStreaming(final Request request) {
+
+    protected final AllureResults executeServerStreaming(Request request) {
         return runWithinTestContext(() -> {
             try {
-                Iterator<Response> responseIterator = blockingStub.calculateServerStream(request);
+                TestServiceGrpc.TestServiceBlockingStub stub =
+                    TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+                Iterator<Response> responseIterator = stub.calculateServerStream(request);
+                int responseCount = 0;
                 while (responseIterator.hasNext()) {
                     assertThat(responseIterator.next().getMessage()).isEqualTo(RESPONSE_MESSAGE);
+                    responseCount++;
                 }
-            } catch (Exception e) {
-                throw new RuntimeException("Could not execute request " + request, e);
+                assertThat(responseCount).isEqualTo(2);
+            } catch (Exception exception) {
+                throw new RuntimeException("Could not execute request " + request, exception);
             }
         });
     }
 
-    protected final AllureResults executeException(final Request request) {
-        return runWithinTestContext(() -> {
-                assertThatExceptionOfType(StatusRuntimeException.class).isThrownBy(() -> blockingStub.calculate(request));
-        });
+    protected final AllureResults executeUnaryExpectingException(Request request) {
+        return runWithinTestContext(() ->
+            assertThatExceptionOfType(StatusRuntimeException.class)
+                .isThrownBy(() -> {
+                    TestServiceGrpc.TestServiceBlockingStub stub =
+                        TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+                    Response response = stub.calculate(request);
+                    assertThat(response.getMessage()).isEqualTo("ok");
+                })
+        );
+    }
+
+    private static List<StepResult> flattenSteps(List<StepResult> rootSteps) {
+        List<StepResult> allSteps = new ArrayList<>();
+        if (rootSteps == null) {
+            return allSteps;
+        }
+        for (StepResult step : rootSteps) {
+            allSteps.add(step);
+            allSteps.addAll(flattenSteps(step.getSteps()));
+        }
+        return allSteps;
     }
 }
diff --git a/allure-grpc/src/test/proto/api.proto b/allure-grpc/src/test/proto/api.proto
index 552e76f6c..378bb0872 100644
--- a/allure-grpc/src/test/proto/api.proto
+++ b/allure-grpc/src/test/proto/api.proto
@@ -6,6 +6,8 @@ option java_package = "io.qameta.allure.grpc";
 service TestService {
   rpc Calculate (Request) returns (Response);
   rpc CalculateServerStream (Request) returns (stream Response);
+  rpc CalculateClientStream (stream Request) returns (Response);
+  rpc CalculateBidiStream (stream Request) returns (stream Response);
 }
 
 message Request {

From 85f3ccd74791fd33d93beef8d29fa2087a206b89 Mon Sep 17 00:00:00 2001
From: a-simeshin <89605031+a-simeshin@users.noreply.github.com>
Date: Thu, 13 Nov 2025 13:54:27 +0300
Subject: [PATCH 169/233] bump spring-web to 6.2.12 and fix compatibility with
 new api (via #1161)

---
 allure-spring-web/build.gradle.kts                          | 6 +++++-
 .../java/io/qameta/allure/springweb/AllureRestTemplate.java | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/allure-spring-web/build.gradle.kts b/allure-spring-web/build.gradle.kts
index 4b9412226..b79566812 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Spring Web Integration"
 
-val springWebVersion = "5.3.37"
+val springWebVersion = "6.2.12"
 
 dependencies {
     api(project(":allure-attachments"))
@@ -29,3 +29,7 @@ tasks.jar {
 tasks.test {
     useJUnitPlatform()
 }
+
+tasks.compileJava {
+    options.release.set(17)
+}
\ No newline at end of file
diff --git a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
index 9f1daf988..2c302b0ed 100644
--- a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
+++ b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
@@ -81,7 +81,7 @@ public ClientHttpResponse intercept(@NonNull final HttpRequest request, final by
 
         final HttpRequestAttachment.Builder requestAttachmentBuilder = HttpRequestAttachment.Builder
                 .create("Request", request.getURI().toString())
-                .setMethod(request.getMethodValue())
+                .setMethod(request.getMethod().name())
                 .setHeaders(toMapConverter(request.getHeaders()));
         if (body.length != 0) {
             requestAttachmentBuilder.setBody(new String(body, StandardCharsets.UTF_8));
@@ -94,7 +94,7 @@ public ClientHttpResponse intercept(@NonNull final HttpRequest request, final by
 
         final HttpResponseAttachment responseAttachment = HttpResponseAttachment.Builder
                 .create("Response")
-                .setResponseCode(clientHttpResponse.getRawStatusCode())
+                .setResponseCode(clientHttpResponse.getStatusCode().value())
                 .setHeaders(toMapConverter(clientHttpResponse.getHeaders()))
                 .setBody(StreamUtils.copyToString(clientHttpResponse.getBody(), StandardCharsets.UTF_8))
                 .build();

From a2072807c4c65d485455f160c61fec93ec972677 Mon Sep 17 00:00:00 2001
From: a-simeshin <89605031+a-simeshin@users.noreply.github.com>
Date: Thu, 13 Nov 2025 14:01:11 +0300
Subject: [PATCH 170/233] document how to prevent breaking allure lifecycle for
 Steps inside Awaitility evaluations (fixes #1135, via #1158)

---
 allure-awaitility/readme.md                   |  7 +-
 .../ConditionListenersPositiveTest.java       |  7 ++
 .../GlobalSettingsNegativeTest.java           |  1 +
 .../GlobalSettingsPositiveTest.java           |  1 +
 .../awaitility/MultipleConditionsTest.java    | 70 +++++++++++++++++++
 5 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java

diff --git a/allure-awaitility/readme.md b/allure-awaitility/readme.md
index 5a93b6a42..1fcb34691 100644
--- a/allure-awaitility/readme.md
+++ b/allure-awaitility/readme.md
@@ -7,11 +7,16 @@ For more information about awaitility highly recommended look into [awaitility u
 
 
 ### Configuration examples
-Single line for all awaitility conditions in project
+Single line for all awaitility conditions in project 
 ```java
 Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
 ```
 
+And another line to prevent breaking allure lifecycle for Steps inside Awaitility evaluations
+```java
+Awaitility.pollInSameThread();
+```
+
 Moreover, it's possible logging only few unstable conditions with method `.conditionEvaluationListener()`
 ```java
 final AtomicInteger atomicInteger = new AtomicInteger(0);
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
index 74cfa88f2..1a3bad814 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
@@ -18,6 +18,8 @@
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DynamicNode;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
@@ -38,6 +40,11 @@
 
 class ConditionListenersPositiveTest {
 
+    @BeforeAll
+    static void setup() {
+        Awaitility.pollInSameThread();
+    }
+
     /**
      * Positive test to check proper allure steps generation.
      * <p>
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
index 29577aee2..5c169fd63 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
@@ -48,6 +48,7 @@ void reset() {
 
     @BeforeEach
     void setup() {
+        Awaitility.pollInSameThread();
         Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
     }
 
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
index db00c41e6..52a6b50db 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
@@ -48,6 +48,7 @@ void reset() {
 
     @BeforeEach
     void setup() {
+        Awaitility.pollInSameThread();
         Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
     }
 
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java
new file mode 100644
index 000000000..36a74a164
--- /dev/null
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java
@@ -0,0 +1,70 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.awaitility;
+
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.TestResult;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.*;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+public class MultipleConditionsTest {
+
+    @AfterEach
+    void reset() {
+        Awaitility.reset();
+    }
+
+    @BeforeEach
+    void setup() {
+        Awaitility.pollInSameThread();
+        Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
+    }
+
+    @TestFactory
+    Stream<DynamicNode> bothAwaitilityStepsShouldAppearTest() {
+        final List<TestResult> testResult = runWithinTestContext(() -> {
+                    await().with()
+                            .alias("First waiting")
+                            .until(() -> true);
+                    await().with()
+                            .alias("Second waiting")
+                            .until(() -> true);
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+
+        return Stream.of(
+                DynamicTest.dynamicTest("Exactly 2 top level step for 2 awaitility condition", () ->
+                        assertThat(testResult.get(0).getSteps())
+                                .describedAs("Allure TestResult contains exactly 2 top level step for 2 awaitility condition")
+                                .hasSize(2)
+                ),
+                DynamicTest.dynamicTest("All top level step for all awaitility condition has PASSED", () ->
+                        assertThat(testResult.get(0).getSteps())
+                                .describedAs("Allure TestResult contains all top level step for all awaitility with PASSED condition")
+                                .allMatch(step -> Status.PASSED.equals(step.getStatus()))
+                )
+        );
+    }
+
+}

From 480ec9db8d9f9b74bde66cde99cbb7a4e8c80818 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Nov 2025 11:05:33 +0000
Subject: [PATCH 171/233] build(deps): bump grpcVersion from 1.75.0 to 1.76.0
 (via #1202)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 259fc7e3d..7eab5267c 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -8,7 +8,7 @@ description = "Allure gRPC Integration"
 
 val agent: Configuration by configurations.creating
 
-val grpcVersion = "1.75.0"
+val grpcVersion = "1.76.0"
 val protobufVersion = "4.32.1"
 val jacksonVersion = "2.17.2"
 

From 7709e11703c251454b7e128cad2bf1ca917bbf59 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Thu, 13 Nov 2025 11:07:27 +0000
Subject: [PATCH 172/233] release 2.31.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 0ce9c63c1..4c932d123 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.31-SNAPSHOT
+version=2.31.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 4e8495aaa187ad4b009a7116ed1463391722b304 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Thu, 13 Nov 2025 11:07:27 +0000
Subject: [PATCH 173/233] set next development version 2.32

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 4c932d123..48e478a6b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.31.0
+version=2.32-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 090468624f8fcd5b6d48ec28120e12c31f25c263 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 17:19:21 +0000
Subject: [PATCH 174/233] build(deps): bump actions/checkout from 5 to 6 (via
 #1206)

---
 .github/workflows/build.yml                 | 2 +-
 .github/workflows/dependency-submission.yml | 2 +-
 .github/workflows/publish.yml               | 2 +-
 .github/workflows/release.yml               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0cfd23757..8f537bc9c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
     name: "Build"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: "Set up JDK"
         uses: actions/setup-java@v5
diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index 9cb408169..acc097567 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.github/workflows/dependency-submission.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Generate and submit dependency graph
         uses: gradle/actions/dependency-submission@v4
         env:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 97d4d7fbd..2295deb90 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: "Set up JDK"
         uses: actions/setup-java@v5
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6b08eb0e4..7d5ace556 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
       - name: "Check next version"
         run: |
           expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From 873ac20ccac4ae69f3a0c57943a8fc6bb89d0371 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 09:49:04 +0000
Subject: [PATCH 175/233] build(deps): bump gradle/actions from 4 to 5 (via
 #1197)

---
 .github/workflows/dependency-submission.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index acc097567..748dfe670 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.github/workflows/dependency-submission.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v6
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@v4
+        uses: gradle/actions/dependency-submission@v5
         env:
           DEPENDENCY_GRAPH_EXCLUDE_PROJECTS: ':allure-java-commons-test'
           DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS: 'runtimeClasspath'

From 89371862308aa4baa9b95e93c0cfbeba917d3d30 Mon Sep 17 00:00:00 2001
From: CodeGeek32 <alex.madhatcher@gmail.com>
Date: Thu, 11 Dec 2025 14:47:22 +0300
Subject: [PATCH 176/233] limited prettifying length to 1mb (via #1157)

---
 .../allure/restassured/AllureRestAssured.java | 17 +++++--
 .../restassured/AllureRestAssuredTest.java    | 51 ++++++++++++++++++-
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
index 9e166c309..07f0d5e6c 100644
--- a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
+++ b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
@@ -35,7 +35,6 @@
 import java.util.TreeSet;
 
 import static io.qameta.allure.attachment.http.HttpRequestAttachment.Builder.create;
-import static io.qameta.allure.attachment.http.HttpResponseAttachment.Builder.create;
 import static java.util.Optional.ofNullable;
 
 /**
@@ -45,11 +44,18 @@ public class AllureRestAssured implements OrderedFilter {
 
     private static final String HIDDEN_PLACEHOLDER = "[ BLACKLISTED ]";
 
+    private int maxAllowedPrettifyLength = 1_048_576;
+
     private String requestTemplatePath = "http-request.ftl";
     private String responseTemplatePath = "http-response.ftl";
     private String requestAttachmentName = "Request";
     private String responseAttachmentName;
 
+    public AllureRestAssured setMaxAllowedPrettifyLength(final int maxAllowedPrettifyLength) {
+        this.maxAllowedPrettifyLength = maxAllowedPrettifyLength;
+        return this;
+    }
+
     public AllureRestAssured setRequestTemplate(final String templatePath) {
         this.requestTemplatePath = templatePath;
         return this;
@@ -123,10 +129,15 @@ public Response filter(final FilterableRequestSpecification requestSpec,
         final String attachmentName = ofNullable(responseAttachmentName)
                 .orElse(response.getStatusLine());
 
-        final HttpResponseAttachment responseAttachment = create(attachmentName)
+        final String responseAsString = response.getBody().asString();
+        final String body = responseAsString.length() > maxAllowedPrettifyLength
+                ? responseAsString
+                : prettifier.getPrettifiedBodyIfPossible(response, response.getBody());
+
+        final HttpResponseAttachment responseAttachment = HttpResponseAttachment.Builder.create(attachmentName)
                 .setResponseCode(response.getStatusCode())
                 .setHeaders(toMapConverter(response.getHeaders(), hiddenHeaders))
-                .setBody(prettifier.getPrettifiedBodyIfPossible(response, response.getBody()))
+                .setBody(body)
                 .build();
 
         new DefaultAttachmentProcessor().addAttachment(
diff --git a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
index 61e2b4e85..4b3b2092f 100644
--- a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
+++ b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
@@ -28,7 +28,9 @@
 import io.restassured.config.RestAssuredConfig;
 import io.restassured.http.ContentType;
 import io.restassured.specification.RequestSpecification;
+
 import java.nio.charset.StandardCharsets;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -59,6 +61,23 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
     }
 }
 
+class JsonPrettifyingArgumentsProvider implements ArgumentsProvider {
+    @Override
+    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+
+        return Stream.of(
+                arguments(new AllureRestAssured(), """
+                        {
+                            &quot;name&quot;: &quot;12345&quot;,
+                            &quot;value&quot;: &quot;abcdef&quot;
+                        }"""),
+                arguments(new AllureRestAssured().setMaxAllowedPrettifyLength(5), """
+                        {&quot;name&quot;:&quot;12345&quot;,&quot;value&quot;:&quot;abcdef&quot;}
+                        """)
+        );
+    }
+}
+
 class HiddenHeadersArgumentProvider implements ArgumentsProvider {
     @Override
     public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
@@ -174,6 +193,34 @@ void shouldHideHeadersInAttachments(final Map<String, String> headers,
                 .allSatisfy(at -> expectedValues.forEach(ev -> assertThat(at).contains(ev)));
     }
 
+    @ParameterizedTest
+    @ArgumentsSource(JsonPrettifyingArgumentsProvider.class)
+    void responseJsonPrettified(final AllureRestAssured filter, final String formattedBody) {
+        final ResponseDefinitionBuilder responseBuilder = WireMock.aResponse()
+                .withHeader("Content-Type", "application/json")
+                .withBody("""
+                        {"name":"12345","value":"abcdef"}
+                        """)
+                .withStatus(200);
+
+        RestAssured.replaceFiltersWith(filter);
+
+        final AllureResults results = executeWithStub(responseBuilder, RestAssured.with());
+        final Attachment requestAttachment = results.getTestResults()
+                .stream()
+                .map(TestResult::getAttachments)
+                .flatMap(Collection::stream)
+                .filter(attachment -> "HTTP/1.1 200 OK".equals(attachment.getName()))
+                .findAny()
+                .orElseThrow(() -> new AssertionError("No response attachment found"));
+
+        final byte[] attachmentBody = results.getAttachments().get(requestAttachment.getSource());
+        final String attachmentBodyString = new String(attachmentBody, StandardCharsets.UTF_8);
+
+        assertThat(attachmentBodyString)
+                .contains(formattedBody);
+    }
+
     protected final AllureResults execute() {
         return executeWithStub(WireMock.aResponse().withBody("some body"));
     }
@@ -193,8 +240,8 @@ protected final AllureResults executeWithStub(ResponseDefinitionBuilder response
             WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form")).willReturn(responseBuilder));
             try {
                 spec.contentType(ContentType.URLENC)
-                    .formParams("Allure", "Form")
-                    .get(server.url("/hello")).then().statusCode(statusCode);
+                        .formParams("Allure", "Form")
+                        .get(server.url("/hello")).then().statusCode(statusCode);
             } finally {
                 server.stop();
                 RestAssured.replaceFiltersWith(ImmutableList.of());

From 18ab7b367a17b716f9b132a7e0a81a7c75bddaa7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 11:47:49 +0000
Subject: [PATCH 177/233] build(deps): bump io.qameta.allure plugins from
 2.11.2 to 3.0.1 (via #1205)

---
 settings.gradle.kts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 20eaaa8e7..cb1d273d8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -50,10 +50,10 @@ pluginManagement {
         id("io.github.goooler.shadow") version "8.1.8"
         id("com.gradle.enterprise") version "3.17.5"
         id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
-        id("io.qameta.allure-adapter") version "2.11.2"
-        id("io.qameta.allure-aggregate-report") version "2.11.2"
-        id("io.qameta.allure-download") version "2.12.0"
-        id("io.qameta.allure-report") version "2.11.2"
+        id("io.qameta.allure-adapter") version "3.0.1"
+        id("io.qameta.allure-aggregate-report") version "3.0.1"
+        id("io.qameta.allure-download") version "3.0.1"
+        id("io.qameta.allure-report") version "3.0.1"
         id("io.spring.dependency-management") version "1.1.6"
         id("com.google.protobuf") version "0.9.4"
         id("com.github.spotbugs") version "6.0.19"

From ee62d85942823d9ce11b1e83817c9021a7708f35 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 11:48:14 +0000
Subject: [PATCH 178/233] build(deps): bump org.jboss.resteasy:resteasy-client
 from 6.2.9.Final to 7.0.0.Final (via #1196)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 525bbe6c8..9a3b56419 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -171,7 +171,7 @@ configure(libs) {
             dependency("org.freemarker:freemarker:2.3.33")
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.hamcrest:hamcrest:3.0")
-            dependency("org.jboss.resteasy:resteasy-client:6.2.9.Final")
+            dependency("org.jboss.resteasy:resteasy-client:7.0.1.Final")
             dependency("org.mock-server:mockserver-netty:5.15.0")
             dependency("org.mockito:mockito-core:5.12.0")
             dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")

From 7c81921efcaf3d2f559ef64a58bc6264768c253f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 12:27:00 +0000
Subject: [PATCH 179/233] build(deps): bump assertJVersion from 1.9.22.1 to
 1.9.25 (via #1207)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9a3b56419..f89884360 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -145,7 +145,7 @@ configure(libs) {
     apply(plugin = "java-library")
 
     val orgSlf4jVersion = "2.0.17"
-    val assertJVersion = "1.9.22.1"
+    val assertJVersion = "1.9.25"
 
     dependencyManagement {
         imports {

From f44ede04955e2c9c36893c77eae39f549da3ad79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 12:27:30 +0000
Subject: [PATCH 180/233] build(deps): bump io.rest-assured:rest-assured from
 5.5.0 to 5.5.6 (via #1208)

---
 allure-rest-assured/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-rest-assured/build.gradle.kts b/allure-rest-assured/build.gradle.kts
index d454c364a..4834fa00a 100644
--- a/allure-rest-assured/build.gradle.kts
+++ b/allure-rest-assured/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Rest-Assured Integration"
 
-val restAssuredVersion = "5.5.0"
+val restAssuredVersion = "5.5.6"
 
 dependencies {
     api(project(":allure-attachments"))

From 36a4f1248d5cb26a323d26cfaf522893a0772d62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 12:27:55 +0000
Subject: [PATCH 181/233] build(deps): bump grpcVersion from 1.76.0 to 1.77.0
 (via #1209)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 7eab5267c..34e0bd487 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -8,7 +8,7 @@ description = "Allure gRPC Integration"
 
 val agent: Configuration by configurations.creating
 
-val grpcVersion = "1.76.0"
+val grpcVersion = "1.77.0"
 val protobufVersion = "4.32.1"
 val jacksonVersion = "2.17.2"
 

From 9e68745fd27cc1269bba1f743b51d12555460dbb Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 11 Dec 2025 12:46:58 +0000
Subject: [PATCH 182/233] remove deprecated Gradle Enterprise plugin in favor
 of Devlocity (via #1210)

---
 settings.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index cb1d273d8..79bb4b2e9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -48,7 +48,6 @@ pluginManagement {
     plugins {
         id("com.diffplug.spotless") version "6.25.0"
         id("io.github.goooler.shadow") version "8.1.8"
-        id("com.gradle.enterprise") version "3.17.5"
         id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
         id("io.qameta.allure-adapter") version "3.0.1"
         id("io.qameta.allure-aggregate-report") version "3.0.1"

From 4f3704b0cc98e941c166358526a33779e6bd3cda Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 12:47:21 +0000
Subject: [PATCH 183/233] build(deps): bump org.awaitility:awaitility from
 4.2.1 to 4.3.0 (via #1214)

---
 allure-awaitility/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-awaitility/build.gradle.kts b/allure-awaitility/build.gradle.kts
index e7afac938..3c9ed6c79 100644
--- a/allure-awaitility/build.gradle.kts
+++ b/allure-awaitility/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Awaitlity Integration"
 
 val agent: Configuration by configurations.creating
 
-val awaitilityVersion = "4.2.1"
+val awaitilityVersion = "4.3.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From c63a7c387026c8ad3230a42d8f6cab70fbef74b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 12:47:45 +0000
Subject: [PATCH 184/233] build(deps): bump com.github.spotbugs from 6.0.19 to
 6.4.7 (via #1213)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 79bb4b2e9..360340876 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -55,7 +55,7 @@ pluginManagement {
         id("io.qameta.allure-report") version "3.0.1"
         id("io.spring.dependency-management") version "1.1.6"
         id("com.google.protobuf") version "0.9.4"
-        id("com.github.spotbugs") version "6.0.19"
+        id("com.github.spotbugs") version "6.4.7"
         kotlin("jvm") version "2.0.0"
     }
 }

From f6a25e5abb2137c4ab046f551311515640decacd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 12:48:11 +0000
Subject: [PATCH 185/233] build(deps): bump com.puppycrawl.tools:checkstyle
 from 11.0.1 to 12.2.0 (via #1212)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f89884360..6e659c871 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -157,7 +157,7 @@ configure(libs) {
             dependency("com.github.tomakehurst:wiremock:3.0.1")
             dependency("com.google.inject:guice:7.0.0")
             dependency("com.google.testing.compile:compile-testing:0.21.0")
-            dependency("com.puppycrawl.tools:checkstyle:11.0.1")
+            dependency("com.puppycrawl.tools:checkstyle:12.2.0")
             dependency("com.squareup.retrofit2:retrofit:3.0.0")
             dependency("commons-io:commons-io:2.20.0")
             dependency("io.github.benas:random-beans:3.9.0")

From 7099e17d15b6ff2b27e097f1af855dcd99981207 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 12:48:45 +0000
Subject: [PATCH 186/233] build(deps): bump
 io.zonky.test.postgres:embedded-postgres-binaries-bom from 16.2.0 to 18.1.0
 (via #1211)

---
 allure-jooq/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
index 22d515bad..ed2a5fa78 100644
--- a/allure-jooq/build.gradle.kts
+++ b/allure-jooq/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
-    testImplementation(platform("io.zonky.test.postgres:embedded-postgres-binaries-bom:16.2.0"))
+    testImplementation(platform("io.zonky.test.postgres:embedded-postgres-binaries-bom:18.1.0"))
     testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))

From f973f083496fdb95cd62c7d857fc9c792115fc75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 14:21:21 +0000
Subject: [PATCH 187/233] build(deps): bump io.spring.dependency-management
 from 1.1.6 to 1.1.7 (via #1218)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 360340876..44aff7639 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -53,7 +53,7 @@ pluginManagement {
         id("io.qameta.allure-aggregate-report") version "3.0.1"
         id("io.qameta.allure-download") version "3.0.1"
         id("io.qameta.allure-report") version "3.0.1"
-        id("io.spring.dependency-management") version "1.1.6"
+        id("io.spring.dependency-management") version "1.1.7"
         id("com.google.protobuf") version "0.9.4"
         id("com.github.spotbugs") version "6.4.7"
         kotlin("jvm") version "2.0.0"

From 8ac7f312e247db62123d58375587df9e45253433 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 14:22:02 +0000
Subject: [PATCH 188/233] build(deps): bump io.zonky.test:embedded-postgres
 from 2.0.7 to 2.2.0 (via #1216)

---
 allure-jooq/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
index ed2a5fa78..5cbce74ae 100644
--- a/allure-jooq/build.gradle.kts
+++ b/allure-jooq/build.gradle.kts
@@ -5,7 +5,7 @@ val jooqVersion = "3.19.10"
 dependencies {
     api(project(":allure-java-commons"))
     compileOnly("org.jooq:jooq:${jooqVersion}")
-    testImplementation("io.zonky.test:embedded-postgres:2.0.7")
+    testImplementation("io.zonky.test:embedded-postgres:2.2.0")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.jooq:jooq:${jooqVersion}")
     testImplementation("org.junit.jupiter:junit-jupiter-api")

From 8fc5e9873922aa0d0932101d0913ed7fcd0bb4c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 14:26:34 +0000
Subject: [PATCH 189/233] build(deps): bump com.github.prokod.gradle-crossbuild
 from 0.16.0 to 0.17.0 (via #1215)

---
 allure-scalatest/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts
index 188e8d80e..c673a71d0 100644
--- a/allure-scalatest/build.gradle.kts
+++ b/allure-scalatest/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure ScalaTest Integration"
 
 plugins {
     scala
-    id("com.github.prokod.gradle-crossbuild") version "0.16.0"
+    id("com.github.prokod.gradle-crossbuild") version "0.17.0"
 }
 
 val scala212 = "2.12"

From 18c653368a055a3371c2a5b5d271cf6b8a67b3d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 15:53:17 +0000
Subject: [PATCH 190/233] build(deps): bump com.google.protobuf from 0.9.4 to
 0.9.5 (via #1217)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 44aff7639..5dfda5657 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -54,7 +54,7 @@ pluginManagement {
         id("io.qameta.allure-download") version "3.0.1"
         id("io.qameta.allure-report") version "3.0.1"
         id("io.spring.dependency-management") version "1.1.7"
-        id("com.google.protobuf") version "0.9.4"
+        id("com.google.protobuf") version "0.9.5"
         id("com.github.spotbugs") version "6.4.7"
         kotlin("jvm") version "2.0.0"
     }

From 1d0c9544a9ce3e34331eb10fd4dff73478ca8314 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 16:18:43 +0000
Subject: [PATCH 191/233] build(deps): bump protobufVersion from 4.32.1 to
 4.33.2 (via #1222)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 34e0bd487..2f3cc642d 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -9,7 +9,7 @@ description = "Allure gRPC Integration"
 val agent: Configuration by configurations.creating
 
 val grpcVersion = "1.77.0"
-val protobufVersion = "4.32.1"
+val protobufVersion = "4.33.2"
 val jacksonVersion = "2.17.2"
 
 dependencies {

From c12eb07ff006e949c0d146fd7d1d8265aeb80f52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 16:19:06 +0000
Subject: [PATCH 192/233] build(deps): bump com.github.spotbugs:spotbugs from
 4.9.3 to 4.9.8 (via #1221)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6e659c871..dc1dc9755 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -153,7 +153,7 @@ configure(libs) {
             mavenBom("org.junit:junit-bom:5.10.3")
         }
         dependencies {
-            dependency("com.github.spotbugs:spotbugs:4.9.3")
+            dependency("com.github.spotbugs:spotbugs:4.9.8")
             dependency("com.github.tomakehurst:wiremock:3.0.1")
             dependency("com.google.inject:guice:7.0.0")
             dependency("com.google.testing.compile:compile-testing:0.21.0")

From 733546dc926cce8208ffe451aa52c86d01d55bc0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Dec 2025 10:10:36 +0000
Subject: [PATCH 193/233] build(deps): bump com.fasterxml.jackson:jackson-bom
 from 2.17.2 to 2.20.1 (via #1224)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index dc1dc9755..fe4b0a79e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -149,7 +149,7 @@ configure(libs) {
 
     dependencyManagement {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.17.2")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.20.1")
             mavenBom("org.junit:junit-bom:5.10.3")
         }
         dependencies {

From b604f53f889ff2a9481918e64fdf30c6adfc4b66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Dec 2025 10:11:11 +0000
Subject: [PATCH 194/233] build(deps): bump
 com.google.testing.compile:compile-testing from 0.21.0 to 0.23.0 (via #1225)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index fe4b0a79e..b1b3f9caf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -156,7 +156,7 @@ configure(libs) {
             dependency("com.github.spotbugs:spotbugs:4.9.8")
             dependency("com.github.tomakehurst:wiremock:3.0.1")
             dependency("com.google.inject:guice:7.0.0")
-            dependency("com.google.testing.compile:compile-testing:0.21.0")
+            dependency("com.google.testing.compile:compile-testing:0.23.0")
             dependency("com.puppycrawl.tools:checkstyle:12.2.0")
             dependency("com.squareup.retrofit2:retrofit:3.0.0")
             dependency("commons-io:commons-io:2.20.0")

From d09faf22320711a2d45c892a92b007af110064c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Dec 2025 10:11:54 +0000
Subject: [PATCH 195/233] build(deps): bump
 org.scala-lang.modules:scala-collection-compat_2.13 from 2.12.0 to 2.14.0
 (via #1226)

---
 allure-scalatest/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts
index c673a71d0..a5ecc550d 100644
--- a/allure-scalatest/build.gradle.kts
+++ b/allure-scalatest/build.gradle.kts
@@ -84,14 +84,14 @@ signing {
 dependencies {
     api(project(":allure-java-commons"))
     compileOnly("org.scalatest:scalatest_$scala213:3.2.19")
-    compileOnly("org.scala-lang.modules:scala-collection-compat_$scala213:2.12.0")
+    compileOnly("org.scala-lang.modules:scala-collection-compat_$scala213:2.14.0")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     testImplementation("org.scalatest:scalatest_$scala213:3.2.19")
-    testImplementation("org.scala-lang.modules:scala-collection-compat_$scala213:2.12.0")
+    testImplementation("org.scala-lang.modules:scala-collection-compat_$scala213:2.14.0")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))

From 5083adad90a9a16e84e77ae1a2505c5356a8c922 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Fri, 12 Dec 2025 14:10:42 +0000
Subject: [PATCH 196/233] release 2.32.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 48e478a6b..e8de60e45 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.32-SNAPSHOT
+version=2.32.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From e602a0ff5a5860b96947f417f484a739ac33529a Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Fri, 12 Dec 2025 14:10:43 +0000
Subject: [PATCH 197/233] set next development version 2.33

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index e8de60e45..40a54c453 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.32.0
+version=2.33-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 5ad7b9e4be051599733c7ad3f5b95e18cfe7f6a4 Mon Sep 17 00:00:00 2001
From: Bartek Florczak <bflorczak@outlook.com>
Date: Tue, 13 Jan 2026 14:47:51 +0100
Subject: [PATCH 198/233] update TestNG to version 7 (via #1232)

---
 allure-testng/build.gradle.kts                            | 8 ++++++--
 .../src/main/services/org.testng.ITestNGListener          | 2 +-
 .../java/io/qameta/allure/testng/AllureTestNgTest.java    | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/allure-testng/build.gradle.kts b/allure-testng/build.gradle.kts
index f471e9f7f..7d6fe56a7 100644
--- a/allure-testng/build.gradle.kts
+++ b/allure-testng/build.gradle.kts
@@ -1,6 +1,6 @@
-description = "Allure TestNG Integration"
+description = "Allure TestNG 7 Integration"
 
-val testNgVersion = "6.14.3"
+val testNgVersion = "7.11.0"
 
 dependencies {
     api(project(":allure-java-commons"))
@@ -34,6 +34,10 @@ tasks.test {
     exclude("**/samples/*")
 }
 
+tasks.withType(JavaCompile::class) {
+    options.release.set(11)
+}
+
 val spiOffJar: Jar by tasks.creating(Jar::class) {
     from(sourceSets.getByName("main").output)
     archiveClassifier.set("spi-off")
diff --git a/allure-testng/src/main/services/org.testng.ITestNGListener b/allure-testng/src/main/services/org.testng.ITestNGListener
index 5be291131..cdf527c81 100644
--- a/allure-testng/src/main/services/org.testng.ITestNGListener
+++ b/allure-testng/src/main/services/org.testng.ITestNGListener
@@ -1 +1 @@
-io.qameta.allure.testng.AllureTestNg
\ No newline at end of file
+io.qameta.allure.testng.AllureTestNg
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
index 7af9c5303..1276a2120 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -476,7 +476,8 @@ public void skippedSuiteTest() {
                         "Test tag 8",
                         "Test suite 8",
                         "io.qameta.allure.testng.samples.SkippedSuite",
-                        "io.qameta.allure.testng.samples.TestsWithSteps"
+                        "io.qameta.allure.testng.samples.TestsWithSteps",
+                        "io.qameta.allure.testng.samples.SkippedSuite.skippedBeforeMethod"
                 );
 
         assertThat(findTestContainerByName(results, "Test suite 8").getBefores())
@@ -802,7 +803,8 @@ public void shouldGenerateSameHistoryIdForTheSameTests() {
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
-                .containsExactlyInAnyOrder("45e3e2818aabf660b03908be12ba64f7", "45e3e2818aabf660b03908be12ba64f7");
+                .hasSize(2)
+                .containsOnly("45e3e2818aabf660b03908be12ba64f7");
     }
 
     @SuppressWarnings("unchecked")

From 5c1f6eea3b789d542e86ac99924bea0979db0613 Mon Sep 17 00:00:00 2001
From: Bartek Florczak <bflorczak@outlook.com>
Date: Wed, 4 Feb 2026 11:04:35 +0100
Subject: [PATCH 199/233] Add DataProvider execution support to Allure TestNG
 setup section (#1236)

---
 .../io/qameta/allure/testng/AllureTestNg.java |  84 +++++++++-
 .../allure/testng/AllureTestNgTest.java       | 145 ++++++++++++++++--
 .../samples/DataProviderInheritanceBase.java  |  31 ++++
 .../samples/DataProviderInheritanceChild.java |  25 +++
 .../samples/DataProviderMultipleClasses1.java |  31 ++++
 .../samples/DataProviderMultipleClasses2.java |  31 ++++
 .../samples/DataProviderMultipleTests.java    |  35 +++++
 .../testng/samples/DataProviderParallel.java  |  32 ++++
 .../samples/DataProviderWithAttachment.java   |  35 +++++
 .../testng/samples/FailedDataProvider.java    |  31 ++++
 .../testng/samples/FlakyDataProvider.java     |  53 +++++++
 .../suites/data-provider-inheritance.xml      |   8 +
 .../suites/data-provider-multiple-classes.xml |   9 ++
 .../suites/data-provider-multiple-tests.xml   |   8 +
 .../suites/data-provider-parallel.xml         |   8 +
 .../suites/data-provider-with-attachment.xml  |   8 +
 .../resources/suites/failed-data-provider.xml |   8 +
 .../resources/suites/flaky-data-provider.xml  |   8 +
 18 files changed, 579 insertions(+), 11 deletions(-)
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceBase.java
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceChild.java
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses1.java
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses2.java
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleTests.java
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderParallel.java
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithAttachment.java
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedDataProvider.java
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyDataProvider.java
 create mode 100644 allure-testng/src/test/resources/suites/data-provider-inheritance.xml
 create mode 100644 allure-testng/src/test/resources/suites/data-provider-multiple-classes.xml
 create mode 100644 allure-testng/src/test/resources/suites/data-provider-multiple-tests.xml
 create mode 100644 allure-testng/src/test/resources/suites/data-provider-parallel.xml
 create mode 100644 allure-testng/src/test/resources/suites/data-provider-with-attachment.xml
 create mode 100644 allure-testng/src/test/resources/suites/failed-data-provider.xml
 create mode 100644 allure-testng/src/test/resources/suites/flaky-data-provider.xml

diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
index 41b7c362c..de75dbd59 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
@@ -39,6 +39,8 @@
 import org.testng.IAttributes;
 import org.testng.IClass;
 import org.testng.IConfigurationListener;
+import org.testng.IDataProviderListener;
+import org.testng.IDataProviderMethod;
 import org.testng.IInvokedMethod;
 import org.testng.IInvokedMethodListener;
 import org.testng.IMethodInstance;
@@ -110,7 +112,8 @@ public class AllureTestNg implements
         ITestListener,
         IInvokedMethodListener,
         IConfigurationListener,
-        IMethodInterceptor {
+        IMethodInterceptor,
+        IDataProviderListener {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureTestNg.class);
 
@@ -150,6 +153,10 @@ public class AllureTestNg implements
      * Store uuid for class test containers.
      */
     private final Map<ITestClass, String> classContainerUuidStorage = new ConcurrentHashMap<>();
+    /**
+     * Store uuid for data provider containers.
+     */
+    private final Map<ITestNGMethod, String> dataProviderContainerUuidStorage = new ConcurrentHashMap<>();
     private final ReadWriteLock lock = new ReentrantReadWriteLock();
     private final AllureLifecycle lifecycle;
     private final AllureTestNgTestFilter testFilter;
@@ -280,6 +287,14 @@ public void onAfterClass(final ITestClass testClass) {
             getLifecycle().stopTestContainer(uuid);
             getLifecycle().writeTestContainer(uuid);
         });
+        dataProviderContainerUuidStorage.entrySet().removeIf(entry -> {
+            if (entry.getKey().getTestClass().equals(testClass)) {
+                getLifecycle().stopTestContainer(entry.getValue());
+                getLifecycle().writeTestContainer(entry.getValue());
+                return true;
+            }
+            return false;
+        });
     }
 
     @Override
@@ -302,6 +317,10 @@ public void onTestStart(final ITestResult testResult) {
                 .map(ITestResult::getMethod)
                 .map(ITestNGMethod::getTestClass)
                 .ifPresent(clazz -> addClassContainerChild(clazz, uuid));
+
+        Optional.of(testResult)
+                .map(ITestResult::getMethod)
+                .ifPresent(method -> addDataProviderContainerChild(method, uuid));
     }
 
     @SuppressWarnings("BooleanExpressionComplexity")
@@ -626,6 +645,65 @@ public void onConfigurationSkip(final ITestResult itr) {
         //do nothing
     }
 
+    @Override
+    public void beforeDataProviderExecution(final IDataProviderMethod dataProviderMethod,
+                                            final ITestNGMethod method,
+                                            final ITestContext iTestContext) {
+        currentExecutable.remove();
+        final String containerUuid = dataProviderContainerUuidStorage.computeIfAbsent(
+                method,
+                key -> {
+                    final String uuid = UUID.randomUUID().toString();
+                    getLifecycle().startTestContainer(
+                            new TestResultContainer()
+                                    .setUuid(uuid)
+                                    .setName(method.getMethodName())
+                    );
+                    return uuid;
+                }
+        );
+
+        final String uuid = currentExecutable.get();
+        final FixtureResult result = new FixtureResult()
+                .setName(dataProviderMethod.getMethod().getName())
+                .setStage(Stage.RUNNING);
+
+        processDescription(
+                getClass().getClassLoader(),
+                dataProviderMethod.getMethod(),
+                result::setDescription,
+                result::setDescriptionHtml
+        );
+
+        getLifecycle().startPrepareFixture(containerUuid, uuid, result);
+    }
+
+    @Override
+    public void afterDataProviderExecution(final IDataProviderMethod dataProviderMethod,
+                                           final ITestNGMethod method,
+                                           final ITestContext iTestContext) {
+        final String uuid = currentExecutable.get();
+        getLifecycle().updateFixture(uuid, result -> {
+            if (result.getStatus() == null) {
+                result.setStatus(Status.PASSED);
+            }
+        });
+        getLifecycle().stopFixture(uuid);
+        currentExecutable.remove();
+    }
+
+    @Override
+    public void onDataProviderFailure(final ITestNGMethod method,
+                                      final ITestContext ctx,
+                                      final RuntimeException t) {
+        final String uuid = currentExecutable.get();
+        getLifecycle().updateFixture(uuid, result -> result
+                .setStatus(getStatus(t))
+                .setStatusDetails(getStatusDetails(t).orElse(null)));
+        getLifecycle().stopFixture(uuid);
+        currentExecutable.remove();
+    }
+
     protected String getHistoryId(final ITestNGMethod method, final List<Parameter> parameters) {
         final MessageDigest digest = getMd5Digest();
         final String testClassName = method.getTestClass().getName();
@@ -827,6 +905,10 @@ private Consumer<TestResult> setStatus(final Status status, final StatusDetails
         };
     }
 
+    private void addDataProviderContainerChild(final ITestNGMethod method, final String childUuid) {
+        this.addChildToContainer(dataProviderContainerUuidStorage.get(method), childUuid);
+    }
+
     private void addClassContainerChild(final ITestClass clazz, final String childUuid) {
         this.addChildToContainer(classContainerUuidStorage.get(clazz), childUuid);
     }
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
index 1276a2120..c0cb226ca 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -39,7 +39,6 @@
 import io.qameta.allure.testng.samples.TestsWithIdForFilter;
 import org.assertj.core.api.Condition;
 import org.assertj.core.groups.Tuple;
-import org.testng.ITestNGListener;
 import org.testng.TestNG;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -130,7 +129,7 @@ public void shouldNotDisplayConfigurationFailsAsTests() {
     public void shouldSetConfigurationProperty() {
         AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
         allureTestNgConfig.setHideDisabledTests(true);
-        assertThat(allureTestNgConfig.isHideDisabledTests()).isEqualTo(true);
+        assertThat(allureTestNgConfig.isHideDisabledTests()).isTrue();
     }
 
     @AllureFeatures.Parallel
@@ -507,7 +506,7 @@ public void multipleSuites() {
                 .hasSize(3);
         List<String> uids = testResults.stream().map(TestResult::getUuid).collect(Collectors.toList());
         assertThat(testContainers).as("Unexpected quantity of testng containers has been written")
-                .hasSize(8).extracting(TestResultContainer::getName)
+                .hasSize(9).extracting(TestResultContainer::getName)
                 .contains(beforeMethodName, beforeMethodName, firstTagName, firstSuiteName, secondTagName,
                         secondSuiteName);
 
@@ -553,7 +552,7 @@ public void parallelMethods() {
         assertThat(testResults).as("Unexpected quantity of testng case results has been written")
                 .hasSize(2001);
         assertThat(testContainers).as("Unexpected quantity of testng containers has been written")
-                .hasSize(6006);
+                .hasSize(6007);
 
         assertContainersPerMethod(before1, testContainers, uids);
         assertContainersPerMethod(before2, testContainers, uids);
@@ -1218,7 +1217,7 @@ public void shouldAddBeforeFixtureToFakeTestResult(final String suite, final Str
                 .findAny();
         assertThat(result).as("Before failed fake test result").isNotEmpty();
         final Optional<TestResultContainer> befores = results.getTestResultContainers().stream()
-                .filter(c -> Objects.nonNull(c.getBefores()) && c.getBefores().size() > 0)
+                .filter(c -> Objects.nonNull(c.getBefores()) && !c.getBefores().isEmpty())
                 .findAny();
         assertThat(result).as("Before failed configuration container").isNotEmpty();
         assertThat(befores.get().getChildren())
@@ -1252,7 +1251,6 @@ private AllureResults runTestNgSuites(AllureTestNgConfig config, final String...
 
     private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
                                           final String... suites) {
-        ;
         return runTestNgSuites(configurer, AllureTestNgConfig.loadConfigProperties(), suites);
     }
 
@@ -1276,7 +1274,7 @@ private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
                     new AllureTestNgTestFilter(),
                     config);
             final TestNG testNg = new TestNG(false);
-            testNg.addListener((ITestNGListener) adapter);
+            testNg.addListener(adapter);
             testNg.setTestSuites(suiteFiles);
 
             configurer.accept(testNg);
@@ -1461,7 +1459,7 @@ public void onlyId() {
     @Test
     @AllureFeatures.Filtration
     public void idAssignToOtherTest() {
-        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(otherId));
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(singletonList(otherId));
         List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
 
         assertThat(testResults)
@@ -1476,7 +1474,7 @@ public void idAssignToOtherTest() {
     @Test
     @AllureFeatures.Filtration
     public void skippedTest() {
-        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(skipped));
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(singletonList(skipped));
         List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
         assertThat(testResults)
                 .hasSize(1)
@@ -1508,13 +1506,140 @@ public AllureResults runTestPlan(final TestPlan plan, final Class<?>... testClas
         return RunUtils.runTests(lifecycle -> {
             final AllureTestNg adapter = new AllureTestNg(lifecycle, new AllureTestNgTestFilter(plan));
             final TestNG testNG = new TestNG(false);
-            testNG.addListener((ITestNGListener) adapter);
+            testNG.addListener(adapter);
             testNG.setTestClasses(testClasses);
             testNG.setOutputDirectory("build/test-output");
             testNG.run();
         });
     }
 
+    @AllureFeatures.Fixtures
+    @Test(description = "Should process data provider in setup")
+    public void shouldProcessDataProviderInSetup() {
+        final AllureResults results = runTestNgSuites("suites/data-provider-with-attachment.xml");
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .contains(Tuple.tuple("dataProvider", Status.PASSED));
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getBefores)
+                .filteredOn("name", "dataProvider")
+                .flatExtracting(FixtureResult::getAttachments)
+                .hasSize(1)
+                .extracting(Attachment::getName)
+                .contains("attachment");
+    }
+
+    @AllureFeatures.Fixtures
+    @Test(description = "Should process failed data provider in setup")
+    public void shouldProcessFailedDataProviderInSetup() {
+        final AllureResults results = runTestNgSuites("suites/failed-data-provider.xml");
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .contains(Tuple.tuple("dataProvider", Status.BROKEN));
+    }
+
+    @AllureFeatures.Fixtures
+    @Test(description = "Should process flaky data provider in setup")
+    public void shouldProcessFlakyDataProvider() {
+        final AllureResults results = runTestNgSuites("suites/flaky-data-provider.xml");
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsSubsequence(
+                        Tuple.tuple("provide", Status.BROKEN),
+                        Tuple.tuple("provide", Status.PASSED)
+                );
+    }
+
+    @AllureFeatures.Fixtures
+    @Test(description = "Should properly link data provider container to test result")
+    public void shouldProperlyLinkDataProviderContainerToTestResult() {
+        final AllureResults results = runTestNgSuites("suites/data-provider-with-attachment.xml");
+
+        final TestResult tr = findTestResultByName(results, "test");
+        final TestResultContainer dpContainer = results.getTestResultContainers().stream()
+                .filter(c -> c.getName().equals("test"))
+                .findFirst()
+                .orElseThrow(() -> new IllegalStateException("DP container not found"));
+
+        assertThat(dpContainer.getChildren())
+                .contains(tr.getUuid());
+    }
+
+    @AllureFeatures.Fixtures
+    @Test(description = "Should link multiple tests to data provider container")
+    public void shouldLinkMultipleTestsToDataProviderContainer() {
+        final AllureResults results = runTestNgSuites("suites/data-provider-multiple-tests.xml");
+
+        final List<TestResult> test1Results = results.getTestResults().stream()
+                .filter(tr -> tr.getName().equals("test1"))
+                .collect(Collectors.toList());
+        final List<TestResult> test2Results = results.getTestResults().stream()
+                .filter(tr -> tr.getName().equals("test2"))
+                .collect(Collectors.toList());
+
+        assertThat(test1Results).hasSize(2);
+        assertThat(test2Results).hasSize(2);
+
+        final TestResultContainer dpContainer1 = findTestContainerByName(results, "test1");
+        final TestResultContainer dpContainer2 = findTestContainerByName(results, "test2");
+
+        assertThat(dpContainer1.getChildren())
+                .containsAll(test1Results.stream().map(TestResult::getUuid).collect(Collectors.toList()));
+        assertThat(dpContainer2.getChildren())
+                .containsAll(test2Results.stream().map(TestResult::getUuid).collect(Collectors.toList()));
+    }
+
+    @AllureFeatures.Fixtures
+    @Test(description = "Should link inherited data provider")
+    public void shouldLinkInheritedDataProvider() {
+        final AllureResults results = runTestNgSuites("suites/data-provider-inheritance.xml");
+
+        final TestResult testBase = findTestResultByName(results, "testBase");
+        final TestResult testChild = findTestResultByName(results, "testChild");
+
+        final TestResultContainer dpContainerBase = findTestContainerByName(results, "testBase");
+        final TestResultContainer dpContainerChild = findTestContainerByName(results, "testChild");
+
+        assertThat(dpContainerBase.getChildren()).contains(testBase.getUuid());
+        assertThat(dpContainerChild.getChildren()).contains(testChild.getUuid());
+    }
+
+    @AllureFeatures.Fixtures
+    @Test(description = "Should link correct data provider in multiple classes")
+    public void shouldLinkCorrectDataProviderInMultipleClasses() {
+        final AllureResults results = runTestNgSuites("suites/data-provider-multiple-classes.xml");
+
+        final TestResult test1 = findTestResultByName(results, "test1");
+        final TestResult test2 = findTestResultByName(results, "test2");
+
+        final TestResultContainer dpContainer1 = findTestContainerByName(results, "test1");
+        final TestResultContainer dpContainer2 = findTestContainerByName(results, "test2");
+
+        assertThat(dpContainer1.getChildren())
+                .contains(test1.getUuid())
+                .doesNotContain(test2.getUuid());
+        assertThat(dpContainer2.getChildren())
+                .contains(test2.getUuid())
+                .doesNotContain(test1.getUuid());
+    }
+
+    @AllureFeatures.Fixtures
+    @Test(description = "Should process parallel data provider")
+    public void shouldProcessParallelDataProvider() {
+        final AllureResults results = runTestNgSuites("suites/data-provider-parallel.xml");
+
+        assertThat(results.getTestResults()).hasSize(4);
+        final TestResultContainer dpContainer = findTestContainerByName(results, "test");
+        assertThat(dpContainer.getChildren()).hasSize(4);
+    }
+
     private Integer getOrderParameter(final TestResult result) {
         return result.getParameters().stream()
                 .filter(p -> p.getName().equals("order"))
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceBase.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceBase.java
new file mode 100644
index 000000000..eb634c03d
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceBase.java
@@ -0,0 +1,31 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class DataProviderInheritanceBase {
+
+    @DataProvider
+    public Object[][] dp() {
+        return new Object[][]{{"data"}};
+    }
+
+    @Test(dataProvider = "dp")
+    public void testBase(String s) {
+    }
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceChild.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceChild.java
new file mode 100644
index 000000000..80ae7cae0
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceChild.java
@@ -0,0 +1,25 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import org.testng.annotations.Test;
+
+public class DataProviderInheritanceChild extends DataProviderInheritanceBase {
+
+    @Test(dataProvider = "dp")
+    public void testChild(String s) {
+    }
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses1.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses1.java
new file mode 100644
index 000000000..c2f6f39a5
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses1.java
@@ -0,0 +1,31 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class DataProviderMultipleClasses1 {
+
+    @DataProvider
+    public Object[][] dp1() {
+        return new Object[][]{{"data1"}};
+    }
+
+    @Test(dataProvider = "dp1")
+    public void test1(String s) {
+    }
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses2.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses2.java
new file mode 100644
index 000000000..f71e11e90
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses2.java
@@ -0,0 +1,31 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class DataProviderMultipleClasses2 {
+
+    @DataProvider
+    public Object[][] dp2() {
+        return new Object[][]{{"data2"}};
+    }
+
+    @Test(dataProvider = "dp2")
+    public void test2(String s) {
+    }
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleTests.java
new file mode 100644
index 000000000..160e1d10d
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleTests.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class DataProviderMultipleTests {
+
+    @DataProvider
+    public Object[][] dp() {
+        return new Object[][]{{"data1"}, {"data2"}};
+    }
+
+    @Test(dataProvider = "dp")
+    public void test1(String s) {
+    }
+
+    @Test(dataProvider = "dp")
+    public void test2(String s) {
+    }
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderParallel.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderParallel.java
new file mode 100644
index 000000000..4834229d5
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderParallel.java
@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class DataProviderParallel {
+
+    @DataProvider(parallel = true)
+    public Object[][] dp() {
+        return new Object[][]{{"data1"}, {"data2"}, {"data3"}, {"data4"}};
+    }
+
+    @Test(dataProvider = "dp")
+    public void test(String s) {
+        System.out.println("Test data: " + s);
+    }
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithAttachment.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithAttachment.java
new file mode 100644
index 000000000..511681a08
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithAttachment.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import io.qameta.allure.Allure;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class DataProviderWithAttachment {
+
+    @DataProvider
+    public Object[][] dataProvider() {
+        Allure.addAttachment("attachment", "attachment content");
+        return new Object[][]{
+            {"a"}
+        };
+    }
+
+    @Test(dataProvider = "dataProvider")
+    public void test(String s) {
+    }
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedDataProvider.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedDataProvider.java
new file mode 100644
index 000000000..d5fdd60ec
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedDataProvider.java
@@ -0,0 +1,31 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class FailedDataProvider {
+
+    @DataProvider
+    public Object[][] dataProvider() {
+        throw new RuntimeException("Data provider failed");
+    }
+
+    @Test(dataProvider = "dataProvider")
+    public void test(String s) {
+    }
+}
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyDataProvider.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyDataProvider.java
new file mode 100644
index 000000000..cea3437f3
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyDataProvider.java
@@ -0,0 +1,53 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testng.samples;
+
+import org.testng.IDataProviderMethod;
+import org.testng.IRetryDataProvider;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class FlakyDataProvider {
+
+    private static final AtomicInteger COUNTER = new AtomicInteger(0);
+
+    @BeforeClass
+    public void reset() {
+        COUNTER.set(0);
+    }
+
+    public static class Retry implements IRetryDataProvider {
+        @Override
+        public boolean retry(IDataProviderMethod method) {
+            return COUNTER.incrementAndGet() < 2;
+        }
+    }
+
+    @DataProvider(retryUsing = Retry.class)
+    public Object[][] provide() {
+        if (COUNTER.get() == 0) {
+            throw new RuntimeException("Simulated DataProvider Failure");
+        }
+        return new Object[][]{{"data"}};
+    }
+
+    @Test(dataProvider = "provide")
+    public void test(String s) {
+    }
+}
diff --git a/allure-testng/src/test/resources/suites/data-provider-inheritance.xml b/allure-testng/src/test/resources/suites/data-provider-inheritance.xml
new file mode 100644
index 000000000..4cc6ea8b0
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/data-provider-inheritance.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="Data Provider Inheritance Suite" verbose="1">
+    <test name="Data Provider Inheritance Test">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.DataProviderInheritanceChild" />
+        </classes>
+    </test>
+</suite>
diff --git a/allure-testng/src/test/resources/suites/data-provider-multiple-classes.xml b/allure-testng/src/test/resources/suites/data-provider-multiple-classes.xml
new file mode 100644
index 000000000..a6686a985
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/data-provider-multiple-classes.xml
@@ -0,0 +1,9 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="Data Provider Multiple Classes Suite" verbose="1">
+    <test name="Data Provider Multiple Classes Test">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.DataProviderMultipleClasses1" />
+            <class name="io.qameta.allure.testng.samples.DataProviderMultipleClasses2" />
+        </classes>
+    </test>
+</suite>
diff --git a/allure-testng/src/test/resources/suites/data-provider-multiple-tests.xml b/allure-testng/src/test/resources/suites/data-provider-multiple-tests.xml
new file mode 100644
index 000000000..e1b6dc1f8
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/data-provider-multiple-tests.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="Data Provider Multiple Tests Suite" verbose="1">
+    <test name="Data Provider Multiple Tests">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.DataProviderMultipleTests" />
+        </classes>
+    </test>
+</suite>
diff --git a/allure-testng/src/test/resources/suites/data-provider-parallel.xml b/allure-testng/src/test/resources/suites/data-provider-parallel.xml
new file mode 100644
index 000000000..5f0a94b2a
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/data-provider-parallel.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="Data Provider Parallel Suite" verbose="1" data-provider-thread-count="2">
+    <test name="Data Provider Parallel Test">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.DataProviderParallel" />
+        </classes>
+    </test>
+</suite>
diff --git a/allure-testng/src/test/resources/suites/data-provider-with-attachment.xml b/allure-testng/src/test/resources/suites/data-provider-with-attachment.xml
new file mode 100644
index 000000000..7f9b02c06
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/data-provider-with-attachment.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="Data Provider Suite" verbose="1" parallel="false" thread-count="1">
+    <test name="Data Provider Test">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.DataProviderWithAttachment" />
+        </classes>
+    </test>
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-data-provider.xml b/allure-testng/src/test/resources/suites/failed-data-provider.xml
new file mode 100644
index 000000000..f21c45910
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/failed-data-provider.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="Failed Data Provider Suite" verbose="1" parallel="false" thread-count="1">
+    <test name="Failed Data Provider Test">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.FailedDataProvider" />
+        </classes>
+    </test>
+</suite>
diff --git a/allure-testng/src/test/resources/suites/flaky-data-provider.xml b/allure-testng/src/test/resources/suites/flaky-data-provider.xml
new file mode 100644
index 000000000..6fa5c6e82
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/flaky-data-provider.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="Flaky Data Provider Suite" verbose="1" parallel="false" thread-count="1">
+    <test name="Flaky Data Provider Test">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.FlakyDataProvider" />
+        </classes>
+    </test>
+</suite>

From 6d5d515ffa98fc2e67aaf983b8c9c9221d280195 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Feb 2026 13:56:42 +0000
Subject: [PATCH 200/233] build(deps): bump org.mockito:mockito-core from
 5.12.0 to 5.21.0 (via #1229)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b1b3f9caf..933c81397 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -173,7 +173,7 @@ configure(libs) {
             dependency("org.hamcrest:hamcrest:3.0")
             dependency("org.jboss.resteasy:resteasy-client:7.0.1.Final")
             dependency("org.mock-server:mockserver-netty:5.15.0")
-            dependency("org.mockito:mockito-core:5.12.0")
+            dependency("org.mockito:mockito-core:5.21.0")
             dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")
             dependency("org.slf4j:slf4j-nop:${orgSlf4jVersion}")
             dependency("org.slf4j:slf4j-simple:${orgSlf4jVersion}")

From a3e7fcb03868fe2ec3d757f7463731f4182d76ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Feb 2026 13:57:02 +0000
Subject: [PATCH 201/233] build(deps): bump com.puppycrawl.tools:checkstyle
 from 12.2.0 to 12.3.0 (via #1227)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 933c81397..d04e50b2a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -157,7 +157,7 @@ configure(libs) {
             dependency("com.github.tomakehurst:wiremock:3.0.1")
             dependency("com.google.inject:guice:7.0.0")
             dependency("com.google.testing.compile:compile-testing:0.23.0")
-            dependency("com.puppycrawl.tools:checkstyle:12.2.0")
+            dependency("com.puppycrawl.tools:checkstyle:12.3.0")
             dependency("com.squareup.retrofit2:retrofit:3.0.0")
             dependency("commons-io:commons-io:2.20.0")
             dependency("io.github.benas:random-beans:3.9.0")

From 11443acb84c3df55b84a50b19eb4795321e236db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Feb 2026 11:09:10 +0000
Subject: [PATCH 202/233] build(deps): bump grpcVersion from 1.77.0 to 1.79.0
 (via #1238)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 2f3cc642d..31c4e1ed7 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -8,7 +8,7 @@ description = "Allure gRPC Integration"
 
 val agent: Configuration by configurations.creating
 
-val grpcVersion = "1.77.0"
+val grpcVersion = "1.79.0"
 val protobufVersion = "4.33.2"
 val jacksonVersion = "2.17.2"
 

From 5a0006c3b8ffb4d42c3de498105e8d4dc00ee2d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Feb 2026 11:09:30 +0000
Subject: [PATCH 203/233] build(deps): bump com.google.protobuf from 0.9.5 to
 0.9.6 (via #1237)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5dfda5657..bf49b841b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -54,7 +54,7 @@ pluginManagement {
         id("io.qameta.allure-download") version "3.0.1"
         id("io.qameta.allure-report") version "3.0.1"
         id("io.spring.dependency-management") version "1.1.7"
-        id("com.google.protobuf") version "0.9.5"
+        id("com.google.protobuf") version "0.9.6"
         id("com.github.spotbugs") version "6.4.7"
         kotlin("jvm") version "2.0.0"
     }

From 45da29147cd48503c6ceac607c3717ea997b8a19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Feb 2026 10:48:05 +0000
Subject: [PATCH 204/233] build(deps): bump org.jooq:jooq from 3.19.10 to
 3.20.11 (via #1242)

---
 allure-jooq/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
index 5cbce74ae..5f1709107 100644
--- a/allure-jooq/build.gradle.kts
+++ b/allure-jooq/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure JOOQ Integration"
 
-val jooqVersion = "3.19.10"
+val jooqVersion = "3.20.11"
 
 dependencies {
     api(project(":allure-java-commons"))

From d70af0adcd6758702d194f917e77ce8b8bad93c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Feb 2026 10:48:24 +0000
Subject: [PATCH 205/233] build(deps): bump protobufVersion from 4.33.2 to
 4.33.5 (via #1241)

---
 allure-grpc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
index 31c4e1ed7..104a8e43f 100644
--- a/allure-grpc/build.gradle.kts
+++ b/allure-grpc/build.gradle.kts
@@ -9,7 +9,7 @@ description = "Allure gRPC Integration"
 val agent: Configuration by configurations.creating
 
 val grpcVersion = "1.79.0"
-val protobufVersion = "4.33.2"
+val protobufVersion = "4.33.5"
 val jacksonVersion = "2.17.2"
 
 dependencies {

From 21235bab5e4d78c34594bedbd9ff51677c1a5f18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Feb 2026 12:08:46 +0000
Subject: [PATCH 206/233] build(deps): bump org.assertj:assertj-core from
 3.27.3 to 3.27.7 (via #1244)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d04e50b2a..154281099 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -167,7 +167,7 @@ configure(libs) {
             dependency("org.apache.commons:commons-lang3:3.15.0")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")
-            dependency("org.assertj:assertj-core:3.27.3")
+            dependency("org.assertj:assertj-core:3.27.7")
             dependency("org.freemarker:freemarker:2.3.33")
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.hamcrest:hamcrest:3.0")

From e01a84fc5ce51ec9ebee7a69dac1297e2d8716e8 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 20 Feb 2026 15:45:33 +0000
Subject: [PATCH 207/233] update license headers to 2026 (via #1246)

---
 LICENSE                                                         | 2 +-
 .../src/main/java/io/qameta/allure/assertj/AllureAspectJ.java   | 2 +-
 .../test/java/io/qameta/allure/assertj/AllureAspectJTest.java   | 2 +-
 .../java/io/qameta/allure/attachment/AttachmentContent.java     | 2 +-
 .../main/java/io/qameta/allure/attachment/AttachmentData.java   | 2 +-
 .../java/io/qameta/allure/attachment/AttachmentProcessor.java   | 2 +-
 .../io/qameta/allure/attachment/AttachmentRenderException.java  | 2 +-
 .../java/io/qameta/allure/attachment/AttachmentRenderer.java    | 2 +-
 .../io/qameta/allure/attachment/DefaultAttachmentContent.java   | 2 +-
 .../io/qameta/allure/attachment/DefaultAttachmentProcessor.java | 2 +-
 .../qameta/allure/attachment/FreemarkerAttachmentRenderer.java  | 2 +-
 .../io/qameta/allure/attachment/http/HttpRequestAttachment.java | 2 +-
 .../qameta/allure/attachment/http/HttpResponseAttachment.java   | 2 +-
 .../allure/attachment/DefaultAttachmentProcessorTest.java       | 2 +-
 .../allure/attachment/FreemarkerAttachmentRendererTest.java     | 2 +-
 .../attachment/NegativeFreemarkerAttachmentRendererTest.java    | 2 +-
 .../java/io/qameta/allure/attachment/testdata/TestData.java     | 2 +-
 .../io/qameta/allure/awaitility/AllureAwaitilityListener.java   | 2 +-
 .../main/java/io/qameta/allure/awaitility/TemporalDuration.java | 2 +-
 .../allure/awaitility/ConditionListenersPositiveTest.java       | 2 +-
 .../io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java | 2 +-
 .../io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java | 2 +-
 .../io/qameta/allure/awaitility/MultipleConditionsTest.java     | 2 +-
 .../src/main/java/io/qameta/allure/citrus/AllureCitrus.java     | 2 +-
 .../src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java | 2 +-
 .../java/cucumber/runtime/formatter/TestSourcesModelProxy.java  | 2 +-
 .../java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java  | 2 +-
 .../main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java   | 2 +-
 .../src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java  | 2 +-
 .../io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java   | 2 +-
 .../io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java   | 2 +-
 .../io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java  | 2 +-
 .../allure/cucumber4jvm/samples/BackgroundFeatureSteps.java     | 2 +-
 .../qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java  | 2 +-
 .../allure/cucumber4jvm/samples/DatatableFeatureSteps.java      | 2 +-
 .../java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java   | 2 +-
 .../io/qameta/allure/cucumber4jvm/samples/PendingSteps.java     | 2 +-
 .../io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java  | 2 +-
 .../qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java  | 2 +-
 .../java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java  | 2 +-
 .../main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java   | 2 +-
 .../src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java  | 2 +-
 .../allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java   | 2 +-
 .../cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java     | 2 +-
 .../io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java   | 2 +-
 .../io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java   | 2 +-
 .../io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java  | 2 +-
 .../allure/cucumber5jvm/samples/BackgroundFeatureSteps.java     | 2 +-
 .../qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java  | 2 +-
 .../allure/cucumber5jvm/samples/DatatableFeatureSteps.java      | 2 +-
 .../java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java   | 2 +-
 .../io/qameta/allure/cucumber5jvm/samples/PendingSteps.java     | 2 +-
 .../io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java  | 2 +-
 .../qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java  | 2 +-
 .../java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java  | 2 +-
 .../main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java   | 2 +-
 .../src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java  | 2 +-
 .../allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java   | 2 +-
 .../cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java     | 2 +-
 .../io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java   | 2 +-
 .../io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java   | 2 +-
 .../io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java  | 2 +-
 .../allure/cucumber6jvm/samples/BackgroundFeatureSteps.java     | 2 +-
 .../qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java  | 2 +-
 .../allure/cucumber6jvm/samples/DatatableFeatureSteps.java      | 2 +-
 .../java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java   | 2 +-
 .../io/qameta/allure/cucumber6jvm/samples/PendingSteps.java     | 2 +-
 .../io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java  | 2 +-
 .../qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java  | 2 +-
 .../java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java  | 2 +-
 .../main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java   | 2 +-
 .../src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java  | 2 +-
 .../allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java   | 2 +-
 .../cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java     | 2 +-
 .../io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java   | 2 +-
 .../io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java   | 2 +-
 .../io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java  | 2 +-
 .../allure/cucumber7jvm/samples/BackgroundFeatureSteps.java     | 2 +-
 .../qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java  | 2 +-
 .../allure/cucumber7jvm/samples/DatatableFeatureSteps.java      | 2 +-
 .../java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java   | 2 +-
 .../io/qameta/allure/cucumber7jvm/samples/PendingSteps.java     | 2 +-
 .../io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java  | 2 +-
 .../qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java  | 2 +-
 .../src/main/java/io/qameta/allure/description/ClassNames.java  | 2 +-
 .../qameta/allure/description/JavaDocDescriptionsProcessor.java | 2 +-
 .../io/qameta/allure/description/ProcessDescriptionsTest.java   | 2 +-
 allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java | 2 +-
 .../main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java  | 2 +-
 .../main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java | 2 +-
 .../src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java     | 2 +-
 .../java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java    | 2 +-
 .../hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java | 2 +-
 .../allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java  | 2 +-
 .../allure/hamcrest/AllureHamcrestLogicalMatchersTest.java      | 2 +-
 .../allure/hamcrest/AllureHamcrestNumberMatchersTest.java       | 2 +-
 .../allure/hamcrest/AllureHamcrestObjectMatchersTest.java       | 2 +-
 .../qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java  | 2 +-
 .../io/qameta/allure/httpclient/AllureHttpClientRequest.java    | 2 +-
 .../io/qameta/allure/httpclient/AllureHttpClientResponse.java   | 2 +-
 .../java/io/qameta/allure/httpclient/AllureHttpClientTest.java  | 2 +-
 .../io/qameta/allure/httpclient5/AllureHttpClient5Request.java  | 2 +-
 .../io/qameta/allure/httpclient5/AllureHttpClient5Response.java | 2 +-
 .../io/qameta/allure/httpclient5/AllureHttpEntityUtils.java     | 2 +-
 .../qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java  | 2 +-
 .../io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java  | 2 +-
 .../io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java | 2 +-
 .../src/main/java/io/qameta/allure/test/AllureFeatures.java     | 2 +-
 .../src/main/java/io/qameta/allure/test/AllurePredicates.java   | 2 +-
 .../src/main/java/io/qameta/allure/test/AllureResults.java      | 2 +-
 .../java/io/qameta/allure/test/AllureResultsWriterStub.java     | 2 +-
 .../main/java/io/qameta/allure/test/AllureTestCommonsUtils.java | 2 +-
 .../src/main/java/io/qameta/allure/test/RunUtils.java           | 2 +-
 .../src/main/java/io/qameta/allure/test/TestData.java           | 2 +-
 .../java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java   | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Allure.java  | 2 +-
 .../src/main/java/io/qameta/allure/AllureConstants.java         | 2 +-
 .../src/main/java/io/qameta/allure/AllureId.java                | 2 +-
 .../src/main/java/io/qameta/allure/AllureLifecycle.java         | 2 +-
 .../main/java/io/qameta/allure/AllureResultsWriteException.java | 2 +-
 .../src/main/java/io/qameta/allure/AllureResultsWriter.java     | 2 +-
 .../src/main/java/io/qameta/allure/Attachment.java              | 2 +-
 .../src/main/java/io/qameta/allure/Description.java             | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Epic.java    | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Epics.java   | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Feature.java | 2 +-
 .../src/main/java/io/qameta/allure/Features.java                | 2 +-
 .../src/main/java/io/qameta/allure/FileSystemResultsWriter.java | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Flaky.java   | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Issue.java   | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Issues.java  | 2 +-
 .../src/main/java/io/qameta/allure/LabelAnnotation.java         | 2 +-
 .../src/main/java/io/qameta/allure/LabelAnnotations.java        | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Lead.java    | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Link.java    | 2 +-
 .../src/main/java/io/qameta/allure/LinkAnnotation.java          | 2 +-
 .../src/main/java/io/qameta/allure/LinkAnnotations.java         | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Links.java   | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Muted.java   | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Owner.java   | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Param.java   | 2 +-
 .../src/main/java/io/qameta/allure/Severity.java                | 2 +-
 .../src/main/java/io/qameta/allure/SeverityLevel.java           | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Step.java    | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Stories.java | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/Story.java   | 2 +-
 allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java | 2 +-
 .../src/main/java/io/qameta/allure/TmsLinks.java                | 2 +-
 .../main/java/io/qameta/allure/aspects/AttachmentsAspects.java  | 2 +-
 .../src/main/java/io/qameta/allure/aspects/StepsAspects.java    | 2 +-
 .../java/io/qameta/allure/internal/Allure2ModelJackson.java     | 2 +-
 .../src/main/java/io/qameta/allure/internal/AllureStorage.java  | 2 +-
 .../java/io/qameta/allure/internal/AllureThreadContext.java     | 2 +-
 .../io/qameta/allure/listener/ContainerLifecycleListener.java   | 2 +-
 .../io/qameta/allure/listener/FixtureLifecycleListener.java     | 2 +-
 .../main/java/io/qameta/allure/listener/LifecycleListener.java  | 2 +-
 .../main/java/io/qameta/allure/listener/LifecycleNotifier.java  | 2 +-
 .../java/io/qameta/allure/listener/StepLifecycleListener.java   | 2 +-
 .../java/io/qameta/allure/listener/TestLifecycleListener.java   | 2 +-
 .../src/main/java/io/qameta/allure/util/AnnotationUtils.java    | 2 +-
 .../src/main/java/io/qameta/allure/util/AspectUtils.java        | 2 +-
 .../src/main/java/io/qameta/allure/util/ExceptionUtils.java     | 2 +-
 .../src/main/java/io/qameta/allure/util/NamingUtils.java        | 2 +-
 .../src/main/java/io/qameta/allure/util/ObjectUtils.java        | 2 +-
 .../src/main/java/io/qameta/allure/util/ParameterUtils.java     | 2 +-
 .../src/main/java/io/qameta/allure/util/PropertiesUtils.java    | 2 +-
 .../src/main/java/io/qameta/allure/util/ResultsUtils.java       | 2 +-
 .../src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java | 2 +-
 .../src/test/java/io/qameta/allure/AllureLifecycleTest.java     | 2 +-
 .../src/test/java/io/qameta/allure/AllureTest.java              | 2 +-
 .../test/java/io/qameta/allure/FileSystemResultsWriterTest.java | 2 +-
 .../src/test/java/io/qameta/allure/ResultsUtilsTest.java        | 2 +-
 .../test/java/io/qameta/allure/StepLifecycleListenerTest.java   | 2 +-
 .../test/java/io/qameta/allure/aspects/StepsAspectsTest.java    | 2 +-
 .../java/io/qameta/allure/internal/AllureThreadContextTest.java | 2 +-
 .../src/test/java/io/qameta/allure/testdata/DummyCard.java      | 2 +-
 .../src/test/java/io/qameta/allure/testdata/DummyEmail.java     | 2 +-
 .../src/test/java/io/qameta/allure/testdata/DummyUser.java      | 2 +-
 .../test/java/io/qameta/allure/util/AnnotationUtilsTest.java    | 2 +-
 .../src/test/java/io/qameta/allure/util/NamingUtilsTest.java    | 2 +-
 .../src/test/java/io/qameta/allure/util/ObjectUtilsTest.java    | 2 +-
 .../src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java       | 2 +-
 .../test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java  | 2 +-
 .../src/main/java/io/qameta/allure/jbehave/AllureJbehave.java   | 2 +-
 .../test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java   | 2 +-
 .../src/test/java/io/qameta/allure/jbehave/LoggingReporter.java | 2 +-
 .../java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java | 2 +-
 .../java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java | 2 +-
 .../src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java | 2 +-
 .../test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java | 2 +-
 .../test/java/io/qameta/allure/jbehave5/LoggingReporter.java    | 2 +-
 .../io/qameta/allure/jbehave5/samples/BrokenStorySteps.java     | 2 +-
 .../java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java | 2 +-
 .../io/qameta/allure/jbehave5/samples/SimpleStorySteps.java     | 2 +-
 allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java | 2 +-
 .../src/test/java/io/qameta/allure/jooq/AllureJooqTest.java     | 2 +-
 .../io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java     | 2 +-
 .../qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java   | 2 +-
 .../src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java | 2 +-
 .../src/main/java/io/qameta/allure/jsonunit/DiffModel.java      | 2 +-
 .../main/java/io/qameta/allure/jsonunit/JsonPatchListener.java  | 2 +-
 .../main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java   | 2 +-
 .../java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java   | 2 +-
 .../java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java   | 2 +-
 .../io/qameta/allure/junitplatform/AllureJunitPlatform.java     | 2 +-
 .../qameta/allure/junitplatform/AllureJunitPlatformUtils.java   | 2 +-
 .../qameta/allure/junitplatform/AllurePostDiscoveryFilter.java  | 2 +-
 .../io/qameta/allure/junitplatform/AllureJunitPlatformTest.java | 2 +-
 .../allure/junitplatform/AllureJunitPlatformTestUtils.java      | 2 +-
 .../allure/junitplatform/AllurePostDiscoveryFilterTest.java     | 2 +-
 .../junitplatform/features/AllureIdAnnotationSupport.java       | 2 +-
 .../allure/junitplatform/features/BrokenInAfterAllTests.java    | 2 +-
 .../allure/junitplatform/features/BrokenInBeforeAllTests.java   | 2 +-
 .../io/qameta/allure/junitplatform/features/BrokenTests.java    | 2 +-
 .../allure/junitplatform/features/DescriptionJavadocTest.java   | 2 +-
 .../allure/junitplatform/features/DisabledRepeatedTests.java    | 2 +-
 .../io/qameta/allure/junitplatform/features/DisabledTests.java  | 2 +-
 .../allure/junitplatform/features/DisplayNameOnClassTests.java  | 2 +-
 .../io/qameta/allure/junitplatform/features/DynamicTests.java   | 2 +-
 .../io/qameta/allure/junitplatform/features/FailedTests.java    | 2 +-
 .../allure/junitplatform/features/FilterParameterizedTests.java | 2 +-
 .../qameta/allure/junitplatform/features/FilterSimpleTests.java | 2 +-
 .../allure/junitplatform/features/JupiterUniqueIdTest.java      | 2 +-
 .../allure/junitplatform/features/MarkerAnnotationSupport.java  | 2 +-
 .../io/qameta/allure/junitplatform/features/NestedTests.java    | 2 +-
 .../java/io/qameta/allure/junitplatform/features/OneTest.java   | 2 +-
 .../java/io/qameta/allure/junitplatform/features/OwnerTest.java | 2 +-
 .../io/qameta/allure/junitplatform/features/ParallelTests.java  | 2 +-
 .../allure/junitplatform/features/ParameterisedTests.java       | 2 +-
 .../features/ParameterisedTestsWithDisplayName.java             | 2 +-
 .../io/qameta/allure/junitplatform/features/PassedTests.java    | 2 +-
 .../io/qameta/allure/junitplatform/features/RepeatedTests.java  | 2 +-
 .../allure/junitplatform/features/ReportEntryParameter.java     | 2 +-
 .../io/qameta/allure/junitplatform/features/SeverityTest.java   | 2 +-
 .../allure/junitplatform/features/SkippedInBeforeAllTests.java  | 2 +-
 .../io/qameta/allure/junitplatform/features/SkippedTests.java   | 2 +-
 .../io/qameta/allure/junitplatform/features/TaggedTests.java    | 2 +-
 .../qameta/allure/junitplatform/features/TestClassDisabled.java | 2 +-
 .../features/TestClassWithDisplayNameAnnotation.java            | 2 +-
 .../features/TestClassWithoutDisplayNameAnnotation.java         | 2 +-
 .../allure/junitplatform/features/TestWithClassLabels.java      | 2 +-
 .../allure/junitplatform/features/TestWithClassLinks.java       | 2 +-
 .../allure/junitplatform/features/TestWithDescription.java      | 2 +-
 .../allure/junitplatform/features/TestWithDisplayName.java      | 2 +-
 .../allure/junitplatform/features/TestWithMethodLabels.java     | 2 +-
 .../allure/junitplatform/features/TestWithMethodLinks.java      | 2 +-
 .../io/qameta/allure/junitplatform/features/TestWithSteps.java  | 2 +-
 .../qameta/allure/junitplatform/features/TestWithSystemErr.java | 2 +-
 .../qameta/allure/junitplatform/features/TestWithSystemOut.java | 2 +-
 .../qameta/allure/junitplatform/features/TestsWithAllureId.java | 2 +-
 .../qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java   | 2 +-
 .../qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java | 2 +-
 .../src/main/java/io/qameta/allure/junit4/AllureJunit4.java     | 2 +-
 .../main/java/io/qameta/allure/junit4/AllureJunit4Filter.java   | 2 +-
 .../main/java/io/qameta/allure/junit4/AllureJunit4Utils.java    | 2 +-
 .../src/main/java/io/qameta/allure/junit4/DisplayName.java      | 2 +-
 allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java    | 2 +-
 allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java   | 2 +-
 allure-junit4/src/test/java/SampleTestInDefaultPackage.java     | 2 +-
 .../src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java | 2 +-
 .../io/qameta/allure/junit4/samples/AssumptionFailedTest.java   | 2 +-
 .../test/java/io/qameta/allure/junit4/samples/BrokenTest.java   | 2 +-
 .../qameta/allure/junit4/samples/BrokenWithoutMessageTest.java  | 2 +-
 .../io/qameta/allure/junit4/samples/DescriptionsJavadoc.java    | 2 +-
 .../test/java/io/qameta/allure/junit4/samples/FailedTest.java   | 2 +-
 .../java/io/qameta/allure/junit4/samples/FilterSimpleTests.java | 2 +-
 .../java/io/qameta/allure/junit4/samples/IgnoredClassTest.java  | 2 +-
 .../test/java/io/qameta/allure/junit4/samples/IgnoredTests.java | 2 +-
 .../src/test/java/io/qameta/allure/junit4/samples/OneTest.java  | 2 +-
 .../test/java/io/qameta/allure/junit4/samples/TaggedTests.java  | 2 +-
 .../qameta/allure/junit4/samples/TestBasedOnSampleRunner.java   | 2 +-
 .../io/qameta/allure/junit4/samples/TestWithAnnotations.java    | 2 +-
 .../java/io/qameta/allure/junit4/samples/TestWithSteps.java     | 2 +-
 .../java/io/qameta/allure/junit4/samples/TestWithTimeout.java   | 2 +-
 .../test/java/io/qameta/allure/junit4/samples/TheoriesTest.java | 2 +-
 .../java/io/qameta/allure/junit5assert/AllureJunit5Assert.java  | 2 +-
 .../io/qameta/allure/junit5assert/AllureJunit5AssertTest.java   | 2 +-
 .../src/main/java/io/qameta/allure/junit5/AllureJunit5.java     | 2 +-
 .../src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java | 2 +-
 .../allure/junit5/features/AfterEachFixtureBrokenSupport.java   | 2 +-
 .../io/qameta/allure/junit5/features/AllFixtureSupport.java     | 2 +-
 .../allure/junit5/features/BeforeAllFixtureFailureSupport.java  | 2 +-
 .../allure/junit5/features/BeforeEachFixtureBrokenSupport.java  | 2 +-
 .../io/qameta/allure/junit5/features/EachFixtureSupport.java    | 2 +-
 .../junit5/features/ParameterisedBlankParameterValueTests.java  | 2 +-
 .../allure/junit5/features/ParameterisedPrimitivesTests.java    | 2 +-
 .../io/qameta/allure/junit5/features/ParameterisedTests.java    | 2 +-
 .../io/qameta/allure/junit5/features/SkipOtherInjectables.java  | 2 +-
 .../src/main/java/io/qameta/allure/karate/AllureKarate.java     | 2 +-
 .../src/test/java/io/qameta/allure/karate/AllureKarateTest.java | 2 +-
 .../src/test/java/io/qameta/allure/karate/TestRunner.java       | 2 +-
 .../src/main/java/io/qameta/allure/model/Attachment.java        | 2 +-
 .../src/main/java/io/qameta/allure/model/ExecutableItem.java    | 2 +-
 .../src/main/java/io/qameta/allure/model/FixtureResult.java     | 2 +-
 allure-model/src/main/java/io/qameta/allure/model/Label.java    | 2 +-
 allure-model/src/main/java/io/qameta/allure/model/Link.java     | 2 +-
 .../src/main/java/io/qameta/allure/model/Parameter.java         | 2 +-
 allure-model/src/main/java/io/qameta/allure/model/Stage.java    | 2 +-
 allure-model/src/main/java/io/qameta/allure/model/Status.java   | 2 +-
 .../src/main/java/io/qameta/allure/model/StatusDetails.java     | 2 +-
 .../src/main/java/io/qameta/allure/model/StepResult.java        | 2 +-
 .../src/main/java/io/qameta/allure/model/TestResult.java        | 2 +-
 .../main/java/io/qameta/allure/model/TestResultContainer.java   | 2 +-
 .../src/main/java/io/qameta/allure/model/WithAttachments.java   | 2 +-
 .../src/main/java/io/qameta/allure/model/WithLinks.java         | 2 +-
 .../src/main/java/io/qameta/allure/model/WithParameters.java    | 2 +-
 .../src/main/java/io/qameta/allure/model/WithStatus.java        | 2 +-
 .../src/main/java/io/qameta/allure/model/WithStatusDetails.java | 2 +-
 .../src/main/java/io/qameta/allure/model/WithSteps.java         | 2 +-
 .../src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java     | 2 +-
 .../test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java    | 2 +-
 .../src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java   | 2 +-
 .../test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java   | 2 +-
 .../java/io/qameta/allure/reader/AllureEnumDeserializer.java    | 2 +-
 .../java/io/qameta/allure/reader/AllureObjectMapperFactory.java | 2 +-
 .../java/io/qameta/allure/reader/ParameterModeDeserializer.java | 2 +-
 .../main/java/io/qameta/allure/reader/StageDeserializer.java    | 2 +-
 .../main/java/io/qameta/allure/reader/StatusDeserializer.java   | 2 +-
 .../java/io/qameta/allure/restassured/AllureRestAssured.java    | 2 +-
 .../io/qameta/allure/restassured/AllureRestAssuredTest.java     | 2 +-
 .../main/scala/io/qameta/allure/scalatest/AllureScalatest.scala | 2 +-
 .../scala/io/qameta/allure/scalatest/AllureScalatestTest.scala  | 2 +-
 .../io/qameta/allure/scalatest/testdata/AllureApiSpec.scala     | 2 +-
 .../allure/scalatest/testdata/AnnotationsOnClassSpec.scala      | 2 +-
 .../scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala  | 2 +-
 .../io/qameta/allure/scalatest/testdata/CancelledSpec.scala     | 2 +-
 .../scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala  | 2 +-
 .../scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala | 2 +-
 .../io/qameta/allure/scalatest/testdata/SeveritySpec.scala      | 2 +-
 .../scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala  | 2 +-
 .../src/main/java/io/qameta/allure/selenide/AllureSelenide.java | 2 +-
 .../src/main/java/io/qameta/allure/selenide/LogType.java        | 2 +-
 .../test/java/io/qameta/allure/selenide/AllureSelenideTest.java | 2 +-
 .../qameta/allure/servletapi/HttpServletAttachmentBuilder.java  | 2 +-
 .../src/main/java/io/qameta/allure/spock/AllureSpock.java       | 2 +-
 .../src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java | 2 +-
 .../groovy/io/qameta/allure/spock/samples/BrokenTest.groovy     | 2 +-
 .../groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy | 2 +-
 .../groovy/io/qameta/allure/spock/samples/FailedTest.groovy     | 2 +-
 .../test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy | 2 +-
 .../test/groovy/io/qameta/allure/spock/samples/OneTest.groovy   | 2 +-
 .../groovy/io/qameta/allure/spock/samples/ParametersTest.groovy | 2 +-
 .../io/qameta/allure/spock/samples/TestWithAnnotations.groovy   | 2 +-
 .../allure/spock/samples/TestWithAnnotationsOnClass.groovy      | 2 +-
 .../allure/spock/samples/TestWithCustomAnnotations.groovy       | 2 +-
 .../groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy  | 2 +-
 .../test/groovy/io/qameta/allure/spock/samples/XrayId.groovy    | 2 +-
 .../src/main/java/io/qameta/allure/spock2/AllureSpock2.java     | 2 +-
 .../compiler/AllureStatementsLabelsToStepsTransformation.java   | 2 +-
 .../test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java   | 2 +-
 .../groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy    | 2 +-
 .../io/qameta/allure/spock2/samples/DataDrivenTest.groovy       | 2 +-
 .../groovy/io/qameta/allure/spock2/samples/FailedTest.groovy    | 2 +-
 .../groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy  | 2 +-
 .../io/qameta/allure/spock2/samples/HelloSpockSpec.groovy       | 2 +-
 .../groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy     | 2 +-
 .../test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy  | 2 +-
 .../io/qameta/allure/spock2/samples/ParametersTest.groovy       | 2 +-
 .../groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy  | 2 +-
 .../io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy  | 2 +-
 .../groovy/io/qameta/allure/spock2/samples/SpockTags.groovy     | 2 +-
 .../io/qameta/allure/spock2/samples/StepsAndBlocks.groovy       | 2 +-
 .../io/qameta/allure/spock2/samples/TestWithAnnotations.groovy  | 2 +-
 .../allure/spock2/samples/TestWithAnnotationsOnClass.groovy     | 2 +-
 .../allure/spock2/samples/TestWithCustomAnnotations.groovy      | 2 +-
 .../groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy | 2 +-
 .../io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy | 2 +-
 .../test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy   | 2 +-
 .../java/io/qameta/allure/springweb/AllureRestTemplate.java     | 2 +-
 .../java/io/qameta/allure/springweb/AllureRestTemplateTest.java | 2 +-
 .../java/io/qameta/allure/testfilter/FileTestPlanSupplier.java  | 2 +-
 .../src/main/java/io/qameta/allure/testfilter/TestPlan.java     | 2 +-
 .../main/java/io/qameta/allure/testfilter/TestPlanSupplier.java | 2 +-
 .../main/java/io/qameta/allure/testfilter/TestPlanUnknown.java  | 2 +-
 .../src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java | 2 +-
 .../src/main/java/io/qameta/allure/testng/AllureTestNg.java     | 2 +-
 .../java/io/qameta/allure/testng/AllureTestNgTestFilter.java    | 2 +-
 allure-testng/src/main/java/io/qameta/allure/testng/Tag.java    | 2 +-
 allure-testng/src/main/java/io/qameta/allure/testng/Tags.java   | 2 +-
 .../java/io/qameta/allure/testng/TestInstanceParameter.java     | 2 +-
 .../java/io/qameta/allure/testng/config/AllureTestNgConfig.java | 2 +-
 .../src/test/java/io/qameta/allure/testng/AllureTestNgTest.java | 2 +-
 .../qameta/allure/testng/samples/AfterFixturesCombination.java  | 2 +-
 .../test/java/io/qameta/allure/testng/samples/AllFeatures.java  | 2 +-
 .../java/io/qameta/allure/testng/samples/AttachmentsTest.java   | 2 +-
 .../src/test/java/io/qameta/allure/testng/samples/BaseTest.java | 2 +-
 .../test/java/io/qameta/allure/testng/samples/BaseTestA.java    | 2 +-
 .../test/java/io/qameta/allure/testng/samples/BaseTestB.java    | 2 +-
 .../io/qameta/allure/testng/samples/BddAnnotationsTests.java    | 2 +-
 .../allure/testng/samples/BddAnnotationsTestsInherited.java     | 2 +-
 .../qameta/allure/testng/samples/BeforeFixturesCombination.java | 2 +-
 .../java/io/qameta/allure/testng/samples/BeforeMethods.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/ClassFixtures1.java    | 2 +-
 .../java/io/qameta/allure/testng/samples/ClassFixtures2.java    | 2 +-
 .../java/io/qameta/allure/testng/samples/ClassFixtures3.java    | 2 +-
 .../io/qameta/allure/testng/samples/ClassFixturesInParent.java  | 2 +-
 .../io/qameta/allure/testng/samples/ClassFixturesInherited.java | 2 +-
 .../io/qameta/allure/testng/samples/ConfigurationFailure.java   | 2 +-
 .../io/qameta/allure/testng/samples/CyrillicDescriptions.java   | 2 +-
 .../allure/testng/samples/DataProviderInheritanceBase.java      | 2 +-
 .../allure/testng/samples/DataProviderInheritanceChild.java     | 2 +-
 .../allure/testng/samples/DataProviderMultipleClasses1.java     | 2 +-
 .../allure/testng/samples/DataProviderMultipleClasses2.java     | 2 +-
 .../qameta/allure/testng/samples/DataProviderMultipleTests.java | 2 +-
 .../io/qameta/allure/testng/samples/DataProviderParallel.java   | 2 +-
 .../io/qameta/allure/testng/samples/DataProviderWithArray.java  | 2 +-
 .../allure/testng/samples/DataProviderWithAttachment.java       | 2 +-
 .../qameta/allure/testng/samples/DescriptionsAnotherTest.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/DescriptionsTest.java  | 2 +-
 .../test/java/io/qameta/allure/testng/samples/DisabledTest.java | 2 +-
 .../qameta/allure/testng/samples/FactoryOnConstructorTests.java | 2 +-
 .../java/io/qameta/allure/testng/samples/FailedAfterMethod.java | 2 +-
 .../java/io/qameta/allure/testng/samples/FailedAfterSuite.java  | 2 +-
 .../java/io/qameta/allure/testng/samples/FailedAfterTest.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/FailedBeforeClass.java | 2 +-
 .../io/qameta/allure/testng/samples/FailedBeforeMethod.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/FailedBeforeSuite.java | 2 +-
 .../java/io/qameta/allure/testng/samples/FailedBeforeTest.java  | 2 +-
 .../io/qameta/allure/testng/samples/FailedDataProvider.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/FailedFlakyTest.java   | 2 +-
 .../test/java/io/qameta/allure/testng/samples/FailedSetUp.java  | 2 +-
 .../allure/testng/samples/FailedTestPassedBeforeFixture.java    | 2 +-
 .../io/qameta/allure/testng/samples/FixtureWithDescription.java | 2 +-
 .../java/io/qameta/allure/testng/samples/FlakyDataProvider.java | 2 +-
 .../test/java/io/qameta/allure/testng/samples/FlakyMethods.java | 2 +-
 .../io/qameta/allure/testng/samples/FlakyMethodsInherited.java  | 2 +-
 .../java/io/qameta/allure/testng/samples/FlakyTestClass.java    | 2 +-
 .../qameta/allure/testng/samples/FlakyTestClassInherited.java   | 2 +-
 .../allure/testng/samples/HistoryIdForTestWithDataProvider.java | 2 +-
 .../src/test/java/io/qameta/allure/testng/samples/JustTest.java | 2 +-
 .../test/java/io/qameta/allure/testng/samples/LinksOnTests.java | 2 +-
 .../io/qameta/allure/testng/samples/LinksOnTestsInherited.java  | 2 +-
 .../test/java/io/qameta/allure/testng/samples/MutedMethods.java | 2 +-
 .../io/qameta/allure/testng/samples/MutedMethodsInherited.java  | 2 +-
 .../java/io/qameta/allure/testng/samples/MutedTestClass.java    | 2 +-
 .../qameta/allure/testng/samples/MutedTestClassInherited.java   | 2 +-
 .../test/java/io/qameta/allure/testng/samples/NestedSteps.java  | 2 +-
 .../java/io/qameta/allure/testng/samples/NullParamTest.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/OwnerClassTest.java    | 2 +-
 .../qameta/allure/testng/samples/OwnerClassTestInherited.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/OwnerMethodTest.java   | 2 +-
 .../qameta/allure/testng/samples/OwnerMethodTestInherited.java  | 2 +-
 .../allure/testng/samples/ParallelDataProviderSample.java       | 2 +-
 .../java/io/qameta/allure/testng/samples/ParallelMethods.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/ParameterizedTest.java | 2 +-
 .../java/io/qameta/allure/testng/samples/PerClassFixtures.java  | 2 +-
 .../java/io/qameta/allure/testng/samples/PerMethodFixtures.java | 2 +-
 .../java/io/qameta/allure/testng/samples/PerSuiteFixtures.java  | 2 +-
 .../java/io/qameta/allure/testng/samples/PerTestFixtures.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/PriorityTests.java     | 2 +-
 .../test/java/io/qameta/allure/testng/samples/RetryTest.java    | 2 +-
 .../java/io/qameta/allure/testng/samples/SeverityClassTest.java | 2 +-
 .../allure/testng/samples/SeverityClassTestInherited.java       | 2 +-
 .../io/qameta/allure/testng/samples/SeverityMethodTest.java     | 2 +-
 .../allure/testng/samples/SeverityMethodTestInherited.java      | 2 +-
 .../test/java/io/qameta/allure/testng/samples/SkippedSuite.java | 2 +-
 .../io/qameta/allure/testng/samples/SuiteParameterTest.java     | 2 +-
 .../test/java/io/qameta/allure/testng/samples/TagClassTest.java | 2 +-
 .../java/io/qameta/allure/testng/samples/TagMethodTest.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/TestTagFixtures.java   | 2 +-
 .../io/qameta/allure/testng/samples/TestWithParameters.java     | 2 +-
 .../java/io/qameta/allure/testng/samples/TestWithTimeout.java   | 2 +-
 .../io/qameta/allure/testng/samples/TestsWithIdForFilter.java   | 2 +-
 .../java/io/qameta/allure/testng/samples/TestsWithSteps.java    | 2 +-
 .../java/io/qameta/allure/testng/samples/VarargsParameters.java | 2 +-
 gradle/quality-configs/spotless/header.java                     | 2 +-
 466 files changed, 466 insertions(+), 466 deletions(-)

diff --git a/LICENSE b/LICENSE
index aa0c10ae1..961d751b7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016-2024 Qameta Software Inc
+   Copyright 2016-2026 Qameta Software Inc
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
index 128791172..dbd92dc36 100644
--- a/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java b/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
index 57ddef240..957657b14 100644
--- a/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
+++ b/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java
index 50af67ea4..070f2b5c6 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java
index 5c6d09f34..f7f6af5ff 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java
index 99129f89a..06ef35fc1 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java
index daaf9cc91..3a6303e7a 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
index 2b6f5b1a5..15423fc86 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java
index ccdc978a8..2e3f200d9 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentProcessor.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentProcessor.java
index 652c8ca5f..017d1f610 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentProcessor.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentProcessor.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java
index 50ac53924..354956d89 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/FreemarkerAttachmentRenderer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
index a51052cf7..8f35b75b3 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
index d606af57e..20187c7cb 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/DefaultAttachmentProcessorTest.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/DefaultAttachmentProcessorTest.java
index a1d2def2e..fe84d9cf6 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/DefaultAttachmentProcessorTest.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/DefaultAttachmentProcessorTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
index 0a773e59f..4f0c235e8 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java
index fbc2e6611..444e5c61e 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/NegativeFreemarkerAttachmentRendererTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
index f5933c6db..d30634dae 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
index 01b793cf5..451e3fd9b 100644
--- a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
+++ b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
index d549ee811..5632b1bed 100644
--- a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
+++ b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
index 1a3bad814..592078479 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
index 5c169fd63..b01c36cd6 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
index 52a6b50db..df782adac 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java
index 36a74a164..8acb2782f 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java b/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
index 21f68bebe..d501b3a2a 100644
--- a/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
+++ b/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java b/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java
index 7f29c0490..bf12e2999 100644
--- a/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java
+++ b/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/main/java/cucumber/runtime/formatter/TestSourcesModelProxy.java b/allure-cucumber4-jvm/src/main/java/cucumber/runtime/formatter/TestSourcesModelProxy.java
index f55994b76..f0209d581 100644
--- a/allure-cucumber4-jvm/src/main/java/cucumber/runtime/formatter/TestSourcesModelProxy.java
+++ b/allure-cucumber4-jvm/src/main/java/cucumber/runtime/formatter/TestSourcesModelProxy.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
index b5a5d429d..967ee1a30 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
index fbcbb3f10..0424e6e15 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
index 0c6f76e44..4839d4eac 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
index 9cc09bbfc..85a1d093b 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
index 2b43b9ea8..429e6290c 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
index c0308b3f3..d83071100 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java
index b39835696..261680d87 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java
index 53e0895c5..7521a2f4c 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
index 4faa730ab..158b5ece1 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
index 68aa59fd7..2aa7f01ff 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java
index 7d122c577..1ab2b3f72 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java
index 41bd4bfa6..4c768742d 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java
index f2baf281a..0d1f77236 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
index 7b7a0f0e9..e1e9debb8 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
index 95d11ab57..733211486 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
index ced0a37f1..5e980a981 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java
index 2b3909c62..356783cbf 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java
index 0e459841e..8a1bbe7c8 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
index f4de28513..7456106af 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java
index f2a15b537..3e605bb67 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java
index 8439cb453..a4489b086 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BackgroundFeatureSteps.java
index 135a0bb19..8a8a75e40 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BackgroundFeatureSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BackgroundFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java
index d9ee5ce1a..900968add 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/BrokenFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/DatatableFeatureSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/DatatableFeatureSteps.java
index 10ecd8bc9..98f22865b 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/DatatableFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java
index 857683726..775d90860 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/PendingSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/PendingSteps.java
index 52a8da1a5..2b09a1f57 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/PendingSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/PendingSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java
index 20c73a7fa..581b2afe5 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java
index 01c1c1534..46b0e9467 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/SimpleFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
index 19e1fbb1a..e8c71e51f 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
index 0ac417ea1..9684b9d51 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
index ada27215b..3d31fdef5 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
index 2bdc4b09b..2a338e95f 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java
index 228f1623a..36096f189 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
index 8cfbd31bf..75cc84959 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
index 8d8a22dfe..5a2e5a126 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
index b3f397a3b..6a9393a89 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java
index f8b041039..578abfdf5 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java
index 22b64b97b..1222c28f2 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java
index 416732c3d..b8a69f6b4 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
index fcc108bf7..d7fe2a8e0 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java
index db1279635..f0a8fb7a7 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java
index c769404ef..7438ea192 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java
index ffa41cb13..8d1c005a6 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
index cbb3e7246..60883143e 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
index 03585b090..e4d96d5ff 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
index a20ad07bf..ea7e10eff 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
index 8b3533d65..479ada73a 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java
index 1ceacf741..9a9226206 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
index 45da3d019..0d8a20a73 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
index 2358228cd..0406db2f3 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
index 0c8d10141..455aaffe7 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java
index f1a6f01f5..1cb2041c3 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java
index 206f927f7..e2b7676b4 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java
index 30e7e406e..d43bacfc2 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
index 072c7d810..b85751afa 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java
index c55390ed0..b3c74e1b9 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java
index 0f66fa87c..e76d71acc 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java
index 9212f0318..1280d9a57 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java
index 5bdaf305c..09def58cd 100644
--- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/ClassNames.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
index 320ffe841..f423c7bb4 100644
--- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
index 4b3b5fc90..bf29d9f1c 100644
--- a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
+++ b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
index 6518f5341..ce71871a8 100644
--- a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
index 4d05ead6d..1f2276728 100644
--- a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
index 15d4629ec..414aa7257 100644
--- a/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java b/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
index e316fc75a..a98e09e70 100644
--- a/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
+++ b/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java b/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
index d78020e78..60153b143 100644
--- a/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
+++ b/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java
index f04ba4d74..bc945a66e 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
index a8c07b827..21f2e5ee1 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java
index 5d0a376d1..6e986f47f 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java
index f5fa62efa..86d72532f 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java
index 44d468b1c..beeb7fd4f 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java
index cddd89106..6c3932a0d 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java
index fdbbc52fc..e988f9226 100644
--- a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java
+++ b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
index 1eb4bfe75..d34476b6c 100644
--- a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
+++ b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java b/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
index ddc3019ed..4126ca325 100644
--- a/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
+++ b/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
index 14167a41d..60aff3996 100644
--- a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Request.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
index eb515ea3a..5c9683b47 100644
--- a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
index de2cdd03d..47a4d80a3 100644
--- a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpEntityUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
index 364ea253f..0b9688566 100644
--- a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
index 301e13862..d750d5cc2 100644
--- a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
index 6b73e36dd..3346e1835 100644
--- a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java
index d059716fc..e3706d29a 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java
index ba96ddd3c..cfb24b3da 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllurePredicates.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
index a836a04d7..bc9225725 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResultsWriterStub.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResultsWriterStub.java
index cdbfcd85f..10501feef 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResultsWriterStub.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResultsWriterStub.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
index e0e65881b..6a00c5c4b 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
index 3905c64a7..d28a685e9 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java
index ce23958a4..13b035c8f 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java
index 092c183e9..1c9b27184 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
index 141488990..25092818e 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java
index f436de66e..7d932178e 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureConstants.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureId.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureId.java
index 3ca5b245a..6e84162c5 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureId.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureId.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
index b6b6c4fb3..0edf0170d 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriteException.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriteException.java
index 0dd0b5ef1..1b1299a49 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriteException.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriteException.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriter.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriter.java
index 9e266b383..5d191ba1e 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriter.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsWriter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Attachment.java b/allure-java-commons/src/main/java/io/qameta/allure/Attachment.java
index b08ed83ed..9ca7c51d8 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Attachment.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Attachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Description.java b/allure-java-commons/src/main/java/io/qameta/allure/Description.java
index 3f83f6855..b349a7c06 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Description.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Description.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Epic.java b/allure-java-commons/src/main/java/io/qameta/allure/Epic.java
index 851c90f56..5d9edb8a0 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Epic.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Epic.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Epics.java b/allure-java-commons/src/main/java/io/qameta/allure/Epics.java
index 2ea16dbdb..9ea7c0801 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Epics.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Epics.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Feature.java b/allure-java-commons/src/main/java/io/qameta/allure/Feature.java
index d938062bc..5161a2f6b 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Feature.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Feature.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Features.java b/allure-java-commons/src/main/java/io/qameta/allure/Features.java
index 8c80d6399..093b0a747 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Features.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Features.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java b/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
index 187f39dc0..7bbcaf228 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Flaky.java b/allure-java-commons/src/main/java/io/qameta/allure/Flaky.java
index f1fc21733..3914c435b 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Flaky.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Flaky.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Issue.java b/allure-java-commons/src/main/java/io/qameta/allure/Issue.java
index 9abe55616..f909aad46 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Issue.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Issue.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Issues.java b/allure-java-commons/src/main/java/io/qameta/allure/Issues.java
index c70da23de..1f2c29f56 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Issues.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Issues.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotation.java b/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotation.java
index 36a28f031..682ba2d24 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotation.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotations.java b/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotations.java
index 5a63ee889..75f75b1d1 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotations.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LabelAnnotations.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Lead.java b/allure-java-commons/src/main/java/io/qameta/allure/Lead.java
index 30c95c176..27f53c05a 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Lead.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Lead.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Link.java b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
index d48f8b873..8be0fcf1f 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Link.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
index f8ef85974..0120765fe 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
index e4df3187a..a1a2ccf63 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Links.java b/allure-java-commons/src/main/java/io/qameta/allure/Links.java
index b85c39857..76f1f7ded 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Links.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Links.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Muted.java b/allure-java-commons/src/main/java/io/qameta/allure/Muted.java
index 42ab5879a..90c1ff856 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Muted.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Muted.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Owner.java b/allure-java-commons/src/main/java/io/qameta/allure/Owner.java
index cce5b56a2..7101a5b85 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Owner.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Owner.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Param.java b/allure-java-commons/src/main/java/io/qameta/allure/Param.java
index 5c03f1f33..14a374de6 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Param.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Param.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Severity.java b/allure-java-commons/src/main/java/io/qameta/allure/Severity.java
index d34ca0e26..ccfb284dc 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Severity.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Severity.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/SeverityLevel.java b/allure-java-commons/src/main/java/io/qameta/allure/SeverityLevel.java
index ad7bcd152..1abd896a6 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/SeverityLevel.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/SeverityLevel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Step.java b/allure-java-commons/src/main/java/io/qameta/allure/Step.java
index 2ddcc2e33..83e62af92 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Step.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Step.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Stories.java b/allure-java-commons/src/main/java/io/qameta/allure/Stories.java
index 9e990597c..5d3528149 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Stories.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Stories.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Story.java b/allure-java-commons/src/main/java/io/qameta/allure/Story.java
index 929485db8..8d19605d9 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Story.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Story.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java b/allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java
index f4f3b68d2..273354d04 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/TmsLink.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/TmsLinks.java b/allure-java-commons/src/main/java/io/qameta/allure/TmsLinks.java
index f364bab76..f862c3aa7 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/TmsLinks.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/TmsLinks.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java b/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
index 02b4ac000..106a8069b 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java b/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
index 965a93814..8f59189d3 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
index 765aa1421..21d2250ff 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java
index 3f1c72392..458d06941 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureStorage.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
index e052c8d11..51dd87416 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java
index e8cca6af8..96bb63385 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java
index 39296505a..035eb845b 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleListener.java
index b411081f2..3029dad9d 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
index d082a4bc3..29174eceb 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java
index e304beab3..277a4b0fb 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java
index bed90719b..c4d8e9c8a 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
index efc966051..b032b35cf 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java
index ea6396924..97921fc13 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java
index f644cf7e7..3739ab54c 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ExceptionUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
index 5b68c1d0d..6946aca20 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
index e38c7f361..f409d81b5 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java
index 2cb2687c9..0ac0c43e6 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java
index da96fe87b..9bae9abdb 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index 3c9a2cfb8..289df7dfa 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java
index c6ff3c5b9..7ca753171 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ServiceLoaderUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
index bd2c079b7..b24e489f0 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java b/allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java
index a4b8afa51..fa691623c 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
index d4bc5bda0..c16d25d1b 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
index 3e70d0a03..79b6505a3 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java b/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java
index 0a0ba0f78..8fce16e25 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/StepLifecycleListenerTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java
index dd053822e..a3add35c7 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/internal/AllureThreadContextTest.java b/allure-java-commons/src/test/java/io/qameta/allure/internal/AllureThreadContextTest.java
index 77fefe583..1a15d4a74 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/internal/AllureThreadContextTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/internal/AllureThreadContextTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyCard.java b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyCard.java
index 7cdf5ebe2..cbf16ecfc 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyCard.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyCard.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyEmail.java b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyEmail.java
index 31f42ec82..f6edd82a4 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyEmail.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyEmail.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyUser.java b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyUser.java
index d9476fda9..7f084236a 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyUser.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/testdata/DummyUser.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
index 71d3b47d8..16629b7b3 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
index 422c825cd..37d21a70c 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
index 218ef4a33..e28ee2cfb 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java b/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
index d7f61baa0..c6f831273 100644
--- a/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
+++ b/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java b/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java
index d0bc75158..30b1d7245 100644
--- a/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java
+++ b/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java b/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
index d1ee185b7..2acd047dc 100644
--- a/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
+++ b/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
index 1f1917b97..c57a6e453 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/LoggingReporter.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/LoggingReporter.java
index dc3b7ba83..4f3d3f533 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/LoggingReporter.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/LoggingReporter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java
index e401c825f..67cd88938 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/BrokenStorySteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java
index 45a93ede9..3189964b1 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/samples/SimpleStorySteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
index 5ef296db8..81e347366 100644
--- a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
+++ b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
index 54bff8ab3..1c5c153d1 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java
index 3389fe420..a83e922c3 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/LoggingReporter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java
index e1a0b5e2b..b76dd9cc0 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/BrokenStorySteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java
index 9711b4caf..d81f43e08 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/RuntimeApiSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java
index 99aab03b3..f2e17e513 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/samples/SimpleStorySteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
index 3498deb2b..c9f4600c9 100644
--- a/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
+++ b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java b/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
index d4e6f853e..bd0b241b3 100644
--- a/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
+++ b/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
index 329dbc6c8..ba0f06472 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
index 3b95e3348..fa45c7030 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AllureConfigurableJsonMatcher.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java
index c747b1121..055f0ce22 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffModel.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffModel.java
index 3a65e6012..68772ee1e 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffModel.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/DiffModel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
index ea1aaf899..2744359bf 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
index 78bed71ed..078c99579 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java
index 4b6b043ac..74a96e5fe 100644
--- a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java
+++ b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java
index 29e85869d..e0dcbdfbc 100644
--- a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java
+++ b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index 352cf2a42..a336ee2ab 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
index 14769ed22..e985458d4 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
index 56525bd02..646063102 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
index 9e9c1b82a..ebb98067c 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
index 9cd8a8f60..a72cf8e9e 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
index eb13add0b..6c0b58a44 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/AllureIdAnnotationSupport.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/AllureIdAnnotationSupport.java
index 5fce824ad..713baedd7 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/AllureIdAnnotationSupport.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/AllureIdAnnotationSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java
index 2fb9f401b..422d8e921 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java
index f91459bad..d83104e29 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenTests.java
index a69c7c4f9..e7c36c2e9 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java
index d4fa32846..c34d8dc8f 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledRepeatedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledRepeatedTests.java
index f3e8101f7..b61a852dd 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledRepeatedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledRepeatedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledTests.java
index 48cfcef98..7208af9a1 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisabledTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisplayNameOnClassTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisplayNameOnClassTests.java
index a3940fa20..773972b62 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisplayNameOnClassTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DisplayNameOnClassTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java
index 1a8a1d779..3a7784178 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FailedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FailedTests.java
index 91be711a6..f8f2cdec0 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FailedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FailedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.java
index 44867edd0..814fe4dd4 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java
index dad7fcb45..cc323b52d 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java
index d3f33cafc..943ad3e76 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java
index b8c91afbe..6a03203d0 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java
index 55069931f..48fa3c349 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/NestedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OneTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OneTest.java
index 9a9ea4136..6cf10d149 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OneTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OneTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OwnerTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OwnerTest.java
index f59e95fad..ba31c5e4e 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OwnerTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/OwnerTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParallelTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParallelTests.java
index 06dbe11f4..085b97201 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParallelTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParallelTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTests.java
index ee0606cd1..adf7dfa2c 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java
index e3677440a..2f3809faf 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java
index 4b6cb9f62..12587b378 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/RepeatedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/RepeatedTests.java
index a63a81cca..f1723b820 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/RepeatedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/RepeatedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java
index de199041f..f51f82ecb 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SeverityTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SeverityTest.java
index 055a34537..a9262a456 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SeverityTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SeverityTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java
index 51e856360..f984955d7 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedTests.java
index 17bfcafff..080dc618f 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java
index 8f544d85b..bacf18e4c 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassDisabled.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassDisabled.java
index bba2c9e0e..7a7e1e236 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassDisabled.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassDisabled.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithDisplayNameAnnotation.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithDisplayNameAnnotation.java
index 8dcf86e56..b8bec7bf7 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithDisplayNameAnnotation.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithDisplayNameAnnotation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithoutDisplayNameAnnotation.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithoutDisplayNameAnnotation.java
index 1119c59dc..91699e2ed 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithoutDisplayNameAnnotation.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestClassWithoutDisplayNameAnnotation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java
index d2ee4ed9f..260a0bec6 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java
index 39701deca..decfd287e 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDescription.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDescription.java
index 09d45396c..b6ccc170a 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDescription.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDescription.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDisplayName.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDisplayName.java
index 77f6d1409..b82280bea 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDisplayName.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithDisplayName.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java
index a1f8b6706..419036bb9 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java
index 7310b02bb..91ee2570f 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java
index 1e3762d4b..e33bea572 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemErr.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemErr.java
index ee2c4a38a..df3ac9965 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemErr.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemErr.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemOut.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemOut.java
index e66f077ff..b142de5ea 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemOut.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSystemOut.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
index 2f013ff0d..d8f62c115 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
index 348f7c971..2e7e66123 100644
--- a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
+++ b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4FilterAspect.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java
index bd351e30e..a7dd916f5 100644
--- a/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java
+++ b/allure-junit4-aspect/src/main/java/io/qameta/allure/junit4/aspect/AllureJunit4ListenerAspect.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index e2eee4396..b79cff7a2 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
index f856bf269..a4a46d585 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
index 24fa2a8a2..1f5ec302e 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/DisplayName.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/DisplayName.java
index e72d01575..165ab849c 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/DisplayName.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/DisplayName.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
index 271dc7c5a..6813f5aaf 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
index 112db3588..73e6c7794 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/SampleTestInDefaultPackage.java b/allure-junit4/src/test/java/SampleTestInDefaultPackage.java
index 065c7d47a..62c2f6f2e 100644
--- a/allure-junit4/src/test/java/SampleTestInDefaultPackage.java
+++ b/allure-junit4/src/test/java/SampleTestInDefaultPackage.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
index 99d08a644..b9835917c 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/AssumptionFailedTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/AssumptionFailedTest.java
index ed9b654f2..8ec481eee 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/AssumptionFailedTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/AssumptionFailedTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenTest.java
index a4a66c02a..338729173 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenWithoutMessageTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenWithoutMessageTest.java
index d622552ef..3095e3c63 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenWithoutMessageTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/BrokenWithoutMessageTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
index f7f0e97d1..555632fbd 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FailedTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FailedTest.java
index 9887d7f8c..28bb566a6 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FailedTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FailedTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java
index 31cec99f8..f97d5e5bb 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/FilterSimpleTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredClassTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredClassTest.java
index 6702ec083..5baa7b6ae 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredClassTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredClassTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredTests.java
index ff16dc0f7..f6d3474f7 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredTests.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/IgnoredTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java
index 3600cc143..52156e042 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
index a72c91bc8..6cd462d8b 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestBasedOnSampleRunner.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestBasedOnSampleRunner.java
index 446dc661b..fd949fd35 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestBasedOnSampleRunner.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestBasedOnSampleRunner.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java
index 3eb78a05a..c0e9aaeec 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithSteps.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithSteps.java
index 51f48e489..55da4e723 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithSteps.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithTimeout.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithTimeout.java
index 53640d19a..ed39268b1 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithTimeout.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithTimeout.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java
index e668da036..f5a7a378d 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TheoriesTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java b/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
index b483e0802..e7fad0087 100644
--- a/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
+++ b/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java b/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
index 4848e2b90..d8ad7b7b9 100644
--- a/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
+++ b/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
index 8b785649f..5bd1f59a7 100644
--- a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
+++ b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
index 19e62a917..0712c8875 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
index 1f7ba67dd..dc2931c27 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java
index 923d4f75b..871159d64 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
index 6cf6f09b3..0ec87a715 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
index 8084c1b56..6fc33d93b 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java
index 8231baf97..c38c7f733 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java
index ab53e4547..9442cc31f 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
index 1553e2a81..62c3be094 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
index 3cbb9adc6..d0b67f080 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java
index 9209f1ad7..63a9db244 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
index 6fa4e1cb8..f49f31d6f 100644
--- a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
+++ b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
index fedbd276f..5d18e9f0b 100644
--- a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java b/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
index a8300251a..1149317c3 100644
--- a/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Attachment.java b/allure-model/src/main/java/io/qameta/allure/model/Attachment.java
index ef938f240..af5c78458 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Attachment.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Attachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java b/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java
index 714a30b17..05bcc254c 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/FixtureResult.java b/allure-model/src/main/java/io/qameta/allure/model/FixtureResult.java
index 20e7b3cdc..e51d940a1 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/FixtureResult.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/FixtureResult.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Label.java b/allure-model/src/main/java/io/qameta/allure/model/Label.java
index af9c52595..fe13509e3 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Label.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Label.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Link.java b/allure-model/src/main/java/io/qameta/allure/model/Link.java
index 7009aee99..5b0175fe6 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Link.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Link.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Parameter.java b/allure-model/src/main/java/io/qameta/allure/model/Parameter.java
index 6fbb0fb00..4022c85d5 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Parameter.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Parameter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Stage.java b/allure-model/src/main/java/io/qameta/allure/model/Stage.java
index ff08a6149..aec915831 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Stage.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Stage.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Status.java b/allure-model/src/main/java/io/qameta/allure/model/Status.java
index 37ed668f2..425636094 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Status.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/Status.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java b/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java
index 92e5449e5..10ca653f5 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/StepResult.java b/allure-model/src/main/java/io/qameta/allure/model/StepResult.java
index 92de00ecf..0e293f366 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/StepResult.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/StepResult.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/TestResult.java b/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
index ac5688a43..f1039c231 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java b/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java
index b4645051d..7ca8bcc75 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/TestResultContainer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java b/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java
index 6b773b11e..b253548fb 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithAttachments.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java b/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java
index 050518333..122ce9647 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithLinks.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java b/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java
index 92f0be89d..aeb404544 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithParameters.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java b/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java
index 645e03fcb..b11bf6a4e 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithStatus.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithStatusDetails.java b/allure-model/src/main/java/io/qameta/allure/model/WithStatusDetails.java
index 08400c748..1ff71732a 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithStatusDetails.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithStatusDetails.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java b/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java
index 52caf387c..83829a3e4 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/WithSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java b/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
index b8f72ad76..4987e0934 100644
--- a/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
+++ b/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java b/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java
index 4a6c9dc3f..c05b0e20a 100644
--- a/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java
+++ b/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java b/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
index 6cdfcc226..e843434d8 100644
--- a/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
+++ b/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java b/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java
index b2a8630f4..350790a03 100644
--- a/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java
+++ b/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
index 9a9861826..037cf28ac 100644
--- a/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java b/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
index 88fe9eccf..d516eda0a 100644
--- a/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
index f048e72e1..4e5fb9aaa 100644
--- a/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
index 8b6ddb62a..a99be6c95 100644
--- a/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java
index f7824aa0e..99a61913b 100644
--- a/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
index 07f0d5e6c..a4c62a183 100644
--- a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
+++ b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
index 4b3b2092f..8a2d6e297 100644
--- a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
+++ b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala b/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
index a1b84719e..e42e01847 100644
--- a/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
+++ b/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
index 03f172a3d..2519f7997 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala
index 77cb1fdc5..f3f978455 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala
index 9e7b6460c..58b0d6a6d 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala
index 351fddf4a..eef704813 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala
index b13b174bd..713b46b60 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala
index 29f996fef..91ab06e5b 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala
index 9a13d712d..642d554a7 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala
index 39011d68b..c5e10b06b 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala
index 31bfcb563..a77849a10 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java b/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
index 1f320f68b..12f94213e 100644
--- a/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
+++ b/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-selenide/src/main/java/io/qameta/allure/selenide/LogType.java b/allure-selenide/src/main/java/io/qameta/allure/selenide/LogType.java
index 97995efc5..726d173d3 100644
--- a/allure-selenide/src/main/java/io/qameta/allure/selenide/LogType.java
+++ b/allure-selenide/src/main/java/io/qameta/allure/selenide/LogType.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java b/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java
index 889fd8ff5..7db0358ad 100644
--- a/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java
+++ b/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java b/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
index a6434ea28..fe1c3abc4 100644
--- a/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
+++ b/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java b/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
index f29578ddc..6e44d270c 100644
--- a/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
+++ b/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java b/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java
index f7bc5af8b..7788d1692 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/AllureSpockTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/BrokenTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/BrokenTest.groovy
index 908722f4a..574a1cba1 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/BrokenTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/BrokenTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy
index e07a9db3a..f21b75180 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/DataDrivenTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy
index 00bf73451..29ef77e96 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy
index ad8c2234c..f149b7b95 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/JiraIssue.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/OneTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/OneTest.groovy
index 28f18540e..a2dab8394 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/OneTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/OneTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/ParametersTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/ParametersTest.groovy
index 506c514ba..7d120ba14 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/ParametersTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/ParametersTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy
index d7b086890..51af61540 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy
index c6eda8825..fb1e63292 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithCustomAnnotations.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithCustomAnnotations.groovy
index 32efd0e2a..8a2c69624 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithCustomAnnotations.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithCustomAnnotations.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy
index 1e019b408..ab4cdfd92 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithSteps.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/XrayId.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/XrayId.groovy
index 2055e1d73..0aae4cac4 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/XrayId.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/XrayId.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
index 8798e1f40..99a7de326 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
index 4db9dc0fe..477edd5b0 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
index c5c55f79a..93145e00b 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy
index 722cdc975..f9f2e3fa6 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy
index 8a7a62afd..457bdf356 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
index b690390b2..d264a1ba8 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy
index 581241776..15f21f1d4 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
index 890d8aca1..4a65efb69 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy
index 3ae0b7f34..cd0ec5548 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
index 27e7e70dd..9a547f435 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy
index d5b4f5beb..b6f108bd3 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
index 3884e6fed..ef80eb4e3 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
index 41a1ef57f..9bea32a58 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy
index 25940b3c1..3c6210b88 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpockTags.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
index 2aed57c68..29a0307a6 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
index 8f1a4b46e..844fce1d7 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
index 58347d7b2..9e22496e3 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy
index a535ba9c4..891e59cc0 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy
index c80c9e4ab..95b8b8213 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy
index 64ae85712..a40b477b0 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestsWithIdForFilter.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy
index ac88117c5..f9dbe175b 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
index 2c302b0ed..fbf57c410 100644
--- a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
+++ b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java b/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
index 3911b640f..3298e093b 100644
--- a/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
+++ b/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java
index 5587bbf3c..e179d20bf 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
index 64bad2ebd..55a0b44f6 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java
index bbd53e1cd..c76659c3e 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java
index fd4720302..68eeeaa5a 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
index 2ccd7b413..71f7f793b 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
index de75dbd59..1461065f0 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
index 886f3e55e..2c0f6cfe3 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/Tag.java b/allure-testng/src/main/java/io/qameta/allure/testng/Tag.java
index b6ddaec1b..37570fcdd 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/Tag.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/Tag.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/Tags.java b/allure-testng/src/main/java/io/qameta/allure/testng/Tags.java
index 2d1590102..46139cfd5 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/Tags.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/Tags.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/TestInstanceParameter.java b/allure-testng/src/main/java/io/qameta/allure/testng/TestInstanceParameter.java
index 62de34c33..abd0690ca 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/TestInstanceParameter.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/TestInstanceParameter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java b/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
index e68c09879..7fc1738a6 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
index c0cb226ca..0148ad0da 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java
index 563680c60..e91a9f759 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java
index f24a42c19..aca5ade90 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AttachmentsTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AttachmentsTest.java
index a816b75d7..c5ba61444 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AttachmentsTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AttachmentsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java
index 62485655a..6077f8648 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestA.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestA.java
index 460d1b0c9..a4473eb22 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestA.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestA.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestB.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestB.java
index a99c791bb..5860f9879 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestB.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTestB.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTests.java
index 23e4b8949..2a735c01f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTestsInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTestsInherited.java
index 9aa261359..018ea651f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTestsInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BddAnnotationsTestsInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeFixturesCombination.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeFixturesCombination.java
index 0122ae8df..6c401adf9 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeFixturesCombination.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeFixturesCombination.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeMethods.java
index 802a5a309..c21281fb6 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BeforeMethods.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures1.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures1.java
index 258a738fd..c81c1a8cf 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures1.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures1.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures2.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures2.java
index a58f47ace..64814ad5d 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures2.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures2.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures3.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures3.java
index 76195b36f..f35a2f7aa 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures3.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixtures3.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInParent.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInParent.java
index a620ffbba..796f6aef7 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInParent.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInParent.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInherited.java
index 196aad966..4169ee45d 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ClassFixturesInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ConfigurationFailure.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ConfigurationFailure.java
index d258efa0b..09c230683 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ConfigurationFailure.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ConfigurationFailure.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/CyrillicDescriptions.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/CyrillicDescriptions.java
index 475ffb5bd..c9963b520 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/CyrillicDescriptions.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/CyrillicDescriptions.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceBase.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceBase.java
index eb634c03d..80766dba1 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceBase.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceBase.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceChild.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceChild.java
index 80ae7cae0..a8f8eb492 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceChild.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderInheritanceChild.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses1.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses1.java
index c2f6f39a5..c773f2c71 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses1.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses1.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses2.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses2.java
index f71e11e90..9e55c94e7 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses2.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleClasses2.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleTests.java
index 160e1d10d..0cc8a0052 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderMultipleTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderParallel.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderParallel.java
index 4834229d5..f0a894084 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderParallel.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderParallel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithArray.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithArray.java
index 994e32565..ec7d93c53 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithArray.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithArray.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithAttachment.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithAttachment.java
index 511681a08..20b5a7f61 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithAttachment.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithAttachment.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsAnotherTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsAnotherTest.java
index cb5f9f3df..9e94688e8 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsAnotherTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsAnotherTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsTest.java
index c16eab81a..b128d90e7 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DescriptionsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DisabledTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DisabledTest.java
index b01b16f4f..82e4c9d76 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DisabledTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DisabledTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FactoryOnConstructorTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FactoryOnConstructorTests.java
index 4f2af21c4..351ac5955 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FactoryOnConstructorTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FactoryOnConstructorTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterMethod.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterMethod.java
index 5297b3d69..fd5d8be6e 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterMethod.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterMethod.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterSuite.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterSuite.java
index 09ed05877..9af5a2f80 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterSuite.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterSuite.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterTest.java
index 417b2fbfc..4685a119e 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedAfterTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java
index 05d8853fb..b3a8fcb38 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeMethod.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeMethod.java
index fdba2be7f..c87c920b2 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeMethod.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeMethod.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeSuite.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeSuite.java
index 4226d81f8..feeece1f3 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeSuite.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeSuite.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeTest.java
index bd498a19a..0283bab6e 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedDataProvider.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedDataProvider.java
index d5fdd60ec..c3fada4ca 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedDataProvider.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedDataProvider.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedFlakyTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedFlakyTest.java
index 7bf87987e..78873feef 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedFlakyTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedFlakyTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedSetUp.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedSetUp.java
index 578b4f807..be6efc8df 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedSetUp.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedSetUp.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedTestPassedBeforeFixture.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedTestPassedBeforeFixture.java
index d5a24421c..f839d9c79 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedTestPassedBeforeFixture.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedTestPassedBeforeFixture.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FixtureWithDescription.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FixtureWithDescription.java
index 94e0922d9..8be7f6d76 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FixtureWithDescription.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FixtureWithDescription.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyDataProvider.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyDataProvider.java
index cea3437f3..f9e7151a6 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyDataProvider.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyDataProvider.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethods.java
index 5441c5940..25b9cafa8 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethods.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethodsInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethodsInherited.java
index 970dd55af..96d09bb5f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethodsInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyMethodsInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClass.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClass.java
index 317c0603b..a952d709d 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClass.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClass.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClassInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClassInherited.java
index 65b002350..3dd8fc66e 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClassInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FlakyTestClassInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/HistoryIdForTestWithDataProvider.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/HistoryIdForTestWithDataProvider.java
index e21a0ac06..539ef6c0f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/HistoryIdForTestWithDataProvider.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/HistoryIdForTestWithDataProvider.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/JustTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/JustTest.java
index 98f2f142d..e9c93fe8a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/JustTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/JustTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java
index b964fbb46..fdaf6a4c4 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTestsInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTestsInherited.java
index c63d7b821..cc178f591 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTestsInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTestsInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethods.java
index fd0f30bfa..186258caa 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethods.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethodsInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethodsInherited.java
index 078f3b0a4..13a75d7e9 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethodsInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedMethodsInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClass.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClass.java
index 0edc9b78f..3c346d1cb 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClass.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClass.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClassInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClassInherited.java
index 741cb2924..bbfcd4f56 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClassInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/MutedTestClassInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/NestedSteps.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/NestedSteps.java
index f12af9f78..ad5c9b911 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/NestedSteps.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/NestedSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/NullParamTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/NullParamTest.java
index bb1482c06..8ac309d88 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/NullParamTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/NullParamTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTest.java
index 36cbed218..c09319228 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTestInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTestInherited.java
index 26a18b612..fddffe742 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTestInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerClassTestInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTest.java
index 8c5b56bc7..5858262ff 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTestInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTestInherited.java
index 1b6e7251e..f8d940b4a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTestInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/OwnerMethodTestInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java
index 5a98b901b..30b5dd41a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java
index 3adfa59eb..82180ccb2 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParameterizedTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParameterizedTest.java
index 385689b14..4f2da5bf1 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParameterizedTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParameterizedTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerClassFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerClassFixtures.java
index 49c67d25c..137181bbb 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerClassFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerClassFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerMethodFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerMethodFixtures.java
index ec0515dbf..859209053 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerMethodFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerMethodFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java
index 51c1a6c1a..050655a45 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java
index da09bb7fd..44ace6ce2 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java
index b61c15088..cc6e6d87c 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/RetryTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/RetryTest.java
index 94f28efc4..49fb59ab0 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/RetryTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/RetryTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTest.java
index 3f8468389..fb778713d 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTestInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTestInherited.java
index 968fbe9ff..8a7d0bce4 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTestInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityClassTestInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTest.java
index fe2671834..56aab448f 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTestInherited.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTestInherited.java
index 87d1ddffd..d3710b2c3 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTestInherited.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SeverityMethodTestInherited.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SkippedSuite.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SkippedSuite.java
index 45d36923c..1532c3b95 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SkippedSuite.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SkippedSuite.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SuiteParameterTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SuiteParameterTest.java
index d1ab7946d..bcc6c72cf 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/SuiteParameterTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/SuiteParameterTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java
index f9fa0f65a..bc7ff60be 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java
index 0aae5a0aa..504289518 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestTagFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestTagFixtures.java
index af3aeb2f4..ab8f49b15 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestTagFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestTagFixtures.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithParameters.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithParameters.java
index bd08a9ba2..5c633114a 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithParameters.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithParameters.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithTimeout.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithTimeout.java
index 548d2780c..506d565fb 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithTimeout.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestWithTimeout.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java
index aa401db70..764267787 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithSteps.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithSteps.java
index 25faca37c..9f0b1a800 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithSteps.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithSteps.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/VarargsParameters.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/VarargsParameters.java
index f620badc1..8a4ede2a3 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/VarargsParameters.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/VarargsParameters.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/gradle/quality-configs/spotless/header.java b/gradle/quality-configs/spotless/header.java
index a91c27d5a..38f30f938 100644
--- a/gradle/quality-configs/spotless/header.java
+++ b/gradle/quality-configs/spotless/header.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016-2024 Qameta Software Inc
+ *  Copyright 2016-2026 Qameta Software Inc
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

From aceceb303850abc5b76a0d1f57de0679b2e4c3b9 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Fri, 20 Feb 2026 15:46:08 +0000
Subject: [PATCH 208/233] release 2.33.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 40a54c453..03684fa37 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.33-SNAPSHOT
+version=2.33.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 6ec3b155557c829375ffca9625ff70c7386c83e5 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Fri, 20 Feb 2026 15:46:09 +0000
Subject: [PATCH 209/233] set next development version 2.34

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 03684fa37..ffccaed3a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.33.0
+version=2.34-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 89ac78e12c678d76ad3b857226a5c35bcf976e0d Mon Sep 17 00:00:00 2001
From: Denys Gaievskyi <denys.gaievskyi@gls-itservices.com>
Date: Fri, 20 Feb 2026 17:01:47 +0100
Subject: [PATCH 210/233] Prevent IndexOutOfBoundsException for synthetic
 parameters in Kotlin suspend functions (#1231)

---
 .../io/qameta/allure/junit5/AllureJunit5.java    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
index 5bd1f59a7..3d1019a2b 100644
--- a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
+++ b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
@@ -28,6 +28,7 @@
 import java.lang.reflect.Parameter;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
@@ -62,15 +63,20 @@ public void interceptTestTemplateMethod(final Invocation<Void> invocation,
     private void sendParameterEvent(final ReflectiveInvocationContext<Method> invocationContext,
                                     final ExtensionContext extensionContext) {
         final Parameter[] parameters = invocationContext.getExecutable().getParameters();
-        for (int i = 0; i < parameters.length; i++) {
-            final Parameter parameter = parameters[i];
+        final List<Object> arguments = invocationContext.getArguments();
+        int argumentIndex = 0;
 
+        for (final Parameter parameter : parameters) {
             final Class<?> parameterType = parameter.getType();
-            // Skip default jupiter injectables as TestInfo, TestReporter and TempDirectory
-            if (parameterType.getCanonicalName().startsWith("org.junit.jupiter.api")) {
+
+            // Skip JUnit injectables AND synthetic parameters
+            if (parameterType.getCanonicalName().startsWith("org.junit.jupiter.api")
+                    || parameter.isSynthetic()
+                    || argumentIndex >= arguments.size()) {
                 continue;
             }
-            final Object value = invocationContext.getArguments().get(i);
+
+            final Object value = arguments.get(argumentIndex++);
             final Map<String, String> map = new HashMap<>();
             map.put(ALLURE_PARAMETER, parameter.getName());
             map.put(ALLURE_PARAMETER_VALUE_KEY, ObjectUtils.toString(value));

From 87629802184c78c61172f7f3f605eeb8b1feb78d Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 20 Feb 2026 16:39:35 +0000
Subject: [PATCH 211/233] enable automatic release publishing (via #1247)

---
 .github/workflows/publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 2295deb90..fd0a661c4 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: "Gradle Publish"
         run: |
-          ./gradlew publishToSonatype closeSonatypeStagingRepository -Pversion=${GITHUB_REF:10} \
+          ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -Pversion=${GITHUB_REF:10} \
                     -Psigning.keyId=${GPG_KEY_ID} \
                     -Psigning.password=${GPG_PASSPHRASE} \
                     -Psigning.secretKeyRingFile=${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg

From 0e87c21a6f3417d592f5b481107ad715d49c5dce Mon Sep 17 00:00:00 2001
From: skuznetsov-al <skuznetsov@qameta.io>
Date: Fri, 20 Feb 2026 21:57:36 +0300
Subject: [PATCH 212/233] cover parameterized tests with injectables (#1248)

---
 .../AllureJunit5Junit6CompatibilityTest.java  | 161 ++++++++++++++++++
 .../allure/junit5/AllureJunit5Test.java       |  38 +++++
 .../ParameterisedWithInjectablesTests.java    |  29 ++++
 3 files changed, 228 insertions(+)
 create mode 100644 allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java
 create mode 100644 allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedWithInjectablesTests.java

diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java
new file mode 100644
index 000000000..a9d85cc24
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java
@@ -0,0 +1,161 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.Param;
+import io.qameta.allure.junitplatform.AllureJunitPlatform;
+import io.qameta.allure.model.FixtureResult;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.RunUtils;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.DiscoverySelectors;
+import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.core.LauncherConfig;
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
+import org.junit.platform.launcher.core.LauncherFactory;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+@Tag("junit6-compat")
+@SuppressWarnings("unused")
+class AllureJunit5Junit6CompatibilityTest {
+
+    @ExtendWith(AllureJunit5.class)
+    static class CompatParametersTest {
+
+        @org.junit.jupiter.params.ParameterizedTest
+        @org.junit.jupiter.params.provider.ValueSource(strings = {"a", "b"})
+        void paramTest(@Param("id") String value) {
+        }
+    }
+
+    @Nested
+    @ExtendWith(AllureJunit5.class)
+    class CompatFixtures {
+
+        @BeforeEach
+        void setUp() {
+            Allure.step("before step");
+        }
+
+        @Test
+        void testBody() {
+            Allure.step("test step");
+        }
+
+        @AfterEach
+        void tearDown() {
+            Allure.step("after step");
+        }
+    }
+
+    @Test
+    void shouldCaptureParametersWithParamAnnotationOnJunit6() {
+        AllureResults results = runWithLauncher(CompatParametersTest.class);
+
+        assertThat(results.getTestResults()).isNotEmpty();
+
+        List<Parameter> allParams = results.getTestResults().stream()
+            .flatMap(tr -> tr.getParameters().stream())
+            .toList();
+
+        assertThat(allParams)
+            .isNotEmpty()
+            .extracting(Parameter::getName, Parameter::getValue)
+            .contains(
+                tuple("id", "a"),
+                tuple("id", "b")
+            );
+    }
+
+    @Test
+    void shouldCaptureFixturesAndStepsOnJunit6() {
+        AllureResults results = runWithLauncher(CompatFixtures.class);
+
+        assertThat(results.getTestResults()).hasSize(1);
+        TestResult testResult = results.getTestResults().get(0);
+
+        assertThat(results.getTestResultContainers())
+            .flatExtracting(TestResultContainer::getChildren)
+            .contains(testResult.getUuid());
+
+        assertThat(results.getTestResultContainers())
+            .flatExtracting(TestResultContainer::getBefores)
+            .extracting(FixtureResult::getStatus)
+            .contains(Status.PASSED);
+
+        assertThat(results.getTestResultContainers())
+            .flatExtracting(TestResultContainer::getAfters)
+            .extracting(FixtureResult::getStatus)
+            .contains(Status.PASSED);
+
+        assertThat(results.getTestResultContainers())
+            .flatExtracting(TestResultContainer::getBefores)
+            .flatExtracting(FixtureResult::getSteps)
+            .extracting(StepResult::getName)
+            .contains("before step");
+
+        assertThat(results.getTestResults())
+            .flatExtracting(TestResult::getSteps)
+            .extracting(StepResult::getName)
+            .contains("test step");
+
+        assertThat(results.getTestResultContainers())
+            .flatExtracting(TestResultContainer::getAfters)
+            .flatExtracting(FixtureResult::getSteps)
+            .extracting(StepResult::getName)
+            .contains("after step");
+    }
+
+    @io.qameta.allure.Step("Run classes {classes}")
+    private AllureResults runWithLauncher(Class<?>... classes) {
+        return RunUtils.runTests(lifecycle -> {
+            ClassSelector[] selectors = Stream.of(classes)
+                .map(DiscoverySelectors::selectClass)
+                .toArray(ClassSelector[]::new);
+
+            LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+                .configurationParameter("junit.jupiter.extensions.autodetection.enabled", "true")
+                .selectors(selectors)
+                .build();
+
+            LauncherConfig config = LauncherConfig.builder()
+                .enableTestExecutionListenerAutoRegistration(false)
+                .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
+                .build();
+
+            Launcher launcher = LauncherFactory.create(config);
+            launcher.execute(request);
+        });
+    }
+}
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
index 0712c8875..66d102e2a 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
@@ -25,6 +25,7 @@
 import io.qameta.allure.junit5.features.ParameterisedBlankParameterValueTests;
 import io.qameta.allure.junit5.features.ParameterisedPrimitivesTests;
 import io.qameta.allure.junit5.features.ParameterisedTests;
+import io.qameta.allure.junit5.features.ParameterisedWithInjectablesTests;
 import io.qameta.allure.junit5.features.SkipOtherInjectables;
 import io.qameta.allure.junitplatform.AllureJunitPlatform;
 import io.qameta.allure.model.FixtureResult;
@@ -181,6 +182,43 @@ void shouldSkipReportingOfTestInjectablesTestReporterForParameterisedTest() {
                 );
     }
 
+    @Test
+    void shouldReportParametersWhenTestHasInjectableArgument() {
+        final AllureResults results = runClasses(ParameterisedWithInjectablesTests.class);
+
+        assertThat(results.getTestResults())
+                .filteredOn("fullName", "io.qameta.allure.junit5.features.ParameterisedWithInjectablesTests.valueAndReporter")
+                .filteredOn("name", "valueAndReporter(String, TestReporter) [1] value=a")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .contains(
+                        tuple("value", "a")
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("fullName", "io.qameta.allure.junit5.features.ParameterisedWithInjectablesTests.valueAndReporter")
+                .filteredOn("name", "valueAndReporter(String, TestReporter) [1] value=a")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName)
+                .doesNotContain("testReporter");
+
+        assertThat(results.getTestResults())
+                .filteredOn("fullName", "io.qameta.allure.junit5.features.ParameterisedWithInjectablesTests.valueAndReporter")
+                .filteredOn("name", "valueAndReporter(String, TestReporter) [2] value=b")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .contains(
+                        tuple("value", "b")
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("fullName", "io.qameta.allure.junit5.features.ParameterisedWithInjectablesTests.valueAndReporter")
+                .filteredOn("name", "valueAndReporter(String, TestReporter) [2] value=b")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName)
+                .doesNotContain("testReporter");
+    }
+
     @Test
     void shouldSupportBeforeEachFixture() {
         final AllureResults results = runClasses(EachFixtureSupport.class);
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedWithInjectablesTests.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedWithInjectablesTests.java
new file mode 100644
index 000000000..7ef9b0206
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedWithInjectablesTests.java
@@ -0,0 +1,29 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5.features;
+
+import org.junit.jupiter.api.TestReporter;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class ParameterisedWithInjectablesTests {
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void valueAndReporter(final String value, final TestReporter testReporter) {
+        testReporter.publishEntry("value", value);
+    }
+}

From bf6d32a0c4dd9dfac054d4b1d4a2ef1219846608 Mon Sep 17 00:00:00 2001
From: skuznetsov-al <skuznetsov@qameta.io>
Date: Thu, 12 Mar 2026 12:23:26 +0300
Subject: [PATCH 213/233] Update jackson bom version (#1250)

---
 build.gradle.kts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 154281099..b3a82e141 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -149,25 +149,30 @@ configure(libs) {
 
     dependencyManagement {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.20.1")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.21.1")
             mavenBom("org.junit:junit-bom:5.10.3")
         }
         dependencies {
             dependency("com.github.spotbugs:spotbugs:4.9.8")
             dependency("com.github.tomakehurst:wiremock:3.0.1")
+            dependency("com.google.code.gson:gson:2.8.9")
+            dependency("com.google.guava:guava:32.0.1-jre")
             dependency("com.google.inject:guice:7.0.0")
             dependency("com.google.testing.compile:compile-testing:0.23.0")
             dependency("com.puppycrawl.tools:checkstyle:12.3.0")
             dependency("com.squareup.retrofit2:retrofit:3.0.0")
             dependency("commons-io:commons-io:2.20.0")
+            dependency("commons-beanutils:commons-beanutils:1.11.0")
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.6.0")
             dependency("javax.annotation:javax.annotation-api:1.3.2")
             dependency("net.sourceforge.pmd:pmd-java:7.15.0")
-            dependency("org.apache.commons:commons-lang3:3.15.0")
+            dependency("org.apache.commons:commons-lang3:3.18.0")
+            dependency("org.apache.commons:commons-text:1.10.0")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")
             dependency("org.assertj:assertj-core:3.27.7")
+            dependency("junit:junit:4.13.2")
             dependency("org.freemarker:freemarker:2.3.33")
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.hamcrest:hamcrest:3.0")

From 4e596326d3677738f31c77ada0fa43e46495f8c3 Mon Sep 17 00:00:00 2001
From: skuznetsov-al <skuznetsov@qameta.io>
Date: Mon, 23 Mar 2026 16:47:11 +0300
Subject: [PATCH 214/233] prevent spock2 uuid reuse (#1251)

---
 .../io/qameta/allure/spock2/AllureSpock2.java | 36 +++++-----
 .../allure/spock2/AllureSpock2Test.java       | 67 +++++++++++++++++++
 2 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
index 99a7de326..2a852407b 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -82,12 +82,7 @@
  */
 public class AllureSpock2 extends AbstractRunListener implements IGlobalExtension {
 
-    private final ThreadLocal<String> testResults = new InheritableThreadLocal<String>() {
-        @Override
-        protected String initialValue() {
-            return UUID.randomUUID().toString();
-        }
-    };
+    private final ThreadLocal<String> testResults = new ThreadLocal<>();
 
     private final AllureLifecycle lifecycle;
 
@@ -142,7 +137,7 @@ public void visitSpec(final SpecInfo spec) {
 
     @Override
     public void beforeIteration(final IterationInfo iteration) {
-        final String uuid = testResults.get();
+        final String uuid = UUID.randomUUID().toString();
 
         final FeatureInfo feature = iteration.getFeature();
         final MethodInfo methodInfo = feature.getFeatureMethod();
@@ -222,6 +217,7 @@ public void beforeIteration(final IterationInfo iteration) {
                 result::setDescriptionHtml
         );
 
+        testResults.set(uuid);
         getLifecycle().scheduleTestCase(result);
         getLifecycle().startTestCase(uuid);
 
@@ -285,6 +281,9 @@ private boolean match(final TestPlanV1_0.TestCase tc, final String allureId, fin
     @Override
     public void error(final ErrorInfo error) {
         final String uuid = testResults.get();
+        if (Objects.isNull(uuid)) {
+            return;
+        }
         getLifecycle().updateTestCase(uuid, testResult -> testResult
                 .setStatus(getStatus(error.getException()).orElse(null))
                 .setStatusDetails(getStatusDetails(error.getException()).orElse(null))
@@ -294,15 +293,22 @@ public void error(final ErrorInfo error) {
     @Override
     public void afterIteration(final IterationInfo iteration) {
         final String uuid = testResults.get();
-        testResults.remove();
+        if (Objects.isNull(uuid)) {
+            testResults.remove();
+            return;
+        }
 
-        getLifecycle().updateTestCase(uuid, testResult -> {
-            if (Objects.isNull(testResult.getStatus())) {
-                testResult.setStatus(Status.PASSED);
-            }
-        });
-        getLifecycle().stopTestCase(uuid);
-        getLifecycle().writeTestCase(uuid);
+        try {
+            getLifecycle().updateTestCase(uuid, testResult -> {
+                if (Objects.isNull(testResult.getStatus())) {
+                    testResult.setStatus(Status.PASSED);
+                }
+            });
+            getLifecycle().stopTestCase(uuid);
+            getLifecycle().writeTestCase(uuid);
+        } finally {
+            testResults.remove();
+        }
     }
 
     private List<Parameter> getParameters(final List<String> names, final Object... values) {
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
index 93145e00b..3771a655d 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -61,7 +61,9 @@
 import org.spockframework.runtime.GlobalExtensionRegistry;
 import org.spockframework.runtime.RunContext;
 import org.spockframework.runtime.SpockEngine;
+import org.mockito.ArgumentCaptor;
 
+import java.lang.reflect.Method;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collection;
@@ -73,12 +75,77 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
 
 /**
  * @author charlie (Dmitry Baev).
  */
 class AllureSpock2Test {
 
+    @Test
+    void shouldCreateNewUuidForEachIteration() throws Exception {
+        final io.qameta.allure.AllureLifecycle lifecycle = mock(io.qameta.allure.AllureLifecycle.class);
+        final AllureSpock2 allureSpock2 = new AllureSpock2(lifecycle);
+
+        final org.spockframework.runtime.model.SpecInfo specInfo = mock(org.spockframework.runtime.model.SpecInfo.class);
+        final org.spockframework.runtime.model.FeatureInfo featureInfo = mock(org.spockframework.runtime.model.FeatureInfo.class);
+        final org.spockframework.runtime.model.MethodInfo methodInfo = mock(org.spockframework.runtime.model.MethodInfo.class);
+        final org.spockframework.runtime.model.IterationInfo iterationInfo = mock(org.spockframework.runtime.model.IterationInfo.class);
+
+        final Method method = DummySpec.class.getMethod("dummy");
+        when(methodInfo.getReflection()).thenReturn(method);
+
+        when(specInfo.getReflection()).thenReturn((Class) DummySpec.class);
+        when(specInfo.getPackage()).thenReturn(DummySpec.class.getPackage().getName());
+        when(specInfo.getName()).thenReturn(DummySpec.class.getSimpleName());
+        when(specInfo.getSubSpec()).thenReturn(null);
+        when(specInfo.getSuperSpec()).thenReturn(null);
+
+        when(featureInfo.getFeatureMethod()).thenReturn(methodInfo);
+        when(featureInfo.getSpec()).thenReturn(specInfo);
+        when(featureInfo.getDataVariables()).thenReturn(Collections.emptyList());
+        when(featureInfo.getTestTags()).thenReturn(Collections.emptySet());
+
+        when(iterationInfo.getFeature()).thenReturn(featureInfo);
+        when(iterationInfo.getDataValues()).thenReturn(new Object[0]);
+        when(iterationInfo.getDisplayName()).thenReturn("dummy");
+        when(iterationInfo.getName()).thenReturn("dummy");
+
+        final ArgumentCaptor<TestResult> scheduled = ArgumentCaptor.forClass(TestResult.class);
+
+        allureSpock2.beforeIteration(iterationInfo);
+        allureSpock2.beforeIteration(iterationInfo);
+
+        verify(lifecycle, times(2)).scheduleTestCase(scheduled.capture());
+        final List<TestResult> captured = scheduled.getAllValues();
+        assertThat(captured)
+                .hasSize(2)
+                .extracting(TestResult::getUuid)
+                .doesNotContainNull();
+        assertThat(captured.get(0).getUuid()).isNotEqualTo(captured.get(1).getUuid());
+    }
+
+    @Test
+    void shouldIgnoreErrorAndAfterIterationWhenUuidMissing() {
+        final io.qameta.allure.AllureLifecycle lifecycle = mock(io.qameta.allure.AllureLifecycle.class);
+        final AllureSpock2 allureSpock2 = new AllureSpock2(lifecycle);
+
+        allureSpock2.error(mock(org.spockframework.runtime.model.ErrorInfo.class));
+        allureSpock2.afterIteration(mock(org.spockframework.runtime.model.IterationInfo.class));
+
+        verifyNoInteractions(lifecycle);
+    }
+
+    private static final class DummySpec {
+        public void dummy() {
+            // noop
+        }
+    }
+
     @Test
     void shouldStoreTestsInformation() {
         final AllureResults results = runClasses(OneTest.class);

From d94943d8e475b6cc6a4eebe830f41fa78daac012 Mon Sep 17 00:00:00 2001
From: skuznetsov-al <skuznetsov@qameta.io>
Date: Wed, 25 Mar 2026 20:30:02 +0300
Subject: [PATCH 215/233] add optional clean results before run (#1253)

---
 .../io/qameta/allure/AllureLifecycle.java     |  6 +-
 .../allure/FileSystemResultsWriter.java       | 56 ++++++++++++-
 .../allure/FileSystemResultsWriterTest.java   | 82 +++++++++++++++++++
 3 files changed, 140 insertions(+), 4 deletions(-)

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
index 0edf0170d..dc3f9d3b6 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
@@ -640,7 +640,11 @@ private boolean isEmpty(final String s) {
     private static FileSystemResultsWriter getDefaultWriter() {
         final Properties properties = PropertiesUtils.loadAllureProperties();
         final String path = properties.getProperty("allure.results.directory", "allure-results");
-        return new FileSystemResultsWriter(Paths.get(path));
+        final boolean cleanBeforeRun = Boolean.parseBoolean(
+                properties.getProperty("allure.results.clean.before.run", "false"));
+        final boolean cleanOnlyOnce = Boolean.parseBoolean(
+                properties.getProperty("allure.results.clean.only.once", "true"));
+        return new FileSystemResultsWriter(Paths.get(path), cleanBeforeRun, cleanOnlyOnce);
     }
 
     private static LifecycleNotifier getDefaultNotifier() {
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java b/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
index 7bbcaf228..f4b0e3313 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
@@ -19,25 +19,46 @@
 import io.qameta.allure.internal.Allure2ModelJackson;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Comparator;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.stream.Stream;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @author charlie (Dmitry Baev).
  */
 public class FileSystemResultsWriter implements AllureResultsWriter {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileSystemResultsWriter.class);
+
     private final Path outputDirectory;
 
     private final ObjectMapper mapper;
 
+    private final boolean cleanBeforeRun;
+
+    private final boolean cleanOnlyOnce;
+
+    private final AtomicBoolean cleaned = new AtomicBoolean(false);
+
     public FileSystemResultsWriter(final Path outputDirectory) {
+        this(outputDirectory, false, true);
+    }
+
+    public FileSystemResultsWriter(final Path outputDirectory,
+                                    final boolean cleanBeforeRun,
+                                    final boolean cleanOnlyOnce) {
         this.outputDirectory = outputDirectory;
+        this.cleanBeforeRun = cleanBeforeRun;
+        this.cleanOnlyOnce = cleanOnlyOnce;
         this.mapper = Allure2ModelJackson.createMapper();
     }
 
@@ -46,7 +67,7 @@ public void write(final TestResult testResult) {
         final String testResultName = Objects.isNull(testResult.getUuid())
                 ? generateTestResultName()
                 : generateTestResultName(testResult.getUuid());
-        createDirectories(outputDirectory);
+        ensureInitialized();
         final Path file = outputDirectory.resolve(testResultName);
         try {
             mapper.writeValue(file.toFile(), testResult);
@@ -60,7 +81,7 @@ public void write(final TestResultContainer testResultContainer) {
         final String testResultContainerName = Objects.isNull(testResultContainer.getUuid())
                 ? generateTestResultContainerName()
                 : generateTestResultContainerName(testResultContainer.getUuid());
-        createDirectories(outputDirectory);
+        ensureInitialized();
         final Path file = outputDirectory.resolve(testResultContainerName);
         try {
             mapper.writeValue(file.toFile(), testResultContainer);
@@ -71,7 +92,7 @@ public void write(final TestResultContainer testResultContainer) {
 
     @Override
     public void write(final String source, final InputStream attachment) {
-        createDirectories(outputDirectory);
+        ensureInitialized();
         final Path file = outputDirectory.resolve(source);
         try (InputStream is = attachment) {
             Files.copy(is, file);
@@ -88,6 +109,35 @@ private void createDirectories(final Path directory) {
         }
     }
 
+    private void ensureInitialized() {
+        createDirectories(outputDirectory);
+        if (cleanBeforeRun) {
+            final boolean shouldClean = !cleanOnlyOnce || cleaned.compareAndSet(false, true);
+            if (shouldClean) {
+                cleanDirectoryContents(outputDirectory);
+            }
+        }
+    }
+
+    private void cleanDirectoryContents(final Path directory) {
+        if (!Files.exists(directory)) {
+            return;
+        }
+        try (Stream<Path> stream = Files.walk(directory)) {
+            stream.sorted(Comparator.reverseOrder())
+                    .filter(path -> !path.equals(directory))
+                    .forEach(path -> {
+                        try {
+                            Files.deleteIfExists(path);
+                        } catch (IOException e) {
+                            LOGGER.warn("Failed to delete {} during directory cleanup", path, e);
+                        }
+                    });
+        } catch (IOException e) {
+            LOGGER.warn("Failed to clean directory contents: {}", directory, e);
+        }
+    }
+
     protected static String generateTestResultName() {
         return generateTestResultName(UUID.randomUUID().toString());
     }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
index c16d25d1b..e84be69b8 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
@@ -19,6 +19,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.UUID;
 
@@ -53,4 +55,84 @@ void shouldWriteTestResult(@TempDir final Path folder) {
         assertThat(folder.resolve(fileName))
                 .isRegularFile();
     }
+
+    @Test
+    void shouldPreserveOldResultsWhenCleanIsDisabled(@TempDir final Path folder) throws IOException {
+        Path existingFile = folder.resolve("existing-result.json");
+        Files.writeString(existingFile, "{}");
+
+        FileSystemResultsWriter writer = new FileSystemResultsWriter(folder, false, true);
+        final String uuid = UUID.randomUUID().toString();
+        final TestResult testResult = current().nextObject(TestResult.class, "steps").setUuid(uuid);
+        writer.write(testResult);
+
+        assertThat(existingFile).exists();
+        assertThat(folder.resolve(generateTestResultName(uuid))).exists();
+    }
+
+    @Test
+    void shouldCleanDirectoryWhenCleanBeforeRunEnabled(@TempDir final Path folder) throws IOException {
+        Path existingFile = folder.resolve("existing-result.json");
+        Files.writeString(existingFile, "{}");
+
+        FileSystemResultsWriter writer = new FileSystemResultsWriter(folder, true, true);
+        final String uuid = UUID.randomUUID().toString();
+        final TestResult testResult = current().nextObject(TestResult.class, "steps").setUuid(uuid);
+        writer.write(testResult);
+
+        assertThat(existingFile).doesNotExist();
+        assertThat(folder.resolve(generateTestResultName(uuid))).exists();
+    }
+
+    @Test
+    void shouldCleanOnlyOnceWhenCleanOnlyOnceEnabled(@TempDir final Path folder) throws IOException {
+        Path existingFile = folder.resolve("existing-result.json");
+        Files.writeString(existingFile, "{}");
+
+        FileSystemResultsWriter writer = new FileSystemResultsWriter(folder, true, true);
+        
+        final String uuid1 = UUID.randomUUID().toString();
+        final TestResult testResult1 = current().nextObject(TestResult.class, "steps").setUuid(uuid1);
+        writer.write(testResult1);
+
+        final String uuid2 = UUID.randomUUID().toString();
+        final TestResult testResult2 = current().nextObject(TestResult.class, "steps").setUuid(uuid2);
+        writer.write(testResult2);
+
+        assertThat(folder.resolve(generateTestResultName(uuid1))).exists();
+        assertThat(folder.resolve(generateTestResultName(uuid2))).exists();
+    }
+
+    @Test
+    void shouldCleanOnEveryFirstWriteWhenCleanOnlyOnceDisabled(@TempDir final Path folder) throws IOException {
+        FileSystemResultsWriter writer1 = new FileSystemResultsWriter(folder, true, false);
+        final String uuid1 = UUID.randomUUID().toString();
+        final TestResult testResult1 = current().nextObject(TestResult.class, "steps").setUuid(uuid1);
+        writer1.write(testResult1);
+
+        Path intermediateFile = folder.resolve("intermediate-result.json");
+        Files.writeString(intermediateFile, "{}");
+
+        FileSystemResultsWriter writer2 = new FileSystemResultsWriter(folder, true, false);
+        final String uuid2 = UUID.randomUUID().toString();
+        final TestResult testResult2 = current().nextObject(TestResult.class, "steps").setUuid(uuid2);
+        writer2.write(testResult2);
+
+        assertThat(intermediateFile).doesNotExist();
+        assertThat(folder.resolve(generateTestResultName(uuid2))).exists();
+    }
+
+    @Test
+    void shouldNotDeleteDirectoryItself(@TempDir final Path folder) throws IOException {
+        Path existingFile = folder.resolve("existing-result.json");
+        Files.writeString(existingFile, "{}");
+
+        FileSystemResultsWriter writer = new FileSystemResultsWriter(folder, true, true);
+        final String uuid = UUID.randomUUID().toString();
+        final TestResult testResult = current().nextObject(TestResult.class, "steps").setUuid(uuid);
+        writer.write(testResult);
+
+        assertThat(folder).isDirectory();
+        assertThat(folder.resolve(generateTestResultName(uuid))).exists();
+    }
 }

From c1957f0640d1461448b9cd9cc6dc918cd932bd80 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 1 Apr 2026 16:13:23 +0100
Subject: [PATCH 216/233] fix(rest-assured): handle non-string form params in
 request attachments (fixes #1025, via #1256)

---
 .../allure/restassured/AllureRestAssured.java |   9 +-
 .../restassured/AllureRestAssuredTest.java    | 151 +++++++++++++-----
 2 files changed, 122 insertions(+), 38 deletions(-)

diff --git a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
index a4c62a183..d59e998ac 100644
--- a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
+++ b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
@@ -19,6 +19,7 @@
 import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
 import io.qameta.allure.attachment.http.HttpRequestAttachment;
 import io.qameta.allure.attachment.http.HttpResponseAttachment;
+import io.qameta.allure.util.ObjectUtils;
 import io.restassured.filter.FilterContext;
 import io.restassured.filter.OrderedFilter;
 import io.restassured.internal.NameAndValue;
@@ -114,7 +115,7 @@ public Response filter(final FilterableRequestSpecification requestSpec,
         }
 
         if (Objects.nonNull(requestSpec.getFormParams())) {
-            requestAttachmentBuilder.setFormParams(requestSpec.getFormParams());
+            requestAttachmentBuilder.setFormParams(toStringMapConverter(requestSpec.getFormParams()));
         }
 
         final HttpRequestAttachment requestAttachment = requestAttachmentBuilder.build();
@@ -155,6 +156,12 @@ private static Map<String, String> toMapConverter(final Iterable<? extends NameA
         return result;
     }
 
+    private static Map<String, String> toStringMapConverter(final Map<String, ?> items) {
+        final Map<String, String> result = new HashMap<>();
+        items.forEach((key, value) -> result.put(key, ObjectUtils.toString(value)));
+        return result;
+    }
+
     @Override
     public int getOrder() {
         return Integer.MAX_VALUE;
diff --git a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
index 8a2d6e297..2210b7dc3 100644
--- a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
+++ b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
@@ -27,10 +27,6 @@
 import io.restassured.config.LogConfig;
 import io.restassured.config.RestAssuredConfig;
 import io.restassured.http.ContentType;
-import io.restassured.specification.RequestSpecification;
-
-import java.nio.charset.StandardCharsets;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -38,9 +34,11 @@
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -50,21 +48,23 @@
 
 class AttachmentArgumentProvider implements ArgumentsProvider {
     @Override
-    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-
+    public Stream<? extends Arguments> provideArguments(final ExtensionContext context) {
         return Stream.of(
                 arguments(ImmutableList.of("Request", "HTTP/1.1 200 OK"), new AllureRestAssured()),
-                arguments(ImmutableList.of("Allure Request", "Allure Response"), new AllureRestAssured().setRequestAttachmentName("Allure Request").setResponseAttachmentName("Allure Response")),
-                arguments(ImmutableList.of("Request", "Allure Response"), new AllureRestAssured().setResponseAttachmentName("Allure Response")),
-                arguments(ImmutableList.of("Allure Request", "HTTP/1.1 200 OK"), new AllureRestAssured().setRequestAttachmentName("Allure Request"))
+                arguments(ImmutableList.of("Allure Request", "Allure Response"), new AllureRestAssured()
+                        .setRequestAttachmentName("Allure Request")
+                        .setResponseAttachmentName("Allure Response")),
+                arguments(ImmutableList.of("Request", "Allure Response"), new AllureRestAssured()
+                        .setResponseAttachmentName("Allure Response")),
+                arguments(ImmutableList.of("Allure Request", "HTTP/1.1 200 OK"), new AllureRestAssured()
+                        .setRequestAttachmentName("Allure Request"))
         );
     }
 }
 
 class JsonPrettifyingArgumentsProvider implements ArgumentsProvider {
     @Override
-    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-
+    public Stream<? extends Arguments> provideArguments(final ExtensionContext context) {
         return Stream.of(
                 arguments(new AllureRestAssured(), """
                         {
@@ -80,8 +80,7 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 
 class HiddenHeadersArgumentProvider implements ArgumentsProvider {
     @Override
-    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-
+    public Stream<? extends Arguments> provideArguments(final ExtensionContext context) {
         final String hiddenHeader = "Authorization";
         final String header = "Accept";
         final String headerValue = "value";
@@ -104,8 +103,15 @@ class AllureRestAssuredTest {
     @ParameterizedTest
     @ArgumentsSource(AttachmentArgumentProvider.class)
     void shouldCreateAttachment(final List<String> attachmentNames, final AllureRestAssured filter) {
-        RestAssured.replaceFiltersWith(filter);
-        final AllureResults results = execute();
+        final AllureResults results = executeWithStub(
+                server -> WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
+                        .willReturn(WireMock.aResponse().withStatus(200).withBody("some body"))),
+                server -> RestAssured.given()
+                        .contentType(ContentType.URLENC)
+                        .formParams("Allure", "Form")
+                        .get(server.url("/hello")).then().statusCode(200),
+                filter
+        );
 
         assertThat(results.getTestResults()
                 .stream()
@@ -127,11 +133,26 @@ void shouldProperlySetAttachmentNameForSingleFilterInstance() {
                 .withStatus(400)
                 .withBody("some other body");
 
-        RestAssured.replaceFiltersWith(filter);
-        final AllureResults resultsOne = executeWithStub(responseBuilderOne);
+        // Reuse the same filter instance for both requests to verify names are not cached.
+        final AllureResults resultsOne = executeWithStub(
+                server -> WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
+                        .willReturn(responseBuilderOne)),
+                server -> RestAssured.given()
+                        .contentType(ContentType.URLENC)
+                        .formParams("Allure", "Form")
+                        .get(server.url("/hello")).then().statusCode(200),
+                filter
+        );
 
-        RestAssured.replaceFiltersWith(filter);
-        final AllureResults resultsTwo = executeWithStub(responseBuilderTwo);
+        final AllureResults resultsTwo = executeWithStub(
+                server -> WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
+                        .willReturn(responseBuilderTwo)),
+                server -> RestAssured.given()
+                        .contentType(ContentType.URLENC)
+                        .formParams("Allure", "Form")
+                        .get(server.url("/hello")).then().statusCode(400),
+                filter
+        );
 
         assertThat(resultsOne.getTestResults()
                 .stream()
@@ -153,10 +174,17 @@ void shouldProperlySetAttachmentNameForSingleFilterInstance() {
     @ParameterizedTest
     @ArgumentsSource(AttachmentArgumentProvider.class)
     void shouldCatchAttachmentBody(final List<String> attachmentNames, final AllureRestAssured filter) {
-        RestAssured.replaceFiltersWith(filter);
-        final AllureResults results = execute();
+        final AllureResults results = executeWithStub(
+                server -> WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
+                        .willReturn(WireMock.aResponse().withStatus(200).withBody("some body"))),
+                server -> RestAssured.given()
+                        .contentType(ContentType.URLENC)
+                        .formParams("Allure", "Form")
+                        .get(server.url("/hello")).then().statusCode(200),
+                filter
+        );
 
-        List<Attachment> actualAttachments = results.getTestResults().stream()
+        final List<Attachment> actualAttachments = results.getTestResults().stream()
                 .map(TestResult::getAttachments)
                 .flatMap(List::stream)
                 .collect(Collectors.toList());
@@ -178,14 +206,21 @@ void shouldHideHeadersInAttachments(final Map<String, String> headers,
                                         final String hiddenHeader,
                                         final List<String> expectedValues,
                                         final AllureRestAssured filter) {
-
         final ResponseDefinitionBuilder responseBuilder = WireMock.aResponse().withStatus(200);
         headers.forEach(responseBuilder::withHeader);
 
         RestAssured.config = new RestAssuredConfig().logConfig(LogConfig.logConfig().blacklistHeaders(List.of(hiddenHeader)));
-        RestAssured.replaceFiltersWith(filter);
 
-        final AllureResults results = executeWithStub(responseBuilder, RestAssured.with().headers(headers));
+        final AllureResults results = executeWithStub(
+                server -> WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
+                        .willReturn(responseBuilder)),
+                server -> RestAssured.with()
+                        .headers(headers)
+                        .contentType(ContentType.URLENC)
+                        .formParams("Allure", "Form")
+                        .get(server.url("/hello")).then().statusCode(200),
+                filter
+        );
 
         assertThat(results.getAttachments().values())
                 .hasSize(2)
@@ -203,9 +238,16 @@ void responseJsonPrettified(final AllureRestAssured filter, final String formatt
                         """)
                 .withStatus(200);
 
-        RestAssured.replaceFiltersWith(filter);
+        final AllureResults results = executeWithStub(
+                server -> WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
+                        .willReturn(responseBuilder)),
+                server -> RestAssured.with()
+                        .contentType(ContentType.URLENC)
+                        .formParams("Allure", "Form")
+                        .get(server.url("/hello")).then().statusCode(200),
+                filter
+        );
 
-        final AllureResults results = executeWithStub(responseBuilder, RestAssured.with());
         final Attachment requestAttachment = results.getTestResults()
                 .stream()
                 .map(TestResult::getAttachments)
@@ -221,27 +263,62 @@ void responseJsonPrettified(final AllureRestAssured filter, final String formatt
                 .contains(formattedBody);
     }
 
-    protected final AllureResults execute() {
-        return executeWithStub(WireMock.aResponse().withBody("some body"));
+    @Test
+    void shouldRenderListValuedFormParams() {
+        final ResponseDefinitionBuilder responseBuilder = WireMock.aResponse()
+                .withStatus(200)
+                .withBody("some body");
+
+        final AllureResults results = executeWithStub(
+                server -> WireMock.stubFor(WireMock.post(WireMock.urlPathEqualTo("/hello"))
+                        .willReturn(responseBuilder)),
+                server -> RestAssured.given()
+                        .contentType(ContentType.URLENC)
+                        .formParam("data", List.of("a", "b"))
+                        .post(server.url("/hello")).then().statusCode(200)
+        );
+
+        assertThat(results.getTestResults()
+                .stream()
+                .map(TestResult::getAttachments)
+                .flatMap(Collection::stream)
+                .map(Attachment::getName))
+                .containsExactly("Request", "HTTP/1.1 200 OK");
+
+        final Attachment requestAttachment = results.getTestResults()
+                .stream()
+                .map(TestResult::getAttachments)
+                .flatMap(Collection::stream)
+                .filter(attachment -> "Request".equals(attachment.getName()))
+                .findAny()
+                .orElseThrow(() -> new AssertionError("No request attachment found"));
+
+        final byte[] attachmentBody = results.getAttachments().get(requestAttachment.getSource());
+        final String attachmentBodyString = new String(attachmentBody, StandardCharsets.UTF_8);
+
+        assertThat(attachmentBodyString)
+                .contains("data: [a, b]")
+                .contains("data=[a, b]");
     }
 
-    protected final AllureResults executeWithStub(ResponseDefinitionBuilder responseBuilder) {
-        return executeWithStub(responseBuilder, RestAssured.given());
+    protected final AllureResults executeWithStub(final Consumer<WireMockServer> stubSetup,
+                                                  final Consumer<WireMockServer> requestExecutor) {
+        return executeWithStub(stubSetup, requestExecutor, new AllureRestAssured());
     }
 
-    protected final AllureResults executeWithStub(ResponseDefinitionBuilder responseBuilder, RequestSpecification spec) {
+    protected final AllureResults executeWithStub(final Consumer<WireMockServer> stubSetup,
+                                                  final Consumer<WireMockServer> requestExecutor,
+                                                  final AllureRestAssured filter) {
         final WireMockServer server = new WireMockServer(WireMockConfiguration.options().dynamicPort());
-        final int statusCode = responseBuilder.build().getStatus();
 
         return runWithinTestContext(() -> {
             server.start();
             WireMock.configureFor(server.port());
+            RestAssured.replaceFiltersWith(filter);
 
-            WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form")).willReturn(responseBuilder));
+            stubSetup.accept(server);
             try {
-                spec.contentType(ContentType.URLENC)
-                        .formParams("Allure", "Form")
-                        .get(server.url("/hello")).then().statusCode(statusCode);
+                requestExecutor.accept(server);
             } finally {
                 server.stop();
                 RestAssured.replaceFiltersWith(ImmutableList.of());

From d7733b118195eaa589b3638c4d8fe917141a365f Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 1 Apr 2026 17:28:56 +0100
Subject: [PATCH 217/233] render javadoc descriptions safely and ignore block
 tags (fixes #1039, via #1258)

---
 .../JavaDocDescriptionRenderer.java           | 562 ++++++++++++++++++
 .../JavaDocDescriptionsProcessor.java         |   5 +-
 .../JavaDocDescriptionRendererTest.java       | 328 ++++++++++
 .../description/ProcessDescriptionsTest.java  | 104 ++++
 .../java/io/qameta/allure/Description.java    |   3 +-
 .../io/qameta/allure/util/ResultsUtils.java   |  18 +-
 .../AllureJunitPlatformTest.java              |   6 +-
 .../features/DescriptionJavadocTest.java      |   4 +-
 .../junit4/samples/DescriptionsJavadoc.java   |   4 +-
 .../allure/testng/AllureTestNgTest.java       |  36 +-
 10 files changed, 1044 insertions(+), 26 deletions(-)
 create mode 100644 allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionRenderer.java
 create mode 100644 allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/JavaDocDescriptionRendererTest.java

diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionRenderer.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionRenderer.java
new file mode 100644
index 000000000..6546dbb48
--- /dev/null
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionRenderer.java
@@ -0,0 +1,562 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.description;
+
+import java.util.Locale;
+
+/**
+ * Renders raw JavaDoc comment text into a safe, markdown-friendly description for Allure.
+ *
+ * <p>This renderer intentionally implements a small, conservative subset of the JavaDoc comment
+ * specification instead of attempting to preserve the full doclet output. The goal is to keep
+ * JavaDoc-backed descriptions readable in reports while ensuring that untrusted comment content is
+ * never treated as executable HTML.</p>
+ *
+ * <p>The rendering algorithm is intentionally simple:</p>
+ * <ol>
+ *     <li>Take only the main description, stopping at the first block tag such as {@code @param}
+ *     or {@code @throws}.</li>
+ *     <li>Render the remaining content with a small parser that recognizes a limited set of inline
+ *     JavaDoc tags and structural HTML tags.</li>
+ *     <li>Escape or drop everything else so the output remains plain text or safe markdown.</li>
+ * </ol>
+ *
+ * <p>Currently supported JavaDoc constructs include inline tags such as {@code {@code ...}},
+ * {@code {@literal ...}}, {@code {@link ...}}, and {@code {@linkplain ...}}.</p>
+ *
+ * <p>The renderer also understands a small set of structural HTML tags: {@code p}, {@code br},
+ * {@code ul}, {@code ol}, {@code li}, and {@code code}. Common entity references such as
+ * {@code &amp;lt;}, {@code &amp;gt;}, {@code &amp;amp;}, {@code &amp;#064;},
+ * {@code &amp;lbrace;}, and numeric entities are decoded before the output is escaped again.</p>
+ *
+ * <p>Unsupported tags are degraded to escaped text instead of being interpreted. Unknown HTML tags
+ * are ignored as markup while their text content remains visible. This keeps the JavaDoc
+ * description path suitable for open source projects where comments may evolve over time and where
+ * security is more important than pixel-perfect parity with the standard doclet.</p>
+ */
+final class JavaDocDescriptionRenderer {
+
+    private static final String PARAGRAPH_BREAK = "\n\n";
+    private static final String HTML_LT = "&lt;";
+    private static final String HTML_GT = "&gt;";
+    private static final String HTML_AMP = "&amp;";
+    private static final String INLINE_CODE_MARKER = "`";
+    private static final String ESCAPED_INLINE_CODE_MARKER = "``";
+    private static final String CODE_TAG = "code";
+    private static final String HTML_TAG_END = ">";
+    private static final String CLOSING_TAG_PREFIX = "</";
+
+    /**
+     * Converts raw JavaDoc comment text into the description format stored by the annotation
+     * processor.
+     *
+     * <p>The method extracts the JavaDoc main description, renders the supported inline and HTML
+     * constructs into plain text or markdown, normalizes whitespace, and escapes unsafe content.
+     * The returned value is intended for Allure's plain {@code description} field, not for
+     * {@code descriptionHtml}.</p>
+     *
+     * @param rawDocComment the comment text returned by {@link javax.lang.model.util.Elements#getDocComment}
+     * @return a safe markdown/plain-text description, or an empty string if the comment has no main
+     * description
+     */
+    String render(final String rawDocComment) {
+        final String descriptionBody = extractDescriptionBody(rawDocComment);
+        if (descriptionBody.isEmpty()) {
+            return "";
+        }
+
+        final StringBuilder rendered = new StringBuilder();
+        renderFragment(descriptionBody, rendered);
+        return cleanup(rendered.toString());
+    }
+
+    private String extractDescriptionBody(final String rawDocComment) {
+        final String[] lines = normalize(rawDocComment).split("\n", -1);
+        final StringBuilder body = new StringBuilder();
+        int inlineTagDepth = 0;
+
+        for (String line : lines) {
+            if (inlineTagDepth == 0 && startsBlockTag(line)) {
+                return trimBlankLines(body.toString());
+            }
+            if (body.length() > 0) {
+                body.append('\n');
+            }
+            body.append(trimTrailingWhitespace(line));
+            inlineTagDepth = updateInlineTagDepth(line, inlineTagDepth);
+        }
+
+        return trimBlankLines(body.toString());
+    }
+
+    private boolean startsBlockTag(final String line) {
+        final String trimmed = line.trim();
+        return trimmed.length() > 1 && trimmed.charAt(0) == '@' && Character.isJavaIdentifierStart(trimmed.charAt(1));
+    }
+
+    @SuppressWarnings("checkstyle:CyclomaticComplexity")
+    private void renderFragment(final String fragment, final StringBuilder rendered) {
+        int index = 0;
+        while (index < fragment.length()) {
+            final char current = fragment.charAt(index);
+            if (current == '{' && index + 1 < fragment.length() && fragment.charAt(index + 1) == '@') {
+                final int nextIndex = renderInlineTag(fragment, index, rendered);
+                if (nextIndex > index) {
+                    index = nextIndex;
+                    continue;
+                }
+            }
+            if (current == '<') {
+                final int nextIndex = renderHtmlTag(fragment, index, rendered);
+                if (nextIndex > index) {
+                    index = nextIndex;
+                    continue;
+                }
+                rendered.append(HTML_LT);
+                index++;
+                continue;
+            }
+            if (current == '&') {
+                final int nextIndex = renderEntityReference(fragment, index, rendered);
+                if (nextIndex > index) {
+                    index = nextIndex;
+                    continue;
+                }
+                rendered.append(HTML_AMP);
+                index++;
+                continue;
+            }
+            if (current == '>') {
+                rendered.append(HTML_GT);
+                index++;
+                continue;
+            }
+            rendered.append(current);
+            index++;
+        }
+    }
+
+    @SuppressWarnings("checkstyle:ReturnCount")
+    private int renderInlineTag(final String fragment, final int start, final StringBuilder rendered) {
+        final int end = findInlineTagEnd(fragment, start);
+        if (end < 0) {
+            return start;
+        }
+
+        final String content = fragment.substring(start + 2, end).trim();
+        if (content.isEmpty()) {
+            return end + 1;
+        }
+
+        final int separator = findWhitespace(content);
+        final String tag = separator < 0 ? content : content.substring(0, separator);
+        final String payload = separator < 0 ? "" : content.substring(separator + 1).trim();
+
+        if (CODE_TAG.equals(tag)) {
+            appendCode(rendered, payload);
+            return end + 1;
+        }
+        if ("literal".equals(tag)) {
+            rendered.append(escapeText(payload));
+            return end + 1;
+        }
+        if ("link".equals(tag) || "linkplain".equals(tag)) {
+            appendLink(rendered, payload);
+            return end + 1;
+        }
+
+        rendered.append(escapeText(content));
+        return end + 1;
+    }
+
+    @SuppressWarnings({
+            "checkstyle:CyclomaticComplexity",
+            "checkstyle:NPathComplexity",
+            "checkstyle:ReturnCount"})
+    private int renderHtmlTag(final String fragment, final int start, final StringBuilder rendered) {
+        if (start + 1 >= fragment.length() || Character.isWhitespace(fragment.charAt(start + 1))) {
+            return start;
+        }
+
+        final int end = fragment.indexOf('>', start + 1);
+        if (end < 0) {
+            return start;
+        }
+
+        final String rawTag = fragment.substring(start + 1, end).trim();
+        if (rawTag.isEmpty()) {
+            return start;
+        }
+
+        boolean closing = false;
+        String tag = rawTag;
+        if (tag.charAt(0) == '/') {
+            closing = true;
+            tag = tag.substring(1).trim();
+        }
+
+        if (tag.endsWith("/")) {
+            tag = tag.substring(0, tag.length() - 1).trim();
+        }
+
+        final int separator = findTagNameEnd(tag);
+        if (separator <= 0) {
+            return end + 1;
+        }
+
+        final String name = tag.substring(0, separator).toLowerCase(Locale.ROOT);
+        if ("br".equals(name)) {
+            appendLineBreak(rendered);
+            return end + 1;
+        }
+        if ("p".equals(name) || "ul".equals(name) || "ol".equals(name)) {
+            appendParagraphBreak(rendered);
+            return end + 1;
+        }
+        if ("li".equals(name)) {
+            if (!closing) {
+                startListItem(rendered);
+            }
+            return end + 1;
+        }
+        if (CODE_TAG.equals(name)) {
+            if (closing) {
+                return end + 1;
+            }
+            final int closingStart = findClosingTag(fragment, end + 1, CODE_TAG);
+            if (closingStart <= end) {
+                return end + 1;
+            }
+            appendCode(rendered, fragment.substring(end + 1, closingStart));
+            return closingStart + (CLOSING_TAG_PREFIX + CODE_TAG + HTML_TAG_END).length();
+        }
+
+        return end + 1;
+    }
+
+    private void appendLink(final StringBuilder rendered, final String payload) {
+        if (payload.isEmpty()) {
+            return;
+        }
+
+        final int separator = findWhitespace(payload);
+        final String label = separator < 0 ? "" : payload.substring(separator + 1).trim();
+        if (label.isEmpty()) {
+            final String reference = separator < 0 ? payload : payload.substring(0, separator);
+            rendered.append(escapeText(shortenReference(reference)));
+            return;
+        }
+
+        renderFragment(label, rendered);
+    }
+
+    private String shortenReference(final String reference) {
+        final String trimmed = reference.trim();
+        final int hashIndex = trimmed.lastIndexOf('#');
+        if (hashIndex >= 0 && hashIndex + 1 < trimmed.length()) {
+            return trimmed.substring(hashIndex + 1);
+        }
+
+        final int dotIndex = trimmed.lastIndexOf('.');
+        if (dotIndex >= 0 && dotIndex + 1 < trimmed.length()) {
+            return trimmed.substring(dotIndex + 1);
+        }
+
+        return trimmed;
+    }
+
+    private void appendCode(final StringBuilder rendered, final String payload) {
+        final String escaped = escapeText(payload);
+        final String marker = escaped.contains(INLINE_CODE_MARKER)
+                ? ESCAPED_INLINE_CODE_MARKER
+                : INLINE_CODE_MARKER;
+        rendered.append(marker)
+                .append(escaped)
+                .append(marker);
+    }
+
+    private void startListItem(final StringBuilder rendered) {
+        trimTrailingSpaces(rendered);
+        if (rendered.length() > 0 && rendered.charAt(rendered.length() - 1) != '\n') {
+            rendered.append('\n');
+        }
+        rendered.append("- ");
+    }
+
+    private void appendParagraphBreak(final StringBuilder rendered) {
+        trimTrailingSpaces(rendered);
+        if (rendered.length() == 0 || endsWith(rendered, PARAGRAPH_BREAK)) {
+            return;
+        }
+        if (rendered.charAt(rendered.length() - 1) == '\n') {
+            rendered.append('\n');
+            return;
+        }
+        rendered.append(PARAGRAPH_BREAK);
+    }
+
+    private void appendLineBreak(final StringBuilder rendered) {
+        trimTrailingSpaces(rendered);
+        if (rendered.length() == 0 || rendered.charAt(rendered.length() - 1) == '\n') {
+            return;
+        }
+        rendered.append('\n');
+    }
+
+    private String cleanup(final String rendered) {
+        final String[] lines = normalize(rendered).split("\n", -1);
+        final StringBuilder cleaned = new StringBuilder();
+        boolean blankLinePending = false;
+
+        for (String line : lines) {
+            final String trimmed = line.trim();
+            if (trimmed.isEmpty()) {
+                if (cleaned.length() > 0) {
+                    blankLinePending = true;
+                }
+                continue;
+            }
+
+            if (cleaned.length() > 0) {
+                cleaned.append(blankLinePending ? PARAGRAPH_BREAK : "\n");
+            }
+            cleaned.append(trimmed);
+            blankLinePending = false;
+        }
+
+        return cleaned.toString();
+    }
+
+    private String trimBlankLines(final String value) {
+        final String[] lines = normalize(value).split("\n", -1);
+        int start = 0;
+        int end = lines.length;
+
+        while (start < end && isBlank(lines[start])) {
+            start++;
+        }
+        while (end > start && isBlank(lines[end - 1])) {
+            end--;
+        }
+
+        final StringBuilder result = new StringBuilder();
+        for (int index = start; index < end; index++) {
+            if (result.length() > 0) {
+                result.append('\n');
+            }
+            result.append(lines[index]);
+        }
+        return result.toString();
+    }
+
+    private int updateInlineTagDepth(final String line, final int initialDepth) {
+        int depth = initialDepth;
+        int index = 0;
+        while (index < line.length()) {
+            final char current = line.charAt(index);
+            if (depth == 0) {
+                if (current == '{' && index + 1 < line.length() && line.charAt(index + 1) == '@') {
+                    depth = 1;
+                    index += 2;
+                    continue;
+                }
+            } else if (current == '{') {
+                depth++;
+            } else if (current == '}') {
+                depth--;
+            }
+            index++;
+        }
+        return depth;
+    }
+
+    private void trimTrailingSpaces(final StringBuilder builder) {
+        while (builder.length() > 0) {
+            final char current = builder.charAt(builder.length() - 1);
+            if (current != ' ' && current != '\t') {
+                break;
+            }
+            builder.deleteCharAt(builder.length() - 1);
+        }
+    }
+
+    private boolean endsWith(final StringBuilder builder, final String suffix) {
+        return builder.length() >= suffix.length()
+                && builder.substring(builder.length() - suffix.length()).equals(suffix);
+    }
+
+    private int findWhitespace(final String value) {
+        for (int index = 0; index < value.length(); index++) {
+            if (Character.isWhitespace(value.charAt(index))) {
+                return index;
+            }
+        }
+        return -1;
+    }
+
+    private int findTagNameEnd(final String tag) {
+        for (int index = 0; index < tag.length(); index++) {
+            final char current = tag.charAt(index);
+            if (!(Character.isLetterOrDigit(current) || current == '-' || current == '_')) {
+                return index;
+            }
+        }
+        return tag.length();
+    }
+
+    private int findClosingTag(final String fragment, final int fromIndex, final String tagName) {
+        return fragment.toLowerCase(Locale.ROOT).indexOf(CLOSING_TAG_PREFIX + tagName + HTML_TAG_END, fromIndex);
+    }
+
+    private int findInlineTagEnd(final String fragment, final int start) {
+        int depth = 1;
+        for (int index = start + 2; index < fragment.length(); index++) {
+            final char current = fragment.charAt(index);
+            if (current == '{') {
+                depth++;
+                continue;
+            }
+            if (current == '}') {
+                depth--;
+                if (depth == 0) {
+                    return index;
+                }
+            }
+        }
+        return -1;
+    }
+
+    private String trimTrailingWhitespace(final String line) {
+        int end = line.length();
+        while (end > 0) {
+            final char current = line.charAt(end - 1);
+            if (current != ' ' && current != '\t') {
+                break;
+            }
+            end--;
+        }
+        return line.substring(0, end);
+    }
+
+    private String normalize(final String value) {
+        return value.replace("\r\n", "\n").replace('\r', '\n');
+    }
+
+    private boolean isBlank(final String value) {
+        for (int index = 0; index < value.length(); index++) {
+            if (!Character.isWhitespace(value.charAt(index))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private int renderEntityReference(final String fragment, final int start, final StringBuilder rendered) {
+        final int end = fragment.indexOf(';', start + 1);
+        if (end < 0) {
+            return start;
+        }
+
+        final String decoded = decodeEntity(fragment.substring(start + 1, end));
+        if (decoded == null) {
+            return start;
+        }
+
+        rendered.append(escapeText(decoded));
+        return end + 1;
+    }
+
+    @SuppressWarnings({
+            "checkstyle:CyclomaticComplexity",
+            "checkstyle:NPathComplexity",
+            "checkstyle:ReturnCount"})
+    private String decodeEntity(final String entity) {
+        if (entity.isEmpty()) {
+            return null;
+        }
+
+        if (entity.charAt(0) == '#') {
+            return decodeNumericEntity(entity);
+        }
+
+        if ("amp".equals(entity)) {
+            return Character.toString('&');
+        }
+        if ("lt".equals(entity)) {
+            return Character.toString('<');
+        }
+        if ("gt".equals(entity)) {
+            return Character.toString('>');
+        }
+        if ("quot".equals(entity)) {
+            return "\"";
+        }
+        if ("apos".equals(entity)) {
+            return "'";
+        }
+        if ("nbsp".equals(entity)) {
+            return " ";
+        }
+        if ("lbrace".equals(entity)) {
+            return "{";
+        }
+        if ("rbrace".equals(entity)) {
+            return "}";
+        }
+        if ("commat".equals(entity)) {
+            return Character.toString('@');
+        }
+        return null;
+    }
+
+    private String decodeNumericEntity(final String entity) {
+        try {
+            final int codePoint;
+            if (entity.startsWith("#x") || entity.startsWith("#X")) {
+                codePoint = Integer.parseInt(entity.substring(2), 16);
+            } else {
+                codePoint = Integer.parseInt(entity.substring(1), 10);
+            }
+            return new String(Character.toChars(codePoint));
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    private String escapeText(final String value) {
+        final StringBuilder escaped = new StringBuilder();
+        int index = 0;
+        while (index < value.length()) {
+            final char current = value.charAt(index);
+            if (current == '&') {
+                final int nextIndex = renderEntityReference(value, index, escaped);
+                if (nextIndex > index) {
+                    index = nextIndex;
+                    continue;
+                }
+                escaped.append(HTML_AMP);
+            } else if (current == '<') {
+                escaped.append(HTML_LT);
+            } else if (current == '>') {
+                escaped.append(HTML_GT);
+            } else {
+                escaped.append(current);
+            }
+            index++;
+        }
+        return escaped.toString();
+    }
+}
diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
index f423c7bb4..acc1d5559 100644
--- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
@@ -54,6 +54,7 @@ public class JavaDocDescriptionsProcessor extends AbstractProcessor {
     private Filer filer;
     private Elements elementUtils;
     private Messager messager;
+    private JavaDocDescriptionRenderer renderer;
 
     @Override
     @SuppressWarnings("PMD.AvoidSynchronizedAtMethodLevel")
@@ -62,6 +63,7 @@ public synchronized void init(final ProcessingEnvironment env) {
         filer = env.getFiler();
         elementUtils = env.getElementUtils();
         messager = env.getMessager();
+        renderer = new JavaDocDescriptionRenderer();
     }
 
     @Override
@@ -76,12 +78,11 @@ public boolean process(final Set<? extends TypeElement> annotations, final Round
         final Set<ExecutableElement> methods = ElementFilter.methodsIn(elements);
         methods.forEach(method -> {
             final String rawDocs = elementUtils.getDocComment(method);
-
             if (rawDocs == null) {
                 return;
             }
 
-            final String docs = rawDocs.trim();
+            final String docs = renderer.render(rawDocs);
             if (docs.isEmpty()) {
                 return;
             }
diff --git a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/JavaDocDescriptionRendererTest.java b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/JavaDocDescriptionRendererTest.java
new file mode 100644
index 000000000..180d2b03a
--- /dev/null
+++ b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/JavaDocDescriptionRendererTest.java
@@ -0,0 +1,328 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.description;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class JavaDocDescriptionRendererTest {
+
+    private final JavaDocDescriptionRenderer renderer = new JavaDocDescriptionRenderer();
+
+    @Test
+    void shouldRenderPlainTextAndTrimBlankLines() {
+        final String rendered = renderer.render(
+                "\r\n"
+                + "  First line   \r\n"
+                + "\r\n"
+                + "  Second line\t\r\n"
+                + "\r\n"
+        );
+
+        assertThat(rendered)
+                .isEqualTo("First line\n\nSecond line");
+    }
+
+    @Test
+    void shouldReturnEmptyStringWhenBodyContainsOnlyBlockTags() {
+        final String rendered = renderer.render(
+                "@param value description\n"
+                + "@throws Exception description"
+        );
+
+        assertThat(rendered)
+                .isEmpty();
+    }
+
+    @Test
+    void shouldIgnoreBlockTagsAndEverythingAfterThem() {
+        final String rendered = renderer.render(
+                "Summary paragraph.\n"
+                + "\n"
+                + "@param value Description of the value.\n"
+                + "Continuation that should also be ignored."
+        );
+
+        assertThat(rendered)
+                .isEqualTo("Summary paragraph.");
+    }
+
+    @Test
+    void shouldIgnoreStandardBlockTagsAfterMainDescription() {
+        final List<String> blockTags = List.of(
+                "author",
+                "deprecated",
+                "exception",
+                "hidden",
+                "param",
+                "provides",
+                "return",
+                "see",
+                "serial",
+                "serialData",
+                "serialField",
+                "since",
+                "spec",
+                "throws",
+                "uses",
+                "version"
+        );
+
+        for (String blockTag : blockTags) {
+            assertThat(renderer.render("Summary paragraph.\n@" + blockTag + " metadata"))
+                    .as(blockTag)
+                    .isEqualTo("Summary paragraph.");
+        }
+    }
+
+    @Test
+    void shouldNotTreatAtSignsInsideTextAsBlockTags() {
+        final String rendered = renderer.render(
+                "Email support@example.com\n"
+                + "Use @smoke in prose."
+        );
+
+        assertThat(rendered)
+                .isEqualTo("Email support@example.com\nUse @smoke in prose.");
+    }
+
+    @Test
+    void shouldDecodeEscapedAtEntityBeforeBlockTags() {
+        final String rendered = renderer.render(
+                "&#064;version stays in prose.\n"
+                + "@version 2.4.0"
+        );
+
+        assertThat(rendered)
+                .isEqualTo("@version stays in prose.");
+    }
+
+    @Test
+    void shouldPreserveUnicodeCharactersInDescriptions() {
+        final String rendered = renderer.render("Release notes: cafe, café, Привет, 東京, λ.");
+
+        assertThat(rendered)
+                .isEqualTo("Release notes: cafe, café, Привет, 東京, λ.");
+    }
+
+    @Test
+    void shouldDecodeSupportedNamedAndNumericEntities() {
+        final String rendered = renderer.render(
+                "Use &lt;tag&gt;, &amp;, &lbrace;x&rbrace;, &#064;, &#955;, and &#x03BB;."
+        );
+
+        assertThat(rendered)
+                .isEqualTo("Use &lt;tag&gt;, &amp;, {x}, @, λ, and λ.");
+    }
+
+    @Test
+    void shouldRenderSupportedInlineTags() {
+        final String rendered = renderer.render(
+                "Use {@code a < b}, {@literal <safe>}, "
+                + "{@link java.lang.String}, "
+                + "{@linkplain java.lang.String#valueOf(Object)}, "
+                + "{@link java.util.List list docs}."
+        );
+
+        assertThat(rendered)
+                .isEqualTo("Use `a &lt; b`, &lt;safe&gt;, String, valueOf(Object), list docs.");
+    }
+
+    @Test
+    void shouldSupportBalancedBracesInsideInlineTags() {
+        final String rendered = renderer.render(
+                "Payload {@code {\"outer\": {\"inner\": true}}}."
+        );
+
+        assertThat(rendered)
+                .isEqualTo("Payload `{\"outer\": {\"inner\": true}}`.");
+    }
+
+    @Test
+    void shouldNotTreatAtLinesInsideBalancedInlineTagsAsBlockTags() {
+        final String rendered = renderer.render(
+                "Summary {@literal first line\n"
+                + "@notATag\n"
+                + "last line}\n"
+                + "@param ignored"
+        );
+
+        assertThat(rendered)
+                .isEqualTo("Summary first line\n@notATag\nlast line");
+    }
+
+    @Test
+    void shouldRenderNestedInlineTagsInsideLinkLabels() {
+        final String rendered = renderer.render(
+                "See {@linkplain java.util.List docs with {@code List}}."
+        );
+
+        assertThat(rendered)
+                .isEqualTo("See docs with `List`.");
+    }
+
+    @Test
+    void shouldSafelyDegradeUnsupportedStandardInlineTags() {
+        final String rendered = renderer.render(
+                "Fallbacks: {@docRoot}, {@inheritDoc}, {@index release}, "
+                + "{@summary quick summary}, {@systemProperty user.home}, "
+                + "{@value java.lang.Integer#MAX_VALUE}."
+        );
+
+        assertThat(rendered)
+                .isEqualTo(
+                        "Fallbacks: docRoot, inheritDoc, index release, summary quick summary, "
+                        + "systemProperty user.home, value java.lang.Integer#MAX_VALUE."
+                );
+    }
+
+    @Test
+    void shouldSafelyDegradeSnippetTags() {
+        final String rendered = renderer.render(
+                "Snippet {@snippet :\n"
+                + "int answer = 42;\n"
+                + "@highlight substring=\"answer\"\n"
+                + "}."
+        );
+
+        assertThat(rendered)
+                .isEqualTo("Snippet snippet :\nint answer = 42;\n@highlight substring=\"answer\".");
+    }
+
+    @Test
+    void shouldEscapeUnknownInlineTags() {
+        final String rendered = renderer.render("Unsupported {@unknown <tag>} clause.");
+
+        assertThat(rendered)
+                .isEqualTo("Unsupported unknown &lt;tag&gt; clause.");
+    }
+
+    @Test
+    void shouldPreserveMalformedInlineTagsAsText() {
+        final String rendered = renderer.render("Broken {@code tag");
+
+        assertThat(rendered)
+                .isEqualTo("Broken {@code tag");
+    }
+
+    @Test
+    void shouldRenderSupportedHtmlStructure() {
+        final String rendered = renderer.render(
+                "First<p>Second<br>Third<ul><li>one</li><li>two</li></ul><ol><li>three</li></ol>"
+        );
+
+        assertThat(rendered)
+                .isEqualTo("First\n\nSecond\nThird\n\n- one\n- two\n\n- three");
+    }
+
+    @Test
+    void shouldIgnoreUnclosedHtmlTagsSafely() {
+        final String rendered = renderer.render("Broken <b>bold <i>text");
+
+        assertThat(rendered)
+                .isEqualTo("Broken bold text");
+    }
+
+    @Test
+    void shouldPreserveAngleBracketComparisonsAsText() {
+        final String rendered = renderer.render("Math says a < b > c.");
+
+        assertThat(rendered)
+                .isEqualTo("Math says a &lt; b &gt; c.");
+    }
+
+    @Test
+    void shouldIgnoreUnmatchedCodeHtmlTagsSafely() {
+        final String rendered = renderer.render("Broken <code>value < limit and stray </code>tag");
+
+        assertThat(rendered)
+                .isEqualTo("Broken `value &lt; limit and stray `tag");
+    }
+
+    @Test
+    void shouldIgnoreOpeningCodeTagWithoutClosingTag() {
+        final String rendered = renderer.render("Broken <code>value < limit");
+
+        assertThat(rendered)
+                .isEqualTo("Broken value &lt; limit");
+    }
+
+    @Test
+    void shouldIgnoreClosingCodeTagWithoutOpeningTag() {
+        final String rendered = renderer.render("Broken </code>tag");
+
+        assertThat(rendered)
+                .isEqualTo("Broken tag");
+    }
+
+    @Test
+    void shouldRenderHtmlCodeTagAsCodeSpan() {
+        final String rendered = renderer.render("<code>name < value & more</code>");
+
+        assertThat(rendered)
+                .isEqualTo("`name &lt; value &amp; more`");
+    }
+
+    @Test
+    void shouldLeaveUnknownEntitiesEscaped() {
+        final String rendered = renderer.render("Keep &notAnEntity; literal.");
+
+        assertThat(rendered)
+                .isEqualTo("Keep &amp;notAnEntity; literal.");
+    }
+
+    @Test
+    void shouldDropUnknownHtmlTagsButKeepTheirTextContentEscaped() {
+        final String rendered = renderer.render(
+                "prefix <script>alert(\"x\")</script> <div>safe & sound</div>"
+        );
+
+        assertThat(rendered)
+                .isEqualTo("prefix alert(\"x\") safe &amp; sound");
+    }
+
+    @Test
+    void shouldRenderComplexModernJavadocExampleSafely() {
+        final String rendered = renderer.render(
+                "Fetches release metadata for the current build.\n"
+                + "\n"
+                + "<p>Use {@link java.net.URI URIs} for endpoint configuration.</p>\n"
+                + "<ul>\n"
+                + "<li>Supports café, Привет, 東京, and λ.</li>\n"
+                + "<li>See the <a href=\"https://docs.oracle.com/\">Javadoc specification</a> "
+                + "and {@linkplain java.lang.String#formatted(Object...) formatted examples}.</li>\n"
+                + "</ul>\n"
+                + "Example: <code>client.fetch(\"v2\")</code>\n"
+                + "&#064;beta remains prose.\n"
+                + "@author Jane Doe\n"
+                + "@version 2.3.0\n"
+                + "@since 2.0"
+        );
+
+        assertThat(rendered)
+                .isEqualTo(
+                        "Fetches release metadata for the current build.\n\n"
+                        + "Use URIs for endpoint configuration.\n\n"
+                        + "- Supports café, Привет, 東京, and λ.\n"
+                        + "- See the Javadoc specification and formatted examples.\n\n"
+                        + "Example: `client.fetch(\"v2\")`\n"
+                        + "@beta remains prose."
+                );
+    }
+}
diff --git a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
index bf29d9f1c..29f80277e 100644
--- a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
+++ b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
@@ -194,4 +194,108 @@ void captureDescriptionParametrizedTestWithPrimitivesParameterTest() {
                 .contentsAsUtf8String()
                 .isEqualTo("Captured javadoc description");
     }
+
+    @Test
+    void shouldIgnoreBlockTagsAndRenderSafeMarkdown() {
+        final String expectedMethodSignatureHash = "4e7f896021ef2fce7c1deb7f5b9e38fb";
+
+        final JavaFileObject source = JavaFileObjects.forSourceLines(
+                "io.qameta.allure.description.test.DescriptionSample",
+                "package io.qameta.allure.description.test;",
+                "import io.qameta.allure.Description;",
+                "",
+                "public class DescriptionSample {",
+                "",
+                "/**",
+                "* This is my test description with {@code sample} and {@literal <safe>}.",
+                "*",
+                "* <p>Use {@link java.lang.String String} for values.</p>",
+                "* <ul>",
+                "*     <li>first item</li>",
+                "*     <li>second <b>item</b></li>",
+                "* </ul>",
+                "* <script>alert(\"xss\")</script>",
+                "*",
+                "* @throws Exception",
+                "*             Thrown when the test unexpectedly fails.",
+                "*/",
+                "@Description",
+                "public void sampleTest() throws Exception {",
+                "}",
+                "}"
+        );
+
+        final Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor())
+                .withOptions("-Werror");
+        final Compilation compilation = compiler.compile(source);
+        assertThat(compilation)
+                .generatedFile(
+                        StandardLocation.CLASS_OUTPUT,
+                        "",
+                        ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
+                )
+                .contentsAsUtf8String()
+                .isEqualTo(
+                        "This is my test description with `sample` and &lt;safe&gt;.\n\n"
+                        + "Use String for values.\n\n"
+                        + "- first item\n"
+                        + "- second item\n\n"
+                        + "alert(\"xss\")"
+                );
+    }
+
+    @Test
+    void shouldCaptureComplexModernJavadocDescriptionSafely() {
+        final String expectedMethodSignatureHash = "4e7f896021ef2fce7c1deb7f5b9e38fb";
+
+        final JavaFileObject source = JavaFileObjects.forSourceLines(
+                "io.qameta.allure.description.test.DescriptionSample",
+                "package io.qameta.allure.description.test;",
+                "import io.qameta.allure.Description;",
+                "",
+                "public class DescriptionSample {",
+                "",
+                "/**",
+                "* Fetches release metadata for the current build.",
+                "*",
+                "* <p>Use {@link java.net.URI URIs} for endpoint configuration.</p>",
+                "* <ul>",
+                "*     <li>Supports café, Привет, 東京, and λ.</li>",
+                "*     <li>See the <a href=\"https://docs.oracle.com/\">Javadoc specification</a>",
+                "*     and {@linkplain java.lang.String#formatted(Object...) formatted examples}.</li>",
+                "* </ul>",
+                "* Example: <code>client.fetch(\"v2\")</code>",
+                "* &#064;beta remains prose.",
+                "*",
+                "* @author Jane Doe",
+                "* @version 2.3.0",
+                "* @since 2.0",
+                "* @see <a href=\"https://download.java.net/java/early_access/jdk27/docs/specs/javadoc/doc-comment-spec.html\">Javadoc spec</a>",
+                "*/",
+                "@Description",
+                "public void sampleTest() {",
+                "}",
+                "}"
+        );
+
+        final Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor())
+                .withOptions("-Werror");
+        final Compilation compilation = compiler.compile(source);
+        assertThat(compilation)
+                .generatedFile(
+                        StandardLocation.CLASS_OUTPUT,
+                        "",
+                        ALLURE_DESCRIPTIONS_FOLDER + expectedMethodSignatureHash
+                )
+                .contentsAsUtf8String()
+                .isEqualTo(
+                        "Fetches release metadata for the current build.\n\n"
+                        + "Use URIs for endpoint configuration.\n\n"
+                        + "- Supports café, Привет, 東京, and λ.\n"
+                        + "- See the Javadoc specification\n"
+                        + "and formatted examples.\n\n"
+                        + "Example: `client.fetch(\"v2\")`\n"
+                        + "@beta remains prose."
+                );
+    }
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Description.java b/allure-java-commons/src/main/java/io/qameta/allure/Description.java
index b349a7c06..7c879eade 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Description.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Description.java
@@ -35,8 +35,7 @@
     String value() default "";
 
     /**
-     * Use annotated method's javadoc to extract description that
-     * supports html markdown.
+     * Use annotated method's javadoc to extract a safe markdown/plain-text description.
      *
      * @return boolean flag to enable description extraction from javadoc.
      * @deprecated use {@link Description} without value specified instead.
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index 289df7dfa..d8d3b7f8c 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -304,7 +304,7 @@ public static Optional<String> getJavadocDescription(final ClassLoader classLoad
                 parameterTypes);
 
         return readResource(classLoader, ALLURE_DESCRIPTIONS_FOLDER + signatureHash)
-                .map(desc -> separateLines() ? desc.replace("\n", "<br />") : desc);
+                .map(desc -> separateLines() ? toMarkdownLineBreaks(desc) : desc);
     }
 
     public static Optional<String> firstNonEmpty(final String... items) {
@@ -390,7 +390,7 @@ public static void processDescription(final ClassLoader classLoader,
             final Description annotation = method.getAnnotation(Description.class);
             if ("".equals(annotation.value())) {
                 getJavadocDescription(classLoader, method)
-                        .ifPresent(setDescriptionHtml);
+                        .ifPresent(setDescription);
             } else {
                 final String description = annotation.value();
                 setDescription.accept(description);
@@ -398,6 +398,20 @@ public static void processDescription(final ClassLoader classLoader,
         }
     }
 
+    private static String toMarkdownLineBreaks(final String description) {
+        final String[] lines = description.split("\n", -1);
+        final StringBuilder markdown = new StringBuilder();
+        for (int index = 0; index < lines.length; index++) {
+            if (index > 0) {
+                final String previousLine = lines[index - 1];
+                final String currentLine = lines[index];
+                markdown.append(previousLine.isEmpty() || currentLine.isEmpty() ? "\n" : "  \n");
+            }
+            markdown.append(lines[index]);
+        }
+        return markdown.toString();
+    }
+
     private static Optional<String> readResource(final ClassLoader classLoader, final String resourceName) {
         try (InputStream is = classLoader.getResourceAsStream(resourceName)) {
             if (Objects.isNull(is)) {
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
index ebb98067c..29de4f124 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -65,7 +65,6 @@
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.RunUtils;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.ResourceLock;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
@@ -589,15 +588,14 @@ void shouldSetOwner() {
     }
 
     @AllureFeatures.Descriptions
-    @Disabled("Fails when run using IDEA")
     @Test
     void shouldSetJavadocDescription() {
         final AllureResults results = runClasses(DescriptionJavadocTest.class);
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getDescriptionHtml)
-                .contains(" Test javadoc description.\n");
+                .extracting(TestResult::getDescription, TestResult::getDescriptionHtml)
+                .containsExactly(tuple("Test javadoc description.", null));
     }
 
     @AllureFeatures.Attachments
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java
index c34d8dc8f..d0247b9dc 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DescriptionJavadocTest.java
@@ -25,9 +25,11 @@ public class DescriptionJavadocTest {
 
     /**
      * Test javadoc description.
+     *
+     * @throws Exception if block tags are not filtered out.
      */
     @Description(useJavaDoc = true)
     @Test
-    void testWithJavadocDescription() {
+    void testWithJavadocDescription() throws Exception {
     }
 }
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
index 555632fbd..0fbb5f9cf 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/DescriptionsJavadoc.java
@@ -25,9 +25,11 @@ public class DescriptionsJavadoc {
 
     /**
      * Description from javadoc.
+     *
+     * @throws Exception if block tags are not filtered out.
      */
     @Description
     @Test
-    public void simpleTest() {
+    public void simpleTest() throws Exception {
     }
 }
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
index 0148ad0da..bc1f54bf0 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -201,16 +201,16 @@ public void descriptionsWithLineSeparationTest() {
             System.setProperty(ALLURE_SEPARATE_LINES_SYSPROP, "true");
         }
         try {
-            final String testDescription = "Sample test description<br /> - next line<br /> - another line";
+            final String testDescription = "Sample test description  \n- next line  \n- another line";
             final AllureResults results = runTestNgSuites("suites/descriptions-test.xml");
             List<TestResult> testResult = results.getTestResults();
 
             assertThat(testResult).as("Test case result has not been written")
                     .hasSize(2)
                     .filteredOn(result -> result.getName().equals("testSeparated"))
-                    .extracting(result -> result.getDescriptionHtml().trim())
+                    .extracting(TestResult::getDescription, TestResult::getDescriptionHtml)
                     .as("Javadoc description of test case has not been processed correctly")
-                    .contains(testDescription);
+                    .contains(tuple(testDescription, null));
         } finally {
             System.setProperty(ALLURE_SEPARATE_LINES_SYSPROP, String.valueOf(initialSeparateLines));
         }
@@ -226,10 +226,9 @@ public void descriptionsTest() {
         assertThat(testResult).as("Test case result has not been written")
                 .hasSize(2)
                 .filteredOn(result -> result.getName().equals("test"))
-                .extracting(TestResult::getDescriptionHtml)
-                .map(String::trim)
+                .extracting(TestResult::getDescription, TestResult::getDescriptionHtml)
                 .as("Javadoc description of test case has not been processed")
-                .contains(testDescription);
+                .contains(tuple(testDescription, null));
     }
 
     @AllureFeatures.Descriptions
@@ -246,9 +245,15 @@ public void descriptionsBefores(final XmlSuite.ParallelMode mode, final int thre
         assertThat(testContainers).as("Test containers has not been written")
                 .isNotEmpty()
                 .filteredOn(container -> !container.getBefores().isEmpty())
-                .extracting(container -> container.getBefores().get(0).getDescriptionHtml().trim())
+                .extracting(
+                        container -> container.getBefores().get(0).getDescription(),
+                        container -> container.getBefores().get(0).getDescriptionHtml()
+                )
                 .as("Javadoc description of befores have not been processed")
-                .containsOnly(beforeClassDescription, beforeMethodDescription);
+                .containsOnly(
+                        tuple(beforeClassDescription, null),
+                        tuple(beforeMethodDescription, null)
+                );
     }
 
     @AllureFeatures.Descriptions
@@ -1382,24 +1387,27 @@ private static void assertBeforeFixtures(String containerName, List<TestResultCo
     }
 
     @Step("Check that before fixtures javadoc description refer to correct fixture methods")
-    private static void checkBeforeJavadocDescriptions(List<TestResultContainer> containers, String methodReference, String expectedDescriptionHtml) {
+    private static void checkBeforeJavadocDescriptions(List<TestResultContainer> containers, String methodReference, String expectedDescription) {
         assertThat(containers).as("Test containers has not been written")
                 .isNotEmpty()
                 .filteredOn(container -> !container.getBefores().isEmpty())
                 .filteredOn(container -> container.getName().equals(methodReference))
-                .extracting(container -> container.getBefores().get(0).getDescriptionHtml().trim())
+                .extracting(
+                        container -> container.getBefores().get(0).getDescription(),
+                        container -> container.getBefores().get(0).getDescriptionHtml()
+                )
                 .as("Javadoc description of befores have been processed incorrectly")
-                .containsOnly(expectedDescriptionHtml);
+                .containsOnly(tuple(expectedDescription, null));
     }
 
     @Step("Check that javadoc description of tests refer to correct test methods")
-    private static void checkTestJavadocDescriptions(List<TestResult> results, String methodReference, String expectedDescriptionHtml) {
+    private static void checkTestJavadocDescriptions(List<TestResult> results, String methodReference, String expectedDescription) {
         assertThat(results).as("Test results has not been written")
                 .isNotEmpty()
                 .filteredOn(result -> result.getFullName().equals(methodReference))
-                .extracting(result -> result.getDescriptionHtml().trim())
+                .extracting(TestResult::getDescription, TestResult::getDescriptionHtml)
                 .as("Javadoc description of befores have been processed incorrectly")
-                .containsOnly(expectedDescriptionHtml);
+                .containsOnly(tuple(expectedDescription, null));
     }
 
     private final TestPlanV1_0.TestCase onlyId2 = new TestPlanV1_0.TestCase().setId("2");

From db7274478b6cbd09e489fb5153ca68ed2278364b Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 1 Apr 2026 18:18:28 +0100
Subject: [PATCH 218/233] chore(allure-restassured): add test to verify null
 param issue (fixes #1167, via #1259)

Co-authored-by: Dmitry Baev <baev@users.noreply.github.com>
---
 .../restassured/AllureRestAssuredTest.java    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
index 2210b7dc3..c35cef0d7 100644
--- a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
+++ b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
@@ -36,6 +36,7 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -301,6 +302,33 @@ void shouldRenderListValuedFormParams() {
                 .contains("data=[a, b]");
     }
 
+    @Test
+    void shouldNotFailForNullValuedFormParamsMap() {
+        final ResponseDefinitionBuilder responseBuilder = WireMock.aResponse()
+                .withStatus(200)
+                .withBody("some body");
+
+        final Map<String, Object> formParams = new LinkedHashMap<>();
+        formParams.put("param1", "value1");
+        formParams.put("param2", null);
+
+        final AllureResults results = executeWithStub(
+                server -> WireMock.stubFor(WireMock.post(WireMock.urlPathEqualTo("/hello"))
+                        .willReturn(responseBuilder)),
+                server -> RestAssured.given()
+                        .contentType(ContentType.URLENC)
+                        .formParams(formParams)
+                        .post(server.url("/hello")).then().statusCode(200)
+        );
+
+        assertThat(results.getTestResults()
+                .stream()
+                .map(TestResult::getAttachments)
+                .flatMap(Collection::stream)
+                .map(Attachment::getName))
+                .containsExactly("Request", "HTTP/1.1 200 OK");
+    }
+
     protected final AllureResults executeWithStub(final Consumer<WireMockServer> stubSetup,
                                                   final Consumer<WireMockServer> requestExecutor) {
         return executeWithStub(stubSetup, requestExecutor, new AllureRestAssured());

From 822cb2c535213295fc58fe9d9d680f498b99044c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2026 18:19:19 +0100
Subject: [PATCH 219/233] build(deps): bump gradle/actions from 5 to 6 (via
 #1252)

---
 .github/workflows/dependency-submission.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index 748dfe670..d02a1dbee 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.github/workflows/dependency-submission.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v6
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@v5
+        uses: gradle/actions/dependency-submission@v6
         env:
           DEPENDENCY_GRAPH_EXCLUDE_PROJECTS: ':allure-java-commons-test'
           DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS: 'runtimeClasspath'

From 1f5fab882bcebfb2a25b44b54fd191d23c84c746 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 8 Apr 2026 12:00:51 +0100
Subject: [PATCH 220/233] bump restassured to 6 (via #1260)

---
 allure-rest-assured/build.gradle.kts                        | 6 +++++-
 .../io/qameta/allure/restassured/AllureRestAssured.java     | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/allure-rest-assured/build.gradle.kts b/allure-rest-assured/build.gradle.kts
index 4834fa00a..0f88a16d7 100644
--- a/allure-rest-assured/build.gradle.kts
+++ b/allure-rest-assured/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Rest-Assured Integration"
 
-val restAssuredVersion = "5.5.6"
+val restAssuredVersion = "6.0.0"
 
 dependencies {
     api(project(":allure-attachments"))
@@ -29,3 +29,7 @@ tasks.jar {
 tasks.test {
     useJUnitPlatform()
 }
+
+tasks.compileJava {
+    options.release.set(17)
+}
diff --git a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
index d59e998ac..51c166ae2 100644
--- a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
+++ b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
@@ -150,7 +150,7 @@ public Response filter(final FilterableRequestSpecification requestSpec,
     }
 
     private static Map<String, String> toMapConverter(final Iterable<? extends NameAndValue> items,
-                                                      final Set<String> toHide) {
+                                                          final Set<String> toHide) {
         final Map<String, String> result = new HashMap<>();
         items.forEach(h -> result.put(h.getName(), toHide.contains(h.getName()) ? HIDDEN_PLACEHOLDER : h.getValue()));
         return result;

From 60c3bd11f65318574d3430aea92716e2f946f7c6 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Thu, 9 Apr 2026 09:25:33 +0000
Subject: [PATCH 221/233] release 2.34.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ffccaed3a..b41179d66 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.34-SNAPSHOT
+version=2.34.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From bb7e6fec4fa8e4dc8fef97df44f81ad1a30ba343 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Thu, 9 Apr 2026 09:25:34 +0000
Subject: [PATCH 222/233] set next development version 2.35

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index b41179d66..b5be834c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.34.0
+version=2.35-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From bee34be982bdac7ff97e8350bb9ed58742a41610 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 9 Apr 2026 11:00:59 +0100
Subject: [PATCH 223/233] Rename allure-junit5 to allure-jupiter (via #1262)

---
 .github/ISSUE_TEMPLATE/bug_report.yml         |   3 +
 .github/labeler.yml                           |   4 +-
 README.md                                     |  11 +-
 allure-bom/build.gradle.kts                   |   2 +
 .../org.junit.jupiter.api.extension.Extension |   1 -
 .../org.junit.jupiter.api.extension.Extension |   1 -
 .../README.MD                                 |   4 +-
 .../build.gradle.kts                          |  13 +-
 .../junit5assert/AllureJunit5Assert.java      |  26 +++
 .../jupiterassert/AllureJupiterAssert.java    |  28 ++-
 .../src/main/resources/META-INF/aop-ajc.xml   |   2 +-
 .../junit5assert/AllureJunit5AssertTest.java  |   0
 .../AllureJupiterAssertTest.java              |  41 +++++
 .../src/test/resources/allure.properties      |   0
 .../build.gradle.kts                          |   9 +-
 .../io/qameta/allure/junit5/AllureJunit5.java |  26 +++
 .../qameta/allure/jupiter/AllureJupiter.java  |  31 +++-
 .../org.junit.jupiter.api.extension.Extension |   1 +
 .../AllureJunit5Junit6CompatibilityTest.java  |  27 ++-
 .../allure/junit5/AllureJunit5Test.java       |   0
 .../AfterEachFixtureBrokenSupport.java        |   0
 .../junit5/features/AllFixtureSupport.java    |   0
 .../BeforeAllFixtureFailureSupport.java       |   0
 .../BeforeEachFixtureBrokenSupport.java       |   0
 .../junit5/features/EachFixtureSupport.java   |   0
 ...ParameterisedBlankParameterValueTests.java |   0
 .../ParameterisedPrimitivesTests.java         |   0
 .../junit5/features/ParameterisedTests.java   |   0
 .../ParameterisedWithInjectablesTests.java    |   0
 .../junit5/features/SkipOtherInjectables.java |   0
 .../AllureJupiterJunit6CompatibilityTest.java | 165 ++++++++++++++++++
 .../org.junit.jupiter.api.extension.Extension |   1 +
 .../src/test/resources/allure.properties      |   0
 allure-scalatest/build.gradle.kts             |   7 -
 build.gradle.kts                              |  87 +++++++--
 settings.gradle.kts                           |   4 +-
 36 files changed, 426 insertions(+), 68 deletions(-)
 delete mode 100644 allure-junit5/src/main/services/org.junit.jupiter.api.extension.Extension
 delete mode 100644 allure-junit5/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
 rename {allure-junit5-assert => allure-jupiter-assert}/README.MD (78%)
 rename {allure-junit5-assert => allure-jupiter-assert}/build.gradle.kts (64%)
 create mode 100644 allure-jupiter-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
 rename allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java => allure-jupiter-assert/src/main/java/io/qameta/allure/jupiterassert/AllureJupiterAssert.java (87%)
 rename {allure-junit5-assert => allure-jupiter-assert}/src/main/resources/META-INF/aop-ajc.xml (56%)
 rename {allure-junit5-assert => allure-jupiter-assert}/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java (100%)
 create mode 100644 allure-jupiter-assert/src/test/java/io/qameta/allure/jupiterassert/AllureJupiterAssertTest.java
 rename {allure-junit5-assert => allure-jupiter-assert}/src/test/resources/allure.properties (100%)
 rename {allure-junit5 => allure-jupiter}/build.gradle.kts (84%)
 create mode 100644 allure-jupiter/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
 rename allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java => allure-jupiter/src/main/java/io/qameta/allure/jupiter/AllureJupiter.java (88%)
 create mode 100644 allure-jupiter/src/main/services/org.junit.jupiter.api.extension.Extension
 rename {allure-junit5 => allure-jupiter}/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java (87%)
 rename {allure-junit5 => allure-jupiter}/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java (100%)
 rename {allure-junit5 => allure-jupiter}/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java (100%)
 rename {allure-junit5 => allure-jupiter}/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java (100%)
 rename {allure-junit5 => allure-jupiter}/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java (100%)
 rename {allure-junit5 => allure-jupiter}/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java (100%)
 rename {allure-junit5 => allure-jupiter}/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java (100%)
 rename {allure-junit5 => allure-jupiter}/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java (100%)
 rename {allure-junit5 => allure-jupiter}/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java (100%)
 rename {allure-junit5 => allure-jupiter}/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java (100%)
 rename {allure-junit5 => allure-jupiter}/src/test/java/io/qameta/allure/junit5/features/ParameterisedWithInjectablesTests.java (100%)
 rename {allure-junit5 => allure-jupiter}/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java (100%)
 create mode 100644 allure-jupiter/src/test/java/io/qameta/allure/jupiter/AllureJupiterJunit6CompatibilityTest.java
 create mode 100644 allure-jupiter/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
 rename {allure-junit5 => allure-jupiter}/src/test/resources/allure.properties (100%)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index bb09719d9..319290ead 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -45,7 +45,10 @@ body:
         - allure-jsonunit
         - allure-junit-platform
         - allure-junit4
+        - allure-jupiter
+        - allure-jupiter-assert
         - allure-junit5
+        - allure-junit5-assert
         - allure-karate
         - allure-okhttp
         - allure-okhttp3
diff --git a/.github/labeler.yml b/.github/labeler.yml
index a419c97f9..367271a00 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -48,8 +48,8 @@
   - "allure-junit4-aspect/**"
 
 "theme:junit-platform":
-  - "allure-junit5/**"
-  - "allure-junit5-assert/**"
+  - "allure-jupiter/**"
+  - "allure-jupiter-assert/**"
   - "allure-junit-platform/**"
 
 "theme:karate":
diff --git a/README.md b/README.md
index e452787b3..5180b5077 100644
--- a/README.md
+++ b/README.md
@@ -37,11 +37,12 @@
 - 📚 Example project — https://github.com/allure-examples?q=topic%3Ajunit4
 - ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
 - 
-## JUnit 5
-
-- 🚀 Documentation — https://allurereport.org/docs/junit5/
-- 📚 Example project — https://github.com/allure-examples?q=topic%3Ajunit5
-- ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
+## JUnit Jupiter (JUnit 5 and 6)
+
+- 🚀 Documentation — https://allurereport.org/docs/junit5/
+- 📚 Example project — https://github.com/allure-examples?q=topic%3Ajunit5
+- ✅ Generate a project in 10 seconds via Allure Start - https://allurereport.org/start/
+- 🧩 Use `io.qameta.allure:allure-jupiter` for new setups. `allure-junit5` remains available as a deprecated compatibility alias during migration.
 
 ## Cucumber JVM
 
diff --git a/allure-bom/build.gradle.kts b/allure-bom/build.gradle.kts
index 9593300aa..0d83d95e9 100644
--- a/allure-bom/build.gradle.kts
+++ b/allure-bom/build.gradle.kts
@@ -8,6 +8,8 @@ dependencies {
     constraints {
         rootProject.subprojects.sorted()
                 .forEach { api("${it.group}:${it.name}:${it.version}") }
+        api("io.qameta.allure:allure-junit5:${project.version}")
+        api("io.qameta.allure:allure-junit5-assert:${project.version}")
     }
 }
 
diff --git a/allure-junit5/src/main/services/org.junit.jupiter.api.extension.Extension b/allure-junit5/src/main/services/org.junit.jupiter.api.extension.Extension
deleted file mode 100644
index 4a1ec18c0..000000000
--- a/allure-junit5/src/main/services/org.junit.jupiter.api.extension.Extension
+++ /dev/null
@@ -1 +0,0 @@
-io.qameta.allure.junit5.AllureJunit5
diff --git a/allure-junit5/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/allure-junit5/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
deleted file mode 100644
index 4a1ec18c0..000000000
--- a/allure-junit5/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
+++ /dev/null
@@ -1 +0,0 @@
-io.qameta.allure.junit5.AllureJunit5
diff --git a/allure-junit5-assert/README.MD b/allure-jupiter-assert/README.MD
similarity index 78%
rename from allure-junit5-assert/README.MD
rename to allure-jupiter-assert/README.MD
index 5124d63c9..1705bcae0 100644
--- a/allure-junit5-assert/README.MD
+++ b/allure-jupiter-assert/README.MD
@@ -1,4 +1,6 @@
-Adding JUnit5-assert may lead to java.lang.OutOfMemoryError: Java heap space
+Adding Jupiter assert may lead to java.lang.OutOfMemoryError: Java heap space
+
+The primary artifact is now `allure-jupiter-assert`. `allure-junit5-assert` remains available as a deprecated compatibility alias during the transition.
 
 Having a huge class path may lead to OOM, because AspectJ processes all the classes. [Link to documentation](https://www.eclipse.org/aspectj/doc/released/devguide/ltw.html) 
 
diff --git a/allure-junit5-assert/build.gradle.kts b/allure-jupiter-assert/build.gradle.kts
similarity index 64%
rename from allure-junit5-assert/build.gradle.kts
rename to allure-jupiter-assert/build.gradle.kts
index dd5410151..230fb5038 100644
--- a/allure-junit5-assert/build.gradle.kts
+++ b/allure-jupiter-assert/build.gradle.kts
@@ -1,7 +1,7 @@
-description = "Allure Junit5 Assertions Integration"
+description = "Allure Jupiter Assertions Integration"
 
 dependencies {
-    api(project(":allure-junit5"))
+    api(project(":allure-jupiter"))
     compileOnly("org.aspectj:aspectjrt")
     compileOnly("org.junit.jupiter:junit-jupiter-api")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
@@ -15,7 +15,7 @@ dependencies {
 tasks.jar {
     manifest {
         attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.junit5-assert"
+                "Automatic-Module-Name" to "io.qameta.allure.jupiterassert"
         ))
     }
 }
@@ -24,3 +24,10 @@ tasks.test {
     useJUnitPlatform()
 }
 
+publishing {
+    publications {
+        create<MavenPublication>("legacyJunit5Assert") {
+            artifactId = "allure-junit5-assert"
+        }
+    }
+}
diff --git a/allure-jupiter-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java b/allure-jupiter-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
new file mode 100644
index 000000000..f7f04b0fa
--- /dev/null
+++ b/allure-jupiter-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
@@ -0,0 +1,26 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5assert;
+
+import io.qameta.allure.jupiterassert.AllureJupiterAssert;
+
+/**
+ * @author legionivo (Andrey Konovka).
+ * @deprecated use {@link AllureJupiterAssert}.
+ */
+@Deprecated
+public class AllureJunit5Assert extends AllureJupiterAssert {
+}
diff --git a/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java b/allure-jupiter-assert/src/main/java/io/qameta/allure/jupiterassert/AllureJupiterAssert.java
similarity index 87%
rename from allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
rename to allure-jupiter-assert/src/main/java/io/qameta/allure/jupiterassert/AllureJupiterAssert.java
index e7fad0087..a259fdbb1 100644
--- a/allure-junit5-assert/src/main/java/io/qameta/allure/junit5assert/AllureJunit5Assert.java
+++ b/allure-jupiter-assert/src/main/java/io/qameta/allure/jupiterassert/AllureJupiterAssert.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.junit5assert;
+package io.qameta.allure.jupiterassert;
 
 import io.qameta.allure.Allure;
 import io.qameta.allure.AllureLifecycle;
@@ -41,13 +41,12 @@
  */
 @SuppressWarnings("all")
 @Aspect
-public class AllureJunit5Assert {
+public class AllureJupiterAssert {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AllureJunit5Assert.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AllureJupiterAssert.class);
     private StepResult stepResult;
 
-
-    private static InheritableThreadLocal<AllureLifecycle> lifecycle = new InheritableThreadLocal<AllureLifecycle>() {
+    private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE = new InheritableThreadLocal<AllureLifecycle>() {
         @Override
         protected AllureLifecycle initialValue() {
             return Allure.getLifecycle();
@@ -69,11 +68,10 @@ public void stepStart(final JoinPoint joinPoint) {
         if (joinPoint.getArgs().length > 1) {
             final String uuid = UUID.randomUUID().toString();
             final String assertName = joinPoint.getSignature().getName();
-            String name;
+            final String name;
             if (joinPoint.getSignature().getName().equalsIgnoreCase("assertAll")) {
-                name = String.format("assert All in " + " \'%s\'", joinPoint.getArgs()[0].toString());
+                name = String.format("assert All in " + " '%s'", joinPoint.getArgs()[0].toString());
             } else {
-
                 final String actual = joinPoint.getArgs().length > 0
                         ? ObjectUtils.toString(joinPoint.getArgs()[1])
                         : "<?>";
@@ -83,12 +81,13 @@ public void stepStart(final JoinPoint joinPoint) {
 
                 final List<String> assertArray = Arrays.asList(assertName.split("(?=[A-Z])"));
                 if (assertArray.size() >= 3) {
-                    name = String.format(assertArray.get(0) + " " + assertArray.get(1) + " \'%s\'", expected)
+                    name = String.format(assertArray.get(0) + " " + assertArray.get(1) + " '%s'", expected)
                             + " " + String.format(assertArray.stream()
                             .skip(2)
-                            .collect(Collectors.joining(" ")) + " \'%s\'", actual);
+                            .collect(Collectors.joining(" ")) + " '%s'", actual);
                 } else {
-                    name = String.format(assertArray.get(0) + " \'%s\'", expected) + " " + String.format(assertArray.get(1) + " \'%s\'", actual);
+                    name = String.format(assertArray.get(0) + " '%s'", expected)
+                            + " " + String.format(assertArray.get(1) + " '%s'", actual);
                 }
             }
             final StepResult result = new StepResult()
@@ -101,7 +100,7 @@ public void stepStart(final JoinPoint joinPoint) {
                     : "<?>";
             final String uuid = UUID.randomUUID().toString();
             final String assertName = joinPoint.getSignature().getName();
-            final String name = String.format(assertName + " \'%s\'", actual);
+            final String name = String.format(assertName + " '%s'", actual);
 
             final StepResult result = new StepResult()
                     .setName(name)
@@ -129,11 +128,10 @@ public void stepStop() {
      * @param allure allure lifecycle to set.
      */
     public static void setLifecycle(final AllureLifecycle allure) {
-        lifecycle.set(allure);
+        LIFECYCLE.set(allure);
     }
 
     public static AllureLifecycle getLifecycle() {
-        return lifecycle.get();
+        return LIFECYCLE.get();
     }
-
 }
diff --git a/allure-junit5-assert/src/main/resources/META-INF/aop-ajc.xml b/allure-jupiter-assert/src/main/resources/META-INF/aop-ajc.xml
similarity index 56%
rename from allure-junit5-assert/src/main/resources/META-INF/aop-ajc.xml
rename to allure-jupiter-assert/src/main/resources/META-INF/aop-ajc.xml
index 1ce84d6db..f4a039615 100644
--- a/allure-junit5-assert/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-jupiter-assert/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +1,6 @@
 <aspectj>
     <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
-        <aspect name="io.qameta.allure.junit5assert.AllureJunit5Assert"/>
+        <aspect name="io.qameta.allure.jupiterassert.AllureJupiterAssert"/>
     </aspects>
 </aspectj>
diff --git a/allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java b/allure-jupiter-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
similarity index 100%
rename from allure-junit5-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
rename to allure-jupiter-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
diff --git a/allure-jupiter-assert/src/test/java/io/qameta/allure/jupiterassert/AllureJupiterAssertTest.java b/allure-jupiter-assert/src/test/java/io/qameta/allure/jupiterassert/AllureJupiterAssertTest.java
new file mode 100644
index 000000000..1da892a97
--- /dev/null
+++ b/allure-jupiter-assert/src/test/java/io/qameta/allure/jupiterassert/AllureJupiterAssertTest.java
@@ -0,0 +1,41 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jupiterassert;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.test.AllureResults;
+import org.junit.jupiter.api.Test;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class AllureJupiterAssertTest {
+
+    @Test
+    void shouldHandleAssertEquals() {
+        final AllureResults results = runWithinTestContext(
+                () -> assertEquals("expectedString", "actualString"),
+                AllureJupiterAssert::setLifecycle
+        );
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("assert 'expectedString' Equals 'actualString'");
+    }
+}
diff --git a/allure-junit5-assert/src/test/resources/allure.properties b/allure-jupiter-assert/src/test/resources/allure.properties
similarity index 100%
rename from allure-junit5-assert/src/test/resources/allure.properties
rename to allure-jupiter-assert/src/test/resources/allure.properties
diff --git a/allure-junit5/build.gradle.kts b/allure-jupiter/build.gradle.kts
similarity index 84%
rename from allure-junit5/build.gradle.kts
rename to allure-jupiter/build.gradle.kts
index 372885809..dd6033879 100644
--- a/allure-junit5/build.gradle.kts
+++ b/allure-jupiter/build.gradle.kts
@@ -1,4 +1,4 @@
-description = "Allure JUnit 5 Integration"
+description = "Allure Jupiter Integration"
 
 dependencies {
     api(project(":allure-junit-platform"))
@@ -19,7 +19,7 @@ dependencies {
 tasks.jar {
     manifest {
         attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.junit5"
+                "Automatic-Module-Name" to "io.qameta.allure.jupiter"
         ))
     }
     from("src/main/services") {
@@ -43,6 +43,9 @@ publishing {
         named<MavenPublication>("maven") {
             artifact(spiOffJar)
         }
+        create<MavenPublication>("legacyJunit5") {
+            artifactId = "allure-junit5"
+            artifact(spiOffJar)
+        }
     }
 }
-
diff --git a/allure-jupiter/src/main/java/io/qameta/allure/junit5/AllureJunit5.java b/allure-jupiter/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
new file mode 100644
index 000000000..2231d34e0
--- /dev/null
+++ b/allure-jupiter/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
@@ -0,0 +1,26 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5;
+
+import io.qameta.allure.jupiter.AllureJupiter;
+
+/**
+ * @author charlie (Dmitry Baev).
+ * @deprecated use {@link AllureJupiter}.
+ */
+@Deprecated
+public class AllureJunit5 extends AllureJupiter {
+}
diff --git a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java b/allure-jupiter/src/main/java/io/qameta/allure/jupiter/AllureJupiter.java
similarity index 88%
rename from allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
rename to allure-jupiter/src/main/java/io/qameta/allure/jupiter/AllureJupiter.java
index 3d1019a2b..1641ed1f7 100644
--- a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
+++ b/allure-jupiter/src/main/java/io/qameta/allure/jupiter/AllureJupiter.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.junit5;
+package io.qameta.allure.jupiter;
 
 import io.qameta.allure.Param;
 import io.qameta.allure.model.Status;
@@ -27,8 +27,8 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.util.HashMap;
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
@@ -50,12 +50,18 @@
  * @author charlie (Dmitry Baev).
  */
 @SuppressWarnings("MultipleStringLiterals")
-public class AllureJunit5 implements InvocationInterceptor {
+public class AllureJupiter implements InvocationInterceptor {
+
+    private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create(AllureJupiter.class);
 
     @Override
     public void interceptTestTemplateMethod(final Invocation<Void> invocation,
                                             final ReflectiveInvocationContext<Method> invocationContext,
                                             final ExtensionContext extensionContext) throws Throwable {
+        if (!shouldHandle(extensionContext, "template", invocationContext.getExecutable())) {
+            invocation.proceed();
+            return;
+        }
         sendParameterEvent(invocationContext, extensionContext);
         invocation.proceed();
     }
@@ -134,6 +140,10 @@ protected void processFixture(final String type,
                                   final Invocation<Void> invocation,
                                   final ReflectiveInvocationContext<Method> invocationContext,
                                   final ExtensionContext extensionContext) throws Throwable {
+        if (!shouldHandle(extensionContext, type, invocationContext.getExecutable())) {
+            invocation.proceed();
+            return;
+        }
         final String uuid = UUID.randomUUID().toString();
         try {
             extensionContext.publishReportEntry(wrap(buildStartEvent(
@@ -206,4 +216,19 @@ public Map<String, String> wrap(final Map<String, String> data) {
         );
         return res;
     }
+
+    private boolean shouldHandle(final ExtensionContext extensionContext,
+                                 final String eventType,
+                                 final Method method) {
+        final Object marker = new Object();
+        final String key = String.join(":",
+                extensionContext.getUniqueId(),
+                eventType,
+                method.toGenericString()
+        );
+        final Object storedMarker = extensionContext.getRoot()
+                .getStore(NAMESPACE)
+                .getOrComputeIfAbsent(key, ignored -> marker);
+        return marker.equals(storedMarker);
+    }
 }
diff --git a/allure-jupiter/src/main/services/org.junit.jupiter.api.extension.Extension b/allure-jupiter/src/main/services/org.junit.jupiter.api.extension.Extension
new file mode 100644
index 000000000..17a075141
--- /dev/null
+++ b/allure-jupiter/src/main/services/org.junit.jupiter.api.extension.Extension
@@ -0,0 +1 @@
+io.qameta.allure.jupiter.AllureJupiter
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java
similarity index 87%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java
rename to allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java
index a9d85cc24..c1d5171c5 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java
+++ b/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java
@@ -90,12 +90,17 @@ void shouldCaptureParametersWithParamAnnotationOnJunit6() {
             .toList();
 
         assertThat(allParams)
-            .isNotEmpty()
+            .filteredOn(parameter -> "id".equals(parameter.getName()))
             .extracting(Parameter::getName, Parameter::getValue)
-            .contains(
+            .containsExactlyInAnyOrder(
                 tuple("id", "a"),
                 tuple("id", "b")
             );
+
+        assertThat(allParams)
+            .filteredOn(parameter -> "id".equals(parameter.getName()))
+            .extracting(Parameter::getName, Parameter::getValue)
+            .doesNotHaveDuplicates();
     }
 
     @Test
@@ -111,30 +116,34 @@ void shouldCaptureFixturesAndStepsOnJunit6() {
 
         assertThat(results.getTestResultContainers())
             .flatExtracting(TestResultContainer::getBefores)
-            .extracting(FixtureResult::getStatus)
-            .contains(Status.PASSED);
+            .extracting(FixtureResult::getName, FixtureResult::getStatus)
+            .containsExactly(
+                tuple("setUp", Status.PASSED)
+            );
 
         assertThat(results.getTestResultContainers())
             .flatExtracting(TestResultContainer::getAfters)
-            .extracting(FixtureResult::getStatus)
-            .contains(Status.PASSED);
+            .extracting(FixtureResult::getName, FixtureResult::getStatus)
+            .containsExactly(
+                tuple("tearDown", Status.PASSED)
+            );
 
         assertThat(results.getTestResultContainers())
             .flatExtracting(TestResultContainer::getBefores)
             .flatExtracting(FixtureResult::getSteps)
             .extracting(StepResult::getName)
-            .contains("before step");
+            .containsExactly("before step");
 
         assertThat(results.getTestResults())
             .flatExtracting(TestResult::getSteps)
             .extracting(StepResult::getName)
-            .contains("test step");
+            .containsExactly("test step");
 
         assertThat(results.getTestResultContainers())
             .flatExtracting(TestResultContainer::getAfters)
             .flatExtracting(FixtureResult::getSteps)
             .extracting(StepResult::getName)
-            .contains("after step");
+            .containsExactly("after step");
     }
 
     @io.qameta.allure.Step("Run classes {classes}")
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
similarity index 100%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
rename to allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
similarity index 100%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
rename to allure-jupiter/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java
similarity index 100%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java
rename to allure-jupiter/src/test/java/io/qameta/allure/junit5/features/AllFixtureSupport.java
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
similarity index 100%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
rename to allure-jupiter/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
similarity index 100%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
rename to allure-jupiter/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java
similarity index 100%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java
rename to allure-jupiter/src/test/java/io/qameta/allure/junit5/features/EachFixtureSupport.java
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java
similarity index 100%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java
rename to allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
similarity index 100%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
rename to allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
similarity index 100%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
rename to allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedWithInjectablesTests.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedWithInjectablesTests.java
similarity index 100%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedWithInjectablesTests.java
rename to allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedWithInjectablesTests.java
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java
similarity index 100%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java
rename to allure-jupiter/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java
diff --git a/allure-jupiter/src/test/java/io/qameta/allure/jupiter/AllureJupiterJunit6CompatibilityTest.java b/allure-jupiter/src/test/java/io/qameta/allure/jupiter/AllureJupiterJunit6CompatibilityTest.java
new file mode 100644
index 000000000..f40fe2bd8
--- /dev/null
+++ b/allure-jupiter/src/test/java/io/qameta/allure/jupiter/AllureJupiterJunit6CompatibilityTest.java
@@ -0,0 +1,165 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.jupiter;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.Param;
+import io.qameta.allure.junitplatform.AllureJunitPlatform;
+import io.qameta.allure.model.FixtureResult;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.RunUtils;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.DiscoverySelectors;
+import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.core.LauncherConfig;
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
+import org.junit.platform.launcher.core.LauncherFactory;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+@Tag("junit6-compat")
+@SuppressWarnings("unused")
+class AllureJupiterJunit6CompatibilityTest {
+
+    @ExtendWith(AllureJupiter.class)
+    static class CompatParametersTest {
+
+        @org.junit.jupiter.params.ParameterizedTest
+        @org.junit.jupiter.params.provider.ValueSource(strings = {"a", "b"})
+        void paramTest(@Param("id") final String value) {
+        }
+    }
+
+    @Nested
+    @ExtendWith(AllureJupiter.class)
+    class CompatFixtures {
+
+        @BeforeEach
+        void setUp() {
+            Allure.step("before step");
+        }
+
+        @Test
+        void testBody() {
+            Allure.step("test step");
+        }
+
+        @AfterEach
+        void tearDown() {
+            Allure.step("after step");
+        }
+    }
+
+    @Test
+    void shouldCaptureParametersWithParamAnnotationOnJunit6() {
+        final AllureResults results = runWithLauncher(CompatParametersTest.class);
+
+        assertThat(results.getTestResults()).isNotEmpty();
+
+        final List<Parameter> allParams = results.getTestResults().stream()
+                .flatMap(tr -> tr.getParameters().stream())
+                .toList();
+
+        assertThat(allParams)
+                .filteredOn(parameter -> "id".equals(parameter.getName()))
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("id", "a"),
+                        tuple("id", "b")
+                );
+    }
+
+    @Test
+    void shouldCaptureFixturesAndStepsOnJunit6() {
+        final AllureResults results = runWithLauncher(CompatFixtures.class);
+
+        assertThat(results.getTestResults()).hasSize(1);
+        final TestResult testResult = results.getTestResults().get(0);
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getChildren)
+                .contains(testResult.getUuid());
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactly(
+                        tuple("setUp", Status.PASSED)
+                );
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getAfters)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactly(
+                        tuple("tearDown", Status.PASSED)
+                );
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getBefores)
+                .flatExtracting(FixtureResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("before step");
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("test step");
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getAfters)
+                .flatExtracting(FixtureResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("after step");
+    }
+
+    @io.qameta.allure.Step("Run classes {classes}")
+    private AllureResults runWithLauncher(final Class<?>... classes) {
+        return RunUtils.runTests(lifecycle -> {
+            final ClassSelector[] selectors = Stream.of(classes)
+                    .map(DiscoverySelectors::selectClass)
+                    .toArray(ClassSelector[]::new);
+
+            final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+                    .configurationParameter("junit.jupiter.extensions.autodetection.enabled", "true")
+                    .selectors(selectors)
+                    .build();
+
+            final LauncherConfig config = LauncherConfig.builder()
+                    .enableTestExecutionListenerAutoRegistration(false)
+                    .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
+                    .build();
+
+            final Launcher launcher = LauncherFactory.create(config);
+            launcher.execute(request);
+        });
+    }
+}
diff --git a/allure-jupiter/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/allure-jupiter/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
new file mode 100644
index 000000000..17a075141
--- /dev/null
+++ b/allure-jupiter/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -0,0 +1 @@
+io.qameta.allure.jupiter.AllureJupiter
diff --git a/allure-junit5/src/test/resources/allure.properties b/allure-jupiter/src/test/resources/allure.properties
similarity index 100%
rename from allure-junit5/src/test/resources/allure.properties
rename to allure-jupiter/src/test/resources/allure.properties
diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts
index a5ecc550d..f16998fea 100644
--- a/allure-scalatest/build.gradle.kts
+++ b/allure-scalatest/build.gradle.kts
@@ -74,13 +74,6 @@ publishing {
     }
 }
 
-signing {
-    sign(
-        publishing.publications["crossBuildScala_212"],
-        publishing.publications["crossBuildScala_213"]
-    )
-}
-
 dependencies {
     api(project(":allure-java-commons"))
     compileOnly("org.scalatest:scalatest_$scala213:3.2.19")
diff --git a/build.gradle.kts b/build.gradle.kts
index b3a82e141..ac086dec1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,6 +5,7 @@ val qualityConfigsDir by extra("$gradleScriptDir/quality-configs")
 val spotlessDtr by extra("$qualityConfigsDir/spotless")
 
 val libs = subprojects.filterNot { it.name in "allure-bom" }
+val standardJavaLibs = libs.filterNot { it.name == "allure-scalatest" }
 
 tasks.withType(Wrapper::class) {
     gradleVersion = "8.5"
@@ -60,6 +61,12 @@ configure(subprojects) {
     publishing {
         publications {
             withType<MavenPublication>().configureEach {
+                suppressAllPomMetadataWarnings()
+                versionMapping {
+                    allVariants {
+                        fromResolutionResult()
+                    }
+                }
                 pom {
                     name.set(project.name)
                     description.set("Module ${project.name} of Allure Framework.")
@@ -103,19 +110,12 @@ configure(subprojects) {
                     }
                 }
             }
-            create<MavenPublication>("maven") {
-                suppressAllPomMetadataWarnings()
-                versionMapping {
-                    allVariants {
-                        fromResolutionResult()
-                    }
-                }
-            }
+            create<MavenPublication>("maven")
         }
     }
 
     signing {
-        sign(publishing.publications["maven"])
+        sign(publishing.publications)
     }
 
     tasks.withType<Sign>().configureEach {
@@ -375,17 +375,74 @@ configure(libs) {
         }
     }
 
-    publishing.publications.named<MavenPublication>("maven") {
-        pom {
-            from(components["java"])
-        }
-    }
-
     val allDepsInsight by tasks.creating(DependencyInsightReportTask::class) {
         showingAllVariants.set(true)
     }
 }
 
+configure(standardJavaLibs) {
+    publishing.publications.withType<MavenPublication>().configureEach {
+        from(components["java"])
+    }
+}
+
+val verifyJupiterCompatibilityBridge by tasks.registering {
+    dependsOn(
+        ":allure-bom:generatePomFileForMavenPublication"
+    )
+
+    doLast {
+        fun publicationArtifactIds(projectPath: String): Set<String> =
+            project(projectPath)
+                .extensions
+                .getByType(org.gradle.api.publish.PublishingExtension::class.java)
+                .publications
+                .withType(MavenPublication::class.java)
+                .mapTo(linkedSetOf()) { it.artifactId }
+
+        val jupiterArtifactIds = publicationArtifactIds(":allure-jupiter")
+        check("allure-jupiter" in jupiterArtifactIds) {
+            "Expected :allure-jupiter to publish the primary allure-jupiter coordinate."
+        }
+        check("allure-junit5" in jupiterArtifactIds) {
+            "Expected :allure-jupiter to publish the legacy allure-junit5 alias."
+        }
+
+        val jupiterAssertArtifactIds = publicationArtifactIds(":allure-jupiter-assert")
+        check("allure-jupiter-assert" in jupiterAssertArtifactIds) {
+            "Expected :allure-jupiter-assert to publish the primary allure-jupiter-assert coordinate."
+        }
+        check("allure-junit5-assert" in jupiterAssertArtifactIds) {
+            "Expected :allure-jupiter-assert to publish the legacy allure-junit5-assert alias."
+        }
+
+        val bomPom = project(":allure-bom")
+            .layout
+            .buildDirectory
+            .file("publications/maven/pom-default.xml")
+            .get()
+            .asFile
+            .readText()
+
+        check("<artifactId>allure-jupiter</artifactId>" in bomPom) {
+            "Expected allure-bom to manage allure-jupiter."
+        }
+        check("<artifactId>allure-junit5</artifactId>" in bomPom) {
+            "Expected allure-bom to manage the legacy allure-junit5 alias."
+        }
+        check("<artifactId>allure-jupiter-assert</artifactId>" in bomPom) {
+            "Expected allure-bom to manage allure-jupiter-assert."
+        }
+        check("<artifactId>allure-junit5-assert</artifactId>" in bomPom) {
+            "Expected allure-bom to manage the legacy allure-junit5-assert alias."
+        }
+    }
+}
+
+tasks.check {
+    dependsOn(verifyJupiterCompatibilityBridge)
+}
+
 allure {
     version.set("2.19.0")
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bf49b841b..ad6f5e51d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -24,8 +24,8 @@ include("allure-jsonunit")
 include("allure-junit-platform")
 include("allure-junit4")
 include("allure-junit4-aspect")
-include("allure-junit5")
-include("allure-junit5-assert")
+include("allure-jupiter")
+include("allure-jupiter-assert")
 include("allure-karate")
 include("allure-model")
 include("allure-okhttp")

From d2c7b0ca5176d34316b7e53d9685a50c4d9eb8d8 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 9 Apr 2026 16:35:35 +0100
Subject: [PATCH 224/233] Modernize allure-spring-web for current Spring HTTP
 clients (via #1263)

---
 README.md                                     |  58 +++++++--
 allure-spring-web/build.gradle.kts            |   4 +-
 .../allure/springweb/AllureRestTemplate.java  |   7 +-
 .../springweb/AllureRestTemplateTest.java     | 118 ++++++++++++++----
 4 files changed, 147 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index 5180b5077..f77b1f03f 100644
--- a/README.md
+++ b/README.md
@@ -78,9 +78,9 @@ https://github.com/SeleniumHQ/selenium/wiki/Logging
 ```
 
 
-## Rest Assured
-
-Filter for rest-assured http client, that generates attachment for allure.
+## Rest Assured
+
+Filter for rest-assured http client, that generates attachment for allure.
 
 ```xml
 <dependency>
@@ -96,14 +96,50 @@ Usage example:
 ```
 You can specify custom templates, which should be placed in src/main/resources/tpl folder:
 ```
-.filter(new AllureRestAssured()
-        .withRequestTemplate("custom-http-request.ftl")
-        .withResponseTemplate("custom-http-response.ftl"))
-```
-
-## OkHttp
-
-Interceptor for OkHttp client, that generates attachment for allure.
+.filter(new AllureRestAssured()
+        .withRequestTemplate("custom-http-request.ftl")
+        .withResponseTemplate("custom-http-response.ftl"))
+```
+
+## Spring Web
+
+Interceptor for Spring synchronous HTTP clients, that generates attachments for allure.
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-spring-web</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example with `RestClient`:
+```
+RestClient restClient = RestClient.builder()
+        .requestFactory(new BufferingClientHttpRequestFactory(new SimpleClientHttpRequestFactory()))
+        .requestInterceptor(new AllureRestTemplate())
+        .build();
+```
+Use a buffering request factory when the client should still be able to read the response body after Allure captures it.
+
+`RestTemplate` remains supported:
+```
+RestTemplate restTemplate = new RestTemplate(
+        new BufferingClientHttpRequestFactory(new SimpleClientHttpRequestFactory())
+);
+restTemplate.setInterceptors(Collections.singletonList(new AllureRestTemplate()));
+```
+
+You can specify custom templates, which should be placed in src/main/resources/tpl folder:
+```
+new AllureRestTemplate()
+        .setRequestTemplate("custom-http-request.ftl")
+        .setResponseTemplate("custom-http-response.ftl")
+```
+
+## OkHttp
+
+Interceptor for OkHttp client, that generates attachment for allure.
 
 ```xml
 <dependency>
diff --git a/allure-spring-web/build.gradle.kts b/allure-spring-web/build.gradle.kts
index b79566812..ab11b8b26 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Spring Web Integration"
 
-val springWebVersion = "6.2.12"
+val springWebVersion = "6.2.17"
 
 dependencies {
     api(project(":allure-attachments"))
@@ -32,4 +32,4 @@ tasks.test {
 
 tasks.compileJava {
     options.release.set(17)
-}
\ No newline at end of file
+}
diff --git a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
index fbf57c410..bfc5611f7 100644
--- a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
+++ b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
@@ -36,7 +36,12 @@
 import java.util.Map;
 
 /**
- * Allure interceptor for spring rest template.
+ * Allure interceptor for Spring synchronous HTTP clients such as
+ * {@code RestTemplate} and {@code RestClient}.
+ * <p>
+ * Since this interceptor reads the response body to create an attachment,
+ * configure a buffering request factory when the caller also needs to consume
+ * the response body after interception.
  */
 public class AllureRestTemplate implements ClientHttpRequestInterceptor {
 
diff --git a/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java b/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
index 3298e093b..f8b21eaac 100644
--- a/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
+++ b/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
@@ -33,11 +33,13 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.BufferingClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.RestClient;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
 
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
@@ -49,55 +51,119 @@
 @SuppressWarnings("unchecked")
 public class AllureRestTemplateTest {
 
-    static Stream<String> attachmentNameProvider() {
-        return Stream.of("Request", "Response");
+    static Stream<SpringClientType> clientTypeProvider() {
+        return Stream.of(SpringClientType.values());
     }
 
     @ParameterizedTest
-    @MethodSource(value = "attachmentNameProvider")
-    void shouldCreateAttachment(final String attachmentName) {
-        final AllureResults results = execute();
+    @MethodSource("clientTypeProvider")
+    void shouldCreateAttachment(final SpringClientType clientType) {
+        final AllureResults results = execute(clientType).getAllureResults();
         assertThat(results.getTestResults())
                 .flatExtracting(TestResult::getAttachments)
                 .flatExtracting(Attachment::getName)
-                .contains(attachmentName);
+                .contains("Request", "Response");
     }
 
     @ParameterizedTest
-    @MethodSource(value = "attachmentNameProvider")
-    void shouldCatchAttachmentBody(final String attachmentName) {
-        final AllureResults results = execute();
+    @MethodSource("clientTypeProvider")
+    void shouldCatchAttachmentBody(final SpringClientType clientType) {
+        final AllureResults results = execute(clientType).getAllureResults();
 
-        final Attachment found = results.getTestResults().stream()
-                .map(TestResult::getAttachments)
-                .flatMap(Collection::stream)
-                .filter(attachment -> Objects.equals(attachmentName, attachment.getName()))
-                .findAny()
-                .orElseThrow(() -> new RuntimeException("attachment not found"));
-
-        assertThat(results.getAttachments())
-                .containsKeys(found.getSource());
+        Stream.of("Request", "Response")
+                .map(attachmentName -> findAttachment(results, attachmentName))
+                .forEach(found -> assertThat(results.getAttachments())
+                        .containsKeys(found.getSource()));
     }
 
-    protected final AllureResults execute() {
-        final RestTemplate restTemplate = new RestTemplate(new BufferingClientHttpRequestFactory(new SimpleClientHttpRequestFactory()));
-        restTemplate.setInterceptors(Collections.singletonList(new AllureRestTemplate()));
+    @ParameterizedTest
+    @MethodSource("clientTypeProvider")
+    void shouldAllowResponseBodyConsumptionAfterInterception(final SpringClientType clientType) {
+        final ExecutionResult executionResult = execute(clientType);
+        assertThat(executionResult.getResponse().getBody()).isEqualTo("some body");
+    }
 
+    protected final ExecutionResult execute(final SpringClientType clientType) {
         final WireMockServer server = new WireMockServer(WireMockConfiguration.options().dynamicPort());
+        final AtomicReference<ResponseEntity<String>> response = new AtomicReference<>();
 
-        return runWithinTestContext(() -> {
+        final AllureResults results = runWithinTestContext(() -> {
             server.start();
             WireMock.configureFor(server.port());
             WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello")).willReturn(WireMock.aResponse().withBody("some body")));
             try {
-                HttpHeaders headers = new HttpHeaders();
-                headers.setContentType(MediaType.APPLICATION_JSON);
-                HttpEntity<JsonNode> entity = new HttpEntity<>(headers);
-                ResponseEntity<String> result = restTemplate.exchange(server.url("/hello"), HttpMethod.GET, entity, String.class);
+                final ResponseEntity<String> result = clientType.execute(server.url("/hello"));
+                response.set(result);
                 Assertions.assertEquals(result.getStatusCode(), HttpStatus.OK);
+                Assertions.assertEquals(result.getBody(), "some body");
             } finally {
                 server.stop();
             }
         });
+
+        return new ExecutionResult(results, response.get());
+    }
+
+    private static Attachment findAttachment(final AllureResults results, final String attachmentName) {
+        return results.getTestResults().stream()
+                .map(TestResult::getAttachments)
+                .flatMap(Collection::stream)
+                .filter(attachment -> Objects.equals(attachmentName, attachment.getName()))
+                .findAny()
+                .orElseThrow(() -> new RuntimeException("attachment not found"));
+    }
+
+    private static BufferingClientHttpRequestFactory createBufferingRequestFactory() {
+        return new BufferingClientHttpRequestFactory(new SimpleClientHttpRequestFactory());
+    }
+
+    private enum SpringClientType {
+        REST_TEMPLATE {
+            @Override
+            ResponseEntity<String> execute(final String url) {
+                final RestTemplate restTemplate = new RestTemplate(createBufferingRequestFactory());
+                restTemplate.setInterceptors(Collections.singletonList(new AllureRestTemplate()));
+
+                final HttpHeaders headers = new HttpHeaders();
+                headers.setContentType(MediaType.APPLICATION_JSON);
+                final HttpEntity<JsonNode> entity = new HttpEntity<>(headers);
+                return restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
+            }
+        },
+        REST_CLIENT {
+            @Override
+            ResponseEntity<String> execute(final String url) {
+                final RestClient restClient = RestClient.builder()
+                        .requestFactory(createBufferingRequestFactory())
+                        .requestInterceptor(new AllureRestTemplate())
+                        .build();
+                return restClient.get()
+                        .uri(url)
+                        .accept(MediaType.APPLICATION_JSON)
+                        .retrieve()
+                        .toEntity(String.class);
+            }
+        };
+
+        abstract ResponseEntity<String> execute(String url);
+    }
+
+    private static final class ExecutionResult {
+
+        private final AllureResults allureResults;
+        private final ResponseEntity<String> response;
+
+        private ExecutionResult(final AllureResults allureResults, final ResponseEntity<String> response) {
+            this.allureResults = allureResults;
+            this.response = response;
+        }
+
+        AllureResults getAllureResults() {
+            return allureResults;
+        }
+
+        ResponseEntity<String> getResponse() {
+            return response;
+        }
     }
 }

From 35ce7c103a52bd5c1f121a47670067b0702ba61d Mon Sep 17 00:00:00 2001
From: long76 <18124433+long76@users.noreply.github.com>
Date: Sun, 3 May 2026 11:02:51 +0300
Subject: [PATCH 225/233] fix run tests for junit 5.14.3 (via #1265)

---
 allure-hamcrest/build.gradle.kts | 1 +
 allure-karate/build.gradle.kts   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/allure-hamcrest/build.gradle.kts b/allure-hamcrest/build.gradle.kts
index 6b0e5dd3a..3817ab48c 100644
--- a/allure-hamcrest/build.gradle.kts
+++ b/allure-hamcrest/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-java-commons-test"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.jar {
diff --git a/allure-karate/build.gradle.kts b/allure-karate/build.gradle.kts
index 3a2c1ea7b..18c7b4e0c 100644
--- a/allure-karate/build.gradle.kts
+++ b/allure-karate/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-java-commons-test"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.jar {

From 46c68ad9da102ebf5a08679666bed0447d6535f0 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 7 May 2026 17:21:02 +0100
Subject: [PATCH 226/233] add allure report (via #1266)

---
 .github/workflows/build.yml                   |  65 ++++-
 AGENTS.md                                     |   8 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   3 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   3 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 allure-java-commons-test/build.gradle.kts     |   7 +
 .../allure/test/AllurePredicatesTest.java     |  41 ++++
 .../test/AllureResultsWriterStubTest.java     |  55 +++++
 .../io/qameta/allure/test/RunUtilsTest.java   |  60 +++++
 .../qameta/allure/test/TestUtilitiesTest.java |  65 +++++
 .../src/test/resources/allure.properties      |   3 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   3 +
 .../src/test/resources/allure.properties      |   1 +
 allure-junit-platform/build.gradle.kts        |  10 +
 .../src/test/resources/allure.properties      |   1 +
 allure-junit4-aspect/build.gradle.kts         |  11 +
 .../junit4/aspect/AllureJunit4AspectTest.java | 124 ++++++++++
 .../src/test/resources/allure.properties      |   3 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../allure/karate/AllureKarateTest.java       |  14 +-
 .../io/qameta/allure/karate/TestRunner.java   |   7 +
 .../src/test/resources/allure.properties      |   3 +
 .../src/test/resources/allure.properties      |   3 +-
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 allure-reader/build.gradle.kts                |   1 +
 .../reader/AllureObjectMapperFactoryTest.java | 108 ++++++++
 .../src/test/resources/allure.properties      |   3 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 allure-servlet-api/build.gradle.kts           |   9 +
 .../HttpServletAttachmentBuilder.java         |   9 +-
 .../HttpServletAttachmentBuilderTest.java     | 101 ++++++++
 .../src/test/resources/allure.properties      |   3 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 .../src/test/resources/allure.properties      |   1 +
 allure-test-filter/build.gradle.kts           |   2 +-
 .../testfilter/FileTestPlanSupplierTest.java  | 124 ++++++++++
 .../allure/testfilter/TestPlanV1_0Test.java   |  71 ++++++
 .../src/test/resources/allure.properties      |   3 +
 allure-testng/build.gradle.kts                |   8 +-
 .../allure/testng/AllureTestNgTest.java       | 231 +++++++++++-------
 .../src/test/resources/allure.properties      |   1 +
 allurerc.mjs                                  |  22 ++
 build.gradle.kts                              |  23 +-
 docs/allure-agent-mode.md                     | 161 ++++++++++++
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 settings.gradle.kts                           |   5 +-
 66 files changed, 1291 insertions(+), 112 deletions(-)
 create mode 100644 AGENTS.md
 create mode 100644 allure-awaitility/src/test/resources/allure.properties
 create mode 100644 allure-hamcrest/src/test/resources/allure.properties
 create mode 100644 allure-java-commons-test/src/test/java/io/qameta/allure/test/AllurePredicatesTest.java
 create mode 100644 allure-java-commons-test/src/test/java/io/qameta/allure/test/AllureResultsWriterStubTest.java
 create mode 100644 allure-java-commons-test/src/test/java/io/qameta/allure/test/RunUtilsTest.java
 create mode 100644 allure-java-commons-test/src/test/java/io/qameta/allure/test/TestUtilitiesTest.java
 create mode 100644 allure-java-commons-test/src/test/resources/allure.properties
 create mode 100644 allure-jooq/src/test/resources/allure.properties
 create mode 100644 allure-junit4-aspect/src/test/java/io/qameta/allure/junit4/aspect/AllureJunit4AspectTest.java
 create mode 100644 allure-junit4-aspect/src/test/resources/allure.properties
 create mode 100644 allure-karate/src/test/resources/allure.properties
 create mode 100644 allure-reader/src/test/java/io/qameta/allure/reader/AllureObjectMapperFactoryTest.java
 create mode 100644 allure-reader/src/test/resources/allure.properties
 create mode 100644 allure-servlet-api/src/test/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilderTest.java
 create mode 100644 allure-servlet-api/src/test/resources/allure.properties
 create mode 100644 allure-test-filter/src/test/java/io/qameta/allure/testfilter/FileTestPlanSupplierTest.java
 create mode 100644 allure-test-filter/src/test/java/io/qameta/allure/testfilter/TestPlanV1_0Test.java
 create mode 100644 allure-test-filter/src/test/resources/allure.properties
 create mode 100644 allurerc.mjs
 create mode 100644 docs/allure-agent-mode.md

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8f537bc9c..341788f5e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,22 +13,83 @@ on:
       - 'main'
       - 'hotfix-*'
 
+concurrency:
+  # On main, we don't want any jobs cancelled.
+  # On PR branches, we cancel the job if new commits are pushed.
+  group: ${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   build:
     name: "Build"
     runs-on: ubuntu-latest
+    env:
+      ALLURE_MATRIX_ENV: ubuntu-jdk-21
+      ALLURE_TEST_DUMP_NAME: allure-results-test-jdk-21
     steps:
       - uses: actions/checkout@v6
 
+      - uses: actions/setup-node@v6
+        with:
+          node-version: '20.x'
+
       - name: "Set up JDK"
         uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
 
+      - name: "Setup Gradle"
+        uses: gradle/actions/setup-gradle@v6
+        with:
+          gradle-version: 'wrapper'
+
       - name: "Build with Gradle"
         run: ./gradlew build -x test --scan
 
-      - name: "Run tests"
+      - name: "Run tests with Allure"
         if: always()
-        run: ./gradlew --no-build-cache cleanTest test
+        run: npx -y allure@3 run --config ./allurerc.mjs --rerun 2 --environment="${{ env.ALLURE_MATRIX_ENV }}" --dump="${{ env.ALLURE_TEST_DUMP_NAME }}" -- ./gradlew --no-build-cache cleanTest test
+
+      - name: "Upload Allure test dump"
+        if: always()
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ env.ALLURE_TEST_DUMP_NAME }}
+          path: ./${{ env.ALLURE_TEST_DUMP_NAME }}.zip
+
+  report:
+    needs: [build]
+    name: "Build report"
+    runs-on: ubuntu-latest
+    if: always()
+    permissions:
+      contents: read
+      pull-requests: write
+      checks: write
+    env:
+      ALLURE_SERVICE_TOKEN: ${{ secrets.ALLURE_SERVICE_TOKEN }}
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version: '20.x'
+
+      - name: "Download Allure dumps"
+        uses: actions/download-artifact@v8
+        continue-on-error: true
+        with:
+          pattern: allure-results-*
+          path: ./
+          merge-multiple: true
+
+      - name: "Generate Allure report"
+        run: npx -y allure@3 generate --config ./allurerc.mjs --dump="allure-results-*.zip" --output=./build/allure-report
+
+      - name: "Post Allure summary"
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
+        uses: allure-framework/allure-action@v0
+        with:
+          report-directory: ./build/allure-report
+          github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 000000000..8b7a6aa4d
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,8 @@
+# Project Guide
+
+Use [Allure Agent Mode](docs/allure-agent-mode.md) for all test-related work in this repository.
+
+- Read `docs/allure-agent-mode.md` before designing, writing, reviewing, validating, debugging, or enriching tests.
+- Run test-executing commands through `allure run`, including smoke checks after small edits.
+- Use `./gradlew` for repo-local test commands and scope runs to the smallest relevant module or task.
+- If agent-mode output is missing or incomplete, debug that first rather than relying on console-only conclusions.
diff --git a/allure-assertj/src/test/resources/allure.properties b/allure-assertj/src/test/resources/allure.properties
index 9c0b0a2d7..c881472e6 100644
--- a/allure-assertj/src/test/resources/allure.properties
+++ b/allure-assertj/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-assertj
diff --git a/allure-attachments/src/test/resources/allure.properties b/allure-attachments/src/test/resources/allure.properties
index 9c0b0a2d7..b47a01f60 100644
--- a/allure-attachments/src/test/resources/allure.properties
+++ b/allure-attachments/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-attachments
diff --git a/allure-awaitility/src/test/resources/allure.properties b/allure-awaitility/src/test/resources/allure.properties
new file mode 100644
index 000000000..0486d8a71
--- /dev/null
+++ b/allure-awaitility/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
+allure.label.module=allure-awaitility
diff --git a/allure-citrus/src/test/resources/allure.properties b/allure-citrus/src/test/resources/allure.properties
index 9c0b0a2d7..0833b8e02 100644
--- a/allure-citrus/src/test/resources/allure.properties
+++ b/allure-citrus/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-citrus
diff --git a/allure-cucumber4-jvm/src/test/resources/allure.properties b/allure-cucumber4-jvm/src/test/resources/allure.properties
index dbfefee44..e026a61f0 100644
--- a/allure-cucumber4-jvm/src/test/resources/allure.properties
+++ b/allure-cucumber4-jvm/src/test/resources/allure.properties
@@ -1,3 +1,4 @@
 allure.model.indentOutput=true
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-cucumber4-jvm
diff --git a/allure-cucumber5-jvm/src/test/resources/allure.properties b/allure-cucumber5-jvm/src/test/resources/allure.properties
index dbfefee44..8e2960725 100644
--- a/allure-cucumber5-jvm/src/test/resources/allure.properties
+++ b/allure-cucumber5-jvm/src/test/resources/allure.properties
@@ -1,3 +1,4 @@
 allure.model.indentOutput=true
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-cucumber5-jvm
diff --git a/allure-cucumber6-jvm/src/test/resources/allure.properties b/allure-cucumber6-jvm/src/test/resources/allure.properties
index dbfefee44..6b16969f8 100644
--- a/allure-cucumber6-jvm/src/test/resources/allure.properties
+++ b/allure-cucumber6-jvm/src/test/resources/allure.properties
@@ -1,3 +1,4 @@
 allure.model.indentOutput=true
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-cucumber6-jvm
diff --git a/allure-cucumber7-jvm/src/test/resources/allure.properties b/allure-cucumber7-jvm/src/test/resources/allure.properties
index dbfefee44..20fde5c18 100644
--- a/allure-cucumber7-jvm/src/test/resources/allure.properties
+++ b/allure-cucumber7-jvm/src/test/resources/allure.properties
@@ -1,3 +1,4 @@
 allure.model.indentOutput=true
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-cucumber7-jvm
diff --git a/allure-descriptions-javadoc/src/test/resources/allure.properties b/allure-descriptions-javadoc/src/test/resources/allure.properties
index 9c0b0a2d7..384d9cd50 100644
--- a/allure-descriptions-javadoc/src/test/resources/allure.properties
+++ b/allure-descriptions-javadoc/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-descriptions-javadoc
diff --git a/allure-grpc/src/test/resources/allure.properties b/allure-grpc/src/test/resources/allure.properties
index 9c0b0a2d7..556029437 100644
--- a/allure-grpc/src/test/resources/allure.properties
+++ b/allure-grpc/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-grpc
diff --git a/allure-hamcrest/src/test/resources/allure.properties b/allure-hamcrest/src/test/resources/allure.properties
new file mode 100644
index 000000000..ee8c853e2
--- /dev/null
+++ b/allure-hamcrest/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
+allure.label.module=allure-hamcrest
diff --git a/allure-httpclient/src/test/resources/allure.properties b/allure-httpclient/src/test/resources/allure.properties
index 9c0b0a2d7..0b9f016cb 100644
--- a/allure-httpclient/src/test/resources/allure.properties
+++ b/allure-httpclient/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-httpclient
diff --git a/allure-httpclient5/src/test/resources/allure.properties b/allure-httpclient5/src/test/resources/allure.properties
index 9c0b0a2d7..a6feadd77 100644
--- a/allure-httpclient5/src/test/resources/allure.properties
+++ b/allure-httpclient5/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-httpclient5
diff --git a/allure-java-commons-test/build.gradle.kts b/allure-java-commons-test/build.gradle.kts
index e1d5c3995..92c4e2e00 100644
--- a/allure-java-commons-test/build.gradle.kts
+++ b/allure-java-commons-test/build.gradle.kts
@@ -6,6 +6,9 @@ dependencies {
     api("org.apache.commons:commons-lang3")
     api(project(":allure-java-commons"))
     implementation("com.fasterxml.jackson.core:jackson-databind")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
 tasks.jar {
@@ -15,3 +18,7 @@ tasks.jar {
         ))
     }
 }
+
+tasks.test {
+    useJUnitPlatform()
+}
diff --git a/allure-java-commons-test/src/test/java/io/qameta/allure/test/AllurePredicatesTest.java b/allure-java-commons-test/src/test/java/io/qameta/allure/test/AllurePredicatesTest.java
new file mode 100644
index 000000000..4f5048a55
--- /dev/null
+++ b/allure-java-commons-test/src/test/java/io/qameta/allure/test/AllurePredicatesTest.java
@@ -0,0 +1,41 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.test;
+
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.TestResult;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class AllurePredicatesTest {
+
+    @Test
+    void shouldMatchStatusAndLabels() {
+        final TestResult result = new TestResult()
+                .setStatus(Status.PASSED)
+                .setLabels(List.of(new Label().setName("feature").setValue("attachments")));
+
+        assertTrue(AllurePredicates.hasStatus(Status.PASSED).test(result));
+        assertTrue(AllurePredicates.hasLabel("feature", "attachments").test(result));
+        assertFalse(AllurePredicates.hasStatus(Status.FAILED).test(result));
+        assertFalse(AllurePredicates.hasLabel("feature", "steps").test(result));
+    }
+}
diff --git a/allure-java-commons-test/src/test/java/io/qameta/allure/test/AllureResultsWriterStubTest.java b/allure-java-commons-test/src/test/java/io/qameta/allure/test/AllureResultsWriterStubTest.java
new file mode 100644
index 000000000..607d7013f
--- /dev/null
+++ b/allure-java-commons-test/src/test/java/io/qameta/allure/test/AllureResultsWriterStubTest.java
@@ -0,0 +1,55 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.test;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.model.TestResultContainer;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+class AllureResultsWriterStubTest {
+
+    @Test
+    void shouldStoreResultsContainersAndAttachments() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        final TestResult testResult = new TestResult()
+                .setUuid("test-uuid")
+                .setName("demo");
+        final TestResultContainer container = new TestResultContainer()
+                .setUuid("container-uuid")
+                .setChildren(List.of("test-uuid"));
+
+        Allure.step("Store a test result, its container, and an attachment", () -> {
+            writer.write(testResult);
+            writer.write(container);
+            writer.write("payload.txt", new ByteArrayInputStream("payload".getBytes(StandardCharsets.UTF_8)));
+        });
+
+        Allure.step("Verify the stub exposes the written runtime artifacts", () -> {
+            assertSame(testResult, writer.getTestResultByName("demo"));
+            assertEquals(List.of(container), writer.getTestResultContainersForTestResult(testResult));
+            assertArrayEquals("payload".getBytes(StandardCharsets.UTF_8), writer.getAttachments().get("payload.txt"));
+        });
+    }
+}
diff --git a/allure-java-commons-test/src/test/java/io/qameta/allure/test/RunUtilsTest.java b/allure-java-commons-test/src/test/java/io/qameta/allure/test/RunUtilsTest.java
new file mode 100644
index 000000000..12bd9c5d5
--- /dev/null
+++ b/allure-java-commons-test/src/test/java/io/qameta/allure/test/RunUtilsTest.java
@@ -0,0 +1,60 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.test;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.model.Status;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class RunUtilsTest {
+
+    @Test
+    void shouldCaptureFailureStatusWithinSyntheticTestContext() {
+        final AllureResults results = Allure.step("Execute a synthetic test context that raises an assertion error", () ->
+                RunUtils.runWithinTestContext(() -> {
+                    throw new AssertionError("boom");
+                })
+        );
+
+        Allure.step("Verify the captured synthetic test result is marked as failed", () -> {
+            assertEquals(1, results.getTestResults().size());
+            assertEquals(Status.FAILED, results.getTestResults().get(0).getStatus());
+            assertTrue(results.getTestResults().get(0).getStatusDetails().getMessage().contains("boom"));
+        });
+    }
+
+    @Test
+    void shouldAttachNestedRunArtifactsToOuterLifecycle() {
+        final AllureResults results = Allure.step("Execute a nested synthetic run and capture its emitted attachments", () ->
+                RunUtils.runWithinTestContext(() ->
+                        RunUtils.runWithinTestContext(() -> {
+                        })
+                )
+        );
+
+        Allure.addAttachment("nested-attachment-keys", String.join("\n", results.getAttachments().keySet()));
+        Allure.step("Verify the outer lifecycle receives serialized artifacts from the nested run", () -> {
+            assertFalse(results.getAttachments().isEmpty());
+            assertTrue(results.getAttachments().values().stream()
+                    .map(bytes -> new String(bytes, java.nio.charset.StandardCharsets.UTF_8))
+                    .anyMatch(body -> body.contains("\"uuid\"")));
+        });
+    }
+}
diff --git a/allure-java-commons-test/src/test/java/io/qameta/allure/test/TestUtilitiesTest.java b/allure-java-commons-test/src/test/java/io/qameta/allure/test/TestUtilitiesTest.java
new file mode 100644
index 000000000..d7fb298d1
--- /dev/null
+++ b/allure-java-commons-test/src/test/java/io/qameta/allure/test/TestUtilitiesTest.java
@@ -0,0 +1,65 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.test;
+
+import io.qameta.allure.Allure;
+import io.github.benas.randombeans.api.EnhancedRandom;
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class TestUtilitiesTest {
+
+    @Test
+    void shouldGenerateStableThreadLocalRandomPerThread() throws Exception {
+        final EnhancedRandom mainThread = ThreadLocalEnhancedRandom.current();
+        final AtomicReference<EnhancedRandom> workerThread = new AtomicReference<>();
+        final Thread thread = new Thread(() ->
+                workerThread.set(ThreadLocalEnhancedRandom.current())
+        );
+
+        Allure.step("Resolve thread-local random generators on two threads and compare their identities", () -> {
+            thread.start();
+            thread.join();
+            Allure.addAttachment(
+                    "thread-local-random-identities",
+                    "main=" + System.identityHashCode(mainThread)
+                    + "\nworker=" + System.identityHashCode(workerThread.get())
+            );
+            assertSame(mainThread, ThreadLocalEnhancedRandom.current());
+            assertNotSame(mainThread, workerThread.get());
+        });
+    }
+
+    @Test
+    void shouldGenerateExpectedRandomTestDataShapes() {
+        final String name = TestData.randomName();
+        final String id = TestData.randomId();
+        final String value = TestData.randomString(16);
+
+        assertEquals(10, name.length());
+        assertEquals(10, id.length());
+        assertEquals(16, value.length());
+        assertTrue(name.matches("[A-Za-z]+"));
+        assertTrue(id.matches("[A-Za-z0-9]+"));
+        assertTrue(value.matches("[A-Za-z0-9]+"));
+    }
+}
diff --git a/allure-java-commons-test/src/test/resources/allure.properties b/allure-java-commons-test/src/test/resources/allure.properties
new file mode 100644
index 000000000..c1b2f8a0e
--- /dev/null
+++ b/allure-java-commons-test/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
+allure.label.module=allure-java-commons-test
diff --git a/allure-java-commons/src/test/resources/allure.properties b/allure-java-commons/src/test/resources/allure.properties
index e4f1d9fc1..9f941c45f 100644
--- a/allure-java-commons/src/test/resources/allure.properties
+++ b/allure-java-commons/src/test/resources/allure.properties
@@ -1,3 +1,4 @@
 allure.results.directory=build/allure-results
 allure.link.issue.pattern=https://github.com/allure-framework/allure-java/issues/{}
 allure.label.epic=#project.description#
+allure.label.module=allure-java-commons
diff --git a/allure-jax-rs/src/test/resources/allure.properties b/allure-jax-rs/src/test/resources/allure.properties
index 9c0b0a2d7..cd2d7056f 100644
--- a/allure-jax-rs/src/test/resources/allure.properties
+++ b/allure-jax-rs/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-jax-rs
diff --git a/allure-jbehave/src/test/resources/allure.properties b/allure-jbehave/src/test/resources/allure.properties
index 9c0b0a2d7..04f5f5b67 100644
--- a/allure-jbehave/src/test/resources/allure.properties
+++ b/allure-jbehave/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-jbehave
diff --git a/allure-jbehave5/src/test/resources/allure.properties b/allure-jbehave5/src/test/resources/allure.properties
index 9c0b0a2d7..d61e9c1d7 100644
--- a/allure-jbehave5/src/test/resources/allure.properties
+++ b/allure-jbehave5/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-jbehave5
diff --git a/allure-jooq/src/test/resources/allure.properties b/allure-jooq/src/test/resources/allure.properties
new file mode 100644
index 000000000..d86adbae1
--- /dev/null
+++ b/allure-jooq/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
+allure.label.module=allure-jooq
diff --git a/allure-jsonunit/src/test/resources/allure.properties b/allure-jsonunit/src/test/resources/allure.properties
index 9c0b0a2d7..5f86fe638 100644
--- a/allure-jsonunit/src/test/resources/allure.properties
+++ b/allure-jsonunit/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-jsonunit
diff --git a/allure-junit-platform/build.gradle.kts b/allure-junit-platform/build.gradle.kts
index 4cf244bf2..b090e9ec6 100644
--- a/allure-junit-platform/build.gradle.kts
+++ b/allure-junit-platform/build.gradle.kts
@@ -29,11 +29,21 @@ tasks.jar {
 }
 
 tasks.test {
+    // The Allure Gradle adapter adds this module's published artifact to the
+    // test runtime classpath, so make the jar/task relationship explicit when
+    // jar and test are scheduled in the same build.
+    dependsOn(tasks.jar)
     systemProperty("junit.jupiter.execution.parallel.enabled", "false")
     useJUnitPlatform()
     exclude("**/features/*")
 }
 
+tasks.named<Pmd>("pmdMain") {
+    // PMD type resolution reads the main compile classpath, which also
+    // contains this module's published artifact via the Allure adapter setup.
+    dependsOn(tasks.jar)
+}
+
 val spiOffJar: Jar by tasks.creating(Jar::class) {
     from(sourceSets.getByName("main").output)
     archiveClassifier.set("spi-off")
diff --git a/allure-junit-platform/src/test/resources/allure.properties b/allure-junit-platform/src/test/resources/allure.properties
index 9c0b0a2d7..cff9d0857 100644
--- a/allure-junit-platform/src/test/resources/allure.properties
+++ b/allure-junit-platform/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-junit-platform
diff --git a/allure-junit4-aspect/build.gradle.kts b/allure-junit4-aspect/build.gradle.kts
index 79d3bc537..df7435024 100644
--- a/allure-junit4-aspect/build.gradle.kts
+++ b/allure-junit4-aspect/build.gradle.kts
@@ -6,6 +6,13 @@ dependencies {
     api(project(":allure-junit4"))
     compileOnly("junit:junit:$junitVersion")
     compileOnly("org.aspectj:aspectjrt")
+    testImplementation("junit:junit:$junitVersion")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.aspectj:aspectjrt")
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
 tasks.jar {
@@ -15,3 +22,7 @@ tasks.jar {
         ))
     }
 }
+
+tasks.test {
+    useJUnitPlatform()
+}
diff --git a/allure-junit4-aspect/src/test/java/io/qameta/allure/junit4/aspect/AllureJunit4AspectTest.java b/allure-junit4-aspect/src/test/java/io/qameta/allure/junit4/aspect/AllureJunit4AspectTest.java
new file mode 100644
index 000000000..d76ba2075
--- /dev/null
+++ b/allure-junit4-aspect/src/test/java/io/qameta/allure/junit4/aspect/AllureJunit4AspectTest.java
@@ -0,0 +1,124 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4.aspect;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.junit4.AllureJunit4;
+import io.qameta.allure.junit4.AllureJunit4Filter;
+import org.aspectj.lang.JoinPoint;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.Description;
+import org.junit.runner.Runner;
+import org.junit.runner.manipulation.Filter;
+import org.junit.runner.manipulation.Filterable;
+import org.junit.runner.manipulation.NoTestsRemainException;
+import org.junit.runner.notification.RunListener;
+import org.junit.runner.notification.RunNotifier;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class AllureJunit4AspectTest {
+
+    @Test
+    void shouldApplyAllureFilterToFilterableRunner() {
+        final TrackingRunner runner = new TrackingRunner(false);
+
+        new AllureJunit4FilterAspect().filterBeforeRun(runner);
+
+        assertNotNull(runner.appliedFilter);
+        assertInstanceOf(AllureJunit4Filter.class, runner.appliedFilter);
+    }
+
+    @Test
+    void shouldIgnoreNoTestsRemainExceptionDuringFiltering() {
+        final TrackingRunner runner = new TrackingRunner(true);
+
+        assertDoesNotThrow(() -> new AllureJunit4FilterAspect().filterBeforeRun(runner));
+        assertNotNull(runner.appliedFilter);
+    }
+
+    @Test
+    void shouldAddListenerToPlainRunNotifier() throws Exception {
+        final RunNotifier notifier = new RunNotifier();
+        final JoinPoint point = mock(JoinPoint.class);
+        when(point.getThis()).thenReturn(notifier);
+
+        Allure.step("Invoke the listener aspect against a plain RunNotifier", () ->
+                new AllureJunit4ListenerAspect().addListener(point)
+        );
+
+        Allure.step("Verify the notifier now contains the Allure JUnit 4 listener", () ->
+                assertTrue(getListeners(notifier).stream().anyMatch(AllureJunit4.class::isInstance))
+        );
+    }
+
+    @Test
+    void shouldSkipDerivedRunNotifierInstances() throws Exception {
+        final DerivedRunNotifier notifier = new DerivedRunNotifier();
+        final JoinPoint point = mock(JoinPoint.class);
+        when(point.getThis()).thenReturn(notifier);
+
+        new AllureJunit4ListenerAspect().addListener(point);
+
+        assertFalse(getListeners(notifier).stream().anyMatch(AllureJunit4.class::isInstance));
+    }
+
+    @SuppressWarnings("unchecked")
+    private static List<RunListener> getListeners(final RunNotifier notifier) throws Exception {
+        final Field listeners = RunNotifier.class.getDeclaredField("listeners");
+        listeners.setAccessible(true);
+        return (List<RunListener>) listeners.get(notifier);
+    }
+
+    private static final class TrackingRunner extends Runner implements Filterable {
+        private final boolean throwNoTestsRemain;
+        private Filter appliedFilter;
+
+        private TrackingRunner(final boolean throwNoTestsRemain) {
+            this.throwNoTestsRemain = throwNoTestsRemain;
+        }
+
+        @Override
+        public Description getDescription() {
+            return Description.EMPTY;
+        }
+
+        @Override
+        public void run(final RunNotifier notifier) {
+            // no-op
+        }
+
+        @Override
+        public void filter(final Filter filter) throws NoTestsRemainException {
+            this.appliedFilter = filter;
+            if (throwNoTestsRemain) {
+                throw new NoTestsRemainException();
+            }
+        }
+    }
+
+    private static final class DerivedRunNotifier extends RunNotifier {
+    }
+}
diff --git a/allure-junit4-aspect/src/test/resources/allure.properties b/allure-junit4-aspect/src/test/resources/allure.properties
new file mode 100644
index 000000000..3d37acf1c
--- /dev/null
+++ b/allure-junit4-aspect/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
+allure.label.module=allure-junit4-aspect
diff --git a/allure-junit4/src/test/resources/allure.properties b/allure-junit4/src/test/resources/allure.properties
index 9c0b0a2d7..b68758d17 100644
--- a/allure-junit4/src/test/resources/allure.properties
+++ b/allure-junit4/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-junit4
diff --git a/allure-jupiter-assert/src/test/resources/allure.properties b/allure-jupiter-assert/src/test/resources/allure.properties
index 9c0b0a2d7..2f82d5faa 100644
--- a/allure-jupiter-assert/src/test/resources/allure.properties
+++ b/allure-jupiter-assert/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-jupiter-assert
diff --git a/allure-jupiter/src/test/resources/allure.properties b/allure-jupiter/src/test/resources/allure.properties
index 4c9c3b8ee..36ea007c4 100644
--- a/allure-jupiter/src/test/resources/allure.properties
+++ b/allure-jupiter/src/test/resources/allure.properties
@@ -1,3 +1,4 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
 allure.link.issue.pattern=https://github.com/allure-framework/allure-java/issues/{}
+allure.label.module=allure-jupiter
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
index 5d18e9f0b..5dc65ac04 100644
--- a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
@@ -16,6 +16,8 @@
 package io.qameta.allure.karate;
 
 import com.intuit.karate.Runner;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.FileSystemResultsWriter;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import io.qameta.allure.model.Parameter;
@@ -26,6 +28,8 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import java.nio.file.Path;
+
 import static io.qameta.allure.model.Status.BROKEN;
 import static io.qameta.allure.model.Status.PASSED;
 import static io.qameta.allure.util.ResultsUtils.md5;
@@ -334,13 +338,21 @@ void shouldSkipCallAndCallOnceStepsInBeforeStep() {
 
     @Test
     void buildTest() {
+        final Path allureResults = temp.resolve("allure-results");
+
         Runner.builder()
                 .path("classpath:testdata/greeting.feature")
-                .hook(new AllureKarate())
+                .hook(new AllureKarate(new AllureLifecycle(
+                        new FileSystemResultsWriter(allureResults)
+                )))
                 .backupReportDir(false)
+                .reportDir(temp.resolve("karate-reports").toString())
                 .outputJunitXml(false)
                 .outputCucumberJson(false)
                 .outputHtmlReport(false)
                 .parallel(1);
+
+        assertThat(allureResults)
+                .isDirectoryContaining(path -> path.getFileName().toString().endsWith("-result.json"));
     }
 }
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java b/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
index 1149317c3..677e57572 100644
--- a/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/TestRunner.java
@@ -17,11 +17,14 @@
 
 import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.RunUtils;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockserver.client.MockServerClient;
 import org.mockserver.model.HttpRequest;
 import org.mockserver.model.HttpResponse;
 import org.mockserver.netty.MockServer;
 
+import java.nio.file.Path;
+
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 
@@ -31,6 +34,9 @@ public class TestRunner {
     private MockServer server;
     private MockServerClient client;
 
+    @TempDir
+    protected Path temp;
+
     AllureResults runApi(final String... featurePath) {
         server = new MockServer(8081);
         client = new MockServerClient("localhost", server.getLocalPort());
@@ -63,6 +69,7 @@ AllureResults run(final String... path) {
                         .path(path)
                         .hook(allureKarate)
                         .backupReportDir(false)
+                        .reportDir(temp.resolve("karate-reports").toString())
                         .outputJunitXml(false)
                         .outputCucumberJson(false)
                         .outputHtmlReport(false)
diff --git a/allure-karate/src/test/resources/allure.properties b/allure-karate/src/test/resources/allure.properties
new file mode 100644
index 000000000..a4cd2a544
--- /dev/null
+++ b/allure-karate/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
+allure.label.module=allure-karate
diff --git a/allure-model/src/test/resources/allure.properties b/allure-model/src/test/resources/allure.properties
index cb77d0a3e..5002f01c0 100644
--- a/allure-model/src/test/resources/allure.properties
+++ b/allure-model/src/test/resources/allure.properties
@@ -1 +1,2 @@
-allure.results.directory=build/allure-results
\ No newline at end of file
+allure.results.directory=build/allure-results
+allure.label.module=allure-model
diff --git a/allure-okhttp/src/test/resources/allure.properties b/allure-okhttp/src/test/resources/allure.properties
index 9c0b0a2d7..2182ac90e 100644
--- a/allure-okhttp/src/test/resources/allure.properties
+++ b/allure-okhttp/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-okhttp
diff --git a/allure-okhttp3/src/test/resources/allure.properties b/allure-okhttp3/src/test/resources/allure.properties
index 9c0b0a2d7..a835d79ec 100644
--- a/allure-okhttp3/src/test/resources/allure.properties
+++ b/allure-okhttp3/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-okhttp3
diff --git a/allure-reader/build.gradle.kts b/allure-reader/build.gradle.kts
index 432fd8158..6d05533e7 100644
--- a/allure-reader/build.gradle.kts
+++ b/allure-reader/build.gradle.kts
@@ -7,6 +7,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
diff --git a/allure-reader/src/test/java/io/qameta/allure/reader/AllureObjectMapperFactoryTest.java b/allure-reader/src/test/java/io/qameta/allure/reader/AllureObjectMapperFactoryTest.java
new file mode 100644
index 000000000..74802ce12
--- /dev/null
+++ b/allure-reader/src/test/java/io/qameta/allure/reader/AllureObjectMapperFactoryTest.java
@@ -0,0 +1,108 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.reader;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.qameta.allure.Allure;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.TestResult;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+class AllureObjectMapperFactoryTest {
+
+    @Test
+    void shouldCreateMapperThatReadsEnumsCaseInsensitively() throws Exception {
+        final TestResult result = Allure.step("Deserialize a mixed-case payload with extra fields", () -> {
+            final ObjectMapper mapper = AllureObjectMapperFactory.createMapper();
+            return mapper.readValue(
+                    "{"
+                    + "\"name\":\"demo\","
+                    + "\"status\":\"pAsSeD\","
+                    + "\"stage\":\"fInIsHeD\","
+                    + "\"parameters\":[{\"name\":\"secret\",\"value\":\"42\",\"mode\":\"MaSkEd\"}],"
+                    + "\"unknown\":\"ignored\""
+                    + "}",
+                    TestResult.class
+            );
+        });
+
+        Allure.step("Verify the mapper normalizes enums and keeps the expected payload", () -> {
+            assertEquals("demo", result.getName());
+            assertEquals(Status.PASSED, result.getStatus());
+            assertEquals(Stage.FINISHED, result.getStage());
+            assertEquals(Parameter.Mode.MASKED, result.getParameters().get(0).getMode());
+        });
+    }
+
+    @Test
+    void deprecatedDeserializersShouldTrimInputAndReturnNullForUnknownValues() throws Exception {
+        final ObjectMapper mapper = AllureObjectMapperFactory.createMapper();
+
+        final DeprecatedEnumHolder trimmed = mapper.readValue(
+                "{"
+                + "\"status\":\" broken \","
+                + "\"stage\":\" pending \","
+                + "\"mode\":\" hidden \""
+                + "}",
+                DeprecatedEnumHolder.class
+        );
+        final DeprecatedEnumHolder unknown = mapper.readValue(
+                "{"
+                + "\"status\":\"not-a-status\","
+                + "\"stage\":\"   \","
+                + "\"mode\":\"not-a-mode\""
+                + "}",
+                DeprecatedEnumHolder.class
+        );
+
+        Allure.step("Compare deprecated deserializer output for trimmed and unknown enum values", () -> {
+            Allure.addAttachment(
+                    "enum-deserialization-summary",
+                    "trimmed.status=" + trimmed.status
+                    + "\ntrimmed.stage=" + trimmed.stage
+                    + "\ntrimmed.mode=" + trimmed.mode
+                    + "\nunknown.status=" + unknown.status
+                    + "\nunknown.stage=" + unknown.stage
+                    + "\nunknown.mode=" + unknown.mode
+            );
+            assertEquals(Status.BROKEN, trimmed.status);
+            assertEquals(Stage.PENDING, trimmed.stage);
+            assertEquals(Parameter.Mode.HIDDEN, trimmed.mode);
+
+            assertNull(unknown.status);
+            assertNull(unknown.stage);
+            assertNull(unknown.mode);
+        });
+    }
+
+    private static final class DeprecatedEnumHolder {
+
+        @JsonDeserialize(using = StatusDeserializer.class)
+        private Status status;
+
+        @JsonDeserialize(using = StageDeserializer.class)
+        private Stage stage;
+
+        @JsonDeserialize(using = ParameterModeDeserializer.class)
+        private Parameter.Mode mode;
+    }
+}
diff --git a/allure-reader/src/test/resources/allure.properties b/allure-reader/src/test/resources/allure.properties
new file mode 100644
index 000000000..364aa6dec
--- /dev/null
+++ b/allure-reader/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
+allure.label.module=allure-reader
diff --git a/allure-rest-assured/src/test/resources/allure.properties b/allure-rest-assured/src/test/resources/allure.properties
index 9c0b0a2d7..89b92e231 100644
--- a/allure-rest-assured/src/test/resources/allure.properties
+++ b/allure-rest-assured/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-rest-assured
diff --git a/allure-scalatest/src/test/resources/allure.properties b/allure-scalatest/src/test/resources/allure.properties
index 9c0b0a2d7..760733e93 100644
--- a/allure-scalatest/src/test/resources/allure.properties
+++ b/allure-scalatest/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-scalatest
diff --git a/allure-selenide/src/test/resources/allure.properties b/allure-selenide/src/test/resources/allure.properties
index 9c0b0a2d7..cfcad4a8e 100644
--- a/allure-selenide/src/test/resources/allure.properties
+++ b/allure-selenide/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-selenide
diff --git a/allure-servlet-api/build.gradle.kts b/allure-servlet-api/build.gradle.kts
index 55c4bdcdf..52c92821b 100644
--- a/allure-servlet-api/build.gradle.kts
+++ b/allure-servlet-api/build.gradle.kts
@@ -6,6 +6,11 @@ dependencies {
     api(project(":allure-attachments"))
     compileOnly("javax.servlet:javax.servlet-api:$servletApiVersion")
     testImplementation("javax.servlet:javax.servlet-api:$servletApiVersion")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
 tasks.jar {
@@ -15,3 +20,7 @@ tasks.jar {
         ))
     }
 }
+
+tasks.test {
+    useJUnitPlatform()
+}
diff --git a/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java b/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
index fe1c3abc4..314667b14 100644
--- a/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
+++ b/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
@@ -24,8 +24,8 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
-import java.util.stream.Stream;
 
 import static io.qameta.allure.attachment.http.HttpRequestAttachment.Builder.create;
 import static io.qameta.allure.attachment.http.HttpResponseAttachment.Builder.create;
@@ -49,8 +49,11 @@ public static HttpRequestAttachment buildRequest(final HttpServletRequest reques
                     requestBuilder.setHeader(name, value);
                 });
 
-        Stream.of(request.getCookies())
-                .forEach(cookie -> requestBuilder.setCookie(cookie.getName(), cookie.getValue()));
+        final javax.servlet.http.Cookie[] cookies = request.getCookies();
+        if (cookies != null) {
+            Arrays.stream(cookies)
+                    .forEach(cookie -> requestBuilder.setCookie(cookie.getName(), cookie.getValue()));
+        }
         requestBuilder.setBody(getBody(request));
         return requestBuilder.build();
     }
diff --git a/allure-servlet-api/src/test/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilderTest.java b/allure-servlet-api/src/test/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilderTest.java
new file mode 100644
index 000000000..4fca9bfc7
--- /dev/null
+++ b/allure-servlet-api/src/test/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilderTest.java
@@ -0,0 +1,101 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.servletapi;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.attachment.http.HttpRequestAttachment;
+import io.qameta.allure.attachment.http.HttpResponseAttachment;
+import org.junit.jupiter.api.Test;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class HttpServletAttachmentBuilderTest {
+
+    @Test
+    void shouldBuildRequestWithHeadersCookiesAndBody() throws Exception {
+        final HttpServletRequest request = mock(HttpServletRequest.class);
+        when(request.getRequestURI()).thenReturn("/orders");
+        when(request.getHeaderNames()).thenReturn(Collections.enumeration(List.of("X-Trace", "Accept")));
+        when(request.getHeader("X-Trace")).thenReturn("trace-1");
+        when(request.getHeader("Accept")).thenReturn("application/json");
+        when(request.getCookies()).thenReturn(new Cookie[]{new Cookie("session", "abc123")});
+        when(request.getReader()).thenReturn(new BufferedReader(new StringReader("{\"ok\":true}")));
+
+        final HttpRequestAttachment attachment = HttpServletAttachmentBuilder.buildRequest(request);
+
+        assertEquals("Request", attachment.getName());
+        assertEquals("/orders", attachment.getUrl());
+        assertEquals("{\"ok\":true}", attachment.getBody());
+        assertEquals(Map.of("X-Trace", "trace-1", "Accept", "application/json"), attachment.getHeaders());
+        assertEquals(Map.of("session", "abc123"), attachment.getCookies());
+    }
+
+    @Test
+    void shouldHandleRequestsWithoutCookies() throws Exception {
+        final HttpServletRequest request = mock(HttpServletRequest.class);
+        when(request.getRequestURI()).thenReturn("/orders");
+        when(request.getHeaderNames()).thenReturn(Collections.emptyEnumeration());
+        when(request.getCookies()).thenReturn(null);
+        when(request.getReader()).thenReturn(new BufferedReader(new StringReader("")));
+
+        final HttpRequestAttachment attachment = Allure.step(
+                "Build a request attachment when the servlet container returns null cookies",
+                () -> assertDoesNotThrow(() -> HttpServletAttachmentBuilder.buildRequest(request))
+        );
+
+        Allure.step("Verify the request attachment keeps an empty cookie map", () ->
+                assertTrue(attachment.getCookies().isEmpty())
+        );
+    }
+
+    @Test
+    void shouldBuildResponseWithHeaders() {
+        final HttpServletResponse response = mock(HttpServletResponse.class);
+        when(response.getHeaderNames()).thenReturn(List.of("Content-Type"));
+        when(response.getHeaders("Content-Type")).thenReturn(List.of("application/json"));
+
+        final HttpResponseAttachment attachment = HttpServletAttachmentBuilder.buildResponse(response);
+
+        assertEquals("Response", attachment.getName());
+        assertEquals(Map.of("Content-Type", "application/json"), attachment.getHeaders());
+    }
+
+    @Test
+    void shouldReturnEmptyBodyWhenRequestReaderFails() throws Exception {
+        final HttpServletRequest request = mock(HttpServletRequest.class);
+        when(request.getReader()).thenThrow(new IOException("boom"));
+
+        final String body = Allure.step("Read the request body when the servlet reader throws", () ->
+                HttpServletAttachmentBuilder.getBody(request)
+        );
+
+        Allure.step("Verify the fallback body is empty", () -> assertEquals("", body));
+    }
+}
diff --git a/allure-servlet-api/src/test/resources/allure.properties b/allure-servlet-api/src/test/resources/allure.properties
new file mode 100644
index 000000000..8f58f812c
--- /dev/null
+++ b/allure-servlet-api/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
+allure.label.module=allure-servlet-api
diff --git a/allure-spock/src/test/resources/allure.properties b/allure-spock/src/test/resources/allure.properties
index 9c0b0a2d7..92d17a33c 100644
--- a/allure-spock/src/test/resources/allure.properties
+++ b/allure-spock/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-spock
diff --git a/allure-spock2/src/test/resources/allure.properties b/allure-spock2/src/test/resources/allure.properties
index 9c0b0a2d7..19503db35 100644
--- a/allure-spock2/src/test/resources/allure.properties
+++ b/allure-spock2/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-spock2
diff --git a/allure-spring-web/src/test/resources/allure.properties b/allure-spring-web/src/test/resources/allure.properties
index 9c0b0a2d7..594c44e14 100644
--- a/allure-spring-web/src/test/resources/allure.properties
+++ b/allure-spring-web/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.label.module=allure-spring-web
diff --git a/allure-test-filter/build.gradle.kts b/allure-test-filter/build.gradle.kts
index b2198ce39..2c96987f2 100644
--- a/allure-test-filter/build.gradle.kts
+++ b/allure-test-filter/build.gradle.kts
@@ -16,6 +16,7 @@ dependencies {
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation(project(":allure-assertj"))
     testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
@@ -68,4 +69,3 @@ tasks {
         exclude("**/features/*")
     }
 }
-
diff --git a/allure-test-filter/src/test/java/io/qameta/allure/testfilter/FileTestPlanSupplierTest.java b/allure-test-filter/src/test/java/io/qameta/allure/testfilter/FileTestPlanSupplierTest.java
new file mode 100644
index 000000000..dda3d2de3
--- /dev/null
+++ b/allure-test-filter/src/test/java/io/qameta/allure/testfilter/FileTestPlanSupplierTest.java
@@ -0,0 +1,124 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testfilter;
+
+import io.qameta.allure.Allure;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class FileTestPlanSupplierTest {
+
+    @Test
+    void shouldReadPlanFromPrimaryEnvironmentVariable() throws Exception {
+        final ProbeResult result = Allure.step("Run the supplier probe with ALLURE_TESTPLAN_PATH", () ->
+                runProbe("ALLURE_TESTPLAN_PATH")
+        );
+
+        recordProbe(result);
+        Allure.step("Verify the probe selects the configured test plan entry", () -> {
+            assertEquals(0, result.exitCode);
+            assertEquals("selected=true", result.stdout.strip());
+        });
+    }
+
+    @Test
+    void shouldReadPlanFromLegacyEnvironmentVariable() throws Exception {
+        final ProbeResult result = Allure.step("Run the supplier probe with AS_TESTPLAN_PATH", () ->
+                runProbe("AS_TESTPLAN_PATH")
+        );
+
+        recordProbe(result);
+        Allure.step("Verify the legacy environment alias still loads the plan", () -> {
+            assertEquals(0, result.exitCode);
+            assertEquals("selected=true", result.stdout.strip());
+        });
+    }
+
+    private ProbeResult runProbe(final String variableName) throws IOException, InterruptedException {
+        final Path plan = Files.createTempFile("allure-testplan-", ".json");
+        Files.writeString(
+                plan,
+                "{"
+                + "\"version\":\"1.0\","
+                + "\"tests\":[{\"id\":\"A-1\",\"selector\":\"pkg.Test#name\"}]"
+                + "}",
+                StandardCharsets.UTF_8
+        );
+
+        final String javaBin = Path.of(System.getProperty("java.home"), "bin", "java").toString();
+        final ProcessBuilder builder = new ProcessBuilder(
+                javaBin,
+                "-cp",
+                System.getProperty("java.class.path"),
+                SupplierProbe.class.getName()
+        );
+        final Map<String, String> environment = builder.environment();
+        environment.remove("ALLURE_TESTPLAN_PATH");
+        environment.remove("AS_TESTPLAN_PATH");
+        environment.put(variableName, plan.toString());
+
+        final Process process = builder.start();
+        final boolean finished = process.waitFor(Duration.ofSeconds(10).toMillis(), java.util.concurrent.TimeUnit.MILLISECONDS);
+        if (!finished) {
+            process.destroyForcibly();
+            throw new IllegalStateException("supplier probe timed out");
+        }
+
+        final String stdout = new String(process.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
+        final String stderr = new String(process.getErrorStream().readAllBytes(), StandardCharsets.UTF_8);
+        return new ProbeResult(process.exitValue(), stdout, stderr);
+    }
+
+    private void recordProbe(final ProbeResult result) {
+        Allure.addAttachment("probe-stdout", result.stdout);
+        Allure.addAttachment("probe-stderr", result.stderr);
+    }
+
+    private static final class ProbeResult {
+        private final int exitCode;
+        private final String stdout;
+        private final String stderr;
+
+        private ProbeResult(final int exitCode, final String stdout, final String stderr) {
+            this.exitCode = exitCode;
+            this.stdout = stdout;
+            this.stderr = stderr;
+        }
+    }
+
+    public static final class SupplierProbe {
+        private SupplierProbe() {
+        }
+
+        public static void main(final String[] args) {
+            final FileTestPlanSupplier supplier = new FileTestPlanSupplier();
+            final String result = supplier.supply()
+                    .filter(TestPlanV1_0.class::isInstance)
+                    .map(TestPlanV1_0.class::cast)
+                    .map(plan -> "selected=" + plan.isSelected("A-1", "pkg.Test#name"))
+                    .orElse("selected=false");
+            System.out.println(result);
+        }
+    }
+}
diff --git a/allure-test-filter/src/test/java/io/qameta/allure/testfilter/TestPlanV1_0Test.java b/allure-test-filter/src/test/java/io/qameta/allure/testfilter/TestPlanV1_0Test.java
new file mode 100644
index 000000000..b66cf67c5
--- /dev/null
+++ b/allure-test-filter/src/test/java/io/qameta/allure/testfilter/TestPlanV1_0Test.java
@@ -0,0 +1,71 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.testfilter;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.qameta.allure.Allure;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class TestPlanV1_0Test {
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    @Test
+    void shouldMatchByAllureIdOrSelector() {
+        final TestPlanV1_0 plan = new TestPlanV1_0().setTests(List.of(
+                new TestPlanV1_0.TestCase().setId("A-1"),
+                new TestPlanV1_0.TestCase().setSelector("pkg.Test#name")
+        ));
+
+        assertTrue(plan.isSelected("A-1", "other.Test#name"));
+        assertTrue(plan.isSelected("other-id", "pkg.Test#name"));
+        assertFalse(plan.isSelected("other-id", "other.Test#name"));
+    }
+
+    @Test
+    void shouldDeserializeVersionedPlans() throws Exception {
+        final TestPlan plan = OBJECT_MAPPER.readValue(
+                "{"
+                + "\"version\":\"1.0\","
+                + "\"tests\":[{\"id\":\"A-1\",\"selector\":\"pkg.Test#name\"}]"
+                + "}",
+                TestPlan.class
+        );
+
+        assertInstanceOf(TestPlanV1_0.class, plan);
+        assertTrue(((TestPlanV1_0) plan).isSelected("A-1", "pkg.Test#name"));
+    }
+
+    @Test
+    void shouldFallbackToUnknownPlanForUnknownVersion() throws Exception {
+        final TestPlan plan = Allure.step("Deserialize a plan with an unsupported version", () ->
+                OBJECT_MAPPER.readValue(
+                        "{\"version\":\"2.0\"}",
+                        TestPlan.class
+                )
+        );
+
+        Allure.step("Verify the parser falls back to the unknown plan representation", () ->
+                assertInstanceOf(TestPlanUnknown.class, plan)
+        );
+    }
+}
diff --git a/allure-test-filter/src/test/resources/allure.properties b/allure-test-filter/src/test/resources/allure.properties
new file mode 100644
index 000000000..08b61b47e
--- /dev/null
+++ b/allure-test-filter/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
+allure.label.module=allure-test-filter
diff --git a/allure-testng/build.gradle.kts b/allure-testng/build.gradle.kts
index 7d6fe56a7..7113509d6 100644
--- a/allure-testng/build.gradle.kts
+++ b/allure-testng/build.gradle.kts
@@ -10,10 +10,14 @@ dependencies {
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("com.google.inject:guice")
     testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation(project(":allure-jupiter"))
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation("org.testng:testng:$testNgVersion")
     testImplementation(project(":allure-java-commons-test"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
 tasks.jar {
@@ -28,9 +32,7 @@ tasks.jar {
 }
 
 tasks.test {
-    useTestNG(closureOf<TestNGOptions> {
-        suites("src/test/resources/testng.xml")
-    })
+    useJUnitPlatform()
     exclude("**/samples/*")
 }
 
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
index bc1f54bf0..498befd58 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -39,9 +39,12 @@
 import io.qameta.allure.testng.samples.TestsWithIdForFilter;
 import org.assertj.core.api.Condition;
 import org.assertj.core.groups.Tuple;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testng.TestNG;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import org.testng.xml.XmlSuite;
 
 import java.net.URL;
@@ -54,6 +57,7 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static io.qameta.allure.util.ResultsUtils.ALLURE_SEPARATE_LINES_SYSPROP;
 import static java.lang.String.format;
@@ -61,6 +65,7 @@
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 /**
  * @author Egor Borisov ehborisov@gmail.com
@@ -77,30 +82,30 @@ public class AllureTestNgTest {
             items.stream().allMatch(item -> item.getSteps().size() == 1),
             "All items should have a step attached");
 
-    @DataProvider(name = "parallelConfiguration")
-    public static Object[][] parallelConfiguration() {
-        return new Object[][]{
-                new Object[]{XmlSuite.ParallelMode.NONE, 10},
-                new Object[]{XmlSuite.ParallelMode.NONE, 5},
-                new Object[]{XmlSuite.ParallelMode.NONE, 2},
-                new Object[]{XmlSuite.ParallelMode.NONE, 1},
-                new Object[]{XmlSuite.ParallelMode.METHODS, 10},
-                new Object[]{XmlSuite.ParallelMode.METHODS, 5},
-                new Object[]{XmlSuite.ParallelMode.METHODS, 2},
-                new Object[]{XmlSuite.ParallelMode.METHODS, 1},
-                new Object[]{XmlSuite.ParallelMode.CLASSES, 10},
-                new Object[]{XmlSuite.ParallelMode.CLASSES, 5},
-                new Object[]{XmlSuite.ParallelMode.CLASSES, 2},
-                new Object[]{XmlSuite.ParallelMode.CLASSES, 1},
-                new Object[]{XmlSuite.ParallelMode.INSTANCES, 10},
-                new Object[]{XmlSuite.ParallelMode.INSTANCES, 5},
-                new Object[]{XmlSuite.ParallelMode.INSTANCES, 2},
-                new Object[]{XmlSuite.ParallelMode.INSTANCES, 1},
-                new Object[]{XmlSuite.ParallelMode.TESTS, 10},
-                new Object[]{XmlSuite.ParallelMode.TESTS, 5},
-                new Object[]{XmlSuite.ParallelMode.TESTS, 2},
-                new Object[]{XmlSuite.ParallelMode.TESTS, 1},
-        };
+    @SuppressWarnings("unused")
+    private static Stream<Arguments> parallelConfiguration() {
+        return Stream.of(
+                arguments(XmlSuite.ParallelMode.NONE, 10),
+                arguments(XmlSuite.ParallelMode.NONE, 5),
+                arguments(XmlSuite.ParallelMode.NONE, 2),
+                arguments(XmlSuite.ParallelMode.NONE, 1),
+                arguments(XmlSuite.ParallelMode.METHODS, 10),
+                arguments(XmlSuite.ParallelMode.METHODS, 5),
+                arguments(XmlSuite.ParallelMode.METHODS, 2),
+                arguments(XmlSuite.ParallelMode.METHODS, 1),
+                arguments(XmlSuite.ParallelMode.CLASSES, 10),
+                arguments(XmlSuite.ParallelMode.CLASSES, 5),
+                arguments(XmlSuite.ParallelMode.CLASSES, 2),
+                arguments(XmlSuite.ParallelMode.CLASSES, 1),
+                arguments(XmlSuite.ParallelMode.INSTANCES, 10),
+                arguments(XmlSuite.ParallelMode.INSTANCES, 5),
+                arguments(XmlSuite.ParallelMode.INSTANCES, 2),
+                arguments(XmlSuite.ParallelMode.INSTANCES, 1),
+                arguments(XmlSuite.ParallelMode.TESTS, 10),
+                arguments(XmlSuite.ParallelMode.TESTS, 5),
+                arguments(XmlSuite.ParallelMode.TESTS, 2),
+                arguments(XmlSuite.ParallelMode.TESTS, 1)
+        );
     }
 
     @AllureFeatures.Fixtures
@@ -133,7 +138,8 @@ public void shouldSetConfigurationProperty() {
     }
 
     @AllureFeatures.Parallel
-    @Test(description = "Parallel data provider tests")
+    @Test
+    @DisplayName("Parallel data provider tests")
     public void parallelDataProvider() {
         final AllureResults results = runTestNgSuites("suites/parallel-data-provider.xml");
         List<TestResult> testResult = results.getTestResults();
@@ -143,7 +149,8 @@ public void parallelDataProvider() {
     }
 
     @AllureFeatures.Base
-    @Test(description = "Singe testng")
+    @Test
+    @DisplayName("Singe testng")
     public void singleTest() {
         final String testName = "testWithOneStep";
         final AllureResults results = runTestNgSuites("suites/single-test.xml");
@@ -162,7 +169,9 @@ public void singleTest() {
     }
 
     @AllureFeatures.Base
-    @Test(description = "Test with timeout", dataProvider = "parallelConfiguration")
+    @ParameterizedTest
+    @MethodSource("parallelConfiguration")
+    @DisplayName("Test with timeout")
     public void testWithTimeout(final XmlSuite.ParallelMode mode, final int threadCount) {
 
         final String testNameWithTimeout = "testWithTimeout";
@@ -194,7 +203,8 @@ public void testWithTimeout(final XmlSuite.ParallelMode mode, final int threadCo
     }
 
     @AllureFeatures.Descriptions
-    @Test(description = "Javadoc description with line separation")
+    @Test
+    @DisplayName("Javadoc description with line separation")
     public void descriptionsWithLineSeparationTest() {
         String initialSeparateLines = System.getProperty(ALLURE_SEPARATE_LINES_SYSPROP);
         if (!Boolean.parseBoolean(initialSeparateLines)) {
@@ -217,7 +227,8 @@ public void descriptionsWithLineSeparationTest() {
     }
 
     @AllureFeatures.Descriptions
-    @Test(description = "Javadoc description of tests")
+    @Test
+    @DisplayName("Javadoc description of tests")
     public void descriptionsTest() {
         final String testDescription = "Sample test description";
         final AllureResults results = runTestNgSuites("suites/descriptions-test.xml");
@@ -232,7 +243,9 @@ public void descriptionsTest() {
     }
 
     @AllureFeatures.Descriptions
-    @Test(description = "Javadoc description of befores", dataProvider = "parallelConfiguration")
+    @ParameterizedTest
+    @MethodSource("parallelConfiguration")
+    @DisplayName("Javadoc description of befores")
     public void descriptionsBefores(final XmlSuite.ParallelMode mode, final int threadCount) {
         final String beforeClassDescription = "Before class description";
         final String beforeMethodDescription = "Before method description";
@@ -257,7 +270,8 @@ public void descriptionsBefores(final XmlSuite.ParallelMode mode, final int thre
     }
 
     @AllureFeatures.Descriptions
-    @Test(description = "Javadoc description of befores with the same names")
+    @Test
+    @DisplayName("Javadoc description of befores with the same names")
     public void javadocDescriptionsOfBeforesWithTheSameNames() {
         final AllureResults results = runTestNgSuites("suites/descriptions-test-two-classes.xml");
         List<TestResultContainer> testContainers = results.getTestResultContainers();
@@ -270,7 +284,8 @@ public void javadocDescriptionsOfBeforesWithTheSameNames() {
     }
 
     @AllureFeatures.Descriptions
-    @Test(description = "Javadoc description of tests with the same names")
+    @Test
+    @DisplayName("Javadoc description of tests with the same names")
     public void javadocDescriptionsOfTestsWithTheSameNames() {
         final AllureResults results = runTestNgSuites("suites/descriptions-test-two-classes.xml");
         List<TestResult> testResults = results.getTestResults();
@@ -281,7 +296,8 @@ public void javadocDescriptionsOfTestsWithTheSameNames() {
     }
 
     @AllureFeatures.FailedTests
-    @Test(description = "Test failing by assertion")
+    @Test
+    @DisplayName("Test failing by assertion")
     public void failingByAssertion() {
         String testName = "failingByAssertion";
         final AllureResults results = runTestNgSuites("suites/failing-by-assertion.xml");
@@ -300,7 +316,8 @@ public void failingByAssertion() {
     }
 
     @AllureFeatures.BrokenTests
-    @Test(description = "Broken testng")
+    @Test
+    @DisplayName("Broken testng")
     public void brokenTest() {
         String testName = "brokenTest";
         final AllureResults results = runTestNgSuites("suites/broken.xml");
@@ -322,7 +339,8 @@ public void brokenTest() {
     }
 
     @AllureFeatures.BrokenTests
-    @Test(description = "Broken testng - Exception without message")
+    @Test
+    @DisplayName("Broken testng - Exception without message")
     public void brokenTestWithOutMessage() {
         String testName = "brokenTestWithoutMessage";
         final AllureResults results = runTestNgSuites("suites/brokenWithoutMessage.xml");
@@ -345,7 +363,9 @@ public void brokenTestWithOutMessage() {
     }
 
     @AllureFeatures.Fixtures
-    @Test(description = "Suite fixtures", dataProvider = "parallelConfiguration")
+    @ParameterizedTest
+    @MethodSource("parallelConfiguration")
+    @DisplayName("Suite fixtures")
     public void perSuiteFixtures(final XmlSuite.ParallelMode mode, final int threadCount) {
         String suiteName = "Test suite 12";
         String testTagName = "Test tag 12";
@@ -372,7 +392,9 @@ public void perSuiteFixtures(final XmlSuite.ParallelMode mode, final int threadC
     }
 
     @AllureFeatures.Fixtures
-    @Test(description = "Class fixtures", dataProvider = "parallelConfiguration")
+    @ParameterizedTest
+    @MethodSource("parallelConfiguration")
+    @DisplayName("Class fixtures")
     public void perClassFixtures(final XmlSuite.ParallelMode mode, final int threadCount) {
         final AllureResults results = runTestNgSuites(
                 parallel(mode, threadCount),
@@ -401,7 +423,9 @@ public void perClassFixtures(final XmlSuite.ParallelMode mode, final int threadC
     }
 
     @AllureFeatures.Fixtures
-    @Test(description = "Method fixtures", dataProvider = "parallelConfiguration")
+    @ParameterizedTest
+    @MethodSource("parallelConfiguration")
+    @DisplayName("Method fixtures")
     public void perMethodFixtures(final XmlSuite.ParallelMode mode, final int threadCount) {
         String suiteName = "Test suite 11";
         String testTagName = "Test tag 11";
@@ -430,7 +454,9 @@ public void perMethodFixtures(final XmlSuite.ParallelMode mode, final int thread
     }
 
     @AllureFeatures.Fixtures
-    @Test(description = "Test fixtures", dataProvider = "parallelConfiguration")
+    @ParameterizedTest
+    @MethodSource("parallelConfiguration")
+    @DisplayName("Test fixtures")
     public void perTestTagFixtures(final XmlSuite.ParallelMode mode, final int threadCount) {
         String suiteName = "Test suite 13";
         String testTagName = "Test tag 13";
@@ -457,7 +483,8 @@ public void perTestTagFixtures(final XmlSuite.ParallelMode mode, final int threa
     }
 
     @AllureFeatures.SkippedTests
-    @Test(description = "Skipped suite")
+    @Test
+    @DisplayName("Skipped suite")
     public void skippedSuiteTest() {
         final Condition<StepResult> skipReason = new Condition<>(step ->
                 step.getStatusDetails().getTrace().startsWith("java.lang.RuntimeException: Skip all"),
@@ -494,7 +521,8 @@ public void skippedSuiteTest() {
     }
 
     @AllureFeatures.Base
-    @Test(description = "Multi suites")
+    @Test
+    @DisplayName("Multi suites")
     public void multipleSuites() {
         String beforeMethodName = "io.qameta.allure.testng.samples.ParameterizedTest.beforeMethod";
         String firstSuiteName = "Test suite 6";
@@ -526,7 +554,8 @@ public void multipleSuites() {
 
     @SuppressWarnings("unchecked")
     @AllureFeatures.Parameters
-    @Test(description = "Before Suite Parameter")
+    @Test
+    @DisplayName("Before Suite Parameter")
     public void testBeforeSuiteParameter() {
         final AllureResults results = runTestNgSuites("suites/parameterized-suite1.xml", "suites/parameterized-suite2.xml");
         List<TestResult> testResults = results.getTestResults();
@@ -543,7 +572,8 @@ public void testBeforeSuiteParameter() {
     }
 
     @AllureFeatures.Parallel
-    @Test(description = "Parallel methods")
+    @Test
+    @DisplayName("Parallel methods")
     public void parallelMethods() {
         String before1 = "io.qameta.allure.testng.samples.ParallelMethods.beforeMethod";
         String before2 = "io.qameta.allure.testng.samples.ParallelMethods.beforeMethod2";
@@ -566,7 +596,8 @@ public void parallelMethods() {
     }
 
     @AllureFeatures.Steps
-    @Test(description = "Nested steps")
+    @Test
+    @DisplayName("Nested steps")
     public void nestedSteps() {
         String beforeMethod = "io.qameta.allure.testng.samples.NestedSteps.beforeMethod";
         String nestedStep = "nestedStep";
@@ -599,7 +630,8 @@ public void nestedSteps() {
     }
 
     @AllureFeatures.MarkerAnnotations
-    @Test(description = "Flaky tests")
+    @Test
+    @DisplayName("Flaky tests")
     public void flakyTests() {
         final AllureResults results = runTestNgSuites("suites/flaky.xml");
 
@@ -621,7 +653,8 @@ public void flakyTests() {
     }
 
     @AllureFeatures.MarkerAnnotations
-    @Test(description = "Muted tests")
+    @Test
+    @DisplayName("Muted tests")
     public void mutedTests() {
         final AllureResults results = runTestNgSuites("suites/muted.xml");
 
@@ -643,7 +676,8 @@ public void mutedTests() {
     }
 
     @AllureFeatures.Links
-    @Test(description = "Tests with links")
+    @Test
+    @DisplayName("Tests with links")
     public void linksTest() {
         final AllureResults results = runTestNgSuites("suites/links.xml");
 
@@ -663,7 +697,8 @@ public void linksTest() {
     }
 
     @AllureFeatures.MarkerAnnotations
-    @Test(description = "BDD annotations")
+    @Test
+    @DisplayName("BDD annotations")
     public void bddAnnotationsTest() {
         final AllureResults results = runTestNgSuites("suites/bdd-annotations.xml");
 
@@ -689,7 +724,8 @@ public void bddAnnotationsTest() {
     }
 
     @AllureFeatures.Base
-    @Test(description = "Should support TestNG retries")
+    @Test
+    @DisplayName("Should support TestNG retries")
     public void retryTest() {
         final AllureResults results = runTestNgSuites("suites/retry.xml");
         List<TestResult> testResults = results.getTestResults();
@@ -698,7 +734,8 @@ public void retryTest() {
     }
 
     @AllureFeatures.Severity
-    @Test(description = "Should add severity for tests")
+    @Test
+    @DisplayName("Should add severity for tests")
     public void severityTest() {
         final AllureResults results = runTestNgSuites("suites/severity.xml");
         List<TestResult> testResults = results.getTestResults();
@@ -711,7 +748,8 @@ public void severityTest() {
     }
 
     @AllureFeatures.MarkerAnnotations
-    @Test(description = "Should add owner to tests")
+    @Test
+    @DisplayName("Should add owner to tests")
     public void ownerTest() {
         final AllureResults results = runTestNgSuites("suites/owner.xml");
         List<TestResult> testResults = results.getTestResults();
@@ -736,7 +774,8 @@ public void ownerTest() {
     }
 
     @AllureFeatures.MarkerAnnotations
-    @Test(description = "Should add tag to tests")
+    @Test
+    @DisplayName("Should add tag to tests")
     public void tagTest() {
         final AllureResults results = runTestNgSuites("suites/tags.xml");
         List<TestResult> testResults = results.getTestResults();
@@ -759,7 +798,8 @@ public void tagTest() {
     }
 
     @AllureFeatures.Attachments
-    @Test(description = "Should add attachments to tests")
+    @Test
+    @DisplayName("Should add attachments to tests")
     public void attachmentsTest() {
         final AllureResults results = runTestNgSuites("suites/attachments.xml");
         List<TestResult> testResults = results.getTestResults();
@@ -773,7 +813,8 @@ public void attachmentsTest() {
 
     @AllureFeatures.MarkerAnnotations
     @Issue("42")
-    @Test(description = "Should process flaky for failed tests")
+    @Test
+    @DisplayName("Should process flaky for failed tests")
     public void shouldAddFlakyToFailedTests() {
         final AllureResults results = runTestNgSuites("suites/gh-42.xml");
 
@@ -789,7 +830,8 @@ public void shouldAddFlakyToFailedTests() {
     }
 
     @AllureFeatures.History
-    @Test(description = "Should use parameters for history id")
+    @Test
+    @DisplayName("Should use parameters for history id")
     public void shouldUseParametersForHistoryIdGeneration() {
         final AllureResults results = runTestNgSuites("suites/history-id-parameters.xml");
 
@@ -800,7 +842,8 @@ public void shouldUseParametersForHistoryIdGeneration() {
     }
 
     @AllureFeatures.History
-    @Test(description = "Should generate the same history id for the same tests")
+    @Test
+    @DisplayName("Should generate the same history id for the same tests")
     public void shouldGenerateSameHistoryIdForTheSameTests() {
         final AllureResults results = runTestNgSuites("suites/history-id-the-same.xml");
 
@@ -814,7 +857,8 @@ public void shouldGenerateSameHistoryIdForTheSameTests() {
     @SuppressWarnings("unchecked")
     @AllureFeatures.Fixtures
     @Issue("67")
-    @Test(description = "Should set correct status for fixtures")
+    @Test
+    @DisplayName("Should set correct status for fixtures")
     public void shouldSetCorrectStatusesForFixtures() {
         final AllureResults results = runTestNgSuites(
                 "suites/per-suite-fixtures-combination.xml",
@@ -860,7 +904,8 @@ public void shouldSetCorrectStatusesForFixtures() {
     @SuppressWarnings("unchecked")
     @AllureFeatures.Fixtures
     @Issue("67")
-    @Test(description = "Should set correct status for failed before fixtures")
+    @Test
+    @DisplayName("Should set correct status for failed before fixtures")
     public void shouldSetCorrectStatusForFailedBeforeFixtures() {
         final AllureResults results = runTestNgSuites(
                 "suites/failed-before-suite-fixture.xml",
@@ -882,7 +927,8 @@ public void shouldSetCorrectStatusForFailedBeforeFixtures() {
     @SuppressWarnings("unchecked")
     @AllureFeatures.Fixtures
     @Issue("67")
-    @Test(description = "Should set correct status for failed after fixtures")
+    @Test
+    @DisplayName("Should set correct status for failed after fixtures")
     public void shouldSetCorrectStatusForFailedAfterFixtures() {
         final Consumer<TestNG> configurer = parallel(XmlSuite.ParallelMode.METHODS, 5);
 
@@ -906,7 +952,8 @@ public void shouldSetCorrectStatusForFailedAfterFixtures() {
 
     @AllureFeatures.Parameters
     @Issue("97")
-    @Test(description = "Should process varargs test parameters")
+    @Test
+    @DisplayName("Should process varargs test parameters")
     public void shouldProcessVarargsParameters() {
         final AllureResults results = runTestNgSuites("suites/gh-97.xml");
 
@@ -921,7 +968,8 @@ public void shouldProcessVarargsParameters() {
 
     @AllureFeatures.Fixtures
     @Issue("99")
-    @Test(description = "Should attach class fixtures correctly")
+    @Test
+    @DisplayName("Should attach class fixtures correctly")
     public void shouldAttachClassFixturesCorrectly() {
         final Consumer<TestNG> configurer = parallel(XmlSuite.ParallelMode.METHODS, 5);
 
@@ -974,7 +1022,8 @@ public void shouldAttachClassFixturesCorrectly() {
 
     @AllureFeatures.History
     @Issue("102")
-    @Test(description = "Should generate different history id for inherited tests")
+    @Test
+    @DisplayName("Should generate different history id for inherited tests")
     public void shouldGenerateDifferentHistoryIdForInheritedTests() {
         final AllureResults results = runTestNgSuites("suites/gh-102.xml");
 
@@ -985,7 +1034,8 @@ public void shouldGenerateDifferentHistoryIdForInheritedTests() {
 
     @AllureFeatures.Fixtures
     @Issue("101")
-    @Test(description = "Should use fixture description")
+    @Test
+    @DisplayName("Should use fixture description")
     public void shouldUseFixtureDescriptions() {
         final AllureResults results = runTestNgSuites("suites/gh-101.xml");
 
@@ -1009,10 +1059,9 @@ public void shouldProcessCyrillicDescriptions() {
     @AllureFeatures.Fixtures
     @AllureFeatures.Parallel
     @Issue("219")
-    @Test(
-            description = "Should not mix up fixtures during parallel run",
-            dataProvider = "parallelConfiguration"
-    )
+    @ParameterizedTest
+    @MethodSource("parallelConfiguration")
+    @DisplayName("Should not mix up fixtures during parallel run")
     public void shouldAddCorrectBeforeMethodFixturesInCaseOfParallelRun(
             final XmlSuite.ParallelMode mode, final int threadCount) {
         final AllureResults results = runTestNgSuites(
@@ -1149,7 +1198,8 @@ public void shouldProcessArrayParameters() {
     @SuppressWarnings("unchecked")
     @AllureFeatures.Fixtures
     @Issue("304")
-    @Test(dataProvider = "parallelConfiguration")
+    @ParameterizedTest
+    @MethodSource("parallelConfiguration")
     public void shouldProcessFailedSetUps(final XmlSuite.ParallelMode mode, final int threadCount) {
         final AllureResults results = runTestNgSuites(parallel(mode, threadCount), "suites/gh-304.xml");
 
@@ -1204,16 +1254,17 @@ public void shouldSupportFactoryOnConstructor() {
                 );
     }
 
-    @DataProvider(name = "failedFixtures")
-    public Object[][] failedFixtures() {
-        return new Object[][]{
-                {"suites/failed-before-test-fixture.xml", "beforeTest"},
-                {"suites/failed-before-class-fixture.xml", "beforeClass"},
-                {"suites/failed-before-suite-fixture.xml", "beforeSuite"}
-        };
+    @SuppressWarnings("unused")
+    private static Stream<Arguments> failedFixtures() {
+        return Stream.of(
+                arguments("suites/failed-before-test-fixture.xml", "beforeTest"),
+                arguments("suites/failed-before-class-fixture.xml", "beforeClass"),
+                arguments("suites/failed-before-suite-fixture.xml", "beforeSuite")
+        );
     }
 
-    @Test(dataProvider = "failedFixtures")
+    @ParameterizedTest
+    @MethodSource("failedFixtures")
     @AllureFeatures.Fixtures
     public void shouldAddBeforeFixtureToFakeTestResult(final String suite, final String fixture) {
         final AllureResults results = runTestNgSuites(suite);
@@ -1522,7 +1573,8 @@ public AllureResults runTestPlan(final TestPlan plan, final Class<?>... testClas
     }
 
     @AllureFeatures.Fixtures
-    @Test(description = "Should process data provider in setup")
+    @Test
+    @DisplayName("Should process data provider in setup")
     public void shouldProcessDataProviderInSetup() {
         final AllureResults results = runTestNgSuites("suites/data-provider-with-attachment.xml");
 
@@ -1541,7 +1593,8 @@ public void shouldProcessDataProviderInSetup() {
     }
 
     @AllureFeatures.Fixtures
-    @Test(description = "Should process failed data provider in setup")
+    @Test
+    @DisplayName("Should process failed data provider in setup")
     public void shouldProcessFailedDataProviderInSetup() {
         final AllureResults results = runTestNgSuites("suites/failed-data-provider.xml");
 
@@ -1552,7 +1605,8 @@ public void shouldProcessFailedDataProviderInSetup() {
     }
 
     @AllureFeatures.Fixtures
-    @Test(description = "Should process flaky data provider in setup")
+    @Test
+    @DisplayName("Should process flaky data provider in setup")
     public void shouldProcessFlakyDataProvider() {
         final AllureResults results = runTestNgSuites("suites/flaky-data-provider.xml");
 
@@ -1566,7 +1620,8 @@ public void shouldProcessFlakyDataProvider() {
     }
 
     @AllureFeatures.Fixtures
-    @Test(description = "Should properly link data provider container to test result")
+    @Test
+    @DisplayName("Should properly link data provider container to test result")
     public void shouldProperlyLinkDataProviderContainerToTestResult() {
         final AllureResults results = runTestNgSuites("suites/data-provider-with-attachment.xml");
 
@@ -1581,7 +1636,8 @@ public void shouldProperlyLinkDataProviderContainerToTestResult() {
     }
 
     @AllureFeatures.Fixtures
-    @Test(description = "Should link multiple tests to data provider container")
+    @Test
+    @DisplayName("Should link multiple tests to data provider container")
     public void shouldLinkMultipleTestsToDataProviderContainer() {
         final AllureResults results = runTestNgSuites("suites/data-provider-multiple-tests.xml");
 
@@ -1605,7 +1661,8 @@ public void shouldLinkMultipleTestsToDataProviderContainer() {
     }
 
     @AllureFeatures.Fixtures
-    @Test(description = "Should link inherited data provider")
+    @Test
+    @DisplayName("Should link inherited data provider")
     public void shouldLinkInheritedDataProvider() {
         final AllureResults results = runTestNgSuites("suites/data-provider-inheritance.xml");
 
@@ -1620,7 +1677,8 @@ public void shouldLinkInheritedDataProvider() {
     }
 
     @AllureFeatures.Fixtures
-    @Test(description = "Should link correct data provider in multiple classes")
+    @Test
+    @DisplayName("Should link correct data provider in multiple classes")
     public void shouldLinkCorrectDataProviderInMultipleClasses() {
         final AllureResults results = runTestNgSuites("suites/data-provider-multiple-classes.xml");
 
@@ -1639,7 +1697,8 @@ public void shouldLinkCorrectDataProviderInMultipleClasses() {
     }
 
     @AllureFeatures.Fixtures
-    @Test(description = "Should process parallel data provider")
+    @Test
+    @DisplayName("Should process parallel data provider")
     public void shouldProcessParallelDataProvider() {
         final AllureResults results = runTestNgSuites("suites/data-provider-parallel.xml");
 
diff --git a/allure-testng/src/test/resources/allure.properties b/allure-testng/src/test/resources/allure.properties
index e4f1d9fc1..69cd85a70 100644
--- a/allure-testng/src/test/resources/allure.properties
+++ b/allure-testng/src/test/resources/allure.properties
@@ -1,3 +1,4 @@
 allure.results.directory=build/allure-results
 allure.link.issue.pattern=https://github.com/allure-framework/allure-java/issues/{}
 allure.label.epic=#project.description#
+allure.label.module=allure-testng
diff --git a/allurerc.mjs b/allurerc.mjs
new file mode 100644
index 000000000..0e718deea
--- /dev/null
+++ b/allurerc.mjs
@@ -0,0 +1,22 @@
+const { ALLURE_SERVICE_TOKEN } = process.env;
+
+const allureService = ALLURE_SERVICE_TOKEN
+    ? {
+        accessToken: ALLURE_SERVICE_TOKEN,
+        legacy: true,
+    }
+    : undefined;
+
+export default {
+    name: "Allure Java",
+    output: "./build/allure-report",
+    plugins: {
+        awesome: {
+            options: {
+                groupBy: ["module", "parentSuite", "suite", "subSuite"],
+                publish: true,
+            },
+        },
+    },
+    ...(allureService ? { allureService } : {}),
+};
diff --git a/build.gradle.kts b/build.gradle.kts
index ac086dec1..962913572 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ val libs = subprojects.filterNot { it.name in "allure-bom" }
 val standardJavaLibs = libs.filterNot { it.name == "allure-scalatest" }
 
 tasks.withType(Wrapper::class) {
-    gradleVersion = "8.5"
+    gradleVersion = "8.11"
 }
 
 plugins {
@@ -21,8 +21,7 @@ plugins {
     id("com.github.spotbugs")
     id("com.diffplug.spotless")
     id("io.github.gradle-nexus.publish-plugin")
-    id("io.qameta.allure-adapter") apply false
-    id("io.qameta.allure-report")
+    id("io.qameta.allure")
     id("io.spring.dependency-management")
 }
 
@@ -138,8 +137,7 @@ configure(libs) {
     apply(plugin = "pmd")
     apply(plugin = "com.github.spotbugs")
     apply(plugin = "com.diffplug.spotless")
-    apply(plugin = "io.qameta.allure-report")
-    apply(plugin = "io.qameta.allure-adapter")
+    apply(plugin = "io.qameta.allure")
     apply(plugin = "io.spring.dependency-management")
     apply(plugin = "java")
     apply(plugin = "java-library")
@@ -258,15 +256,20 @@ configure(libs) {
 
     allure {
         adapter {
+            // Many modules carry third-party test frameworks on the classpath as integration fixtures,
+            // so never let the Gradle plugin auto-detect adapters from dependencies alone.
             autoconfigure.set(false)
             aspectjWeaver.set(true)
             aspectjVersion.set(dependencyManagement.managedVersions["org.aspectj:aspectjweaver"])
 
-            // in order to disable dependencySubstitution (spi-off classifier)
-            autoconfigureListeners.set(true)
-
-            afterEvaluate {
-                frameworks.forEach { adapter -> adapter.enabled.set(false) }
+            // Every Gradle test task in this build runs on JUnit Platform now.
+            // Avoid mentioning unused adapters here because allure-gradle adds mentioned
+            // adapters to the test classpath even when we do not execute that framework.
+            frameworks {
+                junitPlatform {
+                    enabled.set(true)
+                    autoconfigureListeners.set(true)
+                }
             }
         }
     }
diff --git a/docs/allure-agent-mode.md b/docs/allure-agent-mode.md
new file mode 100644
index 000000000..f99482013
--- /dev/null
+++ b/docs/allure-agent-mode.md
@@ -0,0 +1,161 @@
+# Allure Agent Mode
+
+Use Allure agent-mode to design, review, validate, debug, and enrich tests in this repository.
+
+## Project Context
+
+- This repository is a Gradle multi-project build. Use `./gradlew` for repo-local test commands.
+- Prefer the narrowest relevant scope first, usually a module task such as `:allure-jupiter:test` or a single test via `--tests`.
+- CI's broad verification entry point is `./gradlew --no-build-cache cleanTest test`.
+- Many modules already emit framework results to `<module>/build/allure-results`; agent mode adds a separate per-run review artifact layer and does not replace those module outputs.
+- If `allure run` is unavailable in the local agent environment, fix that first before treating console-only runs as authoritative.
+
+## Review Principle
+
+Runtime first, source second.
+
+- If a command executes tests and its result will be used for smoke checking, reasoning, review, coverage analysis, debugging, or any user-facing conclusion, run it through `allure run`. It preserves the original console logs and adds agent-mode artifacts when you need them.
+- If the agent-mode output is missing or incomplete, debug that first and treat console-only conclusions as provisional.
+
+## Verification Standard
+
+- Use `allure run` for smoke checks too, even when the change is small or mechanical.
+- Only skip agent mode when it is impossible or when you are debugging agent mode itself.
+
+## Core Loops
+
+### Test Review Loop
+
+1. Identify the exact review scope.
+2. Create a fresh expectations file for this run in a temp directory.
+3. Run only that scope with `allure run`.
+4. Read `index.md`, `manifest/run.json`, `manifest/tests.jsonl`, and `manifest/findings.jsonl`.
+5. Read per-test markdown only for tests that failed, drifted, or have findings.
+6. Only after runtime review, inspect source code for root cause or coverage gaps.
+7. If evidence is weak or partial, enrich the tests and rerun.
+
+### Feature Delivery Loop
+
+1. Understand the feature or issue.
+2. Create a fresh expectations file for this run in a temp directory.
+3. Write or update the tests.
+4. Run the target Gradle scope with `allure run`.
+5. Review `index.md`, manifests, and per-test markdown.
+6. Enrich tests when evidence is weak.
+7. Rerun until scope and evidence are acceptable.
+
+### Metadata Enrichment Loop
+
+Use this when the run is functionally correct but too weak to review:
+
+1. Identify missing or low-signal findings.
+2. Add real steps, attachments, or minimal metadata.
+3. Rerun the same intended scope.
+4. Reject noop-style or placeholder evidence.
+
+### Small Test Change Workflow
+
+1. Create a fresh expectations file and temp output directory for the touched scope.
+2. Run the touched scope with `allure run`, even if the goal is only a smoke check after a mechanical change such as typing cleanup, mock refactors, or helper extraction.
+3. Review `index.md`, `manifest/run.json`, `manifest/tests.jsonl`, and `manifest/findings.jsonl`.
+4. Only then make a final statement about regression safety or test correctness.
+
+### Coverage Review Workflow
+
+1. Split command, package, or module audits into scoped groups.
+2. Give each group its own expectations file and temp output directory.
+3. Run each group with `allure run`.
+4. Review runtime artifacts first, then inspect source code only after the run explains what actually executed.
+5. Mark the review incomplete until each scoped group either matched expectations or was explicitly documented as a broad package-health audit.
+
+## Per-Run Artifacts
+
+- `ALLURE_AGENT_OUTPUT` must use a unique temp directory per run.
+- `ALLURE_AGENT_EXPECTATIONS` must use a unique temp file per run.
+- Do not reuse those paths across parallel runs.
+- Keep agent-mode artifacts in temp locations, not in committed repo paths or module `build/allure-results` directories.
+
+YAML is preferred for expectations in v1.
+
+Review-oriented expectations example:
+
+```yaml
+goal: Review a module-scoped Gradle test run
+task_id: module-review
+notes:
+  - Start with the smallest relevant Gradle test scope.
+  - Review runtime evidence before source inspection.
+```
+
+Targeted module-run pattern:
+
+```bash
+TMP_DIR="$(mktemp -d)"
+EXPECTATIONS="$TMP_DIR/expectations.yaml"
+
+cat > "$EXPECTATIONS" <<'YAML'
+goal: Review a module-scoped Gradle test run
+task_id: module-review
+notes:
+  - Start with the smallest relevant Gradle test scope.
+  - Review runtime evidence before source inspection.
+YAML
+
+ALLURE_AGENT_OUTPUT="$TMP_DIR/agent-output" \
+ALLURE_AGENT_EXPECTATIONS="$EXPECTATIONS" \
+allure run -- ./gradlew :allure-jupiter:test \
+  --tests io.qameta.allure.junit5.AllureJunit5Junit6CompatibilityTest
+```
+
+Broad repo-smoke pattern:
+
+```bash
+TMP_DIR="$(mktemp -d)"
+
+ALLURE_AGENT_OUTPUT="$TMP_DIR/agent-output" \
+allure run -- ./gradlew --no-build-cache cleanTest test
+```
+
+Broad package-health or repo-health audits may omit expectations, but the resulting scope review is weaker and should be called out explicitly.
+
+## Evidence Rules
+
+- Steps must wrap real setup, actions, state transitions, or assertions.
+- Attachments must contain real runtime evidence from that execution.
+- Metadata should stay minimal and purposeful.
+- Prefer helper-boundary instrumentation over repetitive caller wrapping.
+
+Good example:
+
+- instrument a shared assertion helper once instead of wrapping every caller
+
+Rejected examples:
+
+- empty wrapper steps
+- static `test passed` attachments
+- labels that no review or policy step uses
+
+## When Console Errors Are Not Represented As Test Results
+
+- Suite-load, import, or setup failures may appear only in `artifacts/global/stderr.txt` or global errors.
+- If `manifest/tests.jsonl` does not account for all visible failures from the test runner, inspect global stderr before concluding the run is fully modeled.
+- Treat that state as a partial runtime review, not as a clean or complete result set.
+- If runner-visible failures are present outside logical test files, final conclusions must stay provisional until the missing modeling is understood.
+
+## Acceptance Rules
+
+Accept a run only when:
+
+- scope matches expectations
+- evidence is strong enough to explain what happened
+- no high-confidence noop or placeholder findings remain
+
+### Review Completeness
+
+A test review is not complete unless:
+
+- the relevant scope was run with agent mode, unless that is impossible
+- expectations were created for the intended scope, unless this is a broad package-health audit
+- agent artifacts were reviewed before final conclusions
+- missing or partial runtime modeling was called out explicitly
+- console-only conclusions are treated as provisional when agent output is absent or incomplete
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a59520664..e48eca575 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ad6f5e51d..02cf649af 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -49,10 +49,7 @@ pluginManagement {
         id("com.diffplug.spotless") version "6.25.0"
         id("io.github.goooler.shadow") version "8.1.8"
         id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
-        id("io.qameta.allure-adapter") version "3.0.1"
-        id("io.qameta.allure-aggregate-report") version "3.0.1"
-        id("io.qameta.allure-download") version "3.0.1"
-        id("io.qameta.allure-report") version "3.0.1"
+        id("io.qameta.allure") version "4.0.0"
         id("io.spring.dependency-management") version "1.1.7"
         id("com.google.protobuf") version "0.9.6"
         id("com.github.spotbugs") version "6.4.7"

From d1da0de8882710fa62f55ecad3334228c8dc5c25 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 8 May 2026 09:21:11 +0100
Subject: [PATCH 227/233] improve assertj reporting with readable assertion
 chains (via #1268)

---
 .../qameta/allure/assertj/AllureAspectJ.java  | 150 +++--
 .../qameta/allure/assertj/AssertJChain.java   | 123 ++++
 .../assertj/AssertJLifecycleListener.java     |  44 ++
 .../allure/assertj/AssertJMethodSupport.java  |  96 +++
 .../allure/assertj/AssertJOperation.java      | 160 +++++
 .../allure/assertj/AssertJRecorder.java       | 261 ++++++++
 .../allure/assertj/AssertJValueRenderer.java  | 556 ++++++++++++++++++
 ...a.allure.listener.FixtureLifecycleListener |   1 +
 ...meta.allure.listener.TestLifecycleListener |   1 +
 .../allure/assertj/AllureAspectJTest.java     | 452 ++++++++++++--
 .../io/qameta/allure/util/ObjectUtils.java    |   4 +-
 .../io/qameta/allure/util/ResultsUtils.java   |  47 ++
 .../io/qameta/allure/ResultsUtilsTest.java    |  41 ++
 .../qameta/allure/util/ObjectUtilsTest.java   |  14 +
 14 files changed, 1849 insertions(+), 101 deletions(-)
 create mode 100644 allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJChain.java
 create mode 100644 allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJLifecycleListener.java
 create mode 100644 allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJMethodSupport.java
 create mode 100644 allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJOperation.java
 create mode 100644 allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJRecorder.java
 create mode 100644 allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJValueRenderer.java
 create mode 100644 allure-assertj/src/main/resources/META-INF/services/io.qameta.allure.listener.FixtureLifecycleListener
 create mode 100644 allure-assertj/src/main/resources/META-INF/services/io.qameta.allure.listener.TestLifecycleListener

diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
index dbd92dc36..00af9c095 100644
--- a/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
@@ -17,28 +17,22 @@
 
 import io.qameta.allure.Allure;
 import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.util.ObjectUtils;
+import org.assertj.core.api.AbstractAssert;
 import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static io.qameta.allure.util.ResultsUtils.getStatus;
-import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
+import java.util.function.Supplier;
 
 /**
+ * Captures user-side AssertJ factories and fluent calls, then delegates assertion-chain state
+ * to {@link AssertJRecorder}.
+ *
  * @author charlie (Dmitry Baev).
  * @author sskorol (Sergey Korol).
  */
@@ -46,8 +40,6 @@
 @Aspect
 public class AllureAspectJ {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AllureAspectJ.class);
-
     private static InheritableThreadLocal<AllureLifecycle> lifecycle = new InheritableThreadLocal<AllureLifecycle>() {
         @Override
         protected AllureLifecycle initialValue() {
@@ -55,64 +47,73 @@ protected AllureLifecycle initialValue() {
         }
     };
 
-    @Pointcut("execution(!private org.assertj.core.api.AbstractAssert.new(..))")
-    public void anyAssertCreation() {
+    private static final ThreadLocal<AssertJRecorder> RECORDER = ThreadLocal.withInitial(AssertJRecorder::new);
+
+    private static final ThreadLocal<Boolean> RECORDING_MUTED = ThreadLocal.withInitial(() -> false);
+
+    @Pointcut("("
+            + "call(public static * org.assertj.core.api.Assertions*.assertThat*(..))"
+            + " || call(public static * org.assertj.core.api.BDDAssertions*.then*(..))"
+            + " || call(public * org.assertj.core.api.*SoftAssertionsProvider+.assertThat*(..))"
+            + " || call(public * org.assertj.core.api.*SoftAssertionsProvider+.then*(..))"
+            + ")")
+    public void assertFactoryCall() {
         //pointcut body, should be empty
     }
 
-    @Pointcut("execution(* org.assertj.core.api.AssertJProxySetup.*(..))")
-    public void proxyMethod() {
+    @Pointcut("("
+            + "call(public * org.assertj.core.api.AbstractAssert+.*(..))"
+            + " || call(public * org.assertj.core.api.Assert+.*(..))"
+            + " || call(public * org.assertj.core.api.Descriptable+.*(..))"
+            + ")"
+            + " && target(assertion)")
+    public void assertOperationCall(final AbstractAssert<?, ?> assertion) {
         //pointcut body, should be empty
     }
 
-    @Pointcut("execution(public * org.assertj.core.api.AbstractAssert+.*(..)) && !proxyMethod()")
-    public void anyAssert() {
+    @Pointcut("!within(org.assertj..*) && !within(io.qameta.allure.assertj.AllureAspectJ)")
+    public void userCodeCall() {
         //pointcut body, should be empty
     }
 
-    @After("anyAssertCreation()")
-    public void logAssertCreation(final JoinPoint joinPoint) {
-        final String actual = joinPoint.getArgs().length > 0
-                ? ObjectUtils.toString(joinPoint.getArgs()[0])
-                : "<?>";
-        final String uuid = UUID.randomUUID().toString();
-        final String name = String.format("assertThat \'%s\'", actual);
-
-        final StepResult result = new StepResult()
-                .setName(name)
-                .setStatus(Status.PASSED);
+    @AfterReturning(pointcut = "assertFactoryCall() && userCodeCall()", returning = "result")
+    public void logAssertCreation(final JoinPoint joinPoint, final Object result) {
+        if (isRecordingMuted() || !(result instanceof AbstractAssert)) {
+            return;
+        }
 
-        getLifecycle().startStep(uuid, result);
-        getLifecycle().stopStep(uuid);
+        final AbstractAssert<?, ?> assertion = (AbstractAssert<?, ?>) result;
+        getRecorder().assertionCreated(getLifecycle(), assertion, firstArgumentOf(joinPoint));
     }
 
-    @Before("anyAssert()")
-    public void stepStart(final JoinPoint joinPoint) {
-        final MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
-
-        final String uuid = UUID.randomUUID().toString();
-        final String name = joinPoint.getArgs().length > 0
-                ? String.format("%s \'%s\'", methodSignature.getName(), arrayToString(joinPoint.getArgs()))
-                : methodSignature.getName();
-
-        final StepResult result = new StepResult()
-                .setName(name);
-
-        getLifecycle().startStep(uuid, result);
-    }
+    @Around("assertOperationCall(assertion) && userCodeCall()")
+    public Object logAssertOperation(final ProceedingJoinPoint joinPoint,
+                                     final AbstractAssert<?, ?> assertion) throws Throwable {
+        final String methodName = getMethodName(joinPoint);
+        if (isRecordingMuted() || getRecorder().isIgnored(methodName)) {
+            return joinPoint.proceed();
+        }
 
-    @AfterThrowing(pointcut = "anyAssert()", throwing = "e")
-    public void stepFailed(final Throwable e) {
-        getLifecycle().updateStep(s -> s
-                .setStatus(getStatus(e).orElse(Status.BROKEN))
-                .setStatusDetails(getStatusDetails(e).orElse(null)));
-        getLifecycle().stopStep();
+        final AssertJOperation operation = getRecorder().startOperation(
+                getLifecycle(),
+                assertion,
+                methodName,
+                joinPoint.getArgs()
+        );
+        try {
+            final Object result = joinPoint.proceed();
+            getRecorder().operationPassed(operation, result);
+            return result;
+        } catch (Throwable throwable) {
+            getRecorder().operationFailed(operation, throwable);
+            throw throwable;
+        }
     }
 
-    @AfterReturning(pointcut = "anyAssert()")
-    public void stepStop() {
-        getLifecycle().updateStep(s -> s.setStatus(Status.PASSED));
-        getLifecycle().stopStep();
+    @After("execution(public void org.assertj.core.api.DefaultAssertionErrorCollector.collectAssertionError("
+            + "java.lang.AssertionError)) && args(error)")
+    public void softAssertionFailed(final AssertionError error) {
+        getRecorder().softAssertionFailed(error);
     }
 
     /**
@@ -122,15 +123,40 @@ public void stepStop() {
      */
     public static void setLifecycle(final AllureLifecycle allure) {
         lifecycle.set(allure);
+        clearContext();
     }
 
     public static AllureLifecycle getLifecycle() {
         return lifecycle.get();
     }
 
-    private static String arrayToString(final Object... array) {
-        return Stream.of(array)
-                .map(ObjectUtils::toString)
-                .collect(Collectors.joining(" "));
+    public static void clearContext() {
+        RECORDER.remove();
+    }
+
+    static <T> T withoutRecording(final Supplier<T> supplier) {
+        final boolean previous = RECORDING_MUTED.get();
+        RECORDING_MUTED.set(true);
+        try {
+            return supplier.get();
+        } finally {
+            RECORDING_MUTED.set(previous);
+        }
+    }
+
+    private static AssertJRecorder getRecorder() {
+        return RECORDER.get();
+    }
+
+    private static boolean isRecordingMuted() {
+        return RECORDING_MUTED.get();
+    }
+
+    private static Object firstArgumentOf(final JoinPoint joinPoint) {
+        return joinPoint.getArgs().length == 0 ? null : joinPoint.getArgs()[0];
+    }
+
+    private static String getMethodName(final ProceedingJoinPoint joinPoint) {
+        return ((MethodSignature) joinPoint.getSignature()).getMethod().getName();
     }
 }
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJChain.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJChain.java
new file mode 100644
index 000000000..c4d30c752
--- /dev/null
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJChain.java
@@ -0,0 +1,123 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.assertj;
+
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.StepResult;
+import org.assertj.core.api.AbstractAssert;
+
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ * Parent Allure step for one AssertJ assertion chain.
+ *
+ * <p>A chain is the stable container for all meaningful fluent operations produced by one AssertJ assertion object.
+ * {@link AssertJRecorder} creates it when user code calls an AssertJ factory such as {@code assertThat(actual)},
+ * stores it by assertion object identity, and appends one {@link AssertJOperation} child for every reported fluent
+ * call. Methods such as {@code extracting}, {@code first}, or {@code asInstanceOf} can return another assertion
+ * object, but they should still read as the same assertion story, so the returned assertion is associated with this
+ * chain instead of creating an unrelated top-level step.</p>
+ *
+ * <p>For a scalar assertion:</p>
+ * <pre>{@code
+ * assertThat("Data").hasSize(4)
+ *
+ * assert "Data"
+ *   has size 4
+ * }</pre>
+ *
+ * <p>For an assertion with a description, the parent step is renamed while the operation history stays visible:</p>
+ * <pre>{@code
+ * assertThat(user).as("user profile").isNotNull()
+ *
+ * assert user profile
+ *   described as "user profile"
+ *   is not null
+ * }</pre>
+ *
+ * <p>For navigation or extraction, later checks remain under the same parent:</p>
+ * <pre>{@code
+ * assertThat(results).extracting(Result::getName).containsExactly("passed")
+ *
+ * assert 1 Result item
+ *   extracts Result::getName -> 1 string
+ *   contains exactly ["passed"]
+ * }</pre>
+ *
+ * <p>This class is intentionally only a small mutable model around the retained {@link StepResult}. It owns the
+ * parent step name, status, timing, and child operation list. It does not decide which AssertJ methods are meaningful
+ * or how subjects and arguments are rendered; those decisions belong to {@link AssertJRecorder},
+ * {@link AssertJMethodSupport}, and {@link AssertJValueRenderer}.</p>
+ */
+final class AssertJChain {
+
+    private static final String ASSERTJ_STEP_PREFIX = "assert ";
+
+    private final String uuid;
+
+    private final AbstractAssert<?, ?> assertion;
+
+    private final StepResult step;
+
+    AssertJChain(final AbstractAssert<?, ?> assertion, final String subject) {
+        this.uuid = UUID.randomUUID().toString();
+        this.assertion = assertion;
+        this.step = new StepResult()
+                .setName(chainName(subject))
+                .setStatus(Status.PASSED)
+                .setStage(Stage.FINISHED)
+                .setStart(System.currentTimeMillis())
+                .setStop(System.currentTimeMillis());
+    }
+
+    String getUuid() {
+        return uuid;
+    }
+
+    AbstractAssert<?, ?> getAssertion() {
+        return assertion;
+    }
+
+    StepResult getStep() {
+        return step;
+    }
+
+    void addOperation(final AssertJOperation operation) {
+        step.getSteps().add(operation.getStep());
+    }
+
+    void rename(final Optional<String> description) {
+        description.ifPresent(value -> step.setName(chainName(value)));
+    }
+
+    void updateStatus(final Status status, final StatusDetails details) {
+        step
+                .setStatus(status)
+                .setStatusDetails(details);
+        finish();
+    }
+
+    void finish() {
+        step.setStop(System.currentTimeMillis());
+    }
+
+    private String chainName(final String subject) {
+        return AssertJValueRenderer.truncateStepName(ASSERTJ_STEP_PREFIX + subject);
+    }
+}
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJLifecycleListener.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJLifecycleListener.java
new file mode 100644
index 000000000..c9ea7a1ea
--- /dev/null
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJLifecycleListener.java
@@ -0,0 +1,44 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.assertj;
+
+import io.qameta.allure.listener.FixtureLifecycleListener;
+import io.qameta.allure.listener.TestLifecycleListener;
+import io.qameta.allure.model.FixtureResult;
+import io.qameta.allure.model.TestResult;
+
+/**
+ * Clears per-thread AssertJ recorder state after Allure has finished owning the current result.
+ *
+ * <p>{@link AllureAspectJ} keeps an {@link AssertJRecorder} in a {@link ThreadLocal} so assertion objects can
+ * be matched by identity across later fluent calls. Test engines commonly reuse worker threads, so that
+ * thread-local map would otherwise keep old assertion objects, rendered steps, and operation stack state after
+ * the test or fixture result has already been written. The retained {@code StepResult}s are already attached to
+ * the Allure model by reference, so removing the recorder here does not remove any reported steps; it only
+ * releases per-thread bookkeeping before the next test or fixture starts on the same thread.</p>
+ */
+public class AssertJLifecycleListener implements TestLifecycleListener, FixtureLifecycleListener {
+
+    @Override
+    public void afterTestWrite(final TestResult result) {
+        AllureAspectJ.clearContext();
+    }
+
+    @Override
+    public void afterFixtureStop(final FixtureResult result) {
+        AllureAspectJ.clearContext();
+    }
+}
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJMethodSupport.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJMethodSupport.java
new file mode 100644
index 000000000..685e51bf0
--- /dev/null
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJMethodSupport.java
@@ -0,0 +1,96 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.assertj;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Keeps method-name decisions out of the aspect and recorder flow.
+ */
+final class AssertJMethodSupport {
+
+    private static final String AS = "as";
+    private static final String DESCRIBED_AS = "describedAs";
+
+    private static final List<String> IGNORED_METHODS = Arrays.asList(
+            "actual",
+            "descriptionText",
+            "equals",
+            "getWritableAssertionInfo",
+            "hashCode",
+            "toString"
+    );
+
+    private static final Set<String> NAVIGATION_METHODS = new HashSet<>(Arrays.asList(
+            "asBase64Decoded",
+            "asBoolean",
+            "asByte",
+            "asDouble",
+            "asFloat",
+            "asInstanceOf",
+            "asInt",
+            "asList",
+            "asLong",
+            "asShort",
+            "asString",
+            "bytes",
+            "decodedAsBase64",
+            "element",
+            "elements",
+            "extracting",
+            "extractingResultOf",
+            "first",
+            "flatExtracting",
+            "flatMap",
+            "last",
+            "map",
+            "rootCause",
+            "singleElement",
+            "size",
+            "usingRecursiveAssertion",
+            "usingRecursiveComparison"
+    ));
+
+    private AssertJMethodSupport() {
+        throw new IllegalStateException("do not instantiate");
+    }
+
+    static boolean isIgnored(final String methodName) {
+        return IGNORED_METHODS.contains(methodName);
+    }
+
+    static String normalize(final String methodName) {
+        final int accessorIndex = methodName.indexOf("$accessor$");
+        if (accessorIndex > 0) {
+            return methodName.substring(0, accessorIndex);
+        }
+        if (DESCRIBED_AS.equals(methodName)) {
+            return AS;
+        }
+        return methodName;
+    }
+
+    static boolean isDescription(final String methodName) {
+        return AS.equals(methodName) || DESCRIBED_AS.equals(methodName);
+    }
+
+    static boolean isNavigation(final String methodName) {
+        return NAVIGATION_METHODS.contains(methodName);
+    }
+}
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJOperation.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJOperation.java
new file mode 100644
index 000000000..d79b025fc
--- /dev/null
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJOperation.java
@@ -0,0 +1,160 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.assertj;
+
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.StepResult;
+
+import java.util.List;
+
+import static io.qameta.allure.util.ResultsUtils.getStatus;
+import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
+
+/**
+ * Child Allure step for one meaningful AssertJ fluent operation.
+ *
+ * <p>An operation is the report entry for one fluent method call inside an {@link AssertJChain}. The recorder creates
+ * it before proceeding with the intercepted AssertJ call, marks it passed or failed after the call returns, and keeps
+ * it attached to the chain that owns the assertion object. Earlier operations remain passed when a later operation
+ * fails, so the report shows the exact point where the assertion chain stopped matching the expectation.</p>
+ *
+ * <p>For a simple assertion, each checked method becomes one operation:</p>
+ * <pre>{@code
+ * assertThat("Data").startsWith("Da").endsWith("ta")
+ *
+ * assert "Data"
+ *   starts with "Da"
+ *   ends with "ta"
+ * }</pre>
+ *
+ * <p>For navigation methods, the operation name is enriched with the returned subject. The returned AssertJ object
+ * still belongs to the same chain, so the report stays readable as one story:</p>
+ * <pre>{@code
+ * assertThat(users).first(InstanceOfAssertFactories.STRING).startsWith("alice")
+ *
+ * assert 1 string
+ *   first element as InstanceOfAssertFactory -> "alice@example.org"
+ *   starts with "alice"
+ * }</pre>
+ *
+ * <p>For failures, this operation receives the failure status and status details, and the parent chain receives the
+ * same status. This makes the failed operation visible without losing the successful context before it:</p>
+ * <pre>{@code
+ * assertThat("Data").startsWith("Da").hasSize(5)
+ *
+ * assert "Data"                 FAILED
+ *   starts with "Da"             PASSED
+ *   has size 5                   FAILED
+ * }</pre>
+ *
+ * <p>Some AssertJ methods call other assertion methods internally. Those calls should not become extra child steps
+ * because they would duplicate implementation details instead of user intent. The {@code nestedLevel} counter lets the
+ * recorder reuse the active operation while those internal calls run, then finish only the user-visible operation.</p>
+ */
+final class AssertJOperation {
+
+    private final AssertJChain chain;
+
+    private final String methodName;
+
+    private final StepResult step;
+
+    private final boolean navigation;
+
+    private String returnedSubject;
+
+    private int nestedLevel;
+
+    AssertJOperation(final AssertJChain chain,
+                     final String methodName,
+                     final String name,
+                     final List<Parameter> parameters,
+                     final boolean navigation) {
+        this.chain = chain;
+        this.methodName = methodName;
+        this.navigation = navigation;
+        this.step = new StepResult()
+                .setName(name)
+                .setParameters(parameters)
+                .setStage(Stage.RUNNING)
+                .setStart(System.currentTimeMillis());
+    }
+
+    AssertJChain getChain() {
+        return chain;
+    }
+
+    StepResult getStep() {
+        return step;
+    }
+
+    boolean isNavigation() {
+        return navigation;
+    }
+
+    boolean isDescription() {
+        return AssertJMethodSupport.isDescription(methodName);
+    }
+
+    boolean isNested() {
+        return nestedLevel > 0;
+    }
+
+    AssertJOperation nested() {
+        nestedLevel++;
+        return this;
+    }
+
+    void leaveNested() {
+        nestedLevel--;
+    }
+
+    void setReturnedSubject(final String subject) {
+        if (returnedSubject != null) {
+            return;
+        }
+
+        returnedSubject = subject;
+        step.setName(AssertJValueRenderer.truncateStepName(step.getName() + " -> " + subject));
+    }
+
+    void passed() {
+        if (step.getStatus() == null) {
+            step.setStatus(Status.PASSED);
+        }
+        finish();
+    }
+
+    void failed(final Throwable throwable) {
+        final Status status = getStatus(throwable).orElse(Status.BROKEN);
+        final StatusDetails details = getStatusDetails(throwable).orElse(null);
+        step
+                .setStatus(status)
+                .setStatusDetails(details);
+        chain.updateStatus(status, details);
+        finish();
+    }
+
+    private void finish() {
+        step
+                .setStage(Stage.FINISHED)
+                .setStop(System.currentTimeMillis());
+        chain.finish();
+    }
+}
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJRecorder.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJRecorder.java
new file mode 100644
index 000000000..423d5a48d
--- /dev/null
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJRecorder.java
@@ -0,0 +1,261 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.assertj;
+
+import io.qameta.allure.AllureLifecycle;
+import org.assertj.core.api.AbstractAssert;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * Records AssertJ objects by identity and builds one Allure step tree per assertion chain.
+ *
+ * <p>The recorder is the stateful part behind {@link AllureAspectJ}. The aspect only detects user-side AssertJ
+ * factory calls and fluent operation calls; this class decides which {@link AssertJChain} owns the assertion object,
+ * where a new {@link AssertJOperation} should be attached, and how pass/fail state should be reflected in the retained
+ * Allure {@code StepResult} tree.</p>
+ *
+ * <p>Each aspect thread gets its own recorder instance. Assertion objects are tracked in an {@link IdentityHashMap}
+ * because AssertJ assertion classes can override {@code equals} and {@code hashCode}; object identity is the only safe
+ * way to know that a later fluent call belongs to the same assertion object that was created earlier.</p>
+ *
+ * <p>The normal hard-assertion flow is:</p>
+ * <pre>{@code
+ * assertThat("Data").startsWith("Da").endsWith("ta")
+ *
+ * assertionCreated(assertThat result, "Data")
+ * startOperation(startsWith, ["Da"])
+ * operationPassed(startsWith)
+ * startOperation(endsWith, ["ta"])
+ * operationPassed(endsWith)
+ *
+ * assert "Data"
+ *   starts with "Da"
+ *   ends with "ta"
+ * }</pre>
+ *
+ * <p>Stored assertion instances keep separate chains because the map key is the assertion instance itself:</p>
+ * <pre>{@code
+ * final AbstractStringAssert<?> a = assertThat("alpha");
+ * final AbstractStringAssert<?> b = assertThat("bravo");
+ *
+ * a.isEqualTo("alpha");
+ * b.isEqualTo("bravo");
+ *
+ * assert "alpha"
+ *   is equal to "alpha"
+ * assert "bravo"
+ *   is equal to "bravo"
+ * }</pre>
+ *
+ * <p>Navigation operations such as {@code extracting}, {@code first}, and {@code asInstanceOf} may return new AssertJ
+ * assertion objects. Those returned objects are registered against the existing chain, so later checks stay under the
+ * same parent step:</p>
+ * <pre>{@code
+ * assertThat(results).extracting(Result::getName).containsExactly("passed")
+ *
+ * assert 1 Result item
+ *   extracts Result::getName -> 1 string
+ *   contains exactly ["passed"]
+ * }</pre>
+ *
+ * <p>The {@code operations} stack tracks the currently executing user-visible operation. It has two jobs: assertions
+ * created inside callbacks such as {@code satisfies} are attached beneath the active operation, and AssertJ internal
+ * calls on the same chain are counted as nested work instead of being reported as extra steps.</p>
+ *
+ * <pre>{@code
+ * assertThat("alpha").satisfies(value -> assertThat(value).startsWith("al"))
+ *
+ * assert "alpha"
+ *   satisfies <lambda>
+ *     assert "alpha"
+ *       starts with "al"
+ * }</pre>
+ *
+ * <p>Soft assertion failures are reported before {@code assertAll()} throws. The AssertJ error collector callback calls
+ * {@link #softAssertionFailed(AssertionError)}, which marks the active operation and its chain as failed while
+ * preserving the earlier passed operations.</p>
+ */
+final class AssertJRecorder {
+
+    private final Map<AbstractAssert<?, ?>, AssertJChain> chains = new IdentityHashMap<>();
+
+    private final Deque<AssertJOperation> operations = new ArrayDeque<>();
+
+    private final AssertJValueRenderer renderer = new AssertJValueRenderer();
+
+    void assertionCreated(final AllureLifecycle lifecycle,
+                          final AbstractAssert<?, ?> assertion,
+                          final Object actual) {
+        if (chains.containsKey(assertion)) {
+            return;
+        }
+
+        final AssertJOperation activeOperation = activeOperation();
+        if (isNavigationResult(activeOperation)) {
+            chains.put(assertion, activeOperation.getChain());
+            return;
+        }
+
+        final AssertJChain chain = new AssertJChain(assertion, renderer.renderSubject(actual));
+        chains.put(assertion, chain);
+        attachChain(lifecycle, chain, activeOperation);
+    }
+
+    AssertJOperation startOperation(final AllureLifecycle lifecycle,
+                                    final AbstractAssert<?, ?> assertion,
+                                    final String methodName,
+                                    final Object... args) {
+        final AssertJChain chain = chainFor(lifecycle, assertion);
+        final String normalizedName = AssertJMethodSupport.normalize(methodName);
+
+        final AssertJOperation activeOperation = activeOperation();
+        if (isInternalCallOnSameChain(activeOperation, chain)) {
+            return activeOperation.nested();
+        }
+
+        final AssertJOperation operation = new AssertJOperation(
+                chain,
+                normalizedName,
+                renderer.renderOperation(normalizedName, args),
+                renderer.renderParameters(normalizedName, args),
+                AssertJMethodSupport.isNavigation(normalizedName)
+        );
+        chain.addOperation(operation);
+        operations.push(operation);
+        return operation;
+    }
+
+    void operationPassed(final AssertJOperation operation, final Object result) {
+        if (operation.isNested()) {
+            pop(operation);
+            return;
+        }
+
+        registerReturnedAssertion(operation, result);
+        renameChainFromDescription(operation);
+        operation.passed();
+        pop(operation);
+    }
+
+    void operationFailed(final AssertJOperation operation, final Throwable throwable) {
+        operation.failed(throwable);
+        pop(operation);
+    }
+
+    void softAssertionFailed(final AssertionError error) {
+        final AssertJOperation current = activeOperation();
+        if (current != null) {
+            current.failed(error);
+        }
+    }
+
+    boolean isIgnored(final String methodName) {
+        return AssertJMethodSupport.isIgnored(methodName);
+    }
+
+    private AssertJChain chainFor(final AllureLifecycle lifecycle, final AbstractAssert<?, ?> assertion) {
+        final AssertJChain chain = chains.get(assertion);
+        if (chain != null) {
+            return chain;
+        }
+
+        final AssertJChain created = new AssertJChain(assertion, renderer.renderSubject(actualOf(assertion)));
+        chains.put(assertion, created);
+        attachChain(lifecycle, created, activeOperation());
+        return created;
+    }
+
+    private void attachChain(final AllureLifecycle lifecycle,
+                             final AssertJChain chain,
+                             final AssertJOperation parentOperation) {
+        if (parentOperation == null) {
+            lifecycle.startStep(chain.getUuid(), chain.getStep());
+            lifecycle.stopStep(chain.getUuid());
+            return;
+        }
+
+        parentOperation.getStep().getSteps().add(chain.getStep());
+    }
+
+    private void registerReturnedAssertion(final AssertJOperation operation, final Object result) {
+        if (!(result instanceof AbstractAssert)) {
+            return;
+        }
+
+        final AbstractAssert<?, ?> returned = (AbstractAssert<?, ?>) result;
+        chains.put(returned, operation.getChain());
+        if (operation.isNavigation()) {
+            operation.setReturnedSubject(renderer.renderSubject(actualOf(returned)));
+        }
+    }
+
+    private void renameChainFromDescription(final AssertJOperation operation) {
+        if (operation.isDescription()) {
+            operation.getChain().rename(descriptionOf(operation.getChain().getAssertion()));
+        }
+    }
+
+    private AssertJOperation activeOperation() {
+        return operations.peek();
+    }
+
+    private boolean isNavigationResult(final AssertJOperation activeOperation) {
+        return activeOperation != null && activeOperation.isNavigation();
+    }
+
+    @SuppressWarnings("PMD.CompareObjectsWithEquals")
+    private boolean isInternalCallOnSameChain(final AssertJOperation activeOperation, final AssertJChain chain) {
+        return activeOperation != null && activeOperation.getChain() == chain;
+    }
+
+    @SuppressWarnings("PMD.CompareObjectsWithEquals")
+    private void pop(final AssertJOperation operation) {
+        if (operation.isNested()) {
+            operation.leaveNested();
+            return;
+        }
+        if (!operations.isEmpty() && operations.peek() == operation) {
+            operations.pop();
+        }
+    }
+
+    private Object actualOf(final AbstractAssert<?, ?> assertion) {
+        return AllureAspectJ.withoutRecording(() -> {
+            try {
+                return assertion.actual();
+            } catch (RuntimeException e) {
+                return null;
+            }
+        });
+    }
+
+    private Optional<String> descriptionOf(final AbstractAssert<?, ?> assertion) {
+        return AllureAspectJ.withoutRecording(() -> {
+            try {
+                return Optional.ofNullable(assertion.descriptionText())
+                        .map(String::trim)
+                        .filter(value -> !value.isEmpty());
+            } catch (RuntimeException e) {
+                return Optional.empty();
+            }
+        });
+    }
+}
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJValueRenderer.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJValueRenderer.java
new file mode 100644
index 000000000..d7bee7c89
--- /dev/null
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJValueRenderer.java
@@ -0,0 +1,556 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.assertj;
+
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.util.ObjectUtils;
+import org.assertj.core.description.Description;
+import org.assertj.core.groups.Tuple;
+
+import java.lang.reflect.Array;
+import java.net.URI;
+import java.net.URL;
+import java.nio.file.Path;
+import java.time.temporal.TemporalAccessor;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import static io.qameta.allure.util.ResultsUtils.getLambdaName;
+
+/**
+ * Renders AssertJ subjects and arguments into semantic step names.
+ */
+@SuppressWarnings("all")
+final class AssertJValueRenderer {
+
+    private static final int STEP_NAME_LIMIT = 1000;
+
+    private static final int INLINE_VALUE_LIMIT = 3;
+
+    private static final String LAMBDA = "<lambda>";
+
+    private static final String TRUNCATED = "...";
+
+    String renderSubject(final Object value) {
+        return truncateStepName(renderSubjectValue(value));
+    }
+
+    String renderOperation(final String methodName, final Object[] args) {
+        return truncateStepName(renderOperationName(methodName, args));
+    }
+
+    List<Parameter> renderParameters(final String methodName, final Object[] args) {
+        final Object[] values = parameterArguments(methodName, args);
+        if (values.length == 0) {
+            return Collections.emptyList();
+        }
+
+        final String renderedOperation = renderOperation(methodName, args);
+        final List<Parameter> parameters = new ArrayList<>();
+        for (int index = 0; index < values.length; index++) {
+            final String value = renderParameterValue(values[index]);
+            if (renderedOperation.contains(value)) {
+                continue;
+            }
+            parameters.add(new Parameter()
+                    .setName(parameterName(methodName, index))
+                    .setValue(value)
+                    .setMode(Parameter.Mode.DEFAULT));
+        }
+        return parameters;
+    }
+
+    static String truncateStepName(final String value) {
+        if (value == null || value.length() <= STEP_NAME_LIMIT) {
+            return value;
+        }
+        return value.substring(0, STEP_NAME_LIMIT - TRUNCATED.length()) + TRUNCATED;
+    }
+
+    private String renderSubjectValue(final Object value) {
+        if (value == null) {
+            return "null";
+        }
+        if (value instanceof CharSequence || isSimple(value)) {
+            return renderSimple(value);
+        }
+        if (value instanceof Collection) {
+            if (isInlineCollection((Collection<?>) value)) {
+                return renderCollectionValue((Collection<?>) value);
+            }
+            return renderCollectionSubject((Collection<?>) value);
+        }
+        if (value instanceof Map) {
+            return "map with " + renderEntryCount(((Map<?, ?>) value).size());
+        }
+        if (value.getClass().isArray()) {
+            return renderArraySubject(value);
+        }
+        if (value instanceof Iterable) {
+            return "iterable";
+        }
+        return simpleClassName(value);
+    }
+
+    private Object[] parameterArguments(final String methodName, final Object[] args) {
+        if (isDescriptionWithEmptyValues(args)) {
+            return new Object[]{args[0]};
+        }
+        if (isSingleVarargToUnwrap(methodName, args)) {
+            return new Object[]{Array.get(args[0], 0)};
+        }
+        return args;
+    }
+
+    private String parameterName(final String methodName, final int index) {
+        if ("hasFieldOrPropertyWithValue".equals(methodName)) {
+            return index == 0 ? "field or property" : "expected value";
+        }
+
+        if (index > 0) {
+            return "argument " + (index + 1);
+        }
+
+        switch (methodName) {
+            case "as":
+                return "description";
+            case "asInstanceOf":
+            case "first":
+            case "singleElement":
+                return "factory";
+            case "extracting":
+            case "flatExtracting":
+                return "extractor";
+            case "hasSize":
+                return "expected size";
+            case "satisfies":
+                return "condition";
+            case "contains":
+            case "containsExactly":
+            case "containsExactlyInAnyOrder":
+            case "endsWith":
+            case "isEqualTo":
+            case "startsWith":
+                return "expected";
+            default:
+                return "argument 1";
+        }
+    }
+
+    private String renderParameterValue(final Object value) {
+        return renderArgument(value);
+    }
+
+    private String renderOperationName(final String methodName, final Object[] args) {
+        if (args.length == 0) {
+            return readableMethodName(methodName);
+        }
+
+        final String arguments = renderArguments(methodName, args);
+        switch (methodName) {
+            case "as":
+                return "described as " + arguments;
+            case "asInstanceOf":
+                return "as instance of " + arguments;
+            case "contains":
+                return "contains " + arguments;
+            case "containsExactly":
+                return "contains exactly " + arguments;
+            case "containsExactlyInAnyOrder":
+                return "contains exactly in any order " + arguments;
+            case "endsWith":
+                return "ends with " + arguments;
+            case "extracting":
+                return "extracts " + arguments;
+            case "flatExtracting":
+                return "flat extracts " + arguments;
+            case "first":
+                return "first element as " + arguments;
+            case "hasFieldOrPropertyWithValue":
+                return renderHasFieldOrPropertyWithValue(args);
+            case "hasSize":
+                return "has size " + arguments;
+            case "isEqualTo":
+                return "is equal to " + arguments;
+            case "singleElement":
+                return "single element as " + arguments;
+            case "startsWith":
+                return "starts with " + arguments;
+            case "satisfies":
+                return "satisfies " + arguments;
+            default:
+                return readableMethodName(methodName) + " " + arguments;
+        }
+    }
+
+    private String renderHasFieldOrPropertyWithValue(final Object[] args) {
+        if (args.length != 2) {
+            return "has field or property with value " + renderEach(args);
+        }
+        return "has field or property " + renderArgument(args[0]) + " with value " + renderArgument(args[1]);
+    }
+
+    private String readableMethodName(final String methodName) {
+        if (methodName.startsWith("is") && methodName.length() > 2 && Character.isUpperCase(methodName.charAt(2))) {
+            return "is " + splitCamelCase(methodName.substring(2));
+        }
+        if (methodName.startsWith("has") && methodName.length() > 3 && Character.isUpperCase(methodName.charAt(3))) {
+            return "has " + splitCamelCase(methodName.substring(3));
+        }
+        return splitCamelCase(methodName);
+    }
+
+    private String splitCamelCase(final String value) {
+        return value
+                .replaceAll("([a-z0-9])([A-Z])", "$1 $2")
+                .toLowerCase();
+    }
+
+    private String renderArguments(final String methodName, final Object[] args) {
+        if (isDescriptionWithEmptyValues(args)) {
+            return renderArgument(args[0]);
+        }
+        if (isSingleVarargToUnwrap(methodName, args)) {
+            return renderArgument(Array.get(args[0], 0));
+        }
+        if (isSingleArrayArgument(args)) {
+            return renderArray(args[0]);
+        }
+        return renderEach(args);
+    }
+
+    private boolean isDescriptionWithEmptyValues(final Object[] args) {
+        return args.length == 2
+                && args[1] != null
+                && args[1].getClass().isArray()
+                && Array.getLength(args[1]) == 0;
+    }
+
+    private boolean isSingleVarargToUnwrap(final String methodName, final Object[] args) {
+        return args.length == 1
+                && args[0] != null
+                && args[0].getClass().isArray()
+                && Array.getLength(args[0]) == 1
+                && shouldUnwrapSingleVararg(methodName);
+    }
+
+    private boolean isSingleArrayArgument(final Object[] args) {
+        return args.length == 1
+                && args[0] != null
+                && args[0].getClass().isArray();
+    }
+
+    private boolean shouldUnwrapSingleVararg(final String methodName) {
+        return !methodName.contains("Any")
+                && !methodName.contains("Exactly")
+                && !methodName.contains("Only")
+                && !methodName.contains("Sequence")
+                && !methodName.contains("Subsequence")
+                && !methodName.endsWith("In");
+    }
+
+    private String renderEach(final Object[] args) {
+        final List<String> values = new ArrayList<>();
+        for (Object arg : args) {
+            values.add(renderArgument(arg));
+        }
+        return values.stream().collect(Collectors.joining(", "));
+    }
+
+    private String renderArgument(final Object value) {
+        if (value == null) {
+            return "null";
+        }
+        if (isLambda(value)) {
+            return renderLambda(value);
+        }
+        if (value instanceof Description) {
+            return renderSimple(value.toString());
+        }
+        if (value instanceof Tuple) {
+            return renderTuple((Tuple) value);
+        }
+        if (value instanceof CharSequence || isSimple(value)) {
+            return renderSimple(value);
+        }
+        if (value instanceof Collection) {
+            if (isInlineCollection((Collection<?>) value)) {
+                return renderCollectionValue((Collection<?>) value);
+            }
+            return renderCollectionSubject((Collection<?>) value);
+        }
+        if (value instanceof Map) {
+            return "map with " + renderEntryCount(((Map<?, ?>) value).size());
+        }
+        if (value.getClass().isArray()) {
+            return renderArray(value);
+        }
+        return simpleClassName(value);
+    }
+
+    private String renderArray(final Object array) {
+        if (array instanceof byte[]) {
+            return ObjectUtils.toString(array);
+        }
+
+        final int length = Array.getLength(array);
+        if (array.getClass().getComponentType().isPrimitive()) {
+            return ObjectUtils.toString(array);
+        }
+        if (allLambdas(array, length)) {
+            return length == 1 ? renderLambda(Array.get(array, 0)) : lambdaList(array, length);
+        }
+        if (allSimple(array, length) || !array.getClass().getComponentType().isPrimitive()) {
+            return renderObjectArray(array, length);
+        }
+        return array.getClass().getComponentType().getSimpleName() + "[](length=" + length + ")";
+    }
+
+    private String renderCollectionSubject(final Collection<?> value) {
+        final int size = value.size();
+        if (size == 0) {
+            return "empty collection";
+        }
+        return commonElementType(value)
+                .map(type -> renderElementCount(size, type))
+                .orElseGet(() -> renderItemCount(size));
+    }
+
+    private String renderArraySubject(final Object array) {
+        final int length = Array.getLength(array);
+        if (isInlineArray(array, length)) {
+            return renderArrayValue(array, length);
+        }
+        if (array instanceof byte[]) {
+            return "byte array with " + renderByteCount(length);
+        }
+        return renderElementCount(length, array.getClass().getComponentType());
+    }
+
+    private boolean isInlineCollection(final Collection<?> value) {
+        return value.size() <= INLINE_VALUE_LIMIT && allInlineValues(value);
+    }
+
+    private boolean allInlineValues(final Collection<?> value) {
+        for (Object item : value) {
+            if (!isInlineValue(item)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean isInlineValue(final Object value) {
+        return value == null
+                || isLambda(value)
+                || value instanceof Description
+                || isInlineTuple(value)
+                || value instanceof CharSequence
+                || isSimple(value);
+    }
+
+    private boolean isInlineTuple(final Object value) {
+        if (!(value instanceof Tuple)) {
+            return false;
+        }
+        final Object[] values = ((Tuple) value).toArray();
+        return isInlineArray(values, values.length);
+    }
+
+    private String renderTuple(final Tuple tuple) {
+        final Object[] values = tuple.toArray();
+        return renderObjectArray(values, values.length)
+                .replaceFirst("^\\[", "(")
+                .replaceFirst("]$", ")");
+    }
+
+    private String renderCollectionValue(final Collection<?> value) {
+        final List<String> values = new ArrayList<>();
+        for (Object item : value) {
+            values.add(renderArgument(item));
+        }
+        return values.stream().collect(Collectors.joining(", ", "[", "]"));
+    }
+
+    private boolean isInlineArray(final Object array, final int length) {
+        if (length > INLINE_VALUE_LIMIT || array instanceof byte[]) {
+            return false;
+        }
+        if (array.getClass().getComponentType().isPrimitive()) {
+            return true;
+        }
+        for (int i = 0; i < length; i++) {
+            if (!isInlineValue(Array.get(array, i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private String renderArrayValue(final Object array, final int length) {
+        if (array.getClass().getComponentType().isPrimitive()) {
+            return ObjectUtils.toString(array);
+        }
+        return renderObjectArray(array, length);
+    }
+
+    private Optional<Class<?>> commonElementType(final Collection<?> value) {
+        Class<?> result = null;
+        for (Object item : value) {
+            if (item == null) {
+                continue;
+            }
+            final Class<?> itemType = elementTypeOf(item);
+            if (result == null) {
+                result = itemType;
+            } else if (!result.equals(itemType)) {
+                return java.util.Optional.empty();
+            }
+        }
+        return java.util.Optional.ofNullable(result);
+    }
+
+    private Class<?> elementTypeOf(final Object item) {
+        if (item instanceof Collection) {
+            return Collection.class;
+        }
+        if (item instanceof Map) {
+            return Map.class;
+        }
+        return item.getClass();
+    }
+
+    private String renderElementCount(final int size, final Class<?> type) {
+        if (String.class.equals(type)) {
+            return size + " " + pluralize("string", size);
+        }
+        if (Boolean.class.equals(type) || Boolean.TYPE.equals(type)) {
+            return size + " " + pluralize("boolean", size);
+        }
+        if (Character.class.equals(type) || Character.TYPE.equals(type)) {
+            return size + " " + pluralize("character", size);
+        }
+        if (Number.class.isAssignableFrom(type) || type.isPrimitive() && !Boolean.TYPE.equals(type)
+                && !Character.TYPE.equals(type)) {
+            return size + " " + pluralize("number", size);
+        }
+        if (Collection.class.equals(type)) {
+            return size + " " + pluralize("collection", size);
+        }
+        if (Map.class.equals(type)) {
+            return size + " " + pluralize("map", size);
+        }
+        return size + " " + type.getSimpleName() + " " + pluralize("item", size);
+    }
+
+    private String renderItemCount(final int size) {
+        return size + " " + pluralize("item", size);
+    }
+
+    private String renderEntryCount(final int size) {
+        return size + " " + pluralize("entry", size);
+    }
+
+    private String renderByteCount(final int size) {
+        return size + " " + pluralize("byte", size);
+    }
+
+    private String pluralize(final String word, final int count) {
+        return count == 1 ? word : word + "s";
+    }
+
+    private String renderObjectArray(final Object array, final int length) {
+        final List<String> values = new ArrayList<>();
+        for (int i = 0; i < length; i++) {
+            values.add(renderArgument(Array.get(array, i)));
+        }
+        return values.stream().collect(Collectors.joining(", ", "[", "]"));
+    }
+
+    private boolean allLambdas(final Object array, final int length) {
+        if (length == 0) {
+            return false;
+        }
+        for (int i = 0; i < length; i++) {
+            if (!isLambda(Array.get(array, i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private String lambdaList(final Object array, final int length) {
+        final List<String> values = new ArrayList<>();
+        for (int i = 0; i < length; i++) {
+            values.add(renderLambda(Array.get(array, i)));
+        }
+        return values.stream().collect(Collectors.joining(", ", "[", "]"));
+    }
+
+    private boolean allSimple(final Object array, final int length) {
+        for (int i = 0; i < length; i++) {
+            final Object item = Array.get(array, i);
+            if (item != null && !isSimple(item) && !(item instanceof CharSequence)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean isSimple(final Object value) {
+        return value instanceof Number
+                || value instanceof Boolean
+                || value instanceof Character
+                || value instanceof Enum
+                || value instanceof Path
+                || value instanceof URI
+                || value instanceof URL
+                || value instanceof TemporalAccessor;
+    }
+
+    private boolean isLambda(final Object value) {
+        final Class<?> type = value.getClass();
+        return type.isSynthetic() || type.getName().contains("$$Lambda$");
+    }
+
+    private String renderLambda(final Object value) {
+        return getLambdaName(value)
+                .orElse(LAMBDA);
+    }
+
+    private String renderSimple(final Object value) {
+        if (value instanceof CharSequence || value instanceof Character) {
+            return "\"" + ObjectUtils.toString(value) + "\"";
+        }
+        if (value instanceof Enum) {
+            return ((Enum<?>) value).name();
+        }
+        return ObjectUtils.toString(value);
+    }
+
+    private String simpleClassName(final Object value) {
+        final Class<?> type = value.getClass();
+        if (type.isAnonymousClass()) {
+            return type.getSuperclass().getSimpleName();
+        }
+        return type.getSimpleName();
+    }
+}
diff --git a/allure-assertj/src/main/resources/META-INF/services/io.qameta.allure.listener.FixtureLifecycleListener b/allure-assertj/src/main/resources/META-INF/services/io.qameta.allure.listener.FixtureLifecycleListener
new file mode 100644
index 000000000..65aaf3eca
--- /dev/null
+++ b/allure-assertj/src/main/resources/META-INF/services/io.qameta.allure.listener.FixtureLifecycleListener
@@ -0,0 +1 @@
+io.qameta.allure.assertj.AssertJLifecycleListener
diff --git a/allure-assertj/src/main/resources/META-INF/services/io.qameta.allure.listener.TestLifecycleListener b/allure-assertj/src/main/resources/META-INF/services/io.qameta.allure.listener.TestLifecycleListener
new file mode 100644
index 000000000..65aaf3eca
--- /dev/null
+++ b/allure-assertj/src/main/resources/META-INF/services/io.qameta.allure.listener.TestLifecycleListener
@@ -0,0 +1 @@
+io.qameta.allure.assertj.AssertJLifecycleListener
diff --git a/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java b/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
index 957657b14..1567e7e11 100644
--- a/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
+++ b/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
@@ -15,18 +15,27 @@
  */
 package io.qameta.allure.assertj;
 
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
+import org.assertj.core.api.AbstractStringAssert;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.Test;
 
+import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.function.Function;
 
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -35,90 +44,457 @@ class AllureAspectJTest {
 
     @AllureFeatures.Steps
     @Test
-    void shouldCreateStepsForAsserts() {
+    void shouldCreateSemanticChainForScalarAssert() {
         final AllureResults results = runWithinTestContext(() -> {
             assertThat("Data")
                     .hasSize(4);
         }, AllureAspectJ::setLifecycle);
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getSteps)
+
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(tuple("assert \"Data\"", Status.PASSED));
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
                 .extracting(StepResult::getName)
-                .containsExactly(
-                        "assertThat 'Data'",
-                        "hasSize '4'"
-                );
+                .containsExactly("has size 4");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .flatExtracting(StepResult::getParameters)
+                .isEmpty();
     }
 
     @AllureFeatures.Steps
     @Test
-    void shouldHandleNullableObject() {
+    void shouldUseAssertDescriptionAsChainName() {
         final AllureResults results = runWithinTestContext(() -> {
             assertThat((Object) null)
                     .as("Nullable object")
                     .isNull();
         }, AllureAspectJ::setLifecycle);
 
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getSteps)
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName)
+                .containsExactly("assert Nullable object");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("described as \"Nullable object\"", "is null");
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldRenderByteArraysWithoutPayload() {
+        final String value = "some string";
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat(value.getBytes(StandardCharsets.UTF_8))
+                    .as("Byte array object")
+                    .isEqualTo(value.getBytes(StandardCharsets.UTF_8));
+        }, AllureAspectJ::setLifecycle);
+
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName)
+                .containsExactly("assert Byte array object");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("described as \"Byte array object\"", "is equal to <BINARY>");
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldRenderCollectionsAsSubjectsAndExpectedValuesAsValues() {
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat(Arrays.asList("a", "b"))
+                    .containsExactly("a", "b");
+        }, AllureAspectJ::setLifecycle);
+
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName)
+                .containsExactly("assert [\"a\", \"b\"]");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("contains exactly [\"a\", \"b\"]");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .flatExtracting(StepResult::getParameters)
+                .isEmpty();
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldRenderSmallArraysAsValues() {
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat(new int[]{1, 2})
+                    .containsExactly(1, 2);
+
+            assertThat(new String[]{"alpha", "bravo"})
+                    .containsExactly("alpha", "bravo");
+        }, AllureAspectJ::setLifecycle);
+
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName)
+                .containsExactly("assert [1, 2]", "assert [\"alpha\", \"bravo\"]");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("contains exactly [1, 2]", "contains exactly [\"alpha\", \"bravo\"]");
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldRenderTuplesAsValues() {
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat(Arrays.asList(
+                    tuple("first", Status.PASSED),
+                    tuple("second", Status.FAILED)
+            ))
+                    .containsExactly(
+                            tuple("first", Status.PASSED),
+                            tuple("second", Status.FAILED)
+                    );
+        }, AllureAspectJ::setLifecycle);
+
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName)
+                .containsExactly("assert [(\"first\", PASSED), (\"second\", FAILED)]");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("contains exactly [(\"first\", PASSED), (\"second\", FAILED)]");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .flatExtracting(StepResult::getParameters)
+                .isEmpty();
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldRenderFieldOrPropertyValueAssertions() {
+        final StatusDetails details = new StatusDetails()
+                .setMessage("Make the test failed");
+
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat(details)
+                    .hasFieldOrPropertyWithValue("message", "Make the test failed");
+        }, AllureAspectJ::setLifecycle);
+
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName)
+                .containsExactly("assert StatusDetails");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("has field or property \"message\" with value \"Make the test failed\"");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .flatExtracting(StepResult::getParameters)
+                .isEmpty();
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldTruncateLongStepNamesAndAddOnlyTruncatedValuesAsParameters() {
+        final String value = String.join("", Collections.nCopies(1200, "a"));
+
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat(value)
+                    .isEqualTo(value);
+        }, AllureAspectJ::setLifecycle);
+
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName)
+                .singleElement()
+                .asString()
+                .hasSize(1000)
+                .startsWith("assert \"")
+                .endsWith("...");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .singleElement()
+                .asString()
+                .hasSize(1000)
+                .startsWith("is equal to \"")
+                .endsWith("...");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .flatExtracting(StepResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactly(tuple("expected", "\"" + value + "\""));
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldCreateSeparateChainsForMultipleAssertThatCalls() {
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat("Data")
+                    .hasSize(4);
+
+            assertThat(42)
+                    .isPositive()
+                    .isEqualTo(42);
+
+            assertThat(Arrays.asList("a", "b"))
+                    .hasSize(2)
+                    .contains("a");
+        }, AllureAspectJ::setLifecycle);
+
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(
+                        tuple("assert \"Data\"", Status.PASSED),
+                        tuple("assert 42", Status.PASSED),
+                        tuple("assert [\"a\", \"b\"]", Status.PASSED)
+                );
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
                 .extracting(StepResult::getName)
                 .containsExactly(
-                        "assertThat 'null'",
-                        "as 'Nullable object []'",
-                        "isNull"
+                        "has size 4",
+                        "is positive",
+                        "is equal to 42",
+                        "has size 2",
+                        "contains \"a\""
                 );
     }
 
     @AllureFeatures.Steps
     @Test
-    void shouldHandleByteArrayObject() {
-        final String s = "some string";
+    void shouldAttachOperationsToStoredAssertionInstances() {
+        final String targetA = "alpha";
+        final String targetB = "bravo";
+
         final AllureResults results = runWithinTestContext(() -> {
-            assertThat(s.getBytes(StandardCharsets.UTF_8))
-                    .as("Byte array object")
-                    .isEqualTo(s.getBytes(StandardCharsets.UTF_8));
+            final AbstractStringAssert<?> a = assertThat(targetA);
+            final AbstractStringAssert<?> b = assertThat(targetB);
+
+            a.isEqualTo("alpha");
+            b.isEqualTo("bravo");
+        }, AllureAspectJ::setLifecycle);
+
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(
+                        tuple("assert \"alpha\"", Status.PASSED),
+                        tuple("assert \"bravo\"", Status.PASSED)
+                );
+        assertThat(result.getSteps())
+                .filteredOn("name", "assert \"alpha\"")
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("is equal to \"alpha\"");
+        assertThat(result.getSteps())
+                .filteredOn("name", "assert \"bravo\"")
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("is equal to \"bravo\"");
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldAvoidVerboseModelToStringPayloads() {
+        final TestResult model = new TestResult()
+                .setUuid("uid")
+                .setName("testPassed")
+                .setFullName("other.PassingTest.testPassed");
+
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat(Collections.singletonList(model))
+                    .hasSize(1)
+                    .containsExactly(model);
+        }, AllureAspectJ::setLifecycle);
+
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName)
+                .containsExactly("assert 1 TestResult item");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("has size 1", "contains exactly [TestResult]");
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName)
+                .noneMatch(name -> name.contains("fullName="))
+                .noneMatch(name -> name.contains("other.PassingTest.testPassed"));
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .noneMatch(name -> name.contains("fullName="))
+                .noneMatch(name -> name.contains("other.PassingTest.testPassed"));
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldKeepNavigationInsideTheSameChain() {
+        final TestResult model = new TestResult()
+                .setFullName("my.company.Test.testOne");
+
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat(Collections.singletonList(model))
+                    .extracting(TestResult::getFullName)
+                    .containsExactly("my.company.Test.testOne");
+
+            assertThat(Collections.singletonList("alpha"))
+                    .first(InstanceOfAssertFactories.STRING)
+                    .startsWith("al");
+
+            assertThat(Collections.singletonList("bravo"))
+                    .singleElement(InstanceOfAssertFactories.STRING)
+                    .endsWith("vo");
+
+            assertThat((Object) "charlie")
+                    .asInstanceOf(InstanceOfAssertFactories.STRING)
+                    .contains("har");
+
+            assertThat(Collections.singletonList(Collections.singletonList("delta")))
+                    .flatExtracting(value -> value)
+                    .containsExactly("delta");
         }, AllureAspectJ::setLifecycle);
 
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getSteps)
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .hasSize(5);
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
                 .extracting(StepResult::getName)
                 .containsExactly(
-                        "assertThat '<BINARY>'",
-                        "describedAs 'Byte array object'",
-                        "isEqualTo '<BINARY>'"
+                        "extracts <lambda> -> [\"my.company.Test.testOne\"]",
+                        "contains exactly [\"my.company.Test.testOne\"]",
+                        "first element as InstanceOfAssertFactory -> \"alpha\"",
+                        "starts with \"al\"",
+                        "single element as InstanceOfAssertFactory -> \"bravo\"",
+                        "ends with \"vo\"",
+                        "as instance of InstanceOfAssertFactory -> \"charlie\"",
+                        "contains \"har\"",
+                        "flat extracts <lambda> -> [\"delta\"]",
+                        "contains exactly [\"delta\"]"
                 );
     }
 
     @AllureFeatures.Steps
     @Test
-    void shouldHandleCollections() {
+    void shouldRenderSerializedLambdaMethodReferences() {
+        final TestResult model = new TestResult()
+                .setFullName("my.company.Test.testOne");
+
         final AllureResults results = runWithinTestContext(() -> {
-            assertThat(Arrays.asList("a", "b"))
-                .containsExactly("a", "b");
+            assertThat(Collections.singletonList(model))
+                    .extracting((Function<TestResult, String> & Serializable) TestResult::getFullName)
+                    .containsExactly("my.company.Test.testOne");
+        }, AllureAspectJ::setLifecycle);
+
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "extracts TestResult::getFullName -> [\"my.company.Test.testOne\"]",
+                        "contains exactly [\"my.company.Test.testOne\"]"
+                );
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldMarkTheFailedHardAssertionOperation() {
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat("Data")
+                    .hasSize(5);
         }, AllureAspectJ::setLifecycle);
 
-        assertThat(results.getTestResults())
-            .flatExtracting(TestResult::getSteps)
-            .extracting(StepResult::getName)
-            .containsExactly(
-                "assertThatList '[a, b]'",
-                "containsExactly '[a, b]'"
-            );
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(tuple("assert \"Data\"", Status.FAILED));
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(tuple("has size 5", Status.FAILED));
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .filteredOn("name", "has size 5")
+                .extracting(step -> step.getStatusDetails().getMessage())
+                .singleElement()
+                .asString()
+                .contains("size");
     }
 
     @AllureFeatures.Steps
     @Test
-    void softAssertions() {
+    void shouldMarkTheFailedSoftAssertionOperationBeforeAssertAll() {
         final AllureResults results = runWithinTestContext(() -> {
             final SoftAssertions soft = new SoftAssertions();
             soft.assertThat(25)
-                    .as("Test description")
+                    .as("Age")
                     .isEqualTo(26);
             soft.assertAll();
         }, AllureAspectJ::setLifecycle);
 
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getSteps)
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(tuple("assert Age", Status.FAILED));
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(
+                        tuple("described as \"Age\"", Status.PASSED),
+                        tuple("is equal to 26", Status.FAILED)
+                );
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .filteredOn("name", "is equal to 26")
+                .extracting(step -> step.getStatusDetails().getMessage())
+                .singleElement()
+                .asString()
+                .contains("expected: 26");
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldAttachNestedAssertionsUnderCallbackOperations() {
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat("alpha")
+                    .satisfies(value -> assertThat(value)
+                            .startsWith("al")
+                            .endsWith("ha"));
+        }, AllureAspectJ::setLifecycle);
+
+        final TestResult result = assertOnlyOneResult(results);
+        assertThat(result.getSteps())
+                .extracting(StepResult::getName)
+                .containsExactly("assert \"alpha\"");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
                 .extracting(StepResult::getName)
-                .contains("as 'Test description []'", "isEqualTo '26'");
+                .containsExactly("satisfies <lambda>");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .filteredOn("name", "satisfies <lambda>")
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("assert \"alpha\"");
+        assertThat(result.getSteps())
+                .flatExtracting(StepResult::getSteps)
+                .filteredOn("name", "satisfies <lambda>")
+                .flatExtracting(StepResult::getSteps)
+                .flatExtracting(StepResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("starts with \"al\"", "ends with \"ha\"");
+    }
+
+    private TestResult assertOnlyOneResult(final AllureResults results) {
+        assertThat(results.getTestResults()).hasSize(1);
+        return results.getTestResults().get(0);
     }
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
index f409d81b5..f37ab44b4 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
@@ -51,7 +51,9 @@ public static String toString(final Object object) {
         try {
             if (Objects.nonNull(object) && object.getClass().isArray()) {
                 if (object instanceof Object[]) {
-                    return Arrays.toString((Object[]) object);
+                    return Arrays.stream((Object[]) object)
+                            .map(ObjectUtils::toString)
+                            .collect(Collectors.joining(", ", "[", "]"));
                 } else if (object instanceof long[]) {
                     return Arrays.toString((long[]) object);
                 } else if (object instanceof short[]) {
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index d8d3b7f8c..38faa3a50 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -35,6 +35,7 @@
 import java.io.InputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.lang.invoke.SerializedLambda;
 import java.lang.management.ManagementFactory;
 import java.lang.reflect.Method;
 import java.math.BigInteger;
@@ -336,6 +337,11 @@ public static String md5(final String source) {
         return bytesToHex(getMd5Digest().digest(source.getBytes(StandardCharsets.UTF_8)));
     }
 
+    public static Optional<String> getLambdaName(final Object lambda) {
+        return getSerializedLambda(lambda)
+                .flatMap(ResultsUtils::formatLambdaName);
+    }
+
     public static String bytesToHex(final byte[] bytes) {
         return new BigInteger(1, bytes).toString(16);
     }
@@ -442,4 +448,45 @@ private static boolean separateLines() {
         return parseBoolean(loadAllureProperties().getProperty(ALLURE_SEPARATE_LINES_SYSPROP));
     }
 
+    @SuppressWarnings("PMD.AvoidAccessibilityAlteration")
+    private static Optional<SerializedLambda> getSerializedLambda(final Object value) {
+        if (Objects.isNull(value)) {
+            return Optional.empty();
+        }
+        try {
+            final Method writeReplace = value.getClass().getDeclaredMethod("writeReplace");
+            writeReplace.setAccessible(true);
+            final Object replacement = writeReplace.invoke(value);
+            if (replacement instanceof SerializedLambda) {
+                return Optional.of((SerializedLambda) replacement);
+            }
+        } catch (ReflectiveOperationException | RuntimeException ignored) {
+            return Optional.empty();
+        }
+        return Optional.empty();
+    }
+
+    private static Optional<String> formatLambdaName(final SerializedLambda lambda) {
+        final String methodName = lambda.getImplMethodName();
+        if (methodName.startsWith("lambda$")) {
+            return Optional.empty();
+        }
+        return Optional.of(simpleClassName(lambda.getImplClass()) + "::" + getLambdaMethodName(methodName));
+    }
+
+    private static String getLambdaMethodName(final String methodName) {
+        if ("<init>".equals(methodName)) {
+            return "new";
+        }
+        return methodName;
+    }
+
+    private static String simpleClassName(final String name) {
+        final String normalized = name.replace('/', '.');
+        final int packageIndex = normalized.lastIndexOf('.');
+        final int nestedClassIndex = normalized.lastIndexOf('$');
+        final int index = Math.max(packageIndex, nestedClassIndex);
+        return index < 0 ? normalized : normalized.substring(index + 1);
+    }
+
 }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
index 79b6505a3..dea5482c8 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
@@ -24,8 +24,10 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.util.Objects;
+import java.util.function.Function;
 import java.util.stream.Stream;
 
 import static io.qameta.allure.util.ResultsUtils.ISSUE_LINK_TYPE;
@@ -151,6 +153,32 @@ public String value() {
                 .hasFieldOrPropertyWithValue("type", TMS_LINK_TYPE);
     }
 
+    @Test
+    void shouldGetSerializedLambdaName() {
+        final Function<LambdaSubject, String> getter =
+                (Function<LambdaSubject, String> & Serializable) LambdaSubject::getName;
+
+        assertThat(ResultsUtils.getLambdaName(getter))
+                .hasValue("LambdaSubject::getName");
+    }
+
+    @Test
+    void shouldIgnoreGeneratedSerializedLambdaBody() {
+        final Function<LambdaSubject, String> getter =
+                (Function<LambdaSubject, String> & Serializable) subject -> subject.getName();
+
+        assertThat(ResultsUtils.getLambdaName(getter))
+                .isEmpty();
+    }
+
+    @Test
+    void shouldIgnoreNonSerializedLambda() {
+        final Function<LambdaSubject, String> getter = LambdaSubject::getName;
+
+        assertThat(ResultsUtils.getLambdaName(getter))
+                .isEmpty();
+    }
+
     public static Stream<Arguments> data() {
         return Stream.of(
                 Arguments.of("a", "b", "c", "d", "e", link("a", "c", "d")),
@@ -200,4 +228,17 @@ public void clearSystemProperty(final String type, final String sysProp) {
     private static io.qameta.allure.model.Link link(String name, String url, String type) {
         return new io.qameta.allure.model.Link().setName(name).setUrl(url).setType(type);
     }
+
+    private static final class LambdaSubject {
+
+        private final String name;
+
+        LambdaSubject(final String name) {
+            this.name = name;
+        }
+
+        String getName() {
+            return name;
+        }
+    }
 }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
index e28ee2cfb..586697b55 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
@@ -34,6 +34,20 @@ void shouldProcessToStringNpe() {
                 .isEqualTo("<NPE>");
     }
 
+    @Test
+    void shouldProcessArraysItemByItem() {
+        final Object[] array = {
+                "value",
+                "binary".getBytes(),
+                new MyNpeClass(),
+        };
+
+        final String string = ObjectUtils.toString(array);
+
+        assertThat(string)
+                .isEqualTo("[value, <BINARY>, <NPE>]");
+    }
+
     public class MyNpeClass {
 
         Integer value = null;

From 621d24ce78275ccf6b2d17e7c43264de92b2a87f Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 8 May 2026 13:15:59 +0100
Subject: [PATCH 228/233] Add Allure reporting for Playwright Java (via #1269)

---
 README.md                                     |  64 +-
 .../qameta/allure/model/AttachmentType.java   |  46 ++
 allure-playwright/build.gradle.kts            |  36 +
 .../allure/playwright/AllurePlaywright.java   | 571 ++++++++++++++++
 .../playwright/AllurePlaywrightAspect.java    | 226 ++++++
 .../playwright/AllurePlaywrightConfig.java    |  97 +++
 .../playwright/AllurePlaywrightLifecycle.java |  43 ++
 .../playwright/AllurePlaywrightRegistry.java  | 128 ++++
 .../playwright/DefaultTraceSession.java       |  88 +++
 .../allure/playwright/PlaywrightAction.java   | 285 ++++++++
 .../allure/playwright/TraceSession.java       |  33 +
 .../src/main/resources/META-INF/aop-ajc.xml   |   6 +
 ...meta.allure.listener.TestLifecycleListener |   1 +
 .../playwright/AllurePlaywrightTest.java      | 642 ++++++++++++++++++
 .../src/test/resources/allure.properties      |   3 +
 settings.gradle.kts                           |   1 +
 16 files changed, 2269 insertions(+), 1 deletion(-)
 create mode 100644 allure-model/src/main/java/io/qameta/allure/model/AttachmentType.java
 create mode 100644 allure-playwright/build.gradle.kts
 create mode 100644 allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywright.java
 create mode 100644 allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightAspect.java
 create mode 100644 allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightConfig.java
 create mode 100644 allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightLifecycle.java
 create mode 100644 allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightRegistry.java
 create mode 100644 allure-playwright/src/main/java/io/qameta/allure/playwright/DefaultTraceSession.java
 create mode 100644 allure-playwright/src/main/java/io/qameta/allure/playwright/PlaywrightAction.java
 create mode 100644 allure-playwright/src/main/java/io/qameta/allure/playwright/TraceSession.java
 create mode 100644 allure-playwright/src/main/resources/META-INF/aop-ajc.xml
 create mode 100644 allure-playwright/src/main/resources/META-INF/services/io.qameta.allure.listener.TestLifecycleListener
 create mode 100644 allure-playwright/src/test/java/io/qameta/allure/playwright/AllurePlaywrightTest.java
 create mode 100644 allure-playwright/src/test/resources/allure.properties

diff --git a/README.md b/README.md
index f77b1f03f..fd415585f 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,69 @@ SelenideLogger.addListener("AllureSelenide", new AllureSelenide().enableLogs(Log
 https://github.com/SeleniumHQ/selenium/wiki/Logging
 ```
 
-
+## Playwright Java
+
+AspectJ-based integration for Playwright Java that reports browser actions as Allure steps and attaches
+Playwright screenshots automatically:
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-playwright</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Enable the AspectJ weaver for automatic action steps:
+```
+-javaagent:/path/to/aspectjweaver.jar
+```
+
+Usage example with Playwright Java JUnit fixtures:
+```java
+@UsePlaywright
+class UiTest {
+
+    @Test
+    void shouldOpenPage(Page page) {
+        page.navigate("https://playwright.dev");
+        page.screenshot();
+    }
+}
+```
+
+The module registers an Allure test lifecycle listener automatically, so per-test cleanup, failure diagnostics,
+and final trace/log flush work with any test framework that reports through Allure. Playwright pages and
+contexts are tracked by the AspectJ integration when they are created or used. Use
+`AllurePlaywright.register(...)` only for pages or contexts the aspect cannot observe.
+
+Frameworks or custom runners that do not use the Allure lifecycle can call the reporting hooks directly:
+```java
+AllurePlaywright.beforeTest();
+try {
+    testBody();
+} catch (Throwable e) {
+    AllurePlaywright.afterTestFailure(e);
+    throw e;
+} finally {
+    AllurePlaywright.afterTest();
+}
+```
+
+The following defaults can be overridden in `allure.properties`:
+```
+allure.playwright.steps.enabled=true
+allure.playwright.steps.mode=actions
+allure.playwright.parameters=redacted
+allure.playwright.screenshots.attach=true
+allure.playwright.failure.screenshot=true
+allure.playwright.failure.page-source=true
+allure.playwright.close.trace=true
+allure.playwright.close.video=true
+allure.playwright.close.page-logs=true
+```
+
+
 ## Rest Assured
 
 Filter for rest-assured http client, that generates attachment for allure.
diff --git a/allure-model/src/main/java/io/qameta/allure/model/AttachmentType.java b/allure-model/src/main/java/io/qameta/allure/model/AttachmentType.java
new file mode 100644
index 000000000..806fb3915
--- /dev/null
+++ b/allure-model/src/main/java/io/qameta/allure/model/AttachmentType.java
@@ -0,0 +1,46 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.model;
+
+/**
+ * Common attachment media types and file extensions.
+ */
+public final class AttachmentType {
+
+    public static final AttachmentType PNG = new AttachmentType("image/png", "png");
+    public static final AttachmentType JPEG = new AttachmentType("image/jpeg", "jpg");
+    public static final AttachmentType TEXT = new AttachmentType("text/plain", "txt");
+    public static final AttachmentType HTML = new AttachmentType("text/html", "html");
+    public static final AttachmentType ZIP = new AttachmentType("application/zip", "zip");
+    public static final AttachmentType WEBM = new AttachmentType("video/webm", "webm");
+    public static final AttachmentType OCTET_STREAM = new AttachmentType("application/octet-stream", "");
+
+    private final String mediaType;
+    private final String extension;
+
+    private AttachmentType(final String mediaType, final String extension) {
+        this.mediaType = mediaType;
+        this.extension = extension;
+    }
+
+    public String getMediaType() {
+        return mediaType;
+    }
+
+    public String getExtension() {
+        return extension;
+    }
+}
diff --git a/allure-playwright/build.gradle.kts b/allure-playwright/build.gradle.kts
new file mode 100644
index 000000000..55bec9235
--- /dev/null
+++ b/allure-playwright/build.gradle.kts
@@ -0,0 +1,36 @@
+description = "Allure Playwright Integration"
+
+val agent: Configuration by configurations.creating
+
+val playwrightVersion = "1.59.0"
+
+dependencies {
+    agent("org.aspectj:aspectjweaver")
+    api(project(":allure-java-commons"))
+    compileOnly("com.microsoft.playwright:playwright:$playwrightVersion")
+    compileOnly("org.aspectj:aspectjrt")
+    testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    testImplementation("com.microsoft.playwright:playwright:$playwrightVersion")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-assertj"))
+    testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.playwright"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+    doFirst {
+        jvmArgs("-javaagent:${agent.singleFile}")
+    }
+}
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywright.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywright.java
new file mode 100644
index 000000000..ff5a9ad4d
--- /dev/null
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywright.java
@@ -0,0 +1,571 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.playwright;
+
+import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.BrowserContext;
+import com.microsoft.playwright.ConsoleMessage;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.Tracing;
+import com.microsoft.playwright.Video;
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.AttachmentType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.function.Supplier;
+
+/**
+ * Utility methods for attaching Playwright Java diagnostics to the current Allure test.
+ */
+public final class AllurePlaywright {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AllurePlaywright.class);
+
+    private static final String SCREENSHOT = "Screenshot";
+    private static final String PAGE_SOURCE = "Page source";
+    private static final String TRACE = "Playwright trace";
+    private static final String VIDEO = "Playwright video";
+    private static final String CONSOLE_MESSAGES = "Console messages";
+    private static final String PAGE_ERRORS = "Page errors";
+
+    private static final ThreadLocal<Boolean> SUPPRESS_ASPECT = new ThreadLocal<Boolean>() {
+        @Override
+        protected Boolean initialValue() {
+            return Boolean.FALSE;
+        }
+    };
+
+    private AllurePlaywright() {
+        throw new IllegalStateException("Do not instance");
+    }
+
+    /**
+     * Clears Playwright reporting state before a test starts.
+     */
+    public static void beforeTest() {
+        clear();
+    }
+
+    /**
+     * Attaches final Playwright artifacts and clears reporting state after a test finishes.
+     */
+    public static void afterTest() {
+        attachRegisteredCloseArtifacts();
+        clear();
+    }
+
+    /**
+     * Attaches failure diagnostics for the current test.
+     */
+    public static void afterTestFailure() {
+        attachFailureArtifacts();
+    }
+
+    /**
+     * Attaches failure diagnostics for the current test.
+     *
+     * @param throwable the test failure.
+     */
+    public static void afterTestFailure(final Throwable throwable) {
+        LOGGER.debug("Attaching Playwright failure artifacts", throwable);
+        afterTestFailure();
+    }
+
+    /**
+     * Registers a Playwright page for failure diagnostics produced by reporting lifecycle hooks.
+     *
+     * @param page the page to register.
+     */
+    public static void register(final Page page) {
+        AllurePlaywrightRegistry.register(page);
+    }
+
+    /**
+     * Registers a Playwright browser context for failure diagnostics produced by reporting lifecycle hooks.
+     *
+     * @param context the browser context to register.
+     */
+    public static void register(final BrowserContext context) {
+        AllurePlaywrightRegistry.register(context);
+    }
+
+    /**
+     * Captures and attaches a page screenshot.
+     *
+     * @param name the attachment name.
+     * @param page the page to capture.
+     */
+    public static void attachScreenshot(final String name, final Page page) {
+        if (page == null || !hasAllureContext()) {
+            return;
+        }
+        try {
+            final byte[] screenshot = withAspectSuppressed(new Supplier<byte[]>() {
+                @Override
+                public byte[] get() {
+                    return page.screenshot();
+                }
+            });
+            attachBytes(defaultName(name, SCREENSHOT), AttachmentType.PNG, screenshot);
+        } catch (RuntimeException e) {
+            LOGGER.warn("Could not capture Playwright screenshot", e);
+        }
+    }
+
+    /**
+     * Captures and attaches page source.
+     *
+     * @param name the attachment name.
+     * @param page the page to capture.
+     */
+    public static void attachPageSource(final String name, final Page page) {
+        if (page == null || !hasAllureContext()) {
+            return;
+        }
+        try {
+            final String content = withAspectSuppressed(new Supplier<String>() {
+                @Override
+                public String get() {
+                    return page.content();
+                }
+            });
+            attachBytes(defaultName(name, PAGE_SOURCE), AttachmentType.HTML, content.getBytes(StandardCharsets.UTF_8));
+        } catch (RuntimeException e) {
+            LOGGER.warn("Could not capture Playwright page source", e);
+        }
+    }
+
+    /**
+     * Captures and attaches Playwright console messages retained by the page.
+     *
+     * @param name the attachment name.
+     * @param page the page to capture.
+     */
+    public static void attachConsoleMessages(final String name, final Page page) {
+        if (page == null || !hasAllureContext()) {
+            return;
+        }
+        try {
+            final String content = formatConsoleMessages(page.consoleMessages());
+            attachText(defaultName(name, CONSOLE_MESSAGES), content);
+        } catch (RuntimeException e) {
+            LOGGER.warn("Could not capture Playwright console messages", e);
+        }
+    }
+
+    /**
+     * Captures and attaches Playwright page errors retained by the page.
+     *
+     * @param name the attachment name.
+     * @param page the page to capture.
+     */
+    public static void attachPageErrors(final String name, final Page page) {
+        if (page == null || !hasAllureContext()) {
+            return;
+        }
+        try {
+            final String content = formatLines(page.pageErrors());
+            attachText(defaultName(name, PAGE_ERRORS), content);
+        } catch (RuntimeException e) {
+            LOGGER.warn("Could not capture Playwright page errors", e);
+        }
+    }
+
+    /**
+     * Attaches a Playwright trace archive.
+     *
+     * @param name the attachment name.
+     * @param traceZip the path to the trace zip file.
+     */
+    public static void attachTrace(final String name, final Path traceZip) {
+        attachPath(defaultName(name, TRACE), AttachmentType.ZIP, traceZip);
+    }
+
+    /**
+     * Attaches a Playwright video file.
+     *
+     * @param name the attachment name.
+     * @param videoFile the path to the video file.
+     */
+    public static void attachVideo(final String name, final Path videoFile) {
+        attachPath(defaultName(name, VIDEO), videoType(videoFile), videoFile);
+    }
+
+    /**
+     * Starts Playwright tracing and registers the trace for failure diagnostics.
+     *
+     * @param context the browser context to trace.
+     * @return trace session that stops tracing and attaches the generated archive when closed.
+     */
+    public static TraceSession startTracing(final BrowserContext context) {
+        return startTracing(TRACE, context);
+    }
+
+    /**
+     * Starts Playwright tracing and registers the trace for failure diagnostics.
+     *
+     * @param name the attachment name to use when the trace is attached.
+     * @param context the browser context to trace.
+     * @return trace session that stops tracing and attaches the generated archive when closed.
+     */
+    public static TraceSession startTracing(final String name, final BrowserContext context) {
+        if (context == null) {
+            throw new IllegalArgumentException("context must not be null");
+        }
+        final Tracing.StartOptions options = new Tracing.StartOptions()
+                .setScreenshots(true)
+                .setSnapshots(true);
+        context.tracing().start(options);
+        final DefaultTraceSession traceSession = new DefaultTraceSession(context, defaultName(name, TRACE));
+        AllurePlaywrightRegistry.register(context);
+        AllurePlaywrightRegistry.register(traceSession);
+        return traceSession;
+    }
+
+    static CloseArtifacts beforeClose(final Object target) {
+        final CloseArtifacts closeArtifacts = new CloseArtifacts();
+        if (target instanceof Page) {
+            collectPageCloseArtifacts((Page) target, closeArtifacts);
+        } else if (target instanceof BrowserContext) {
+            collectContextCloseArtifacts((BrowserContext) target, closeArtifacts);
+        } else if (target instanceof Browser) {
+            collectBrowserCloseArtifacts((Browser) target, closeArtifacts);
+        }
+        return closeArtifacts;
+    }
+
+    static void attachScreenshotBytes(final String name, final AttachmentType type, final byte[] bytes) {
+        if (!AllurePlaywrightConfig.shouldAttachScreenshots()) {
+            return;
+        }
+        attachBytes(defaultName(name, SCREENSHOT), type, bytes);
+    }
+
+    static AttachmentType screenshotType(final Object... args) {
+        final Object options = args.length == 0 ? null : args[0];
+        if (isJpegType(options)) {
+            return AttachmentType.JPEG;
+        }
+        if (isJpegPath(options)) {
+            return AttachmentType.JPEG;
+        }
+        return AttachmentType.PNG;
+    }
+
+    static boolean hasAllureContext() {
+        return Allure.getLifecycle().getCurrentTestCaseOrStep().isPresent();
+    }
+
+    static boolean isAspectSuppressed() {
+        return SUPPRESS_ASPECT.get();
+    }
+
+    static <T> T withAspectSuppressed(final Supplier<T> supplier) {
+        final Boolean previous = SUPPRESS_ASPECT.get();
+        SUPPRESS_ASPECT.set(Boolean.TRUE);
+        try {
+            return supplier.get();
+        } finally {
+            SUPPRESS_ASPECT.set(previous);
+        }
+    }
+
+    @SuppressWarnings("PMD.CloseResource")
+    static void clear() {
+        for (DefaultTraceSession traceSession : AllurePlaywrightRegistry.getTraceSessions()) {
+            traceSession.stopWithoutAttachment();
+        }
+        AllurePlaywrightRegistry.clear();
+    }
+
+    static void attachFailureArtifacts() {
+        if (!AllurePlaywrightRegistry.markFailureArtifactsAttached()) {
+            return;
+        }
+        if (AllurePlaywrightConfig.shouldAttachFailureScreenshot()) {
+            attachFailureScreenshots();
+        }
+        if (AllurePlaywrightConfig.shouldAttachFailurePageSource()) {
+            attachFailurePageSources();
+        }
+        attachFailureTraces();
+    }
+
+    @SuppressWarnings("PMD.CloseResource")
+    static void attachRegisteredCloseArtifacts() {
+        if (!hasAllureContext()) {
+            return;
+        }
+        if (AllurePlaywrightConfig.shouldAttachClosePageLogs()) {
+            for (Page page : AllurePlaywrightRegistry.getPages()) {
+                attachPageCloseLogs(page);
+            }
+        }
+        if (AllurePlaywrightConfig.shouldAttachCloseTrace()) {
+            attachFailureTraces();
+        }
+    }
+
+    @SuppressWarnings("PMD.CloseResource")
+    private static void collectBrowserCloseArtifacts(final Browser browser, final CloseArtifacts closeArtifacts) {
+        for (BrowserContext context : contexts(browser)) {
+            collectContextCloseArtifacts(context, closeArtifacts);
+        }
+    }
+
+    @SuppressWarnings("PMD.CloseResource")
+    private static void collectContextCloseArtifacts(final BrowserContext context,
+                                                     final CloseArtifacts closeArtifacts) {
+        register(context);
+        for (Page page : pages(context)) {
+            collectPageCloseArtifacts(page, closeArtifacts);
+        }
+        if (AllurePlaywrightConfig.shouldAttachCloseTrace()) {
+            attachCloseTraces(context);
+        }
+    }
+
+    private static void collectPageCloseArtifacts(final Page page, final CloseArtifacts closeArtifacts) {
+        register(page);
+        attachPageCloseLogs(page);
+        if (AllurePlaywrightRegistry.markCloseVideoAttached(page)) {
+            closeArtifacts.addVideo(video(page));
+        }
+    }
+
+    private static void attachPageCloseLogs(final Page page) {
+        if (AllurePlaywrightConfig.shouldAttachClosePageLogs()
+                && AllurePlaywrightRegistry.markClosePageLogsAttached(page)) {
+            attachConsoleMessages(CONSOLE_MESSAGES, page);
+            attachPageErrors(PAGE_ERRORS, page);
+        }
+    }
+
+    @SuppressWarnings("PMD.CloseResource")
+    private static void attachCloseTraces(final BrowserContext context) {
+        for (DefaultTraceSession traceSession : AllurePlaywrightRegistry.getTraceSessions(context)) {
+            traceSession.attach();
+        }
+    }
+
+    @SuppressWarnings("PMD.CloseResource")
+    private static void attachFailureScreenshots() {
+        for (Page page : AllurePlaywrightRegistry.getPages()) {
+            attachScreenshot(SCREENSHOT, page);
+        }
+    }
+
+    @SuppressWarnings("PMD.CloseResource")
+    private static void attachFailurePageSources() {
+        for (Page page : AllurePlaywrightRegistry.getPages()) {
+            attachPageSource(PAGE_SOURCE, page);
+        }
+    }
+
+    @SuppressWarnings("PMD.CloseResource")
+    private static void attachFailureTraces() {
+        for (DefaultTraceSession traceSession : AllurePlaywrightRegistry.getTraceSessions()) {
+            traceSession.attach();
+        }
+    }
+
+    private static List<BrowserContext> contexts(final Browser browser) {
+        try {
+            return browser.contexts();
+        } catch (RuntimeException e) {
+            LOGGER.warn("Could not collect Playwright browser contexts", e);
+            return Collections.emptyList();
+        }
+    }
+
+    private static List<Page> pages(final BrowserContext context) {
+        try {
+            return context.pages();
+        } catch (RuntimeException e) {
+            LOGGER.warn("Could not collect Playwright pages", e);
+            return Collections.emptyList();
+        }
+    }
+
+    private static Video video(final Page page) {
+        try {
+            return page.video();
+        } catch (RuntimeException e) {
+            LOGGER.warn("Could not collect Playwright video", e);
+            return null;
+        }
+    }
+
+    private static AttachmentType videoType(final Path path) {
+        if (path == null) {
+            return AttachmentType.WEBM;
+        }
+        final String name = path.getFileName().toString().toLowerCase(Locale.ROOT);
+        if (name.endsWith(".webm")) {
+            return AttachmentType.WEBM;
+        }
+        return AttachmentType.OCTET_STREAM;
+    }
+
+    private static void attachPath(final String name, final AttachmentType type, final Path path) {
+        if (path == null || !hasAllureContext() || !Files.isRegularFile(path)) {
+            return;
+        }
+        try {
+            attachBytes(name, type, Files.readAllBytes(path));
+        } catch (IOException e) {
+            LOGGER.warn("Could not attach Playwright artifact {}", path, e);
+        }
+    }
+
+    private static void attachBytes(final String name, final AttachmentType type, final byte[] bytes) {
+        if (bytes == null || !hasAllureContext()) {
+            return;
+        }
+        final AllureLifecycle lifecycle = Allure.getLifecycle();
+        lifecycle.addAttachment(name, type.getMediaType(), type.getExtension(), bytes);
+    }
+
+    private static void attachText(final String name, final String content) {
+        if (content == null || content.isEmpty()) {
+            return;
+        }
+        attachBytes(name, AttachmentType.TEXT, content.getBytes(StandardCharsets.UTF_8));
+    }
+
+    private static String defaultName(final String name, final String fallback) {
+        return name == null || name.isEmpty() ? fallback : name;
+    }
+
+    private static boolean isJpegType(final Object options) {
+        final Object type = readField(options, "type");
+        return type != null && "JPEG".equals(type.toString());
+    }
+
+    private static boolean isJpegPath(final Object options) {
+        final Object path = readField(options, "path");
+        if (!(path instanceof Path)) {
+            return false;
+        }
+        final String name = ((Path) path).getFileName().toString().toLowerCase(Locale.ROOT);
+        return name.endsWith(".jpg") || name.endsWith(".jpeg");
+    }
+
+    private static Object readField(final Object target, final String name) {
+        if (target == null) {
+            return null;
+        }
+        try {
+            final Field field = target.getClass().getField(name);
+            return field.get(target);
+        } catch (ReflectiveOperationException ignored) {
+            return null;
+        }
+    }
+
+    private static String formatConsoleMessages(final List<ConsoleMessage> messages) {
+        if (messages == null || messages.isEmpty()) {
+            return "";
+        }
+        final StringBuilder builder = new StringBuilder();
+        for (ConsoleMessage message : messages) {
+            final String type = safe(new Supplier<String>() {
+                @Override
+                public String get() {
+                    return message.type();
+                }
+            });
+            final String text = safe(new Supplier<String>() {
+                @Override
+                public String get() {
+                    return message.text();
+                }
+            });
+            final String location = safe(new Supplier<String>() {
+                @Override
+                public String get() {
+                    return message.location();
+                }
+            });
+            builder.append('[').append(type).append("] ").append(text);
+            if (!location.isEmpty()) {
+                builder.append(" (").append(location).append(')');
+            }
+            builder.append(System.lineSeparator());
+        }
+        return builder.toString();
+    }
+
+    private static String formatLines(final List<String> lines) {
+        if (lines == null || lines.isEmpty()) {
+            return "";
+        }
+        final StringBuilder builder = new StringBuilder();
+        for (String line : lines) {
+            builder.append(line).append(System.lineSeparator());
+        }
+        return builder.toString();
+    }
+
+    private static String safe(final Supplier<String> supplier) {
+        try {
+            final String value = supplier.get();
+            return value == null ? "" : value;
+        } catch (RuntimeException ignored) {
+            return "";
+        }
+    }
+
+    static final class CloseArtifacts {
+
+        private final List<Video> videos = new ArrayList<>();
+
+        private void addVideo(final Video video) {
+            if (video != null) {
+                videos.add(video);
+            }
+        }
+
+        void attachAfterClose() {
+            if (!AllurePlaywrightConfig.shouldAttachCloseVideo()) {
+                return;
+            }
+            for (Video video : videos) {
+                attachVideo(VIDEO, path(video));
+            }
+        }
+
+        private static Path path(final Video video) {
+            try {
+                return video.path();
+            } catch (RuntimeException e) {
+                LOGGER.warn("Could not resolve Playwright video path", e);
+                return null;
+            }
+        }
+    }
+}
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightAspect.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightAspect.java
new file mode 100644
index 000000000..2601d27be
--- /dev/null
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightAspect.java
@@ -0,0 +1,226 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.playwright;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.AttachmentType;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+
+import java.util.UUID;
+import java.util.function.Supplier;
+
+import static io.qameta.allure.util.ResultsUtils.getStatus;
+import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
+
+/**
+ * Aspect that logs Playwright Java browser actions as Allure steps.
+ */
+@Aspect
+public class AllurePlaywrightAspect {
+
+    private static final ThreadLocal<Integer> DEPTH = new ThreadLocal<Integer>() {
+        @Override
+        protected Integer initialValue() {
+            return 0;
+        }
+    };
+
+    private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE =
+            new InheritableThreadLocal<AllureLifecycle>() {
+                @Override
+                protected AllureLifecycle initialValue() {
+                    return Allure.getLifecycle();
+                }
+            };
+
+    @Pointcut("execution(public * com.microsoft.playwright.Page+.*(..))"
+            + " || execution(public * com.microsoft.playwright.Frame+.*(..))"
+            + " || execution(public * com.microsoft.playwright.Locator+.*(..))"
+            + " || execution(public * com.microsoft.playwright.ElementHandle+.*(..))"
+            + " || execution(public * com.microsoft.playwright.assertions.*Assertions+.*(..))")
+    public void playwrightApi() {
+        //pointcut body, should be empty
+    }
+
+    @Pointcut("execution(public byte[] com.microsoft.playwright.Page+.screenshot(..))"
+            + " || execution(public byte[] com.microsoft.playwright.Locator+.screenshot(..))"
+            + " || execution(public byte[] com.microsoft.playwright.ElementHandle+.screenshot(..))")
+    public void screenshotApi() {
+        //pointcut body, should be empty
+    }
+
+    @Pointcut("execution(public com.microsoft.playwright.BrowserContext "
+            + "com.microsoft.playwright.Browser+.newContext(..))")
+    public void newContextApi() {
+        //pointcut body, should be empty
+    }
+
+    @Pointcut("execution(public com.microsoft.playwright.Page com.microsoft.playwright.Browser+.newPage(..))"
+            + " || execution(public com.microsoft.playwright.Page "
+            + "com.microsoft.playwright.BrowserContext+.newPage(..))")
+    public void newPageApi() {
+        //pointcut body, should be empty
+    }
+
+    @Pointcut("execution(public void com.microsoft.playwright.Browser+.close(..))"
+            + " || execution(public void com.microsoft.playwright.BrowserContext+.close(..))"
+            + " || execution(public void com.microsoft.playwright.Page+.close(..))")
+    public void closeApi() {
+        //pointcut body, should be empty
+    }
+
+    @Around("playwrightApi() && !screenshotApi()")
+    public Object logPlaywrightStep(final ProceedingJoinPoint joinPoint) throws Throwable {
+        registerTarget(joinPoint.getTarget());
+        if (shouldSkip()) {
+            return joinPoint.proceed();
+        }
+        final PlaywrightAction action = PlaywrightAction.from(joinPoint, false);
+        if (!action.isLogged()) {
+            return joinPoint.proceed();
+        }
+        return runStep(joinPoint, action, false);
+    }
+
+    @Around("screenshotApi()")
+    public Object logScreenshotStep(final ProceedingJoinPoint joinPoint) throws Throwable {
+        registerTarget(joinPoint.getTarget());
+        if (shouldSkip()) {
+            return joinPoint.proceed();
+        }
+        return runStep(joinPoint, PlaywrightAction.from(joinPoint, true), true);
+    }
+
+    @Around("newContextApi() || newPageApi()")
+    public Object registerCreatedPlaywrightObject(final ProceedingJoinPoint joinPoint) throws Throwable {
+        final Object result = joinPoint.proceed();
+        if (!shouldSkipArtifacts()) {
+            register(result);
+        }
+        return result;
+    }
+
+    @Around("closeApi()")
+    public Object attachCloseArtifacts(final ProceedingJoinPoint joinPoint) throws Throwable {
+        if (shouldSkipArtifacts()) {
+            return joinPoint.proceed();
+        }
+        final AllurePlaywright.CloseArtifacts closeArtifacts = beforeClose(joinPoint.getTarget());
+        final Object result = joinPoint.proceed();
+        afterClose(closeArtifacts);
+        return result;
+    }
+
+    /**
+     * For tests only.
+     *
+     * @param lifecycle allure lifecycle to set.
+     */
+    public static void setLifecycle(final AllureLifecycle lifecycle) {
+        LIFECYCLE.set(lifecycle);
+    }
+
+    public static AllureLifecycle getLifecycle() {
+        return LIFECYCLE.get();
+    }
+
+    private static Object runStep(final ProceedingJoinPoint joinPoint, final PlaywrightAction action,
+                                  final boolean screenshot) throws Throwable {
+        final String uuid = UUID.randomUUID().toString();
+        DEPTH.set(DEPTH.get() + 1);
+        getLifecycle().startStep(uuid, new StepResult().setName(action.getName()));
+        try {
+            final Object result = joinPoint.proceed();
+            if (screenshot && result instanceof byte[]) {
+                attachScreenshot(joinPoint, (byte[]) result);
+            }
+            getLifecycle().updateStep(uuid, step -> step.setStatus(Status.PASSED));
+            return result;
+        } catch (Throwable e) {
+            getLifecycle().updateStep(uuid, step -> step
+                    .setStatus(getStatus(e).orElse(Status.BROKEN))
+                    .setStatusDetails(getStatusDetails(e).orElse(null)));
+            throw e;
+        } finally {
+            getLifecycle().stopStep(uuid);
+            DEPTH.set(DEPTH.get() - 1);
+        }
+    }
+
+    private static void attachScreenshot(final ProceedingJoinPoint joinPoint, final byte[] bytes) {
+        if (AllurePlaywrightConfig.shouldAttachScreenshots()) {
+            final AttachmentType type = AllurePlaywright.screenshotType(joinPoint.getArgs());
+            getLifecycle().addAttachment("Screenshot", type.getMediaType(), type.getExtension(), bytes);
+        }
+    }
+
+    private static void registerTarget(final Object target) {
+        if (!shouldSkipArtifacts()) {
+            register(target);
+        }
+    }
+
+    private static void register(final Object result) {
+        AllurePlaywright.withAspectSuppressed(new Supplier<Object>() {
+            @Override
+            public Object get() {
+                if (result instanceof com.microsoft.playwright.Page) {
+                    AllurePlaywrightRegistry.registerPage((com.microsoft.playwright.Page) result);
+                } else if (result instanceof com.microsoft.playwright.BrowserContext) {
+                    AllurePlaywright.register((com.microsoft.playwright.BrowserContext) result);
+                }
+                return null;
+            }
+        });
+    }
+
+    private static AllurePlaywright.CloseArtifacts beforeClose(final Object target) {
+        return AllurePlaywright.withAspectSuppressed(new Supplier<AllurePlaywright.CloseArtifacts>() {
+            @Override
+            public AllurePlaywright.CloseArtifacts get() {
+                return AllurePlaywright.beforeClose(target);
+            }
+        });
+    }
+
+    private static void afterClose(final AllurePlaywright.CloseArtifacts closeArtifacts) {
+        AllurePlaywright.withAspectSuppressed(new Supplier<Object>() {
+            @Override
+            public Object get() {
+                closeArtifacts.attachAfterClose();
+                return null;
+            }
+        });
+    }
+
+    private static boolean shouldSkip() {
+        return !AllurePlaywrightConfig.isStepsEnabled()
+                || AllurePlaywright.isAspectSuppressed()
+                || DEPTH.get() > 0
+                || !getLifecycle().getCurrentTestCaseOrStep().isPresent();
+    }
+
+    private static boolean shouldSkipArtifacts() {
+        return AllurePlaywright.isAspectSuppressed()
+                || !AllurePlaywright.hasAllureContext();
+    }
+}
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightConfig.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightConfig.java
new file mode 100644
index 000000000..8bdf50655
--- /dev/null
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightConfig.java
@@ -0,0 +1,97 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.playwright;
+
+import io.qameta.allure.util.PropertiesUtils;
+
+import java.util.Locale;
+import java.util.Properties;
+
+final class AllurePlaywrightConfig {
+
+    static final String STEPS_ENABLED = "allure.playwright.steps.enabled";
+    static final String STEPS_MODE = "allure.playwright.steps.mode";
+    static final String PARAMETERS = "allure.playwright.parameters";
+    static final String SCREENSHOTS_ATTACH = "allure.playwright.screenshots.attach";
+    static final String FAILURE_SCREENSHOT = "allure.playwright.failure.screenshot";
+    static final String FAILURE_PAGE_SOURCE = "allure.playwright.failure.page-source";
+    static final String CLOSE_TRACE = "allure.playwright.close.trace";
+    static final String CLOSE_VIDEO = "allure.playwright.close.video";
+    static final String CLOSE_PAGE_LOGS = "allure.playwright.close.page-logs";
+
+    private static final String ACTIONS = "actions";
+    private static final String ALL = "all";
+    private static final String REDACTED = "redacted";
+
+    private AllurePlaywrightConfig() {
+    }
+
+    static boolean isStepsEnabled() {
+        return getBoolean(STEPS_ENABLED, true);
+    }
+
+    static boolean isActionsMode() {
+        return ACTIONS.equals(getString(STEPS_MODE, ACTIONS));
+    }
+
+    static boolean isAllMode() {
+        return ALL.equals(getString(STEPS_MODE, ACTIONS));
+    }
+
+    static boolean isParametersRedacted() {
+        return REDACTED.equals(getString(PARAMETERS, REDACTED));
+    }
+
+    static boolean shouldAttachScreenshots() {
+        return getBoolean(SCREENSHOTS_ATTACH, true);
+    }
+
+    static boolean shouldAttachFailureScreenshot() {
+        return getBoolean(FAILURE_SCREENSHOT, true);
+    }
+
+    static boolean shouldAttachFailurePageSource() {
+        return getBoolean(FAILURE_PAGE_SOURCE, true);
+    }
+
+    static boolean shouldAttachCloseTrace() {
+        return getBoolean(CLOSE_TRACE, true);
+    }
+
+    static boolean shouldAttachCloseVideo() {
+        return getBoolean(CLOSE_VIDEO, true);
+    }
+
+    static boolean shouldAttachClosePageLogs() {
+        return getBoolean(CLOSE_PAGE_LOGS, true);
+    }
+
+    private static boolean getBoolean(final String key, final boolean defaultValue) {
+        return Boolean.parseBoolean(getProperties().getProperty(key, Boolean.toString(defaultValue)));
+    }
+
+    private static String getString(final String key, final String defaultValue) {
+        return getProperties()
+                .getProperty(key, defaultValue)
+                .trim()
+                .toLowerCase(Locale.ROOT);
+    }
+
+    private static Properties getProperties() {
+        return PropertiesUtils.loadAllureProperties();
+    }
+
+}
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightLifecycle.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightLifecycle.java
new file mode 100644
index 000000000..793defa8a
--- /dev/null
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightLifecycle.java
@@ -0,0 +1,43 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.playwright;
+
+import io.qameta.allure.listener.TestLifecycleListener;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.TestResult;
+
+/**
+ * Allure lifecycle listener that attaches Playwright diagnostics for any supported test framework.
+ */
+public class AllurePlaywrightLifecycle implements TestLifecycleListener {
+
+    @Override
+    public void afterTestStart(final TestResult result) {
+        AllurePlaywright.beforeTest();
+    }
+
+    @Override
+    public void beforeTestStop(final TestResult result) {
+        if (isFailed(result)) {
+            AllurePlaywright.afterTestFailure();
+        }
+        AllurePlaywright.afterTest();
+    }
+
+    private static boolean isFailed(final TestResult result) {
+        return result != null && (Status.FAILED == result.getStatus() || Status.BROKEN == result.getStatus());
+    }
+}
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightRegistry.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightRegistry.java
new file mode 100644
index 000000000..410b7ac05
--- /dev/null
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightRegistry.java
@@ -0,0 +1,128 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.playwright;
+
+import com.microsoft.playwright.BrowserContext;
+import com.microsoft.playwright.Page;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Set;
+
+final class AllurePlaywrightRegistry {
+
+    private static final ThreadLocal<State> STATE = new ThreadLocal<State>() {
+        @Override
+        protected State initialValue() {
+            return new State();
+        }
+    };
+
+    private AllurePlaywrightRegistry() {
+    }
+
+    static void register(final Page page) {
+        if (page == null) {
+            return;
+        }
+        registerPage(page);
+        try {
+            register(page.context());
+        } catch (RuntimeException ignored) {
+            // The page may already be closed. Failure diagnostics must not alter test behavior.
+        }
+    }
+
+    static void register(final BrowserContext context) {
+        if (context != null) {
+            STATE.get().contexts.add(context);
+        }
+    }
+
+    static void register(final DefaultTraceSession traceSession) {
+        STATE.get().traceSessions.add(traceSession);
+    }
+
+    static void registerPage(final Page page) {
+        if (page != null) {
+            STATE.get().pages.add(page);
+        }
+    }
+
+    @SuppressWarnings("PMD.CloseResource")
+    static Set<Page> getPages() {
+        final State state = STATE.get();
+        for (BrowserContext context : state.contexts) {
+            try {
+                state.pages.addAll(context.pages());
+            } catch (RuntimeException ignored) {
+                // The context may already be closed. Failure diagnostics must not alter test behavior.
+            }
+        }
+        return state.pages;
+    }
+
+    static Set<DefaultTraceSession> getTraceSessions() {
+        return STATE.get().traceSessions;
+    }
+
+    @SuppressWarnings("PMD.CloseResource")
+    static List<DefaultTraceSession> getTraceSessions(final BrowserContext context) {
+        final List<DefaultTraceSession> result = new ArrayList<>();
+        for (DefaultTraceSession traceSession : STATE.get().traceSessions) {
+            if (traceSession.isFor(context)) {
+                result.add(traceSession);
+            }
+        }
+        return result;
+    }
+
+    static boolean markFailureArtifactsAttached() {
+        final State state = STATE.get();
+        if (state.failureArtifactsAttached) {
+            return false;
+        }
+        state.failureArtifactsAttached = true;
+        return true;
+    }
+
+    static boolean markClosePageLogsAttached(final Page page) {
+        return STATE.get().pagesWithCloseLogs.add(page);
+    }
+
+    static boolean markCloseVideoAttached(final Page page) {
+        return STATE.get().pagesWithCloseVideo.add(page);
+    }
+
+    static void clear() {
+        STATE.remove();
+    }
+
+    private static final class State {
+        private final Set<Page> pages = identitySet();
+        private final Set<BrowserContext> contexts = identitySet();
+        private final Set<DefaultTraceSession> traceSessions = identitySet();
+        private final Set<Page> pagesWithCloseLogs = identitySet();
+        private final Set<Page> pagesWithCloseVideo = identitySet();
+        private boolean failureArtifactsAttached;
+
+        private static <T> Set<T> identitySet() {
+            return Collections.newSetFromMap(new IdentityHashMap<T, Boolean>());
+        }
+    }
+}
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/DefaultTraceSession.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/DefaultTraceSession.java
new file mode 100644
index 000000000..e8eac1c00
--- /dev/null
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/DefaultTraceSession.java
@@ -0,0 +1,88 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.playwright;
+
+import com.microsoft.playwright.BrowserContext;
+import com.microsoft.playwright.Tracing;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+final class DefaultTraceSession implements TraceSession {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultTraceSession.class);
+
+    private final BrowserContext context;
+    private final String name;
+    private boolean stopped;
+
+    DefaultTraceSession(final BrowserContext context, final String name) {
+        this.context = context;
+        this.name = name;
+    }
+
+    @Override
+    public void attach() {
+        stop(true);
+    }
+
+    @Override
+    public void close() {
+        attach();
+    }
+
+    void stopWithoutAttachment() {
+        stop(false);
+    }
+
+    @SuppressWarnings("PMD.CompareObjectsWithEquals")
+    boolean isFor(final BrowserContext candidate) {
+        return context == candidate;
+    }
+
+    private void stop(final boolean attach) {
+        if (stopped) {
+            return;
+        }
+        stopped = true;
+        Path trace = null;
+        try {
+            trace = Files.createTempFile("allure-playwright-trace-", ".zip");
+            context.tracing().stop(new Tracing.StopOptions().setPath(trace));
+            if (attach) {
+                AllurePlaywright.attachTrace(name, trace);
+            }
+        } catch (IOException | RuntimeException e) {
+            LOGGER.warn("Could not stop Playwright tracing", e);
+        } finally {
+            delete(trace);
+        }
+    }
+
+    private static void delete(final Path path) {
+        if (path == null) {
+            return;
+        }
+        try {
+            Files.deleteIfExists(path);
+        } catch (IOException e) {
+            LOGGER.debug("Could not delete temporary Playwright trace {}", path, e);
+        }
+    }
+}
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/PlaywrightAction.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/PlaywrightAction.java
new file mode 100644
index 000000000..3d675888b
--- /dev/null
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/PlaywrightAction.java
@@ -0,0 +1,285 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.playwright;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.reflect.MethodSignature;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+final class PlaywrightAction {
+
+    private static final String METHOD_NAVIGATE = "navigate";
+    private static final String METHOD_CLICK = "click";
+    private static final String METHOD_DBLCLICK = "dblclick";
+    private static final String METHOD_CHECK = "check";
+    private static final String METHOD_UNCHECK = "uncheck";
+    private static final String METHOD_TAP = "tap";
+    private static final String METHOD_FILL = "fill";
+    private static final String METHOD_CLEAR = "clear";
+    private static final String METHOD_PRESS = "press";
+    private static final String METHOD_TYPE = "type";
+    private static final String METHOD_HOVER = "hover";
+    private static final String METHOD_DRAG_TO = "dragTo";
+    private static final String METHOD_DRAG_AND_DROP = "dragAndDrop";
+    private static final String METHOD_SET_INPUT_FILES = "setInputFiles";
+    private static final String METHOD_SELECT_OPTION = "selectOption";
+    private static final String METHOD_DISPATCH_EVENT = "dispatchEvent";
+    private static final String DRAG_PREFIX = "Drag ";
+    private static final String ON = " on ";
+    private static final String ASSERTIONS_PACKAGE = ".assertions.";
+    private static final String SELECTOR = "selector";
+    private static final String LOCATOR = "locator";
+    private static final String ELEMENT = "element";
+    private static final String REDACTED = "<redacted>";
+
+    private static final Set<String> ACTION_METHODS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
+            METHOD_NAVIGATE,
+            METHOD_CLICK,
+            METHOD_DBLCLICK,
+            METHOD_CHECK,
+            METHOD_UNCHECK,
+            METHOD_TAP,
+            METHOD_FILL,
+            METHOD_CLEAR,
+            METHOD_PRESS,
+            METHOD_TYPE,
+            METHOD_HOVER,
+            METHOD_DRAG_TO,
+            METHOD_DRAG_AND_DROP,
+            METHOD_SET_INPUT_FILES,
+            METHOD_SELECT_OPTION,
+            METHOD_DISPATCH_EVENT,
+            "focus",
+            "blur",
+            "setChecked",
+            "setContent",
+            "reload",
+            "goBack",
+            "goForward",
+            "bringToFront",
+            "close",
+            "waitForCondition",
+            "waitForClose",
+            "waitForConsoleMessage",
+            "waitForDownload",
+            "waitForFileChooser",
+            "waitForFunction",
+            "waitForLoadState",
+            "waitForNavigation",
+            "waitForPopup",
+            "waitForRequest",
+            "waitForRequestFinished",
+            "waitForResponse",
+            "waitForSelector",
+            "waitForTimeout",
+            "waitForURL",
+            "waitForWebSocket",
+            "waitForWorker"
+    )));
+
+    private static final Map<String, String> ACTION_PREFIXES = createActionPrefixes();
+
+    private static final Set<String> IGNORED_METHODS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
+            "equals",
+            "hashCode",
+            "toString",
+            "not"
+    )));
+
+    private final boolean logged;
+    private final String name;
+
+    private PlaywrightAction(final boolean logged, final String name) {
+        this.logged = logged;
+        this.name = name;
+    }
+
+    boolean isLogged() {
+        return logged;
+    }
+
+    String getName() {
+        return name;
+    }
+
+    static PlaywrightAction from(final JoinPoint joinPoint, final boolean screenshot) {
+        final MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        final String method = signature.getName();
+        if (screenshot) {
+            return new PlaywrightAction(true, "Take screenshot");
+        }
+        if (!shouldLog(joinPoint, method)) {
+            return new PlaywrightAction(false, method);
+        }
+        return new PlaywrightAction(true, name(joinPoint, method));
+    }
+
+    private static boolean shouldLog(final JoinPoint joinPoint, final String method) {
+        if (IGNORED_METHODS.contains(method)) {
+            return false;
+        }
+        if (AllurePlaywrightConfig.isAllMode()) {
+            return true;
+        }
+        return isAssertion(joinPoint) || ACTION_METHODS.contains(method);
+    }
+
+    private static String name(final JoinPoint joinPoint, final String method) {
+        final String result;
+        if (isAssertion(joinPoint)) {
+            result = "Expect " + target(joinPoint) + " " + method;
+        } else if (METHOD_NAVIGATE.equals(method)) {
+            result = "Navigate to " + arg(joinPoint, 0, "url");
+        } else if (METHOD_FILL.equals(method)) {
+            result = "Fill " + target(joinPoint) + " with " + secret(joinPoint, 1);
+        } else if (METHOD_PRESS.equals(method)) {
+            result = "Press " + secret(joinPoint, 0) + ON + target(joinPoint);
+        } else if (METHOD_TYPE.equals(method)) {
+            result = "Type " + secret(joinPoint, 1) + " into " + target(joinPoint);
+        } else if (METHOD_DISPATCH_EVENT.equals(method)) {
+            result = "Dispatch " + arg(joinPoint, 1, "event") + ON + target(joinPoint);
+        } else {
+            result = prefix(method) + target(joinPoint);
+        }
+        return result;
+    }
+
+    private static String prefix(final String method) {
+        final String prefix = ACTION_PREFIXES.get(method);
+        return prefix == null ? humanize(method) + " " : prefix;
+    }
+
+    private static Map<String, String> createActionPrefixes() {
+        final Map<String, String> prefixes = new HashMap<>();
+        prefixes.put(METHOD_CLICK, "Click ");
+        prefixes.put(METHOD_DBLCLICK, "Double click ");
+        prefixes.put(METHOD_HOVER, "Hover ");
+        prefixes.put(METHOD_DRAG_TO, DRAG_PREFIX);
+        prefixes.put(METHOD_DRAG_AND_DROP, DRAG_PREFIX);
+        prefixes.put(METHOD_SET_INPUT_FILES, "Set input files for ");
+        prefixes.put(METHOD_SELECT_OPTION, "Select option in ");
+        return Collections.unmodifiableMap(prefixes);
+    }
+
+    private static boolean isAssertion(final JoinPoint joinPoint) {
+        final String name = joinPoint.getSignature().getDeclaringTypeName();
+        final String targetName = joinPoint.getTarget() == null ? "" : joinPoint.getTarget().getClass().getName();
+        return name.contains(ASSERTIONS_PACKAGE) || targetName.contains(ASSERTIONS_PACKAGE);
+    }
+
+    private static String target(final JoinPoint joinPoint) {
+        final Object[] args = joinPoint.getArgs();
+        if (args.length > 0 && args[0] instanceof String) {
+            return String.valueOf(args[0]);
+        }
+        final String locator = locatorDescription(joinPoint.getTarget());
+        if (locator != null && !locator.isEmpty()) {
+            return locator;
+        }
+        return targetKind(joinPoint);
+    }
+
+    private static String targetKind(final JoinPoint joinPoint) {
+        final String simpleName = joinPoint.getSignature().getDeclaringType().getSimpleName();
+        if (simpleName.contains("Locator")) {
+            return LOCATOR;
+        }
+        if (simpleName.contains("Element")) {
+            return ELEMENT;
+        }
+        return simpleName.toLowerCase(Locale.ROOT);
+    }
+
+    private static String arg(final JoinPoint joinPoint, final int index, final String fallback) {
+        final Object[] args = joinPoint.getArgs();
+        if (index >= args.length || args[index] == null) {
+            return fallback;
+        }
+        return String.valueOf(args[index]);
+    }
+
+    private static String secret(final JoinPoint joinPoint, final int index) {
+        if (AllurePlaywrightConfig.isParametersRedacted()) {
+            return REDACTED;
+        }
+        return arg(joinPoint, index, REDACTED);
+    }
+
+    private static String humanize(final String method) {
+        final StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < method.length(); i++) {
+            final char ch = method.charAt(i);
+            if (Character.isUpperCase(ch)) {
+                builder.append(' ').append(Character.toLowerCase(ch));
+            } else {
+                builder.append(ch);
+            }
+        }
+        builder.setCharAt(0, Character.toUpperCase(builder.charAt(0)));
+        return builder.toString();
+    }
+
+    private static String locatorDescription(final Object target) {
+        final String description = invokeDescription(target);
+        if (description != null && !description.isEmpty()) {
+            return description;
+        }
+        return readSelector(target);
+    }
+
+    private static String invokeDescription(final Object target) {
+        if (target == null) {
+            return null;
+        }
+        try {
+            final Method method = target.getClass().getMethod("description");
+            final Object value = method.invoke(target);
+            return value == null ? null : String.valueOf(value);
+        } catch (ReflectiveOperationException ignored) {
+            return null;
+        }
+    }
+
+    @SuppressWarnings("PMD.AvoidAccessibilityAlteration")
+    private static String readSelector(final Object target) {
+        if (target == null) {
+            return null;
+        }
+        Class<?> type = target.getClass();
+        while (type != null) {
+            try {
+                final Field field = type.getDeclaredField(SELECTOR);
+                field.setAccessible(true);
+                final Object value = field.get(target);
+                return value == null ? null : String.valueOf(value);
+            } catch (NoSuchFieldException e) {
+                type = type.getSuperclass();
+            } catch (ReflectiveOperationException e) {
+                return null;
+            }
+        }
+        return null;
+    }
+}
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/TraceSession.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/TraceSession.java
new file mode 100644
index 000000000..5085a8fed
--- /dev/null
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/TraceSession.java
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.playwright;
+
+/**
+ * Playwright trace session started through {@link AllurePlaywright#startTracing}.
+ */
+public interface TraceSession extends AutoCloseable {
+
+    /**
+     * Stops tracing and attaches the generated trace archive.
+     */
+    void attach();
+
+    /**
+     * Stops tracing and attaches the generated trace archive.
+     */
+    @Override
+    void close();
+}
diff --git a/allure-playwright/src/main/resources/META-INF/aop-ajc.xml b/allure-playwright/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 000000000..62e245096
--- /dev/null
+++ b/allure-playwright/src/main/resources/META-INF/aop-ajc.xml
@@ -0,0 +1,6 @@
+<aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
+    <aspects>
+        <aspect name="io.qameta.allure.playwright.AllurePlaywrightAspect"/>
+    </aspects>
+</aspectj>
diff --git a/allure-playwright/src/main/resources/META-INF/services/io.qameta.allure.listener.TestLifecycleListener b/allure-playwright/src/main/resources/META-INF/services/io.qameta.allure.listener.TestLifecycleListener
new file mode 100644
index 000000000..1f0ef8211
--- /dev/null
+++ b/allure-playwright/src/main/resources/META-INF/services/io.qameta.allure.listener.TestLifecycleListener
@@ -0,0 +1 @@
+io.qameta.allure.playwright.AllurePlaywrightLifecycle
diff --git a/allure-playwright/src/test/java/io/qameta/allure/playwright/AllurePlaywrightTest.java b/allure-playwright/src/test/java/io/qameta/allure/playwright/AllurePlaywrightTest.java
new file mode 100644
index 000000000..ce13316ca
--- /dev/null
+++ b/allure-playwright/src/test/java/io/qameta/allure/playwright/AllurePlaywrightTest.java
@@ -0,0 +1,642 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.playwright;
+
+import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.BrowserContext;
+import com.microsoft.playwright.BrowserType;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.Playwright;
+import com.microsoft.playwright.PlaywrightException;
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.Description;
+import io.qameta.allure.Param;
+import io.qameta.allure.Step;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.test.AllureFeatures;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.test.AllureTestCommonsUtils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.api.parallel.ResourceLock;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static io.qameta.allure.model.Parameter.Mode.HIDDEN;
+import static io.qameta.allure.util.ResultsUtils.getStatus;
+import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
+
+@ResourceLock(value = "io.qameta.allure.playwright.lifecycle", mode = READ_WRITE)
+class AllurePlaywrightTest {
+
+    private static final byte[] PNG_HEADER = new byte[]{(byte) 0x89, 'P', 'N', 'G'};
+    private static final byte[] ZIP_HEADER = new byte[]{'P', 'K'};
+    private static final String FAILURE_HTML = "<html><body><h1>Failure diagnostics</h1></body></html>";
+
+    private static Playwright playwright;
+    private static Browser browser;
+
+    private final List<BrowserContext> contexts = new ArrayList<>();
+
+    @BeforeAll
+    static void startBrowser() {
+        try {
+            playwright = Playwright.create();
+            browser = playwright.chromium().launch(new BrowserType.LaunchOptions()
+                    .setHeadless(true)
+                    .setArgs(Collections.singletonList("--no-sandbox")));
+        } catch (PlaywrightException e) {
+            closeBrowser();
+            assumeTrue(false, "Chromium is not available for Playwright integration tests: " + e.getMessage());
+        }
+    }
+
+    @AfterAll
+    static void closeBrowser() {
+        if (browser != null) {
+            close(browser::close);
+        }
+        if (playwright != null) {
+            close(playwright::close);
+        }
+        browser = null;
+        playwright = null;
+    }
+
+    @AfterEach
+    void clearRegistry() {
+        for (BrowserContext context : contexts) {
+            close(context::close);
+        }
+        contexts.clear();
+        AllurePlaywright.clear();
+    }
+
+    /**
+     * Checks that a real Playwright browser action is reported as an Allure step.
+     *
+     * The test clicks a button on a Chromium page and verifies that the aspect records one passed action step with the
+     * expected human-readable name.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Steps
+    @Test
+    void shouldLogPlaywrightActionSteps() {
+        final Page page = newPageWithContent("<button>Save</button>");
+
+        final AllureResults results = runWithPlaywrightContext(() -> page.click("button"));
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(tuple("Click button", Status.PASSED));
+    }
+
+    /**
+     * Checks that Playwright action steps are nested under user-created Allure runtime steps.
+     *
+     * The test wraps a real Playwright click in {@code Allure.step(...)} and verifies that Allure keeps the user step as
+     * the parent while reporting the Playwright action as its child step.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Steps
+    @Test
+    void shouldNestPlaywrightActionStepsInsideRuntimeSteps() {
+        final Page page = newPageWithContent("<button>Pay</button>");
+
+        final AllureResults results = runWithPlaywrightContext(
+                () -> Allure.step("Checkout flow", () -> page.click("button"))
+        );
+
+        final StepResult step = results.getTestResults().iterator().next().getSteps().iterator().next();
+        assertThat(step)
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly("Checkout flow", Status.PASSED);
+        assertThat(step.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(tuple("Click button", Status.PASSED));
+    }
+
+    /**
+     * Checks that sensitive action parameters are redacted in generated step names.
+     *
+     * The test fills an input with a real value and verifies that the reported Playwright step contains the selector but
+     * replaces the typed value with the configured redaction marker.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Steps
+    @Test
+    void shouldRedactTypedValuesInActionStepNames() {
+        final Page page = newPageWithContent("<input id='password'>");
+
+        final AllureResults results = runWithPlaywrightContext(() -> page.fill("#password", "secret"));
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("Fill #password with <redacted>");
+    }
+
+    /**
+     * Checks that Playwright action failures keep their original exception details in Allure.
+     *
+     * The test clicks a missing element with a short timeout and verifies that the reported action step is marked broken
+     * and includes the Playwright failure message.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Steps
+    @Test
+    void shouldPreservePlaywrightActionFailures() {
+        final Page page = newPageWithContent("<button>Present</button>");
+
+        final AllureResults results = runWithPlaywrightContext(
+                () -> page.click("#missing", new Page.ClickOptions().setTimeout(100))
+        );
+
+        final StepResult step = results.getTestResults().iterator().next().getSteps().iterator().next();
+        assertThat(step)
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly("Click #missing", Status.BROKEN);
+        assertThat(message(step.getStatusDetails()))
+                .contains("#missing");
+    }
+
+    /**
+     * Checks that user-created Playwright screenshots are attached automatically.
+     *
+     * The test calls the real {@code Page.screenshot(...)} API and verifies that the returned bytes are attached to the
+     * screenshot step without changing the value returned to the test.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachUserScreenshotsAutomatically() {
+        final AtomicReference<byte[]> screenshot = new AtomicReference<>();
+        final Page page = newPageWithContent("<main style='width: 100px; height: 40px'>Screenshot</main>");
+
+        final AllureResults results = runWithPlaywrightContext(
+                () -> screenshot.set(page.screenshot(new Page.ScreenshotOptions()))
+        );
+
+        final StepResult step = results.getTestResults().iterator().next().getSteps().iterator().next();
+        final Attachment attachment = step.getAttachments().iterator().next();
+
+        assertThat(step)
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly("Take screenshot", Status.PASSED);
+        assertThat(attachment)
+                .extracting(Attachment::getName, Attachment::getType)
+                .containsExactly("Screenshot", "image/png");
+        assertAttachmentContent(results, screenshot.get());
+    }
+
+    /**
+     * Checks that the public screenshot helper attaches a page image without creating an extra action step.
+     *
+     * The helper suppresses the Playwright aspect while it captures the screenshot, so the test verifies that only the
+     * attachment is written and the generated PNG bytes are present in Allure results.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachScreenshotThroughHelperWithoutDuplicateAspectAttachment() {
+        final Page page = newPageWithContent("<main style='width: 100px; height: 40px'>Current page</main>");
+
+        final AllureResults results = runWithPlaywrightContext(
+                () -> AllurePlaywright.attachScreenshot("Current page", page)
+        );
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .isEmpty();
+        assertThat(results.getAttachments())
+                .hasSize(1);
+        assertAttachmentStartsWith(results, PNG_HEADER);
+    }
+
+    /**
+     * Checks that explicitly registered pages produce failure diagnostics.
+     *
+     * The test registers a real page, invokes the failure hook, and verifies that Allure receives both a screenshot and
+     * the current page source for the failed test.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachFailureDiagnosticsForRegisteredPages() {
+        final Page page = newPageWithContent(FAILURE_HTML);
+
+        final AllureResults results = runWithPlaywrightContext(() -> {
+            AllurePlaywright.register(page);
+            AllurePlaywright.afterTestFailure(new AssertionError("boom"));
+        });
+
+        assertFailureDiagnostics(results);
+    }
+
+    /**
+     * Checks that the Allure test lifecycle listener attaches diagnostics for failed tests.
+     *
+     * The test marks the current Allure test as failed and verifies that the Playwright lifecycle hook adds screenshot
+     * and page source artifacts before the test result is written.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachFailureDiagnosticsFromAllureLifecycle() {
+        final Page page = newPageWithContent(FAILURE_HTML);
+
+        final AllureResults results = runWithPlaywrightContext(() -> {
+            AllurePlaywright.register(page);
+            Allure.getLifecycle().updateTestCase(testResult -> testResult.setStatus(Status.FAILED));
+        });
+
+        assertFailureDiagnostics(results);
+    }
+
+    /**
+     * Checks that pages touched by reported Playwright actions are registered automatically.
+     *
+     * The test performs a real click, triggers failure diagnostics, and verifies that the page observed by the aspect is
+     * used for screenshot and page source attachments.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldRegisterPageWhenPlaywrightActionIsReported() {
+        final Page page = newPageWithContent("<button>Attach diagnostics</button>" + FAILURE_HTML);
+
+        final AllureResults results = runWithPlaywrightContext(() -> {
+            page.click("button");
+            AllurePlaywright.afterTestFailure(new AssertionError("boom"));
+        });
+
+        assertFailureDiagnostics(results);
+    }
+
+    /**
+     * Checks that pages created through Playwright contexts are registered automatically.
+     *
+     * The test creates a page from a real browser context, triggers failure diagnostics, and verifies that the created
+     * page contributes screenshot and page source artifacts even without manual registration.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldRegisterCreatedPagesAutomatically() {
+        final AllureResults results = runWithPlaywrightContext(() -> {
+            final BrowserContext context = newContext();
+            final Page page = context.newPage();
+            AllurePlaywright.withAspectSuppressed(() -> {
+                page.setContent(FAILURE_HTML);
+                return null;
+            });
+            AllurePlaywright.afterTestFailure(new AssertionError("boom"));
+        });
+
+        assertFailureDiagnostics(results);
+    }
+
+    /**
+     * Checks that a tracing session attaches its trace archive when closed.
+     *
+     * The test starts Playwright tracing on a real context, performs browser activity, closes the returned session, and
+     * verifies that Allure receives a zip trace attachment.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachTraceWhenSessionIsClosed() {
+        final BrowserContext context = newContext();
+        final Page page = context.newPage();
+
+        final AllureResults results = runWithPlaywrightContext(() -> {
+            final TraceSession traceSession = AllurePlaywright.startTracing("Trace", context);
+            page.setContent("<button>Trace</button>");
+            page.click("button");
+            traceSession.close();
+        });
+
+        assertThat(results.getAttachments())
+                .hasSize(1);
+        assertAttachmentStartsWith(results, ZIP_HEADER);
+    }
+
+    /**
+     * Checks that registered tracing is attached when a browser context closes.
+     *
+     * The test starts tracing, closes the real Playwright context, and verifies that the close hook stops tracing and
+     * writes the generated trace archive to Allure.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachTraceWhenContextIsClosed() {
+        final BrowserContext context = newContext();
+        final Page page = context.newPage();
+
+        final AllureResults results = runWithPlaywrightContext(() -> {
+            AllurePlaywright.startTracing("Trace", context);
+            page.setContent("<button>Trace</button>");
+            context.close();
+        });
+
+        assertThat(results.getAttachments())
+                .hasSize(1);
+        assertAttachmentStartsWith(results, ZIP_HEADER);
+    }
+
+    /**
+     * Checks that unfinished tracing sessions are attached during Allure test shutdown.
+     *
+     * The test leaves an active Playwright trace open and verifies that the Allure lifecycle hook stops it and attaches
+     * the generated trace archive before clearing per-test state.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachTraceWhenAllureLifecycleStopsTest() {
+        final BrowserContext context = newContext();
+        final Page page = context.newPage();
+
+        final AllureResults results = runWithPlaywrightContext(() -> {
+            AllurePlaywright.startTracing("Trace", context);
+            page.setContent("<button>Trace</button>");
+        });
+
+        assertThat(results.getAttachments())
+                .hasSize(1);
+        assertAttachmentStartsWith(results, ZIP_HEADER);
+    }
+
+    /**
+     * Checks that page console messages and page errors are attached when a context closes.
+     *
+     * The test emits a browser console error and an uncaught page error, closes the real context, and verifies that both
+     * diagnostic text attachments are present.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachPageLogsWhenContextIsClosed() {
+        final BrowserContext context = newContext();
+        final Page page = context.newPage();
+
+        final AllureResults results = runWithPlaywrightContext(() -> {
+            page.setContent("<script>"
+                    + "console.error('console boom');"
+                    + "setTimeout(() => { throw new Error('page boom'); }, 0);"
+                    + "</script>");
+            page.waitForTimeout(250);
+            context.close();
+        });
+
+        assertThat(results.getAttachments())
+                .hasSize(2);
+        assertTextAttachmentContent(results, "console boom");
+        assertTextAttachmentContent(results, "page boom");
+    }
+
+    /**
+     * Checks that Playwright-recorded videos are attached when a video context closes.
+     *
+     * The test enables video recording on a real context, closes it after page activity, and verifies that exactly one
+     * non-empty video attachment is written.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachVideoWhenContextIsClosed(@TempDir final Path videoDir) {
+        final BrowserContext context = newVideoContext(videoDir);
+        final Page page = context.newPage();
+
+        final AllureResults results = runWithPlaywrightContext(() -> {
+            page.setContent("<h1>Video</h1>");
+            page.waitForTimeout(100);
+            context.close();
+        });
+
+        assertThat(results.getAttachments())
+                .hasSize(1);
+        assertThat(results.getAttachments().values())
+                .anySatisfy(actual -> assertThat(actual).isNotEmpty());
+    }
+
+    /**
+     * Checks that the public video helper attaches an existing video file.
+     *
+     * The test writes a temporary WebM file, passes it to {@code AllurePlaywright.attachVideo(...)}, and verifies that
+     * the exact file bytes are stored as an Allure attachment.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachVideoFile(@TempDir final Path tempDir) throws IOException {
+        final byte[] video = "video".getBytes(StandardCharsets.UTF_8);
+        final Path path = tempDir.resolve("video.webm");
+        Files.write(path, video);
+
+        final AllureResults results = runWithPlaywrightContext(() -> AllurePlaywright.attachVideo("Video", path));
+
+        assertThat(results.getAttachments())
+                .hasSize(1);
+        assertAttachmentContent(results, video);
+    }
+
+    /**
+     * Checks that helper attachments are ignored when no Allure test or step is active.
+     *
+     * The test installs a lifecycle without a running test, calls the video helper, and verifies that no attachment is
+     * written outside an Allure context.
+     */
+    @Description(useJavaDoc = true)
+    @AllureFeatures.Attachments
+    @Test
+    void shouldIgnoreMissingAllureContext(@TempDir final Path tempDir) throws IOException {
+        final byte[] video = "video".getBytes(StandardCharsets.UTF_8);
+        final Path path = tempDir.resolve("video.webm");
+        Files.write(path, video);
+
+        final AllureResultsWriterStub writer = runWithoutAllureContext(
+                () -> AllurePlaywright.attachVideo("Video", path)
+        );
+
+        assertThat(writer.getAttachments())
+                .isEmpty();
+    }
+
+    @Step("Create Playwright page with HTML content")
+    private Page newPageWithContent(@Param(mode = HIDDEN) final String html) {
+        final Page page = newContext().newPage();
+        page.setContent(html);
+        return page;
+    }
+
+    @Step("Create Playwright browser context")
+    private BrowserContext newContext() {
+        final BrowserContext context = browser.newContext();
+        contexts.add(context);
+        return context;
+    }
+
+    @Step("Create Playwright browser context with video recording")
+    private BrowserContext newVideoContext(final Path videoDir) {
+        final BrowserContext context = browser.newContext(new Browser.NewContextOptions().setRecordVideoDir(videoDir));
+        contexts.add(context);
+        return context;
+    }
+
+    @Step("Close Playwright resource")
+    private static void close(@Param(mode = HIDDEN) final Runnable close) {
+        try {
+            AllurePlaywright.withAspectSuppressed(() -> {
+                close.run();
+                return null;
+            });
+        } catch (RuntimeException ignored) {
+            // The test may have already closed this Playwright resource.
+        }
+    }
+
+    @Step("Run Playwright adapter scenario")
+    private static AllureResults runWithPlaywrightContext(@Param(mode = HIDDEN) final Runnable runnable) {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
+        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
+        final AllureLifecycle defaultAspectLifecycle = AllurePlaywrightAspect.getLifecycle();
+        try {
+            Allure.setLifecycle(lifecycle);
+            AllurePlaywrightAspect.setLifecycle(lifecycle);
+            runSyntheticTest(runnable, lifecycle);
+            return writer;
+        } finally {
+            Allure.setLifecycle(defaultLifecycle);
+            AllurePlaywrightAspect.setLifecycle(defaultAspectLifecycle);
+            attachResults(writer);
+        }
+    }
+
+    @Step("Run helper without active Allure context")
+    private static AllureResultsWriterStub runWithoutAllureContext(@Param(mode = HIDDEN) final Runnable runnable) {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
+        final AllureLifecycle defaultLifecycle = Allure.getLifecycle();
+        final AllureLifecycle defaultAspectLifecycle = AllurePlaywrightAspect.getLifecycle();
+        try {
+            Allure.setLifecycle(lifecycle);
+            AllurePlaywrightAspect.setLifecycle(lifecycle);
+            runnable.run();
+            return writer;
+        } finally {
+            Allure.setLifecycle(defaultLifecycle);
+            AllurePlaywrightAspect.setLifecycle(defaultAspectLifecycle);
+            attachResults(writer);
+        }
+    }
+
+    private static void runSyntheticTest(final Runnable runnable, final AllureLifecycle lifecycle) {
+        final String uuid = UUID.randomUUID().toString();
+        final TestResult result = new TestResult().setUuid(uuid);
+        try {
+            lifecycle.scheduleTestCase(result);
+            lifecycle.startTestCase(uuid);
+            runnable.run();
+        } catch (Throwable e) {
+            lifecycle.updateTestCase(uuid, testResult -> {
+                getStatus(e).ifPresent(testResult::setStatus);
+                getStatusDetails(e).ifPresent(testResult::setStatusDetails);
+            });
+        } finally {
+            lifecycle.stopTestCase(uuid);
+            lifecycle.writeTestCase(uuid);
+        }
+    }
+
+    @Step("Attach collected Allure results")
+    private static void attachResults(@Param(mode = HIDDEN) final AllureResults results) {
+        AllureTestCommonsUtils.attach(results);
+    }
+
+    @Step("Assert failure diagnostics attachments")
+    private static void assertFailureDiagnostics(@Param(mode = HIDDEN) final AllureResults results) {
+        assertThat(attachments(results))
+                .extracting(Attachment::getName, Attachment::getType)
+                .contains(
+                        tuple("Screenshot", "image/png"),
+                        tuple("Page source", "text/html")
+                );
+        assertAttachmentStartsWith(results, PNG_HEADER);
+        assertTextAttachmentContent(results, "Failure diagnostics");
+    }
+
+    private static List<Attachment> attachments(final AllureResults results) {
+        final List<Attachment> attachments = new ArrayList<>();
+        for (TestResult testResult : results.getTestResults()) {
+            attachments.addAll(testResult.getAttachments());
+            for (StepResult step : testResult.getSteps()) {
+                attachments.addAll(step.getAttachments());
+            }
+        }
+        return attachments;
+    }
+
+    @Step("Assert exact attachment payload")
+    private static void assertAttachmentContent(@Param(mode = HIDDEN) final AllureResults results,
+                                                @Param(mode = HIDDEN) final byte[] expected) {
+        assertThat(results.getAttachments().values())
+                .anySatisfy(actual -> assertThat(actual).containsExactly(expected));
+    }
+
+    @Step("Assert attachment payload prefix")
+    private static void assertAttachmentStartsWith(@Param(mode = HIDDEN) final AllureResults results,
+                                                   @Param(mode = HIDDEN) final byte[] expected) {
+        assertThat(results.getAttachments().values())
+                .anySatisfy(actual -> assertThat(actual).startsWith(expected));
+    }
+
+    private static String message(final StatusDetails statusDetails) {
+        return statusDetails == null ? null : statusDetails.getMessage();
+    }
+
+    @Step("Assert text attachment contains {expected}")
+    private static void assertTextAttachmentContent(@Param(mode = HIDDEN) final AllureResults results,
+                                                    final String expected) {
+        assertThat(results.getAttachments().values())
+                .map(actual -> new String(actual, StandardCharsets.UTF_8))
+                .anySatisfy(actual -> assertThat(actual).contains(expected));
+    }
+}
diff --git a/allure-playwright/src/test/resources/allure.properties b/allure-playwright/src/test/resources/allure.properties
new file mode 100644
index 000000000..e3a692e05
--- /dev/null
+++ b/allure-playwright/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.model.indentOutput=true
+allure.results.directory=build/allure-results
+allure.label.module=allure-playwright
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 02cf649af..6f2e058a9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -30,6 +30,7 @@ include("allure-karate")
 include("allure-model")
 include("allure-okhttp")
 include("allure-okhttp3")
+include("allure-playwright")
 include("allure-reader")
 include("allure-rest-assured")
 include("allure-scalatest")

From 7ff0fae174880c545c0c6dda8c9ed778c9f63bf8 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 8 May 2026 17:14:25 +0100
Subject: [PATCH 229/233] Add Selenium WebDriver BiDi log and network reporting
 (via #1270)

---
 .idea/vcs.xml                                 |   5 +-
 .../allure/test/AllureTestCommonsUtils.java   |  35 +-
 allure-selenium-bidi/build.gradle.kts         |  47 +
 .../seleniumbidi/AllureWebDriverBiDi.java     | 182 ++++
 .../seleniumbidi/BiDiAttachmentStorage.java   | 140 +++
 .../seleniumbidi/BiDiConfiguration.java       |  83 ++
 .../allure/seleniumbidi/BiDiJsonKeys.java     |  32 +
 .../allure/seleniumbidi/BiDiLogEvent.java     | 144 +++
 .../allure/seleniumbidi/BiDiNetworkEvent.java | 196 ++++
 .../seleniumbidi/BiDiSessionFactory.java      |  29 +
 .../allure/seleniumbidi/BiDiSessionState.java |  97 ++
 .../allure/seleniumbidi/HeaderRedactor.java   | 127 +++
 .../allure/seleniumbidi/RecordingSession.java |  22 +
 .../SeleniumBiDiSessionFactory.java           |  91 ++
 .../seleniumbidi/AllureWebDriverBiDiTest.java | 900 ++++++++++++++++++
 .../src/test/resources/allure.properties      |   3 +
 settings.gradle.kts                           |   1 +
 17 files changed, 2127 insertions(+), 7 deletions(-)
 create mode 100644 allure-selenium-bidi/build.gradle.kts
 create mode 100644 allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/AllureWebDriverBiDi.java
 create mode 100644 allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiAttachmentStorage.java
 create mode 100644 allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiConfiguration.java
 create mode 100644 allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiJsonKeys.java
 create mode 100644 allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiLogEvent.java
 create mode 100644 allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiNetworkEvent.java
 create mode 100644 allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiSessionFactory.java
 create mode 100644 allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiSessionState.java
 create mode 100644 allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/HeaderRedactor.java
 create mode 100644 allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/RecordingSession.java
 create mode 100644 allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/SeleniumBiDiSessionFactory.java
 create mode 100644 allure-selenium-bidi/src/test/java/io/qameta/allure/seleniumbidi/AllureWebDriverBiDiTest.java
 create mode 100644 allure-selenium-bidi/src/test/resources/allure.properties

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index aeaa9e459..95443a122 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -10,7 +10,4 @@
       </list>
     </option>
   </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
index 6a00c5c4b..75fa00300 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
@@ -41,6 +41,11 @@
  */
 public final class AllureTestCommonsUtils {
 
+    private static final String DOT = ".";
+    private static final String JSON_EXTENSION = "json";
+    private static final String JSON_TYPE = "application/json";
+    private static final String TEXT_EXTENSION = "txt";
+    private static final String TEXT_TYPE = "text/plain";
     private static final ObjectWriter WRITER = JsonMapper
             .builder()
             .configure(USE_WRAPPER_NAME_AS_PROPERTY_NAME, true)
@@ -65,7 +70,9 @@ public static void attach(final AllureResults allureResults) {
             try {
                 Allure.addAttachment(
                         testResult.getUuid() + AllureConstants.TEST_RESULT_FILE_SUFFIX,
-                        WRITER.writeValueAsString(testResult)
+                        JSON_TYPE,
+                        WRITER.writeValueAsString(testResult),
+                        JSON_EXTENSION
                 );
             } catch (JsonProcessingException e) {
                 throw new UncheckedIOException(e);
@@ -76,7 +83,9 @@ public static void attach(final AllureResults allureResults) {
             try {
                 Allure.addAttachment(
                         container.getUuid() + AllureConstants.TEST_RESULT_CONTAINER_FILE_SUFFIX,
-                        WRITER.writeValueAsString(container)
+                        JSON_TYPE,
+                        WRITER.writeValueAsString(container),
+                        JSON_EXTENSION
                 );
             } catch (JsonProcessingException e) {
                 throw new UncheckedIOException(e);
@@ -86,11 +95,31 @@ public static void attach(final AllureResults allureResults) {
         allureResults.getAttachments().forEach((fileName, body) -> Allure
                 .addAttachment(
                         fileName,
-                        new ByteArrayInputStream(body)
+                        type(fileName),
+                        new ByteArrayInputStream(body),
+                        extension(fileName)
                 )
         );
     }
 
+    private static String type(final String fileName) {
+        if (fileName.endsWith(DOT + JSON_EXTENSION)) {
+            return JSON_TYPE;
+        }
+        if (fileName.endsWith(DOT + TEXT_EXTENSION)) {
+            return TEXT_TYPE;
+        }
+        return null;
+    }
+
+    private static String extension(final String fileName) {
+        final int index = fileName.lastIndexOf('.');
+        if (index < 0 || index == fileName.length() - 1) {
+            return null;
+        }
+        return fileName.substring(index + 1);
+    }
+
     /**
      * Parameter mode serializer.
      */
diff --git a/allure-selenium-bidi/build.gradle.kts b/allure-selenium-bidi/build.gradle.kts
new file mode 100644
index 000000000..392d791ef
--- /dev/null
+++ b/allure-selenium-bidi/build.gradle.kts
@@ -0,0 +1,47 @@
+description = "Allure Selenium WebDriver BiDi Integration"
+
+val agent: Configuration by configurations.creating
+
+val seleniumVersion = "4.23.0"
+val testcontainersVersion = "1.21.4"
+
+dependencies {
+    agent("org.aspectj:aspectjweaver")
+    api(project(":allure-java-commons"))
+    compileOnly("org.seleniumhq.selenium:selenium-java:$seleniumVersion")
+    testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    testImplementation("org.seleniumhq.selenium:selenium-java:$seleniumVersion")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation("org.testcontainers:junit-jupiter:$testcontainersVersion")
+    testImplementation("org.testcontainers:testcontainers:$testcontainersVersion")
+    testImplementation(project(":allure-assertj"))
+    testImplementation(project(":allure-java-commons-test"))
+    testImplementation(project(":allure-junit-platform"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks {
+    compileJava {
+        options.release.set(17)
+    }
+    compileTestJava {
+        options.release.set(17)
+    }
+    jar {
+        manifest {
+            attributes(
+                mapOf(
+                    "Automatic-Module-Name" to "io.qameta.allure.seleniumbidi"
+                )
+            )
+        }
+    }
+    test {
+        useJUnitPlatform()
+        jvmArgs("-javaagent:${agent.singleFile}")
+        systemProperty("allure.model.indentOutput", "true")
+        systemProperty("org.slf4j.simpleLogger.defaultLogLevel", "warn")
+    }
+}
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/AllureWebDriverBiDi.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/AllureWebDriverBiDi.java
new file mode 100644
index 000000000..264d44862
--- /dev/null
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/AllureWebDriverBiDi.java
@@ -0,0 +1,182 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.seleniumbidi;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.events.EventFiringDecorator;
+import org.openqa.selenium.support.events.WebDriverListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Selenium WebDriver BiDi listener that captures browser log and network events
+ * as aggregated Allure attachments.
+ */
+@SuppressWarnings("unused")
+public class AllureWebDriverBiDi implements WebDriverListener, AutoCloseable {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AllureWebDriverBiDi.class);
+
+    private final AllureLifecycle lifecycle;
+    private final BiDiSessionFactory sessionFactory;
+    private final BiDiConfiguration configuration = new BiDiConfiguration();
+    private final Map<WebDriver, BiDiSessionState> sessions = new IdentityHashMap<>();
+    private final Lock sessionsLock = new ReentrantLock();
+
+    public AllureWebDriverBiDi() {
+        this(Allure.getLifecycle(), new SeleniumBiDiSessionFactory());
+    }
+
+    AllureWebDriverBiDi(final AllureLifecycle lifecycle,
+                        final BiDiSessionFactory sessionFactory) {
+        this.lifecycle = lifecycle;
+        this.sessionFactory = sessionFactory;
+    }
+
+    public <T extends WebDriver> T decorate(final T driver) {
+        return new EventFiringDecorator<T>(this).decorate(driver);
+    }
+
+    public AllureWebDriverBiDi logs(final boolean enabled) {
+        configuration.setLogsEnabled(enabled);
+        return this;
+    }
+
+    public AllureWebDriverBiDi network(final boolean enabled) {
+        configuration.setNetworkEnabled(enabled);
+        return this;
+    }
+
+    public AllureWebDriverBiDi maxLogEntries(final int maxLogEntries) {
+        configuration.setMaxLogEntries(maxLogEntries);
+        return this;
+    }
+
+    public AllureWebDriverBiDi maxNetworkEvents(final int maxNetworkEvents) {
+        configuration.setMaxNetworkEvents(maxNetworkEvents);
+        return this;
+    }
+
+    public AllureWebDriverBiDi redactHeaders(final String... headerNames) {
+        configuration.redactHeaders(headerNames);
+        return this;
+    }
+
+    @Override
+    public void beforeAnyWebDriverCall(final WebDriver driver,
+                                       final Method method,
+                                       final Object[] args) {
+        captureActiveAllureContext(driver);
+    }
+
+    @Override
+    public void afterAnyWebDriverCall(final WebDriver driver,
+                                      final Method method,
+                                      final Object[] args,
+                                      final Object result) {
+        captureActiveAllureContext(driver);
+    }
+
+    @Override
+    public void beforeQuit(final WebDriver driver) {
+        closeSession(driver);
+    }
+
+    @Override
+    public void afterQuit(final WebDriver driver) {
+        closeSession(driver);
+    }
+
+    @Override
+    public void close() {
+        final List<BiDiSessionState> activeSessions = new ArrayList<>();
+        sessionsLock.lock();
+        try {
+            activeSessions.addAll(sessions.values());
+            sessions.clear();
+        } finally {
+            sessionsLock.unlock();
+        }
+        activeSessions.forEach(this::safeFlushAndClose);
+    }
+
+    private void captureActiveAllureContext(final WebDriver driver) {
+        if (!configuration.isAnyEnabled()) {
+            return;
+        }
+
+        if (!lifecycle.getCurrentTestCaseOrStep().isPresent()) {
+            return;
+        }
+
+        getOrCreateSession(driver);
+    }
+
+    private BiDiSessionState getOrCreateSession(final WebDriver driver) {
+        sessionsLock.lock();
+        try {
+            final BiDiSessionState existing = sessions.get(driver);
+            if (existing != null) {
+                return existing;
+            }
+
+            try {
+                final BiDiSessionState created = BiDiSessionState.start(driver, configuration, sessionFactory);
+                if (created != null) {
+                    sessions.put(driver, created);
+                }
+                return created;
+            } catch (RuntimeException e) {
+                LOGGER.debug("Could not start WebDriver BiDi capture", e);
+                return null;
+            }
+        } finally {
+            sessionsLock.unlock();
+        }
+    }
+
+    private void closeSession(final WebDriver driver) {
+        final BiDiSessionState state;
+        sessionsLock.lock();
+        try {
+            state = sessions.remove(driver);
+        } finally {
+            sessionsLock.unlock();
+        }
+        safeFlushAndClose(state);
+    }
+
+    private void safeFlushAndClose(final BiDiSessionState state) {
+        if (state == null) {
+            return;
+        }
+        try {
+            state.flushAndClose(lifecycle);
+        } catch (RuntimeException e) {
+            LOGGER.debug("Could not flush WebDriver BiDi capture", e);
+        }
+    }
+}
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiAttachmentStorage.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiAttachmentStorage.java
new file mode 100644
index 000000000..251bb2989
--- /dev/null
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiAttachmentStorage.java
@@ -0,0 +1,140 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.seleniumbidi;
+
+import io.qameta.allure.AllureLifecycle;
+import org.openqa.selenium.json.Json;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+final class BiDiAttachmentStorage {
+
+    static final String LOG_ATTACHMENT_NAME = "WebDriver BiDi logs";
+    static final String NETWORK_ATTACHMENT_NAME = "WebDriver BiDi network";
+
+    private static final String JSON_TYPE = "application/json";
+    private static final String JSON_EXTENSION = "json";
+    private static final Json JSON = new Json();
+
+    private final List<Map<String, Object>> logs = new ArrayList<>();
+    private final List<Map<String, Object>> network = new ArrayList<>();
+    private final Lock lock = new ReentrantLock();
+    private long droppedLogs;
+    private long droppedNetworkEvents;
+
+    void addLog(final BiDiLogEvent event, final int maxEntries) {
+        lock.lock();
+        try {
+            if (logs.size() < maxEntries) {
+                logs.add(event.toMap());
+            } else {
+                droppedLogs++;
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    void addNetwork(final BiDiNetworkEvent event,
+                    final int maxEntries,
+                    final HeaderRedactor redactor) {
+        lock.lock();
+        try {
+            if (network.size() < maxEntries) {
+                network.add(event.toMap(redactor));
+            } else {
+                droppedNetworkEvents++;
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    void flush(final AllureLifecycle lifecycle) {
+        try {
+            if (!lifecycle.getCurrentTestCaseOrStep().isPresent()) {
+                return;
+            }
+
+            logsAttachment()
+                    .ifPresent(body -> lifecycle.addAttachment(
+                            LOG_ATTACHMENT_NAME,
+                            JSON_TYPE,
+                            JSON_EXTENSION,
+                            body
+                    ));
+            networkAttachment()
+                    .ifPresent(body -> lifecycle.addAttachment(
+                            NETWORK_ATTACHMENT_NAME,
+                            JSON_TYPE,
+                            JSON_EXTENSION,
+                            body
+                    ));
+        } finally {
+            clear();
+        }
+    }
+
+    void clear() {
+        lock.lock();
+        try {
+            logs.clear();
+            network.clear();
+            droppedLogs = 0;
+            droppedNetworkEvents = 0;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    Optional<byte[]> logsAttachment() {
+        lock.lock();
+        try {
+            if (logs.isEmpty() && droppedLogs == 0) {
+                return Optional.empty();
+            }
+            return Optional.of(toJson(new ArrayList<>(logs), droppedLogs));
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    Optional<byte[]> networkAttachment() {
+        lock.lock();
+        try {
+            if (network.isEmpty() && droppedNetworkEvents == 0) {
+                return Optional.empty();
+            }
+            return Optional.of(toJson(new ArrayList<>(network), droppedNetworkEvents));
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    private static byte[] toJson(final List<Map<String, Object>> entries, final long dropped) {
+        final Map<String, Object> payload = new LinkedHashMap<>();
+        payload.put("entries", entries);
+        payload.put("dropped", dropped);
+        return JSON.toJson(payload).getBytes(StandardCharsets.UTF_8);
+    }
+}
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiConfiguration.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiConfiguration.java
new file mode 100644
index 000000000..e313ca8bc
--- /dev/null
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiConfiguration.java
@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.seleniumbidi;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+final class BiDiConfiguration {
+
+    static final int DEFAULT_MAX_LOG_ENTRIES = 1_000;
+    static final int DEFAULT_MAX_NETWORK_EVENTS = 2_000;
+
+    private final AtomicBoolean logsEnabled = new AtomicBoolean(true);
+    private final AtomicBoolean networkEnabled = new AtomicBoolean(true);
+    private final AtomicInteger maxLogEntries = new AtomicInteger(DEFAULT_MAX_LOG_ENTRIES);
+    private final AtomicInteger maxNetworkEvents = new AtomicInteger(DEFAULT_MAX_NETWORK_EVENTS);
+    private final AtomicReference<HeaderRedactor> headerRedactor = new AtomicReference<>(HeaderRedactor.defaults());
+
+    boolean isLogsEnabled() {
+        return logsEnabled.get();
+    }
+
+    void setLogsEnabled(final boolean logsEnabled) {
+        this.logsEnabled.set(logsEnabled);
+    }
+
+    boolean isNetworkEnabled() {
+        return networkEnabled.get();
+    }
+
+    void setNetworkEnabled(final boolean networkEnabled) {
+        this.networkEnabled.set(networkEnabled);
+    }
+
+    boolean isAnyEnabled() {
+        return logsEnabled.get() || networkEnabled.get();
+    }
+
+    int getMaxLogEntries() {
+        return maxLogEntries.get();
+    }
+
+    void setMaxLogEntries(final int maxLogEntries) {
+        this.maxLogEntries.set(requireNonNegative(maxLogEntries, "maxLogEntries"));
+    }
+
+    int getMaxNetworkEvents() {
+        return maxNetworkEvents.get();
+    }
+
+    void setMaxNetworkEvents(final int maxNetworkEvents) {
+        this.maxNetworkEvents.set(requireNonNegative(maxNetworkEvents, "maxNetworkEvents"));
+    }
+
+    HeaderRedactor getHeaderRedactor() {
+        return headerRedactor.get();
+    }
+
+    void redactHeaders(final String... headerNames) {
+        this.headerRedactor.set(HeaderRedactor.defaults().withAdditionalHeaders(headerNames));
+    }
+
+    private static int requireNonNegative(final int value, final String name) {
+        if (value < 0) {
+            throw new IllegalArgumentException(name + " must be greater than or equal to zero");
+        }
+        return value;
+    }
+}
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiJsonKeys.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiJsonKeys.java
new file mode 100644
index 000000000..d0720c0df
--- /dev/null
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiJsonKeys.java
@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.seleniumbidi;
+
+final class BiDiJsonKeys {
+
+    static final String EVENT = "event";
+    static final String HEADERS = "headers";
+    static final String HEADERS_SIZE = "headersSize";
+    static final String REQUEST_ID = "requestId";
+    static final String TEXT = "text";
+    static final String TYPE = "type";
+    static final String URL = "url";
+    static final String VALUE = "value";
+
+    private BiDiJsonKeys() {
+        throw new IllegalStateException("Do not instance");
+    }
+}
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiLogEvent.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiLogEvent.java
new file mode 100644
index 000000000..7d04ad6eb
--- /dev/null
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiLogEvent.java
@@ -0,0 +1,144 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.seleniumbidi;
+
+import org.openqa.selenium.bidi.log.BaseLogEntry;
+import org.openqa.selenium.bidi.log.ConsoleLogEntry;
+import org.openqa.selenium.bidi.log.GenericLogEntry;
+import org.openqa.selenium.bidi.log.JavascriptLogEntry;
+import org.openqa.selenium.bidi.log.LogEntry;
+import org.openqa.selenium.bidi.log.StackFrame;
+import org.openqa.selenium.bidi.log.StackTrace;
+import org.openqa.selenium.bidi.script.RemoteValue;
+import org.openqa.selenium.bidi.script.Source;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("PMD.ReturnEmptyCollectionRatherThanNull")
+final class BiDiLogEvent {
+
+    private final Map<String, Object> values;
+
+    private BiDiLogEvent(final Map<String, Object> values) {
+        this.values = values;
+    }
+
+    static List<BiDiLogEvent> from(final LogEntry entry) {
+        final List<BiDiLogEvent> events = new ArrayList<>(3);
+        entry.getConsoleLogEntry().ifPresent(console -> events.add(console(console)));
+        entry.getJavascriptLogEntry().ifPresent(javascript -> events.add(javascript(javascript)));
+        entry.getGenericLogEntry().ifPresent(generic -> events.add(generic(generic)));
+        return events;
+    }
+
+    static BiDiLogEvent generic(final GenericLogEntry entry) {
+        final Map<String, Object> values = base("generic", entry);
+        putIfNotNull(values, BiDiJsonKeys.TYPE, entry.getType());
+        return new BiDiLogEvent(values);
+    }
+
+    static BiDiLogEvent console(final ConsoleLogEntry entry) {
+        final Map<String, Object> values = base("console", entry);
+        putIfNotNull(values, BiDiJsonKeys.TYPE, entry.getType());
+        putIfNotNull(values, "method", entry.getMethod());
+        values.put("args", remoteValues(entry.getArgs()));
+        return new BiDiLogEvent(values);
+    }
+
+    static BiDiLogEvent javascript(final JavascriptLogEntry entry) {
+        final Map<String, Object> values = base("javascript", entry);
+        putIfNotNull(values, BiDiJsonKeys.TYPE, entry.getType());
+        return new BiDiLogEvent(values);
+    }
+
+    static BiDiLogEvent of(final String text) {
+        final Map<String, Object> values = new LinkedHashMap<>();
+        values.put(BiDiJsonKeys.EVENT, "log");
+        values.put(BiDiJsonKeys.TEXT, text);
+        return new BiDiLogEvent(values);
+    }
+
+    Map<String, Object> toMap() {
+        return new LinkedHashMap<>(values);
+    }
+
+    private static Map<String, Object> base(final String event, final BaseLogEntry entry) {
+        final Map<String, Object> values = new LinkedHashMap<>();
+        values.put(BiDiJsonKeys.EVENT, event);
+        putIfNotNull(values, "level", entry.getLevel());
+        putIfNotNull(values, BiDiJsonKeys.TEXT, entry.getText());
+        values.put("timestamp", entry.getTimestamp());
+        putIfNotNull(values, "source", source(entry.getSource()));
+        putIfNotNull(values, "stackTrace", stackTrace(entry.getStackTrace()));
+        return values;
+    }
+
+    private static Map<String, Object> source(final Source source) {
+        if (source == null) {
+            return null;
+        }
+        final Map<String, Object> values = new LinkedHashMap<>();
+        putIfNotNull(values, "realm", source.getRealm());
+        source.getBrowsingContext().ifPresent(context -> values.put("browsingContextId", context));
+        return values;
+    }
+
+    private static List<Map<String, Object>> remoteValues(final List<RemoteValue> remoteValues) {
+        final List<Map<String, Object>> result = new ArrayList<>();
+        if (remoteValues == null) {
+            return result;
+        }
+        remoteValues.forEach(remoteValue -> {
+            final Map<String, Object> value = new LinkedHashMap<>();
+            putIfNotNull(value, BiDiJsonKeys.TYPE, remoteValue.getType());
+            remoteValue.getValue().ifPresent(content -> value.put(BiDiJsonKeys.VALUE, content));
+            remoteValue.getHandle().ifPresent(handle -> value.put("handle", handle));
+            remoteValue.getInternalId().ifPresent(id -> value.put("internalId", id));
+            remoteValue.getSharedId().ifPresent(id -> value.put("sharedId", id));
+            result.add(value);
+        });
+        return result;
+    }
+
+    static Map<String, Object> stackTrace(final StackTrace stackTrace) {
+        if (stackTrace == null) {
+            return null;
+        }
+        final Map<String, Object> values = new LinkedHashMap<>();
+        final List<Map<String, Object>> frames = new ArrayList<>();
+        stackTrace.getCallFrames().forEach(frame -> frames.add(stackFrame(frame)));
+        values.put("callFrames", frames);
+        return values;
+    }
+
+    private static Map<String, Object> stackFrame(final StackFrame frame) {
+        final Map<String, Object> values = new LinkedHashMap<>();
+        putIfNotNull(values, "url", frame.getUrl());
+        putIfNotNull(values, "functionName", frame.getFunctionName());
+        values.put("lineNumber", frame.getLineNumber());
+        values.put("columnNumber", frame.getColumnNumber());
+        return values;
+    }
+
+    static void putIfNotNull(final Map<String, Object> values, final String name, final Object value) {
+        if (value != null) {
+            values.put(name, value);
+        }
+    }
+}
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiNetworkEvent.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiNetworkEvent.java
new file mode 100644
index 000000000..dc7da7d9f
--- /dev/null
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiNetworkEvent.java
@@ -0,0 +1,196 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.seleniumbidi;
+
+import org.openqa.selenium.bidi.network.BaseParameters;
+import org.openqa.selenium.bidi.network.BeforeRequestSent;
+import org.openqa.selenium.bidi.network.BytesValue;
+import org.openqa.selenium.bidi.network.FetchError;
+import org.openqa.selenium.bidi.network.FetchTimingInfo;
+import org.openqa.selenium.bidi.network.Header;
+import org.openqa.selenium.bidi.network.Initiator;
+import org.openqa.selenium.bidi.network.RequestData;
+import org.openqa.selenium.bidi.network.ResponseData;
+import org.openqa.selenium.bidi.network.ResponseDetails;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("PMD.ReturnEmptyCollectionRatherThanNull")
+final class BiDiNetworkEvent {
+
+    private final Map<String, Object> values;
+
+    private BiDiNetworkEvent(final Map<String, Object> values) {
+        this.values = values;
+    }
+
+    static BiDiNetworkEvent beforeRequestSent(final BeforeRequestSent event) {
+        final Map<String, Object> values = base("beforeRequestSent", event);
+        BiDiLogEvent.putIfNotNull(values, "initiator", initiator(event.getInitiator()));
+        return new BiDiNetworkEvent(values);
+    }
+
+    static BiDiNetworkEvent fetchError(final FetchError event) {
+        final Map<String, Object> values = base("fetchError", event);
+        BiDiLogEvent.putIfNotNull(values, "errorText", event.getErrorText());
+        return new BiDiNetworkEvent(values);
+    }
+
+    static BiDiNetworkEvent responseStarted(final ResponseDetails event) {
+        return response("responseStarted", event);
+    }
+
+    static BiDiNetworkEvent responseCompleted(final ResponseDetails event) {
+        return response("responseCompleted", event);
+    }
+
+    static BiDiNetworkEvent authRequired(final ResponseDetails event) {
+        return response("authRequired", event);
+    }
+
+    static BiDiNetworkEvent of(final String event, final Map<String, Object> values) {
+        final Map<String, Object> copy = new LinkedHashMap<>();
+        copy.put(BiDiJsonKeys.EVENT, event);
+        copy.putAll(values);
+        return new BiDiNetworkEvent(copy);
+    }
+
+    Map<String, Object> toMap(final HeaderRedactor redactor) {
+        return redactor.redact(values);
+    }
+
+    private static BiDiNetworkEvent response(final String name, final ResponseDetails event) {
+        final Map<String, Object> values = base(name, event);
+        BiDiLogEvent.putIfNotNull(values, "response", responseData(event.getResponseData()));
+        return new BiDiNetworkEvent(values);
+    }
+
+    private static Map<String, Object> responseData(final ResponseData response) {
+        if (response == null) {
+            return null;
+        }
+        final Map<String, Object> values = new LinkedHashMap<>();
+        BiDiLogEvent.putIfNotNull(values, BiDiJsonKeys.URL, response.getUrl());
+        BiDiLogEvent.putIfNotNull(values, "protocol", response.getProtocol());
+        values.put("status", response.getStatus());
+        BiDiLogEvent.putIfNotNull(values, "statusText", response.getStatusText());
+        values.put("fromCache", response.isFromCache());
+        values.put(BiDiJsonKeys.HEADERS, headers(response.getHeaders()));
+        BiDiLogEvent.putIfNotNull(values, "mimeType", response.getMimeType());
+        values.put("bytesReceived", response.getBytesReceived());
+        values.put(BiDiJsonKeys.HEADERS_SIZE, response.getHeadersSize());
+        values.put("bodySize", response.getBodySize());
+        response.getContent().ifPresent(content -> values.put("contentLength", content));
+        response.getAuthChallenge().ifPresent(challenge -> {
+            final Map<String, Object> authChallenge = new LinkedHashMap<>();
+            BiDiLogEvent.putIfNotNull(authChallenge, "scheme", challenge.getScheme());
+            BiDiLogEvent.putIfNotNull(authChallenge, "realm", challenge.getRealm());
+            values.put("authChallenge", authChallenge);
+        });
+        return values;
+    }
+
+    private static Map<String, Object> base(final String event, final BaseParameters parameters) {
+        final Map<String, Object> values = new LinkedHashMap<>();
+        values.put(BiDiJsonKeys.EVENT, event);
+        BiDiLogEvent.putIfNotNull(values, "browsingContextId", parameters.getBrowsingContextId());
+        values.put("blocked", parameters.isBlocked());
+        BiDiLogEvent.putIfNotNull(values, "navigationId", parameters.getNavigationId());
+        values.put("redirectCount", parameters.getRedirectCount());
+        BiDiLogEvent.putIfNotNull(values, "request", request(parameters.getRequest()));
+        values.put("timestamp", parameters.getTimestamp());
+        values.put("intercepts", parameters.getIntercepts());
+        return values;
+    }
+
+    private static Map<String, Object> request(final RequestData request) {
+        if (request == null) {
+            return null;
+        }
+        final Map<String, Object> values = new LinkedHashMap<>();
+        BiDiLogEvent.putIfNotNull(values, BiDiJsonKeys.REQUEST_ID, request.getRequestId());
+        BiDiLogEvent.putIfNotNull(values, BiDiJsonKeys.URL, request.getUrl());
+        BiDiLogEvent.putIfNotNull(values, "method", request.getMethod());
+        values.put(BiDiJsonKeys.HEADERS, headers(request.getHeaders()));
+        BiDiLogEvent.putIfNotNull(values, BiDiJsonKeys.HEADERS_SIZE, request.getHeadersSize());
+        BiDiLogEvent.putIfNotNull(values, "timings", timings(request.getTimings()));
+        return values;
+    }
+
+    private static List<Map<String, Object>> headers(final List<Header> headers) {
+        final List<Map<String, Object>> result = new ArrayList<>();
+        if (headers == null) {
+            return result;
+        }
+        headers.forEach(header -> {
+            final Map<String, Object> value = new LinkedHashMap<>();
+            BiDiLogEvent.putIfNotNull(value, "name", header.getName());
+            BiDiLogEvent.putIfNotNull(value, BiDiJsonKeys.VALUE, bytesValue(header.getValue()));
+            result.add(value);
+        });
+        return result;
+    }
+
+    private static Map<String, Object> bytesValue(final BytesValue bytesValue) {
+        if (bytesValue == null) {
+            return null;
+        }
+        final Map<String, Object> value = new LinkedHashMap<>();
+        BiDiLogEvent.putIfNotNull(value, BiDiJsonKeys.TYPE, bytesValue.getType());
+        BiDiLogEvent.putIfNotNull(value, BiDiJsonKeys.VALUE, bytesValue.getValue());
+        return value;
+    }
+
+    private static Map<String, Object> timings(final FetchTimingInfo timings) {
+        if (timings == null) {
+            return null;
+        }
+        final Map<String, Object> values = new LinkedHashMap<>();
+        values.put("timeOrigin", timings.getTimeOrigin());
+        values.put("requestTime", timings.getRequestTime());
+        values.put("redirectStart", timings.getRedirectStart());
+        values.put("redirectEnd", timings.getRedirectEnd());
+        values.put("fetchStart", timings.getFetchStart());
+        values.put("dnsStart", timings.getDnsStart());
+        values.put("dnsEnd", timings.getDnsEnd());
+        values.put("connectStart", timings.getConnectStart());
+        values.put("connectEnd", timings.getConnectEnd());
+        values.put("tlsStart", timings.getTlsStart());
+        values.put("requestStart", timings.getRequestStart());
+        values.put("responseStart", timings.getResponseStart());
+        values.put("responseEnd", timings.getResponseEnd());
+        return values;
+    }
+
+    private static Map<String, Object> initiator(final Initiator initiator) {
+        if (initiator == null) {
+            return null;
+        }
+        final Map<String, Object> values = new LinkedHashMap<>();
+        BiDiLogEvent.putIfNotNull(values, BiDiJsonKeys.TYPE, initiator.getType());
+        initiator.getColumnNumber().ifPresent(column -> values.put("columnNumber", column));
+        initiator.getLineNumber().ifPresent(line -> values.put("lineNumber", line));
+        initiator.getRequestId().ifPresent(requestId -> values.put(BiDiJsonKeys.REQUEST_ID, requestId));
+        initiator.getStackTrace().ifPresent(stackTrace -> values.put(
+                "stackTrace",
+                BiDiLogEvent.stackTrace(stackTrace)
+        ));
+        return values;
+    }
+}
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiSessionFactory.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiSessionFactory.java
new file mode 100644
index 000000000..e0578beb5
--- /dev/null
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiSessionFactory.java
@@ -0,0 +1,29 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.seleniumbidi;
+
+import org.openqa.selenium.WebDriver;
+
+import java.util.function.Consumer;
+
+@FunctionalInterface
+interface BiDiSessionFactory {
+
+    RecordingSession start(WebDriver driver,
+                           BiDiConfiguration configuration,
+                           Consumer<BiDiLogEvent> logConsumer,
+                           Consumer<BiDiNetworkEvent> networkConsumer);
+}
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiSessionState.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiSessionState.java
new file mode 100644
index 000000000..c1332a83f
--- /dev/null
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiSessionState.java
@@ -0,0 +1,97 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.seleniumbidi;
+
+import io.qameta.allure.AllureLifecycle;
+import org.openqa.selenium.WebDriver;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+final class BiDiSessionState {
+
+    private final BiDiConfiguration configuration;
+    private final BiDiAttachmentStorage storage = new BiDiAttachmentStorage();
+    private final AtomicBoolean closed = new AtomicBoolean();
+    private final AtomicReference<RecordingSession> recordingSession = new AtomicReference<>();
+
+    private BiDiSessionState(final BiDiConfiguration configuration) {
+        this.configuration = configuration;
+    }
+
+    static BiDiSessionState start(final WebDriver driver,
+                                  final BiDiConfiguration configuration,
+                                  final BiDiSessionFactory sessionFactory) {
+        final BiDiSessionState state = new BiDiSessionState(configuration);
+        final RecordingSession session = sessionFactory.start(
+                driver,
+                configuration,
+                state::recordLog,
+                state::recordNetwork
+        );
+        if (session == null) {
+            return null;
+        }
+        state.recordingSession.set(session);
+        return state;
+    }
+
+    void recordLog(final BiDiLogEvent event) {
+        if (closed.get() || !configuration.isLogsEnabled()) {
+            return;
+        }
+        storage.addLog(
+                event,
+                configuration.getMaxLogEntries()
+        );
+    }
+
+    void recordNetwork(final BiDiNetworkEvent event) {
+        if (closed.get() || !configuration.isNetworkEnabled()) {
+            return;
+        }
+        storage.addNetwork(
+                event,
+                configuration.getMaxNetworkEvents(),
+                configuration.getHeaderRedactor()
+        );
+    }
+
+    void flushAndClose(final AllureLifecycle lifecycle) {
+        closed.set(true);
+        try {
+            closeRecordingSession();
+        } finally {
+            storage.flush(lifecycle);
+        }
+    }
+
+    void close() {
+        closed.set(true);
+        try {
+            closeRecordingSession();
+        } finally {
+            storage.clear();
+        }
+    }
+
+    private void closeRecordingSession() {
+        final RecordingSession session = recordingSession.getAndSet(null);
+        if (session != null) {
+            session.close();
+        }
+    }
+}
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/HeaderRedactor.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/HeaderRedactor.java
new file mode 100644
index 000000000..d20b32327
--- /dev/null
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/HeaderRedactor.java
@@ -0,0 +1,127 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.seleniumbidi;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+final class HeaderRedactor {
+
+    static final String REDACTED = "[REDACTED]";
+
+    private static final Set<String> DEFAULT_HEADERS = new LinkedHashSet<>(Arrays.asList(
+            "authorization",
+            "proxy-authorization",
+            "cookie",
+            "set-cookie",
+            "x-api-key"
+    ));
+
+    private final Set<String> headerNames;
+
+    private HeaderRedactor(final Set<String> headerNames) {
+        this.headerNames = headerNames;
+    }
+
+    static HeaderRedactor defaults() {
+        return new HeaderRedactor(DEFAULT_HEADERS);
+    }
+
+    HeaderRedactor withAdditionalHeaders(final String... additionalHeaders) {
+        final Set<String> headers = new LinkedHashSet<>(headerNames);
+        if (additionalHeaders != null) {
+            Arrays.stream(additionalHeaders)
+                    .map(HeaderRedactor::normalize)
+                    .filter(value -> !value.isEmpty())
+                    .forEach(headers::add);
+        }
+        return new HeaderRedactor(headers);
+    }
+
+    Map<String, Object> redact(final Map<String, Object> values) {
+        return redactMap(values);
+    }
+
+    private Map<String, Object> redactMap(final Map<String, Object> values) {
+        final Map<String, Object> result = new LinkedHashMap<>();
+        values.forEach((key, value) -> {
+            if (BiDiJsonKeys.HEADERS.equals(key) && value instanceof List) {
+                result.put(key, redactHeaders((List<?>) value));
+            } else if (value instanceof Map) {
+                result.put(key, redactMap(castMap(value)));
+            } else if (value instanceof List) {
+                result.put(key, redactList((List<?>) value));
+            } else {
+                result.put(key, value);
+            }
+        });
+        return result;
+    }
+
+    private List<Object> redactList(final List<?> values) {
+        final List<Object> result = new ArrayList<>();
+        values.forEach(value -> {
+            if (value instanceof Map) {
+                result.add(redactMap(castMap(value)));
+            } else if (value instanceof List) {
+                result.add(redactList((List<?>) value));
+            } else {
+                result.add(value);
+            }
+        });
+        return result;
+    }
+
+    private List<Object> redactHeaders(final List<?> headers) {
+        return headers.stream()
+                .map(header -> header instanceof Map ? redactHeader(castMap(header)) : header)
+                .collect(Collectors.toList());
+    }
+
+    private Map<String, Object> redactHeader(final Map<String, Object> header) {
+        final Map<String, Object> result = new LinkedHashMap<>(header);
+        final Object name = result.get("name");
+        if (name instanceof String && headerNames.contains(normalize((String) name))) {
+            result.put(BiDiJsonKeys.VALUE, redactedValue(result.get(BiDiJsonKeys.VALUE)));
+        }
+        return result;
+    }
+
+    private Object redactedValue(final Object value) {
+        if (value instanceof Map) {
+            final Map<String, Object> redacted = new LinkedHashMap<>(castMap(value));
+            redacted.put(BiDiJsonKeys.VALUE, REDACTED);
+            return redacted;
+        }
+        return REDACTED;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> castMap(final Object value) {
+        return (Map<String, Object>) value;
+    }
+
+    private static String normalize(final String headerName) {
+        return headerName == null ? "" : headerName.toLowerCase(Locale.ROOT);
+    }
+}
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/RecordingSession.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/RecordingSession.java
new file mode 100644
index 000000000..b1db141cf
--- /dev/null
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/RecordingSession.java
@@ -0,0 +1,22 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.seleniumbidi;
+
+@FunctionalInterface
+interface RecordingSession {
+
+    void close();
+}
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/SeleniumBiDiSessionFactory.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/SeleniumBiDiSessionFactory.java
new file mode 100644
index 000000000..3a91fb1af
--- /dev/null
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/SeleniumBiDiSessionFactory.java
@@ -0,0 +1,91 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.seleniumbidi;
+
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.bidi.HasBiDi;
+import org.openqa.selenium.bidi.module.LogInspector;
+import org.openqa.selenium.bidi.module.Network;
+import org.openqa.selenium.remote.Augmenter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+final class SeleniumBiDiSessionFactory implements BiDiSessionFactory {
+
+    @Override
+    @SuppressWarnings("PMD.CloseResource")
+    public RecordingSession start(final WebDriver driver,
+                                  final BiDiConfiguration configuration,
+                                  final Consumer<BiDiLogEvent> logConsumer,
+                                  final Consumer<BiDiNetworkEvent> networkConsumer) {
+        final WebDriver bidiDriver = toBiDiDriver(driver);
+        if (bidiDriver == null) {
+            return null;
+        }
+
+        final List<AutoCloseable> inspectors = new ArrayList<>();
+        if (configuration.isLogsEnabled()) {
+            final LogInspector logInspector = new LogInspector(bidiDriver);
+            logInspector.onLog(entry -> BiDiLogEvent.from(entry).forEach(logConsumer));
+            inspectors.add(logInspector);
+        }
+        if (configuration.isNetworkEnabled()) {
+            final Network network = new Network(bidiDriver);
+            network.onBeforeRequestSent(event -> networkConsumer.accept(BiDiNetworkEvent.beforeRequestSent(event)));
+            network.onFetchError(event -> networkConsumer.accept(BiDiNetworkEvent.fetchError(event)));
+            network.onResponseStarted(event -> networkConsumer.accept(BiDiNetworkEvent.responseStarted(event)));
+            network.onResponseCompleted(event -> networkConsumer.accept(BiDiNetworkEvent.responseCompleted(event)));
+            network.onAuthRequired(event -> networkConsumer.accept(BiDiNetworkEvent.authRequired(event)));
+            inspectors.add(network);
+        }
+        return new SeleniumRecordingSession(inspectors);
+    }
+
+    private WebDriver toBiDiDriver(final WebDriver driver) {
+        if (isBiDiAvailable(driver)) {
+            return driver;
+        }
+
+        final WebDriver augmented = new Augmenter().augment(driver);
+        return isBiDiAvailable(augmented) ? augmented : null;
+    }
+
+    private boolean isBiDiAvailable(final WebDriver driver) {
+        return driver instanceof HasBiDi && ((HasBiDi) driver).maybeGetBiDi().isPresent();
+    }
+
+    private static final class SeleniumRecordingSession implements RecordingSession {
+
+        private final List<AutoCloseable> inspectors;
+
+        private SeleniumRecordingSession(final List<AutoCloseable> inspectors) {
+            this.inspectors = inspectors;
+        }
+
+        @Override
+        public void close() {
+            inspectors.forEach(inspector -> {
+                try {
+                    inspector.close();
+                } catch (Exception ignored) {
+                    // ignore cleanup failures; reporting must not affect WebDriver teardown
+                }
+            });
+        }
+    }
+}
diff --git a/allure-selenium-bidi/src/test/java/io/qameta/allure/seleniumbidi/AllureWebDriverBiDiTest.java b/allure-selenium-bidi/src/test/java/io/qameta/allure/seleniumbidi/AllureWebDriverBiDiTest.java
new file mode 100644
index 000000000..b8463bc3d
--- /dev/null
+++ b/allure-selenium-bidi/src/test/java/io/qameta/allure/seleniumbidi/AllureWebDriverBiDiTest.java
@@ -0,0 +1,900 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.seleniumbidi;
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpServer;
+import io.qameta.allure.Allure;
+import io.qameta.allure.Description;
+import io.qameta.allure.Param;
+import io.qameta.allure.Step;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.test.AllureFeatures;
+import io.qameta.allure.test.AllureResults;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.openqa.selenium.By;
+import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.json.Json;
+import org.openqa.selenium.remote.RemoteWebDriver;
+import org.openqa.selenium.support.ui.WebDriverWait;
+import org.testcontainers.Testcontainers;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import static io.qameta.allure.model.Parameter.Mode.HIDDEN;
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
+
+/**
+ * Real browser integration tests for the Selenium WebDriver BiDi adapter.
+ */
+@ResourceLock(value = "io.qameta.allure.seleniumbidi.lifecycle", mode = READ_WRITE)
+class AllureWebDriverBiDiTest {
+
+    private static final Json JSON = new Json();
+    private static final int SELENIUM_PORT = 4444;
+    private static final long SELENIUM_SHARED_MEMORY = 2L * 1024 * 1024 * 1024;
+    private static final String IMAGE_PROPERTY = "allure.selenium.bidi.integration.image";
+    private static final String SELENIUM_IMAGE_TAG = "4.23.0";
+    private static final String LOCALHOST_URL_FORMAT = "http://localhost:%d";
+    private static final String DEFAULT_PAGE = "/";
+    private static final String LOGS_PAGE = "/logs";
+    private static final String NETWORK_PAGE = "/network";
+    private static final String PING_PATH = "/ping";
+    private static final String HTML_TYPE = "text/html";
+    private static final String WAIT_FOR_BIDI_INTERRUPTED = "Interrupted while waiting for BiDi events";
+    private static final String DROPPED_KEY = "dropped";
+    private static final String ENTRIES_KEY = "entries";
+    private static final String CONSOLE_LOG = "bidi-it-console";
+    private static final String FETCH_LOG = "bidi-it-fetch-ok";
+    private static final String SECOND_CONSOLE_LOG = "bidi-it-second-console";
+    private static final String CUSTOM_PAGE = "/custom";
+    private static final String API_KEY_HEADER_NAME = "X-Api-Key";
+    private static final String CUSTOM_HEADER_NAME = "X-Secret-Token";
+    private static final String TRACE_HEADER_NAME = "X-Trace-Id";
+    private static final String CUSTOM_SECRET = "custom-integration-secret";
+    private static final String VISIBLE_HEADER_VALUE = "visible-integration-value";
+    private static final String API_KEY = "integration-secret";
+    private static final ThreadLocal<Integer> SERVER_PORT = new ThreadLocal<>();
+
+    /**
+     * Checks that console log entries are attached as WebDriver BiDi log data.
+     *
+     * The test emits two browser console messages and verifies that the log attachment contains exactly those messages
+     * without exercising network assertions.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachConsoleLogs() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.network(false),
+                driver -> {
+                    driver.get(testServerUrl(LOGS_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                }
+        );
+
+        assertThat(attachmentNames(results))
+                .containsExactly(BiDiAttachmentStorage.LOG_ATTACHMENT_NAME);
+        final Map<String, Object> payload = attachmentPayload(results, BiDiAttachmentStorage.LOG_ATTACHMENT_NAME);
+        assertThat(entries(payload))
+                .hasSize(2)
+                .extracting(entry -> entry.get("text"))
+                .containsExactlyInAnyOrder(CONSOLE_LOG, SECOND_CONSOLE_LOG);
+        assertDropped(payload, 0);
+    }
+
+    /**
+     * Checks that console log metadata is attached as WebDriver BiDi log data.
+     *
+     * The test emits a browser console message and verifies event metadata such as level, method, source, stack trace,
+     * timestamp, and argument data.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachConsoleLogMetadata() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.network(false),
+                driver -> {
+                    driver.get(testServerUrl(LOGS_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                }
+        );
+
+        final Map<String, Object> payload = attachmentPayload(results, BiDiAttachmentStorage.LOG_ATTACHMENT_NAME);
+        final Map<String, Object> entry = entries(payload).stream()
+                .filter(item -> CONSOLE_LOG.equals(item.get("text")))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("Console log entry not found"));
+        assertThat(entry)
+                .containsEntry("event", "console")
+                .containsEntry("level", "info")
+                .containsEntry("method", "log")
+                .containsEntry("type", "console");
+        assertThat(((Number) entry.get("timestamp")).longValue()).isPositive();
+        assertThat(object(entry, "source").get("browsingContextId"))
+                .isInstanceOf(String.class)
+                .asString()
+                .isNotBlank();
+        assertThat(objects(object(entry, "stackTrace"), "callFrames"))
+                .extracting(frame -> String.valueOf(frame.get("url")))
+                .anyMatch(url -> url.contains(LOGS_PAGE));
+        final Map<String, Object> argument = objects(entry, "args").get(0);
+        assertThat(argument)
+                .containsEntry("type", "string")
+                .containsEntry("value", CONSOLE_LOG);
+    }
+
+    /**
+     * Checks that request and response metadata are attached as WebDriver BiDi network data.
+     *
+     * The test performs a browser fetch and verifies that the network attachment contains request and completed response
+     * events for the fetched URL.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachNetworkEvents() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.logs(false),
+                driver -> {
+                    driver.get(testServerUrl(NETWORK_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                }
+        );
+
+        assertThat(attachmentNames(results))
+                .containsExactly(BiDiAttachmentStorage.NETWORK_ATTACHMENT_NAME);
+        final Map<String, Object> payload = attachmentPayload(results, BiDiAttachmentStorage.NETWORK_ATTACHMENT_NAME);
+        assertThat(object(networkEntry(payload, "beforeRequestSent", PING_PATH), "request").get("url"))
+                .asString()
+                .contains(PING_PATH);
+        assertThat(object(networkEntry(payload, "responseCompleted", PING_PATH), "response").get("url"))
+                .asString()
+                .contains(PING_PATH);
+        assertDropped(payload, 0);
+    }
+
+    /**
+     * Checks that request metadata is attached as WebDriver BiDi network data.
+     *
+     * The test performs a browser fetch and verifies the captured request URL, method, request id, timing object, and
+     * browser context fields.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachNetworkRequestMetadata() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.logs(false),
+                driver -> {
+                    driver.get(testServerUrl(NETWORK_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                }
+        );
+
+        final Map<String, Object> payload = attachmentPayload(results, BiDiAttachmentStorage.NETWORK_ATTACHMENT_NAME);
+        final Map<String, Object> entry = networkEntry(payload, "beforeRequestSent", PING_PATH);
+        final Map<String, Object> request = object(entry, "request");
+        assertThat(String.valueOf(request.get("url"))).contains(PING_PATH);
+        assertThat(request.get("method")).isEqualTo("GET");
+        assertThat(request.get("requestId"))
+                .isInstanceOf(String.class)
+                .asString()
+                .isNotBlank();
+        assertThat(object(request, "timings"))
+                .containsKeys("requestStart", "responseEnd");
+        assertThat(entry.get("browsingContextId"))
+                .isInstanceOf(String.class)
+                .asString()
+                .isNotBlank();
+        assertThat(((Number) entry.get("timestamp")).longValue()).isPositive();
+        assertThat(entry.get("blocked")).isEqualTo(false);
+        assertThat(((Number) entry.get("redirectCount")).longValue()).isZero();
+        assertThat(objects(entry, "intercepts")).isEmpty();
+        assertThat(object(entry, "initiator").get("type")).isEqualTo("script");
+    }
+
+    /**
+     * Checks that response metadata is attached as WebDriver BiDi network data.
+     *
+     * The test performs a browser fetch and verifies the captured response URL, status, MIME type, protocol, cache flag,
+     * size counters, and headers.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAttachNetworkResponseMetadata() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.logs(false),
+                driver -> {
+                    driver.get(testServerUrl(NETWORK_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                }
+        );
+
+        final Map<String, Object> payload = attachmentPayload(results, BiDiAttachmentStorage.NETWORK_ATTACHMENT_NAME);
+        final Map<String, Object> response = object(networkEntry(payload, "responseCompleted", PING_PATH), "response");
+        assertThat(String.valueOf(response.get("url"))).contains(PING_PATH);
+        assertThat(response)
+                .containsEntry("protocol", "http/1.1")
+                .containsEntry("statusText", "OK")
+                .containsEntry("fromCache", false)
+                .containsEntry("mimeType", "text/plain");
+        assertThat(((Number) response.get("status")).longValue()).isEqualTo(200L);
+        assertThat(((Number) response.get("bytesReceived")).longValue()).isPositive();
+        assertThat(((Number) response.get("headersSize")).longValue()).isPositive();
+        assertThat(headerValue(response, "Content-type")).isEqualTo("text/plain");
+    }
+
+    /**
+     * Checks that built-in sensitive headers are redacted in network attachments.
+     *
+     * The test sends an API key request header and verifies that the attached request metadata contains the header name
+     * but not the header value.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldRedactDefaultSensitiveHeaders() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.logs(false),
+                driver -> {
+                    driver.get(testServerUrl(NETWORK_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                }
+        );
+
+        final Map<String, Object> payload = attachmentPayload(results, BiDiAttachmentStorage.NETWORK_ATTACHMENT_NAME);
+        final Map<String, Object> request = object(networkEntry(payload, "beforeRequestSent", PING_PATH), "request");
+        assertThat(headerValue(request, API_KEY_HEADER_NAME)).isEqualTo(HeaderRedactor.REDACTED);
+        assertThat(attachmentContent(results, BiDiAttachmentStorage.NETWORK_ATTACHMENT_NAME))
+                .doesNotContain(API_KEY);
+    }
+
+    /**
+     * Checks that user-configured sensitive headers are redacted in network attachments.
+     *
+     * The test sends one custom secret header and one visible tracing header, then verifies that only the tracing value
+     * survives redaction.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldRedactCustomHeaders() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.logs(false).redactHeaders(CUSTOM_HEADER_NAME),
+                driver -> {
+                    driver.get(testServerUrl(CUSTOM_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                }
+        );
+
+        final Map<String, Object> payload = attachmentPayload(results, BiDiAttachmentStorage.NETWORK_ATTACHMENT_NAME);
+        final Map<String, Object> request = object(networkEntry(payload, "beforeRequestSent", PING_PATH), "request");
+        assertThat(headerValue(request, CUSTOM_HEADER_NAME)).isEqualTo(HeaderRedactor.REDACTED);
+        assertThat(headerValue(request, TRACE_HEADER_NAME)).isEqualTo(VISIBLE_HEADER_VALUE);
+        assertThat(attachmentContent(results, BiDiAttachmentStorage.NETWORK_ATTACHMENT_NAME))
+                .doesNotContain(CUSTOM_SECRET);
+    }
+
+    /**
+     * Checks that disabled log capture does not write a log attachment.
+     *
+     * The test opens a page that emits console logs while log capture is disabled and verifies that only network data is
+     * attached.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldDisableLogCapture() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.logs(false),
+                driver -> {
+                    driver.get(testServerUrl(LOGS_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                }
+        );
+
+        assertThat(attachmentNames(results))
+                .containsExactly(BiDiAttachmentStorage.NETWORK_ATTACHMENT_NAME);
+    }
+
+    /**
+     * Checks that disabled network capture does not write a network attachment.
+     *
+     * The test opens a page that emits both console logs and network activity while network capture is disabled, then
+     * verifies that only log data is attached.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldDisableNetworkCapture() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.network(false),
+                driver -> {
+                    driver.get(testServerUrl(DEFAULT_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                }
+        );
+
+        assertThat(attachmentNames(results))
+                .containsExactly(BiDiAttachmentStorage.LOG_ATTACHMENT_NAME);
+        final Map<String, Object> payload = attachmentPayload(results, BiDiAttachmentStorage.LOG_ATTACHMENT_NAME);
+        assertThat(entries(payload))
+                .extracting(entry -> entry.get("text"))
+                .contains(CONSOLE_LOG, SECOND_CONSOLE_LOG, FETCH_LOG);
+    }
+
+    /**
+     * Checks that the log attachment reports dropped entries when the log cap is reached.
+     *
+     * The test limits log capture to one entry, emits two console messages, and verifies both the retained entry count
+     * and dropped counter.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldTrackDroppedLogEntries() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.network(false).maxLogEntries(1),
+                driver -> {
+                    driver.get(testServerUrl(LOGS_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                }
+        );
+
+        final Map<String, Object> payload = attachmentPayload(results, BiDiAttachmentStorage.LOG_ATTACHMENT_NAME);
+        assertThat(entries(payload)).hasSize(1);
+        assertDropped(payload, 1);
+    }
+
+    /**
+     * Checks that the network attachment reports dropped events when the network cap is reached.
+     *
+     * The test limits network capture to one event, performs browser network activity, and verifies that additional
+     * events are counted as dropped.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldTrackDroppedNetworkEvents() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.logs(false).maxNetworkEvents(1),
+                driver -> {
+                    driver.get(testServerUrl(NETWORK_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                }
+        );
+
+        final Map<String, Object> payload = attachmentPayload(results, BiDiAttachmentStorage.NETWORK_ATTACHMENT_NAME);
+        assertThat(entries(payload)).hasSize(1);
+        assertThat(((Number) payload.get(DROPPED_KEY)).longValue()).isPositive();
+    }
+
+    /**
+     * Checks that closing the listener flushes buffered BiDi data.
+     *
+     * The test closes {@link AllureWebDriverBiDi} before WebDriver quit and verifies that collected log data is still
+     * attached.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldFlushBufferedEventsWhenListenerCloses() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.network(false),
+                true,
+                driver -> {
+                    driver.get(testServerUrl(LOGS_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                }
+        );
+
+        final Map<String, Object> payload = attachmentPayload(results, BiDiAttachmentStorage.LOG_ATTACHMENT_NAME);
+        assertThat(entries(payload))
+                .extracting(entry -> entry.get("text"))
+                .contains(CONSOLE_LOG, SECOND_CONSOLE_LOG);
+    }
+
+    /**
+     * Checks that a driver session without BiDi support does not attach data.
+     *
+     * The test starts Chrome without BiDi enabled and verifies that browser activity does not produce BiDi attachments.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @Test
+    void shouldNotAttachDataWhenBiDiIsUnavailable() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(chromeOptionsWithoutBiDi(), driver -> {
+            driver.get(testServerUrl(DEFAULT_PAGE));
+            waitUntilPageDone(driver);
+            driver.findElement(By.tagName("body"));
+        });
+
+        assertThat(attachmentNames(results)).isEmpty();
+    }
+
+    /**
+     * Checks that WebDriver interactions inside a user-created runtime step keep the expected Allure step tree.
+     *
+     * The test opens a real browser page inside {@code Allure.step(...)} and verifies that the runtime step is preserved
+     * as the parent for helper steps executed from the lambda, while BiDi data is still attached to the generated result.
+     */
+    @Description
+    @AllureFeatures.Attachments
+    @AllureFeatures.Steps
+    @Test
+    void shouldNestRuntimeStepAroundWebDriverInteractions() throws IOException {
+        final AllureResults results = runTestWithSeleniumBidi(
+                chromeOptions(),
+                listener -> listener.network(false),
+                driver -> Allure.step("Open page in runtime step", () -> {
+                    driver.get(testServerUrl(LOGS_PAGE));
+                    waitUntilPageDone(driver);
+                    driver.findElement(By.tagName("body"));
+                })
+        );
+
+        final TestResult testResult = singleTestResult(results);
+        assertThat(attachments(testResult))
+                .extracting(Attachment::getName)
+                .contains(BiDiAttachmentStorage.LOG_ATTACHMENT_NAME);
+
+        final StepResult scenarioStep = step(testResult.getSteps(), "Run ready Selenium WebDriver scenario");
+        assertThat(scenarioStep.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsSubsequence(
+                        tuple("Open page in runtime step", Status.PASSED),
+                        tuple("Wait for asynchronous WebDriver BiDi events", Status.PASSED)
+                );
+
+        final StepResult runtimeStep = step(scenarioStep.getSteps(), "Open page in runtime step");
+        assertThat(runtimeStep)
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly("Open page in runtime step", Status.PASSED);
+        assertThat(runtimeStep.getSteps())
+                .extracting(StepResult::getName, StepResult::getStatus)
+                .containsExactly(tuple("Wait until test page finishes browser activity", Status.PASSED));
+    }
+
+    @Step("Start Selenium Testcontainers browser")
+    private static GenericContainer<?> startSeleniumContainer(final int seleniumPort) {
+        final GenericContainer<?> selenium = seleniumContainer(seleniumPort);
+        selenium.start();
+        return selenium;
+    }
+
+    private static GenericContainer<?> seleniumContainer(final int seleniumPort) {
+        final GenericContainer<?> container = new GenericContainer<>(seleniumImage())
+                .withExposedPorts(SELENIUM_PORT)
+                .withSharedMemorySize(SELENIUM_SHARED_MEMORY)
+                .withEnv("SE_NODE_GRID_URL", seleniumEndpoint(seleniumPort))
+                .waitingFor(Wait.forHttp("/status").forPort(SELENIUM_PORT).forStatusCode(200));
+        container.setPortBindings(Collections.singletonList(String.format("%d:%d", seleniumPort, SELENIUM_PORT)));
+        return container;
+    }
+
+    private static DockerImageName seleniumImage() {
+        return DockerImageName.parse(System.getProperty(IMAGE_PROPERTY, defaultImage()));
+    }
+
+    private static String defaultImage() {
+        final String architecture = System.getProperty("os.arch", "");
+        final String image = architecture.contains("aarch64") || architecture.contains("arm64")
+                ? "selenium/standalone-chromium"
+                : "selenium/standalone-chrome";
+        return String.format("%s:%s", image, SELENIUM_IMAGE_TAG);
+    }
+
+    @Step("Start local HTTP server")
+    private static HttpServer startServer() throws IOException {
+        final HttpServer server = HttpServer.create(
+                new InetSocketAddress(InetAddress.getLoopbackAddress(), 0),
+                0
+        );
+        server.createContext(DEFAULT_PAGE, AllureWebDriverBiDiTest::handleIndex);
+        server.createContext(LOGS_PAGE, AllureWebDriverBiDiTest::handleLogs);
+        server.createContext(NETWORK_PAGE, AllureWebDriverBiDiTest::handleNetwork);
+        server.createContext(CUSTOM_PAGE, AllureWebDriverBiDiTest::handleCustom);
+        server.createContext(PING_PATH, AllureWebDriverBiDiTest::handlePing);
+        server.start();
+        return server;
+    }
+
+    private static void handleIndex(final HttpExchange exchange) throws IOException {
+        respond(
+                exchange,
+                HTML_TYPE,
+                pageScript(
+                        consoleLog(CONSOLE_LOG)
+                                + consoleLog(SECOND_CONSOLE_LOG)
+                                + fetchPing(header(API_KEY_HEADER_NAME, API_KEY))
+                                + ".then(response=>response.text())"
+                                + ".then(text=>console.log('bidi-it-fetch-'+text))"
+                )
+        );
+    }
+
+    private static void handleLogs(final HttpExchange exchange) throws IOException {
+        respond(
+                exchange,
+                HTML_TYPE,
+                pageScript(
+                        consoleLog(CONSOLE_LOG)
+                                + consoleLog(SECOND_CONSOLE_LOG)
+                                + "Promise.resolve()"
+                )
+        );
+    }
+
+    private static void handleNetwork(final HttpExchange exchange) throws IOException {
+        respond(
+                exchange,
+                HTML_TYPE,
+                pageScript(fetchPing(header(API_KEY_HEADER_NAME, API_KEY)))
+        );
+    }
+
+    private static void handleCustom(final HttpExchange exchange) throws IOException {
+        respond(
+                exchange,
+                HTML_TYPE,
+                pageScript(
+                        fetchPing(header(CUSTOM_HEADER_NAME, CUSTOM_SECRET)
+                                + "," + header(TRACE_HEADER_NAME, VISIBLE_HEADER_VALUE))
+                )
+        );
+    }
+
+    private static void handlePing(final HttpExchange exchange) throws IOException {
+        exchange.getResponseHeaders().add("Set-Cookie", "session=server-secret");
+        respond(exchange, "text/plain", "ok");
+    }
+
+    private static void respond(final HttpExchange exchange,
+                                final String contentType,
+                                final String body) throws IOException {
+        final byte[] bytes = body.getBytes(StandardCharsets.UTF_8);
+        exchange.getResponseHeaders().add("Content-Type", contentType);
+        exchange.sendResponseHeaders(200, bytes.length);
+        try (OutputStream output = exchange.getResponseBody()) {
+            output.write(bytes);
+        }
+    }
+
+    private static AllureResults runTestWithSeleniumBidi(final ChromeOptions options,
+                                                        final WebDriverScenario scenario) throws IOException {
+        return runTestWithSeleniumBidi(options, listener -> listener, false, scenario);
+    }
+
+    private static AllureResults runTestWithSeleniumBidi(final ChromeOptions options,
+                                                        final ListenerConfigurer configurer,
+                                                        final WebDriverScenario scenario) throws IOException {
+        return runTestWithSeleniumBidi(options, configurer, false, scenario);
+    }
+
+    @Step("Run Selenium WebDriver BiDi test")
+    private static AllureResults runTestWithSeleniumBidi(@Param(mode = HIDDEN) final ChromeOptions options,
+                                                        @Param(mode = HIDDEN) final ListenerConfigurer configurer,
+                                                        final boolean closeListener,
+                                                        @Param(mode = HIDDEN) final WebDriverScenario scenario)
+            throws IOException {
+        final HttpServer server = startServer();
+        try {
+            final int serverPort = server.getAddress().getPort();
+            SERVER_PORT.set(serverPort);
+            Testcontainers.exposeHostPorts(serverPort);
+
+            final int seleniumPort = availableTcpPort();
+            try (GenericContainer<?> selenium = startSeleniumContainer(seleniumPort)) {
+                final URL remoteUrl = seleniumUrl(seleniumPort);
+                return runWithinTestContext(() -> {
+                    final AllureWebDriverBiDi listener = configurer.configure(
+                            new AllureWebDriverBiDi(Allure.getLifecycle(), new SeleniumBiDiSessionFactory())
+                    );
+                    runWebDriverScenario(
+                            listener,
+                            new RemoteWebDriver(remoteUrl, options),
+                            closeListener,
+                            scenario
+                    );
+                });
+            }
+        } finally {
+            SERVER_PORT.remove();
+            server.stop(0);
+        }
+    }
+
+    @Step("Run ready Selenium WebDriver scenario")
+    private static void runWebDriverScenario(@Param(mode = HIDDEN) final AllureWebDriverBiDi listener,
+                                             @Param(mode = HIDDEN) final WebDriver rawDriver,
+                                             final boolean closeListener,
+                                             @Param(mode = HIDDEN) final WebDriverScenario scenario) {
+        WebDriver driver = null;
+        boolean closed = false;
+        try {
+            driver = listener.decorate(rawDriver);
+            scenario.run(driver);
+            waitForBiDiEvents();
+            if (closeListener) {
+                listener.close();
+                rawDriver.quit();
+            } else {
+                driver.quit();
+            }
+            closed = true;
+        } finally {
+            if (!closed) {
+                quit(driver, rawDriver);
+            }
+        }
+    }
+
+    private static ChromeOptions chromeOptions() {
+        final ChromeOptions options = new ChromeOptions().enableBiDi();
+        addChromeArguments(options);
+        return options;
+    }
+
+    private static ChromeOptions chromeOptionsWithoutBiDi() {
+        final ChromeOptions options = new ChromeOptions();
+        addChromeArguments(options);
+        return options;
+    }
+
+    private static void addChromeArguments(final ChromeOptions options) {
+        options.addArguments("--headless=new", "--disable-gpu", "--no-sandbox", "--disable-dev-shm-usage");
+    }
+
+    @Step("Wait until test page finishes browser activity")
+    private static void waitUntilPageDone(@Param(mode = HIDDEN) final WebDriver driver) {
+        new WebDriverWait(driver, Duration.ofSeconds(10))
+                .until(AllureWebDriverBiDiTest::isPageDone);
+    }
+
+    @Step("Wait for asynchronous WebDriver BiDi events")
+    private static void waitForBiDiEvents() {
+        try {
+            TimeUnit.MILLISECONDS.sleep(500);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IllegalStateException(WAIT_FOR_BIDI_INTERRUPTED, e);
+        }
+    }
+
+    private static boolean isPageDone(final WebDriver driver) {
+        return Boolean.TRUE.equals(((JavascriptExecutor) driver).executeScript("return window.__bidiDone === true;"));
+    }
+
+    private static URL seleniumUrl(final int seleniumPort) throws IOException {
+        return URI.create(seleniumEndpoint(seleniumPort)).toURL();
+    }
+
+    private static String seleniumEndpoint(final int seleniumPort) {
+        return String.format(LOCALHOST_URL_FORMAT, seleniumPort);
+    }
+
+    private static int availableTcpPort() throws IOException {
+        try (ServerSocket socket = new ServerSocket(0)) {
+            return socket.getLocalPort();
+        }
+    }
+
+    private static String testServerUrl(final String path) {
+        final Integer port = SERVER_PORT.get();
+        if (port == null) {
+            throw new IllegalStateException("Test server is not running");
+        }
+        return containerHostServerUrl(port, path);
+    }
+
+    private static String containerHostServerUrl(final int port, final String path) {
+        return String.format("http://host.testcontainers.internal:%d%s", port, path);
+    }
+
+    private static void quit(final WebDriver driver, final WebDriver rawDriver) {
+        if (driver != null) {
+            driver.quit();
+        } else {
+            rawDriver.quit();
+        }
+    }
+
+    @Step("Get single generated test result")
+    private static TestResult singleTestResult(@Param(mode = HIDDEN) final AllureResults results) {
+        assertThat(results.getTestResults()).hasSize(1);
+        final TestResult result = results.getTestResults().iterator().next();
+        assertThat(result.getStatus()).isNull();
+        return result;
+    }
+
+    private static List<String> attachmentNames(final AllureResults results) {
+        final List<String> names = new ArrayList<>();
+        attachments(singleTestResult(results)).forEach(attachment -> names.add(attachment.getName()));
+        return names;
+    }
+
+    private static String attachmentContent(final AllureResults results, final String name) {
+        return attachmentContent(results, attachments(singleTestResult(results)), name);
+    }
+
+    @Step("Read attachment {name}")
+    private static String attachmentContent(@Param(mode = HIDDEN) final AllureResults results,
+                                            @Param(mode = HIDDEN) final List<Attachment> attachments,
+                                            final String name) {
+        final Attachment attachment = attachments.stream()
+                .filter(item -> name.equals(item.getName()))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("Attachment not found: " + name));
+        return new String(results.getAttachments().get(attachment.getSource()), StandardCharsets.UTF_8);
+    }
+
+    @Step("Read JSON attachment {name}")
+    private static Map<String, Object> attachmentPayload(@Param(mode = HIDDEN) final AllureResults results,
+                                                        final String name) {
+        return JSON.toType(attachmentContent(results, name), Json.MAP_TYPE);
+    }
+
+    private static List<Attachment> attachments(final TestResult testResult) {
+        final List<Attachment> attachments = new ArrayList<>(testResult.getAttachments());
+        testResult.getSteps().forEach(step -> collectAttachments(step, attachments));
+        return attachments;
+    }
+
+    private static void collectAttachments(final StepResult step, final List<Attachment> attachments) {
+        attachments.addAll(step.getAttachments());
+        step.getSteps().forEach(child -> collectAttachments(child, attachments));
+    }
+
+    private static void assertDropped(final Map<String, Object> payload, final long expected) {
+        assertThat(((Number) payload.get(DROPPED_KEY)).longValue()).isEqualTo(expected);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static List<Map<String, Object>> entries(final Map<String, Object> payload) {
+        return objects(payload, ENTRIES_KEY);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> object(final Map<String, Object> payload, final String key) {
+        return (Map<String, Object>) payload.get(key);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static List<Map<String, Object>> objects(final Map<String, Object> payload, final String key) {
+        return (List<Map<String, Object>>) payload.get(key);
+    }
+
+    private static Map<String, Object> networkEntry(final Map<String, Object> payload,
+                                                   final String event,
+                                                   final String path) {
+        return entries(payload).stream()
+                .filter(entry -> event.equals(entry.get("event")))
+                .filter(entry -> networkUrl(entry).contains(path))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("Network entry not found: " + event + " " + path));
+    }
+
+    private static String networkUrl(final Map<String, Object> entry) {
+        final Map<String, Object> response = object(entry, "response");
+        if (response != null) {
+            return String.valueOf(response.get("url"));
+        }
+        return String.valueOf(object(entry, "request").get("url"));
+    }
+
+    private static String headerValue(final Map<String, Object> owner, final String name) {
+        return objects(owner, "headers").stream()
+                .filter(header -> name.equalsIgnoreCase(String.valueOf(header.get("name"))))
+                .map(header -> object(header, "value"))
+                .map(value -> String.valueOf(value.get("value")))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("Header not found: " + name));
+    }
+
+    private static StepResult step(final List<StepResult> steps, final String name) {
+        return steps.stream()
+                .filter(step -> name.equals(step.getName()))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("Step not found: " + name));
+    }
+
+    private static String consoleLog(final String text) {
+        return String.format("console.log('%s');", text);
+    }
+
+    private static String fetchPing(final String headers) {
+        return String.format("fetch('%s',{headers:{%s}})", PING_PATH, headers);
+    }
+
+    private static String header(final String name, final String value) {
+        return String.format("'%s':'%s'", name, value);
+    }
+
+    private static String pageScript(final String script) {
+        return "<!doctype html><html><body>"
+                + "<script>"
+                + "window.__bidiDone=false;"
+                + script
+                + ".finally(()=>window.__bidiDone=true);"
+                + "</script>"
+                + "</body></html>";
+    }
+
+    @FunctionalInterface
+    private interface ListenerConfigurer {
+
+        AllureWebDriverBiDi configure(AllureWebDriverBiDi listener);
+    }
+
+    @FunctionalInterface
+    private interface WebDriverScenario {
+
+        void run(WebDriver driver);
+    }
+}
diff --git a/allure-selenium-bidi/src/test/resources/allure.properties b/allure-selenium-bidi/src/test/resources/allure.properties
new file mode 100644
index 000000000..1176dba48
--- /dev/null
+++ b/allure-selenium-bidi/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
+allure.label.module=allure-selenium-bidi
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6f2e058a9..b8a4309a6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -34,6 +34,7 @@ include("allure-playwright")
 include("allure-reader")
 include("allure-rest-assured")
 include("allure-scalatest")
+include("allure-selenium-bidi")
 include("allure-selenide")
 include("allure-servlet-api")
 include("allure-spock")

From 9d6a469857f6657631daf6141c49eaa8e8c3953f Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 8 May 2026 18:49:57 +0100
Subject: [PATCH 230/233] Add titlePath as the default test hierarchy path (via
 #1271)

---
 .../io/qameta/allure/citrus/AllureCitrus.java |   6 +-
 .../allure/citrus/AllureCitrusTest.java       |   2 +
 .../cucumber4jvm/AllureCucumber4Jvm.java      |   6 +
 .../cucumber4jvm/AllureCucumber4JvmTest.java  |   2 +
 .../cucumber5jvm/AllureCucumber5Jvm.java      |   6 +
 .../cucumber5jvm/AllureCucumber5JvmTest.java  |   2 +
 .../cucumber6jvm/AllureCucumber6Jvm.java      |   6 +
 .../cucumber6jvm/AllureCucumber6JvmTest.java  |   2 +
 .../cucumber7jvm/AllureCucumber7Jvm.java      |   6 +
 .../cucumber7jvm/AllureCucumber7JvmTest.java  |   2 +
 .../io/qameta/allure/util/ResultsUtils.java   | 110 ++++++++++++++++++
 .../allure/FileSystemResultsWriterTest.java   |  17 +++
 .../io/qameta/allure/ResultsUtilsTest.java    |  21 ++++
 .../qameta/allure/jbehave/AllureJbehave.java  |   9 ++
 .../allure/jbehave/AllureJbehaveTest.java     |   2 +
 .../allure/jbehave5/AllureJbehave5.java       |   9 ++
 .../allure/jbehave5/AllureJbehave5Test.java   |   2 +
 .../junitplatform/AllureJunitPlatform.java    |  47 ++++++++
 .../AllureJunitPlatformTest.java              |  11 ++
 .../io/qameta/allure/junit4/AllureJunit4.java |   4 +-
 .../allure/junit4/AllureJunit4Test.java       |   5 +
 .../io/qameta/allure/karate/AllureKarate.java |   5 +
 .../io/qameta/allure/model/TestResult.java    |  21 ++++
 .../qameta/allure/model/TestResultTest.java   |  39 +++++++
 .../reader/AllureObjectMapperFactoryTest.java |   3 +
 .../allure/scalatest/AllureScalatest.scala    |   3 +
 .../scalatest/AllureScalatestTest.scala       |   3 +
 .../io/qameta/allure/spock/AllureSpock.java   |   9 ++
 .../io/qameta/allure/spock2/AllureSpock2.java |   9 ++
 .../io/qameta/allure/testng/AllureTestNg.java |  12 ++
 .../allure/testng/AllureTestNgTest.java       |   5 +
 31 files changed, 384 insertions(+), 2 deletions(-)
 create mode 100644 allure-model/src/test/java/io/qameta/allure/model/TestResultTest.java

diff --git a/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java b/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
index d501b3a2a..8aeac02d8 100644
--- a/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
+++ b/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
@@ -59,6 +59,7 @@
 import static io.qameta.allure.util.ResultsUtils.createParameter;
 import static io.qameta.allure.util.ResultsUtils.createSuiteLabel;
 import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+import static io.qameta.allure.util.ResultsUtils.createTitlePath;
 import static io.qameta.allure.util.ResultsUtils.getProvidedLabels;
 
 /**
@@ -161,16 +162,19 @@ public void onTestActionSkipped(final TestCase testCase, final TestAction testAc
 
     private void startTestCase(final TestCase testCase) {
         final String uuid = createUuid(testCase);
+        final Optional<? extends Class<?>> testClass = Optional.ofNullable(testCase.getTestClass());
 
         final TestResult result = new TestResult()
                 .setUuid(uuid)
                 .setName(testCase.getName())
+                .setTitlePath(testClass
+                        .map(ResultsUtils::createTitlePathFromJavaClass)
+                        .orElseGet(() -> createTitlePath(testCase.getName())))
                 .setStage(Stage.RUNNING);
 
         result.getLabels().addAll(getProvidedLabels());
 
 
-        final Optional<? extends Class<?>> testClass = Optional.ofNullable(testCase.getTestClass());
         testClass.map(this::getLabels).ifPresent(result.getLabels()::addAll);
         testClass.map(this::getLinks).ifPresent(result.getLinks()::addAll);
 
diff --git a/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java b/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java
index bf12e2999..eb4b05d29 100644
--- a/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java
+++ b/allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java
@@ -61,6 +61,8 @@ void shouldSetName() {
         assertThat(results.getTestResults())
                 .extracting(TestResult::getName)
                 .containsExactly("Simple test");
+        assertThat(results.getTestResults().get(0).getTitlePath())
+                .containsExactly("com", "consol", "citrus", "dsl", "design", "DefaultTestDesigner");
     }
 
     @AllureFeatures.PassedTests
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
index 967ee1a30..8f57e5005 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
@@ -71,6 +71,8 @@
 
 import static cucumber.api.HookType.Before;
 import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.createTitlePath;
+import static io.qameta.allure.util.ResultsUtils.createTitlePathFromSourcePath;
 import static io.qameta.allure.util.ResultsUtils.getStatus;
 import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
 import static io.qameta.allure.util.ResultsUtils.md5;
@@ -156,11 +158,15 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         final String testCaseUuid = testCaseUuids
                 .computeIfAbsent(testCase, tc -> UUID.randomUUID().toString());
 
+        final List<String> titlePath = createTitlePathFromSourcePath(getTestCaseUri(testCase));
+        titlePath.addAll(createTitlePath(feature.getName()));
+
         final TestResult result = new TestResult()
                 .setUuid(testCaseUuid)
                 .setTestCaseId(getTestCaseId(testCase))
                 .setHistoryId(getHistoryId(testCase))
                 .setFullName(fullName)
+                .setTitlePath(titlePath)
                 .setName(name)
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
index 85a1d093b..a957cd88c 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
@@ -77,6 +77,8 @@ void shouldSetName() {
         assertThat(testResults)
                 .extracting(TestResult::getName)
                 .containsExactlyInAnyOrder("Add a to b");
+        assertThat(testResults.get(0).getTitlePath())
+                .containsExactly("src", "test", "resources", "features", "simple.feature", "Simple feature");
     }
 
     @AllureFeatures.PassedTests
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
index e1e9debb8..a0dec5f37 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
@@ -67,6 +67,8 @@
 import java.util.stream.Stream;
 
 import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.createTitlePath;
+import static io.qameta.allure.util.ResultsUtils.createTitlePathFromSourcePath;
 import static io.qameta.allure.util.ResultsUtils.getStatus;
 import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
 import static io.qameta.allure.util.ResultsUtils.md5;
@@ -150,11 +152,15 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
 
         final String testCaseUuid = testCase.getId().toString();
 
+        final List<String> titlePath = createTitlePathFromSourcePath(getTestCaseUri(testCase));
+        titlePath.addAll(createTitlePath(feature.getName()));
+
         final TestResult result = new TestResult()
                 .setUuid(testCaseUuid)
                 .setTestCaseId(getTestCaseId(testCase))
                 .setHistoryId(getHistoryId(testCase))
                 .setFullName(fullName)
+                .setTitlePath(titlePath)
                 .setName(name)
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
index 7456106af..ff4a2e24e 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
@@ -80,6 +80,8 @@ void shouldSetName() {
         assertThat(testResults)
                 .extracting(TestResult::getName)
                 .containsExactlyInAnyOrder("Add a to b");
+        assertThat(testResults.get(0).getTitlePath())
+                .containsExactly("src", "test", "resources", "features", "simple.feature", "Simple feature");
     }
 
     @AllureFeatures.PassedTests
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
index e8c71e51f..67f11b0a8 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
@@ -65,6 +65,8 @@
 import java.util.stream.Stream;
 
 import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.createTitlePath;
+import static io.qameta.allure.util.ResultsUtils.createTitlePathFromSourcePath;
 import static io.qameta.allure.util.ResultsUtils.getStatus;
 import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
 import static io.qameta.allure.util.ResultsUtils.md5;
@@ -145,11 +147,15 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
 
         final String testCaseUuid = testCase.getId().toString();
 
+        final List<String> titlePath = createTitlePathFromSourcePath(getTestCaseUri(testCase));
+        titlePath.addAll(createTitlePath(feature.getName()));
+
         final TestResult result = new TestResult()
                 .setUuid(testCaseUuid)
                 .setTestCaseId(getTestCaseId(testCase))
                 .setHistoryId(getHistoryId(testCase))
                 .setFullName(fullName)
+                .setTitlePath(titlePath)
                 .setName(name)
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
index 75cc84959..50c32afab 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
@@ -80,6 +80,8 @@ void shouldSetName() {
         assertThat(testResults)
                 .extracting(TestResult::getName)
                 .containsExactlyInAnyOrder("Add a to b");
+        assertThat(testResults.get(0).getTitlePath())
+                .containsExactly("src", "test", "resources", "features", "simple.feature", "Simple feature");
     }
 
     @AllureFeatures.PassedTests
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
index 60883143e..adac06dfd 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
@@ -66,6 +66,8 @@
 import java.util.stream.Stream;
 
 import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.createTitlePath;
+import static io.qameta.allure.util.ResultsUtils.createTitlePathFromSourcePath;
 import static io.qameta.allure.util.ResultsUtils.getStatus;
 import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
 import static io.qameta.allure.util.ResultsUtils.md5;
@@ -146,11 +148,15 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
 
         final String testCaseUuid = testCase.getId().toString();
 
+        final List<String> titlePath = createTitlePathFromSourcePath(getTestCaseUri(testCase));
+        titlePath.addAll(createTitlePath(feature.getName()));
+
         final TestResult result = new TestResult()
                 .setUuid(testCaseUuid)
                 .setTestCaseId(getTestCaseId(testCase))
                 .setHistoryId(getHistoryId(testCase))
                 .setFullName(fullName)
+                .setTitlePath(titlePath)
                 .setName(name)
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
index 0d8a20a73..ed1acc536 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
@@ -80,6 +80,8 @@ void shouldSetName() {
         assertThat(testResults)
                 .extracting(TestResult::getName)
                 .containsExactlyInAnyOrder("Add a to b");
+        assertThat(testResults.get(0).getTitlePath())
+                .containsExactly("src", "test", "resources", "features", "simple.feature", "Simple feature");
     }
 
     @AllureFeatures.PassedTests
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index 38faa3a50..9e8b28ed9 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -31,6 +31,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -40,16 +41,21 @@
 import java.lang.reflect.Method;
 import java.math.BigInteger;
 import java.net.InetAddress;
+import java.net.URI;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
 import java.util.function.Consumer;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -98,6 +104,7 @@ public final class ResultsUtils {
     private static final Logger LOGGER = LoggerFactory.getLogger(ResultsUtils.class);
     private static final String ALLURE_DESCRIPTIONS_FOLDER = "META-INF/allureDescriptions/";
     private static final String MD_5 = "MD5";
+    private static final String DOT = ".";
 
     private static String cachedHost;
 
@@ -142,6 +149,51 @@ public static Label createPackageLabel(final String packageName) {
         return createLabel(PACKAGE_LABEL_NAME, packageName);
     }
 
+    public static List<String> createTitlePath(final String... values) {
+        return createTitlePath(Arrays.asList(values));
+    }
+
+    public static List<String> createTitlePath(final Collection<String> values) {
+        if (Objects.isNull(values)) {
+            return new ArrayList<>();
+        }
+        return values.stream()
+                .filter(Objects::nonNull)
+                .map(String::trim)
+                .filter(value -> !value.isEmpty())
+                .collect(Collectors.toList());
+    }
+
+    public static List<String> createTitlePathFromPackageAndClass(final String packageName, final String className) {
+        final List<String> result = createTitlePathFromPackage(packageName);
+        getClassTitle(packageName, className).ifPresent(result::add);
+        return result;
+    }
+
+    public static List<String> createTitlePathFromQualifiedClassName(final String className) {
+        return getPackageName(className)
+                .map(packageName -> createTitlePathFromPackageAndClass(packageName, className))
+                .orElseGet(() -> createTitlePath(className));
+    }
+
+    public static List<String> createTitlePathFromJavaClass(final Class<?> clazz) {
+        if (Objects.isNull(clazz)) {
+            return createTitlePath();
+        }
+        final String packageName = Optional.ofNullable(clazz.getPackage())
+                .map(Package::getName)
+                .orElse("");
+        return createTitlePathFromPackageAndClass(packageName, clazz.getName());
+    }
+
+    public static List<String> createTitlePathFromPackage(final String packageName) {
+        return split(packageName, DOT);
+    }
+
+    public static List<String> createTitlePathFromSourcePath(final String sourcePath) {
+        return split(normalizeSourcePath(sourcePath), "/");
+    }
+
     public static Label createEpicLabel(final String epic) {
         return createLabel(EPIC_LABEL_NAME, epic);
     }
@@ -474,6 +526,64 @@ private static Optional<String> formatLambdaName(final SerializedLambda lambda)
         return Optional.of(simpleClassName(lambda.getImplClass()) + "::" + getLambdaMethodName(methodName));
     }
 
+    private static Optional<String> getPackageName(final String className) {
+        if (Objects.isNull(className)) {
+            return Optional.empty();
+        }
+        final int index = className.lastIndexOf('.');
+        if (index < 0) {
+            return Optional.empty();
+        }
+        return Optional.of(className.substring(0, index));
+    }
+
+    private static Optional<String> getClassTitle(final String packageName, final String className) {
+        if (Objects.isNull(className) || className.isEmpty()) {
+            return Optional.empty();
+        }
+        final String prefix = packageName + DOT;
+        if (!packageName.isEmpty() && className.startsWith(prefix)) {
+            return Optional.of(className.substring(prefix.length()));
+        }
+        return Optional.of(className);
+    }
+
+    private static List<String> split(final String value, final String delimiter) {
+        if (Objects.isNull(value) || value.isEmpty()) {
+            return new ArrayList<>();
+        }
+        return Stream.of(value.split(Pattern.quote(delimiter)))
+                .map(String::trim)
+                .filter(item -> !item.isEmpty())
+                .collect(Collectors.toList());
+    }
+
+    private static String normalizeSourcePath(final String sourcePath) {
+        if (Objects.isNull(sourcePath)) {
+            return "";
+        }
+        try {
+            final URI uri = URI.create(sourcePath);
+            if (nonNull(uri.getScheme())) {
+                final URI normalized = uri.normalize();
+                if (!normalized.isOpaque()) {
+                    final URI relative = new File("").toURI().relativize(normalized);
+                    final String path = relative.getPath();
+                    if (nonNull(path) && !path.isEmpty()) {
+                        return path.replace('\\', '/');
+                    }
+                }
+                final String schemeSpecificPart = normalized.getSchemeSpecificPart();
+                if (nonNull(schemeSpecificPart)) {
+                    return schemeSpecificPart.replace('\\', '/');
+                }
+            }
+        } catch (IllegalArgumentException ignored) {
+            // Fall back to plain path normalization below.
+        }
+        return sourcePath.replace('\\', '/');
+    }
+
     private static String getLambdaMethodName(final String methodName) {
         if ("<init>".equals(methodName)) {
             return "new";
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
index e84be69b8..4433340f4 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.UUID;
 
 import static io.qameta.allure.FileSystemResultsWriter.generateTestResultName;
@@ -56,6 +57,22 @@ void shouldWriteTestResult(@TempDir final Path folder) {
                 .isRegularFile();
     }
 
+    @Test
+    void shouldWriteTitlePath(@TempDir final Path folder) throws IOException {
+        FileSystemResultsWriter writer = new FileSystemResultsWriter(folder);
+        final String uuid = UUID.randomUUID().toString();
+        final TestResult testResult = new TestResult()
+                .setUuid(uuid)
+                .setTitlePath(Arrays.asList("parent", "child"));
+
+        writer.write(testResult);
+
+        assertThat(Files.readString(folder.resolve(generateTestResultName(uuid))))
+                .contains("\"titlePath\"")
+                .contains("\"parent\"")
+                .contains("\"child\"");
+    }
+
     @Test
     void shouldPreserveOldResultsWhenCleanIsDisabled(@TempDir final Path folder) throws IOException {
         Path existingFile = folder.resolve("existing-result.json");
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
index dea5482c8..a6ee55ed1 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
@@ -34,6 +34,9 @@
 import static io.qameta.allure.util.ResultsUtils.TMS_LINK_TYPE;
 import static io.qameta.allure.util.ResultsUtils.createIssueLink;
 import static io.qameta.allure.util.ResultsUtils.createLink;
+import static io.qameta.allure.util.ResultsUtils.createTitlePath;
+import static io.qameta.allure.util.ResultsUtils.createTitlePathFromQualifiedClassName;
+import static io.qameta.allure.util.ResultsUtils.createTitlePathFromSourcePath;
 import static io.qameta.allure.util.ResultsUtils.createTmsLink;
 import static io.qameta.allure.util.ResultsUtils.getLinkTypePatternPropertyName;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -44,6 +47,24 @@
 @ExtendWith(SystemPropertyExtension.class)
 class ResultsUtilsTest {
 
+    @Test
+    void shouldCreateTitlePath() {
+        assertThat(createTitlePath(" parent ", null, " ", "child"))
+                .containsExactly("parent", "child");
+    }
+
+    @Test
+    void shouldCreateTitlePathFromQualifiedClassName() {
+        assertThat(createTitlePathFromQualifiedClassName("io.qameta.allure.samples.MyTest"))
+                .containsExactly("io", "qameta", "allure", "samples", "MyTest");
+    }
+
+    @Test
+    void shouldCreateTitlePathFromSourcePath() {
+        assertThat(createTitlePathFromSourcePath("features/nested/my.test.feature"))
+                .containsExactly("features", "nested", "my.test.feature");
+    }
+
     @Test
     void shouldCreateLink() {
         io.qameta.allure.model.Link actual = createLink("a", "b", "c", "d");
diff --git a/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java b/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
index 2acd047dc..0c19cd243 100644
--- a/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
+++ b/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
@@ -50,6 +50,7 @@
 import static io.qameta.allure.util.ResultsUtils.createParameter;
 import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
 import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+import static io.qameta.allure.util.ResultsUtils.createTitlePath;
 import static io.qameta.allure.util.ResultsUtils.getMd5Digest;
 import static io.qameta.allure.util.ResultsUtils.getStatus;
 import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
@@ -245,6 +246,7 @@ protected void startTestCase(final String uuid,
                 .setName(name)
                 .setFullName(fullName)
                 .setStage(Stage.SCHEDULED)
+                .setTitlePath(getTitlePath(story))
                 .setLabels(labels)
                 .setParameters(parameters)
                 .setDescription(story.getDescription().asString())
@@ -254,6 +256,13 @@ protected void startTestCase(final String uuid,
         getLifecycle().startTestCase(result.getUuid());
     }
 
+    private List<String> getTitlePath(final Story story) {
+        if (story.getPath() == null) {
+            return createTitlePath();
+        }
+        return createTitlePath(Arrays.asList(story.getPath().replace('\\', '/').split("/")));
+    }
+
     protected void stopTestCase(final String uuid) {
         getLifecycle().stopTestCase(uuid);
         getLifecycle().writeTestCase(uuid);
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
index c57a6e453..1a4650777 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
@@ -167,6 +167,8 @@ void shouldSetFullName() {
         assertThat(results.getTestResults())
                 .extracting(TestResult::getFullName)
                 .containsExactlyInAnyOrder("simple.story: Add a to b");
+        assertThat(results.getTestResults().get(0).getTitlePath())
+                .containsExactly("stories", "simple.story");
     }
 
     @Test
diff --git a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
index 81e347366..1e54bd0d8 100644
--- a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
+++ b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
@@ -54,6 +54,7 @@
 import static io.qameta.allure.util.ResultsUtils.createParameter;
 import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
 import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+import static io.qameta.allure.util.ResultsUtils.createTitlePath;
 import static io.qameta.allure.util.ResultsUtils.getMd5Digest;
 import static io.qameta.allure.util.ResultsUtils.getStatus;
 import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
@@ -245,6 +246,7 @@ protected void startTestCase(final String uuid,
                 .setName(name)
                 .setFullName(fullName)
                 .setStage(Stage.SCHEDULED)
+                .setTitlePath(getTitlePath(story))
                 .setLabels(labels)
                 .setParameters(parameters)
                 .setDescription(story.getDescription().asString())
@@ -254,6 +256,13 @@ protected void startTestCase(final String uuid,
         getLifecycle().startTestCase(result.getUuid());
     }
 
+    private List<String> getTitlePath(final Story story) {
+        if (story.getPath() == null) {
+            return createTitlePath();
+        }
+        return createTitlePath(Arrays.asList(story.getPath().replace('\\', '/').split("/")));
+    }
+
     protected void stopTestCase(final String uuid) {
         getLifecycle().stopTestCase(uuid);
         getLifecycle().writeTestCase(uuid);
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
index 1c5c153d1..1b9596d51 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
@@ -166,6 +166,8 @@ void shouldSetFullName() {
         assertThat(results.getTestResults())
                 .extracting(TestResult::getFullName)
                 .containsExactlyInAnyOrder("simple.story: Add a to b");
+        assertThat(results.getTestResults().get(0).getTitlePath())
+                .containsExactly("stories", "simple.story");
     }
 
     @Test
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index a336ee2ab..f33f45e54 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -523,6 +523,7 @@ private void startTestCase(final TestIdentifier testIdentifier) {
                         ? maybeParent.get().getDisplayName() + " " + testIdentifier.getDisplayName()
                         : testIdentifier.getDisplayName()
                 )
+                .setTitlePath(getTitlePath(testIdentifier, testClass))
                 .setLabels(getTags(testIdentifier))
                 .setTestCaseId(testTemplate
                         ? maybeParent.map(TestIdentifier::getUniqueId)
@@ -662,6 +663,52 @@ private List<Label> getTags(final TestIdentifier testIdentifier) {
                 .collect(Collectors.toList());
     }
 
+    private List<String> getTitlePath(final TestIdentifier testIdentifier,
+                                      final Optional<Class<?>> testClass) {
+        final List<String> result = testClass
+                .map(this::getClassTitlePath)
+                .orElseGet(ArrayList::new);
+
+        getParents(testIdentifier).stream()
+                .filter(parent -> !"engine".equals(parent.getUniqueIdObject().getLastSegment().getType()))
+                .filter(parent -> !parent.isTest())
+                .filter(parent -> !parent.getSource().filter(ClassSource.class::isInstance).isPresent())
+                .map(TestIdentifier::getDisplayName)
+                .forEach(result::add);
+
+        return ResultsUtils.createTitlePath(result);
+    }
+
+    private List<String> getClassTitlePath(final Class<?> testClass) {
+        final String packageName = Optional.ofNullable(testClass.getPackage())
+                .map(Package::getName)
+                .orElse("");
+        final List<String> result = ResultsUtils.createTitlePathFromPackage(packageName);
+        final List<String> classNames = new ArrayList<>();
+        Class<?> current = testClass;
+        while (Objects.nonNull(current)) {
+            classNames.add(getDisplayName(current).orElse(current.getSimpleName()));
+            current = current.getDeclaringClass();
+        }
+        Collections.reverse(classNames);
+        result.addAll(classNames);
+        return result;
+    }
+
+    private List<TestIdentifier> getParents(final TestIdentifier testIdentifier) {
+        final List<TestIdentifier> result = new ArrayList<>();
+        Optional<TestIdentifier> parent = Optional.ofNullable(testPlanStorage.get())
+                .flatMap(testPlan -> testPlan.getParent(testIdentifier));
+        while (parent.isPresent()) {
+            final TestIdentifier value = parent.get();
+            result.add(value);
+            parent = Optional.ofNullable(testPlanStorage.get())
+                    .flatMap(testPlan -> testPlan.getParent(value));
+        }
+        Collections.reverse(result);
+        return result;
+    }
+
     protected String getHistoryId(final TestIdentifier testIdentifier) {
         return md5(testIdentifier.getUniqueId());
     }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
index 29de4f124..7e0b6e53f 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -75,6 +75,7 @@
 import org.junit.platform.launcher.core.LauncherFactory;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -885,6 +886,16 @@ void shouldSupportNestedClasses() {
                         "story1Test()"
                 );
 
+        assertThat(allureResults.getTestResults())
+                .filteredOn("name", "story1Test()")
+                .extracting(TestResult::getTitlePath)
+                .containsExactly(
+                        Arrays.asList(
+                                "io", "qameta", "allure", "junitplatform", "features",
+                                "NestedTests", "Feature2", "Story1"
+                        )
+                );
+
         assertThat(allureResults.getTestResults())
                 .filteredOn("name", "parentTest()")
                 .flatExtracting(TestResult::getLabels)
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index b79cff7a2..5acfd6abd 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -49,6 +49,7 @@
 import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
 import static io.qameta.allure.util.ResultsUtils.createTestMethodLabel;
 import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+import static io.qameta.allure.util.ResultsUtils.createTitlePathFromPackageAndClass;
 import static io.qameta.allure.util.ResultsUtils.getJavadocDescription;
 import static io.qameta.allure.util.ResultsUtils.getProvidedLabels;
 import static io.qameta.allure.util.ResultsUtils.getStatus;
@@ -264,7 +265,8 @@ private TestResult createTestResult(final String uuid, final Description descrip
                 .setUuid(uuid)
                 .setHistoryId(getHistoryId(description))
                 .setFullName(fullName)
-                .setName(name);
+                .setName(name)
+                .setTitlePath(createTitlePathFromPackageAndClass(getPackage(description.getTestClass()), suite));
 
         testResult.getLabels().addAll(getProvidedLabels());
         testResult.getLabels().addAll(Arrays.asList(
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
index b9835917c..31018cf62 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
@@ -70,6 +70,11 @@ void shouldSetTestFullName() {
                 .hasSize(1)
                 .extracting(TestResult::getFullName)
                 .containsExactly("io.qameta.allure.junit4.samples.OneTest.simpleTest");
+        assertThat(testResults.get(0).getTitlePath())
+                .containsExactly(
+                        "io", "qameta", "allure", "junit4", "samples",
+                        "Should be overwritten by method annotation"
+                );
     }
 
     @Test
diff --git a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
index f49f31d6f..245abeb20 100644
--- a/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
+++ b/allure-karate/src/main/java/io/qameta/allure/karate/AllureKarate.java
@@ -54,6 +54,8 @@
 import static io.qameta.allure.util.ResultsUtils.createLabel;
 import static io.qameta.allure.util.ResultsUtils.createLink;
 import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.createTitlePath;
+import static io.qameta.allure.util.ResultsUtils.createTitlePathFromSourcePath;
 import static io.qameta.allure.util.ResultsUtils.md5;
 
 /**
@@ -91,6 +93,8 @@ public boolean beforeScenario(final ScenarioRuntime sr) {
         final String nameOrLine = getName(scenario, String.valueOf(scenario.getLine()));
         final String testCaseId = md5(String.format("%s:%s", featureNameQualified, nameOrLine));
         final String fullName = String.format("%s:%d", featureNameQualified, scenario.getLine());
+        final List<String> titlePath = createTitlePathFromSourcePath(featureNameQualified);
+        titlePath.addAll(createTitlePath(featureName));
         final TestResult result = new TestResult()
                 .setUuid(uuid)
                 .setFullName(fullName)
@@ -98,6 +102,7 @@ public boolean beforeScenario(final ScenarioRuntime sr) {
                 .setDescription(scenario.getDescription())
                 .setTestCaseId(testCaseId)
                 .setHistoryId(md5(scenario.getUniqueId()))
+                .setTitlePath(titlePath)
                 .setStage(Stage.RUNNING);
 
         final List<String> labels = sr.tags.getTags();
diff --git a/allure-model/src/main/java/io/qameta/allure/model/TestResult.java b/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
index f1039c231..51213cb41 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
@@ -43,6 +43,7 @@ public class TestResult implements Serializable, ExecutableItem, WithLinks {
     private String testCaseId;
     private String testCaseName;
     private String fullName;
+    private List<String> titlePath = new ArrayList<>();
     private List<Label> labels = new ArrayList<>();
     private List<Link> links = new ArrayList<>();
     private String name;
@@ -157,6 +158,26 @@ public TestResult setFullName(final String value) {
         return this;
     }
 
+    /**
+     * Gets title path.
+     *
+     * @return the title path
+     */
+    public List<String> getTitlePath() {
+        return titlePath;
+    }
+
+    /**
+     * Sets title path.
+     *
+     * @param titlePath the title path
+     * @return self for method chaining.
+     */
+    public TestResult setTitlePath(final List<String> titlePath) {
+        this.titlePath = titlePath;
+        return this;
+    }
+
     /**
      * Gets labels.
      *
diff --git a/allure-model/src/test/java/io/qameta/allure/model/TestResultTest.java b/allure-model/src/test/java/io/qameta/allure/model/TestResultTest.java
new file mode 100644
index 000000000..36a406297
--- /dev/null
+++ b/allure-model/src/test/java/io/qameta/allure/model/TestResultTest.java
@@ -0,0 +1,39 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.model;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TestResultTest {
+
+    @Test
+    void shouldHaveEmptyTitlePathByDefault() {
+        assertThat(new TestResult().getTitlePath())
+                .isEmpty();
+    }
+
+    @Test
+    void shouldSetTitlePath() {
+        assertThat(new TestResult()
+                .setTitlePath(Arrays.asList("parent", "child"))
+                .getTitlePath())
+                .containsExactly("parent", "child");
+    }
+}
diff --git a/allure-reader/src/test/java/io/qameta/allure/reader/AllureObjectMapperFactoryTest.java b/allure-reader/src/test/java/io/qameta/allure/reader/AllureObjectMapperFactoryTest.java
index 74802ce12..555849059 100644
--- a/allure-reader/src/test/java/io/qameta/allure/reader/AllureObjectMapperFactoryTest.java
+++ b/allure-reader/src/test/java/io/qameta/allure/reader/AllureObjectMapperFactoryTest.java
@@ -36,6 +36,7 @@ void shouldCreateMapperThatReadsEnumsCaseInsensitively() throws Exception {
             return mapper.readValue(
                     "{"
                     + "\"name\":\"demo\","
+                    + "\"titlePath\":[\"parent\",\"child\"],"
                     + "\"status\":\"pAsSeD\","
                     + "\"stage\":\"fInIsHeD\","
                     + "\"parameters\":[{\"name\":\"secret\",\"value\":\"42\",\"mode\":\"MaSkEd\"}],"
@@ -47,6 +48,8 @@ void shouldCreateMapperThatReadsEnumsCaseInsensitively() throws Exception {
 
         Allure.step("Verify the mapper normalizes enums and keeps the expected payload", () -> {
             assertEquals("demo", result.getName());
+            assertEquals("parent", result.getTitlePath().get(0));
+            assertEquals("child", result.getTitlePath().get(1));
             assertEquals(Status.PASSED, result.getStatus());
             assertEquals(Stage.FINISHED, result.getStage());
             assertEquals(Parameter.Mode.MASKED, result.getParameters().get(0).getMode());
diff --git a/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala b/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
index e42e01847..82cd18e0f 100644
--- a/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
+++ b/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
@@ -195,6 +195,9 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
       .setUuid(uuid)
       .setTestCaseId(md5(suiteId + testName))
       .setHistoryId(md5(suiteId + testName))
+      .setTitlePath(suiteClassName
+        .map(createTitlePathFromQualifiedClassName)
+        .getOrElse(createTitlePath(suiteName)))
 
     val testAnnotations = getAnnotations(location)
     val suiteAnnotations = getAnnotations(getSuiteLocation(suiteId))
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
index 2519f7997..0187f1a55 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
@@ -37,6 +37,9 @@ class AllureScalatestTest {
     val results = run(classOf[SimpleSpec])
     results.getTestResults.asScala
       .map(item => item.getName) should contain("test should be passed")
+    results.getTestResults.asScala.head.getTitlePath.asScala.toList shouldBe List(
+      "io", "qameta", "allure", "scalatest", "testdata", "SimpleSpec"
+    )
   }
 
   @Test
diff --git a/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java b/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
index 6e44d270c..686f03c2a 100644
--- a/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
+++ b/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
@@ -61,6 +61,8 @@
 import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
 import static io.qameta.allure.util.ResultsUtils.createTestMethodLabel;
 import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+import static io.qameta.allure.util.ResultsUtils.createTitlePath;
+import static io.qameta.allure.util.ResultsUtils.createTitlePathFromPackage;
 import static io.qameta.allure.util.ResultsUtils.firstNonEmpty;
 import static io.qameta.allure.util.ResultsUtils.getProvidedLabels;
 import static io.qameta.allure.util.ResultsUtils.getStatus;
@@ -139,6 +141,12 @@ public void beforeIteration(final IterationInfo iteration) {
         labels.addAll(getLabels(iteration));
         labels.addAll(getProvidedLabels());
 
+        final List<String> titlePath = new ArrayList<>(createTitlePathFromPackage(packageName));
+        titlePath.addAll(createTitlePath(
+                Objects.nonNull(superSpec) ? superSpec.getName() : null,
+                specName,
+                Objects.nonNull(subSpec) ? subSpec.getName() : null
+        ));
         final TestResult result = new TestResult()
                 .setUuid(uuid)
                 .setHistoryId(getHistoryId(getQualifiedName(iteration), parameters))
@@ -147,6 +155,7 @@ public void beforeIteration(final IterationInfo iteration) {
                         feature.getDescription().getDisplayName(),
                         getQualifiedName(iteration)).orElse("Unknown"))
                 .setFullName(getQualifiedName(iteration))
+                .setTitlePath(titlePath)
                 .setStatusDetails(new StatusDetails()
                         .setFlaky(isFlaky(iteration))
                         .setMuted(isMuted(iteration)))
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
index 2a852407b..8ba169b0f 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -68,6 +68,8 @@
 import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
 import static io.qameta.allure.util.ResultsUtils.createTestMethodLabel;
 import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+import static io.qameta.allure.util.ResultsUtils.createTitlePath;
+import static io.qameta.allure.util.ResultsUtils.createTitlePathFromPackage;
 import static io.qameta.allure.util.ResultsUtils.firstNonEmpty;
 import static io.qameta.allure.util.ResultsUtils.getMd5Digest;
 import static io.qameta.allure.util.ResultsUtils.getProvidedLabels;
@@ -192,12 +194,19 @@ public void beforeIteration(final IterationInfo iteration) {
         links.addAll(specLinks);
 
         final String qualifiedName = getQualifiedName(iteration);
+        final List<String> titlePath = new ArrayList<>(createTitlePathFromPackage(packageName));
+        titlePath.addAll(createTitlePath(
+                Objects.nonNull(superSpec) ? superSpec.getName() : null,
+                specName,
+                Objects.nonNull(subSpec) ? subSpec.getName() : null
+        ));
         final TestResult result = new TestResult()
                 .setUuid(uuid)
                 .setHistoryId(getHistoryId(qualifiedName, parameters))
                 .setTestCaseName(iteration.getName())
                 .setTestCaseId(md5(qualifiedName))
                 .setFullName(qualifiedName)
+                .setTitlePath(titlePath)
                 .setName(
                         firstNonEmpty(testMethodName, iteration.getName(), qualifiedName)
                                 .orElse("Unknown")
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
index 1461065f0..d49ebe232 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
@@ -91,6 +91,8 @@
 import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
 import static io.qameta.allure.util.ResultsUtils.createTestMethodLabel;
 import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+import static io.qameta.allure.util.ResultsUtils.createTitlePath;
+import static io.qameta.allure.util.ResultsUtils.createTitlePathFromQualifiedClassName;
 import static io.qameta.allure.util.ResultsUtils.firstNonEmpty;
 import static io.qameta.allure.util.ResultsUtils.getMd5Digest;
 import static io.qameta.allure.util.ResultsUtils.getProvidedLabels;
@@ -390,6 +392,7 @@ protected void startTestCase(final ITestContext context,
                 .setHistoryId(getHistoryId(method, parameters))
                 .setName(getMethodName(method))
                 .setFullName(getQualifiedName(method))
+                .setTitlePath(getTitlePath(testClass))
                 .setStatusDetails(new StatusDetails()
                         .setFlaky(isFlaky(method, iClass))
                         .setMuted(isMuted(method, iClass)))
@@ -408,6 +411,15 @@ protected void startTestCase(final ITestContext context,
         getLifecycle().startTestCase(uuid);
     }
 
+    private List<String> getTitlePath(final ITestClass testClass) {
+        final List<String> result = new ArrayList<>(createTitlePath(
+                safeExtractSuiteName(testClass),
+                safeExtractTestTag(testClass)
+        ));
+        result.addAll(createTitlePathFromQualifiedClassName(testClass.getName()));
+        return result;
+    }
+
     @Override
     public void onTestSuccess(final ITestResult testResult) {
         if (shouldSkipReportingFor(testResult)) {
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
index 498befd58..606eaf369 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -161,6 +161,11 @@ public void singleTest() {
                 .hasFieldOrPropertyWithValue("status", Status.PASSED)
                 .hasFieldOrPropertyWithValue("stage", Stage.FINISHED)
                 .hasFieldOrPropertyWithValue("name", testName);
+        assertThat(testResult.get(0).getTitlePath())
+                .containsExactly(
+                        "Test suite 7", "Test tag 7",
+                        "io", "qameta", "allure", "testng", "samples", "TestsWithSteps"
+                );
         assertThat(testResult)
                 .flatExtracting(TestResult::getSteps)
                 .hasSize(1)

From 7625d8c9f1190bc52d9b6962ad4c1f237861c5f5 Mon Sep 17 00:00:00 2001
From: epszaw <konstantin@epishev.me>
Date: Tue, 12 May 2026 10:27:35 +0200
Subject: [PATCH 231/233] Remove legacy flag from the service config (#1272)

---
 allurerc.mjs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/allurerc.mjs b/allurerc.mjs
index 0e718deea..cb9002702 100644
--- a/allurerc.mjs
+++ b/allurerc.mjs
@@ -3,7 +3,6 @@ const { ALLURE_SERVICE_TOKEN } = process.env;
 const allureService = ALLURE_SERVICE_TOKEN
     ? {
         accessToken: ALLURE_SERVICE_TOKEN,
-        legacy: true,
     }
     : undefined;
 

From 0217d791d6ad39c1362ae13e669c80c3d86761df Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 13 May 2026 16:43:41 +0100
Subject: [PATCH 232/233] add rich actual/expected assertion details to test
 results (via #1273)

---
 .../io/qameta/allure/util/NamingUtils.java    |  37 +---
 .../qameta/allure/util/ReflectionUtils.java   | 181 ++++++++++++++++
 .../io/qameta/allure/util/ResultsUtils.java   |  35 +++-
 .../allure/FileSystemResultsWriterTest.java   |  19 ++
 .../io/qameta/allure/ResultsUtilsTest.java    | 197 ++++++++++++++++++
 .../allure/util/ReflectionUtilsTest.java      | 180 ++++++++++++++++
 .../junitplatform/AllureJunitPlatform.java    |  12 ++
 .../AllureJunitPlatformTest.java              |  16 ++
 .../ActualExpectedStatusDetailsTests.java     |  31 +++
 .../allure/junit4/AllureJunit4Test.java       |  19 ++
 .../ActualExpectedStatusDetailsTest.java      |  31 +++
 .../qameta/allure/jupiter/AllureJupiter.java  |   2 +
 .../allure/junit5/AllureJunit5Test.java       |  15 ++
 .../ActualExpectedStatusDetailsTests.java     |  31 +++
 .../io/qameta/allure/model/StatusDetails.java |  48 ++++-
 .../allure/spock2/AllureSpock2Test.java       |  12 ++
 .../ActualExpectedStatusDetailsTest.groovy    |  29 +++
 .../io/qameta/allure/testng/AllureTestNg.java |   2 +
 18 files changed, 854 insertions(+), 43 deletions(-)
 create mode 100644 allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
 create mode 100644 allure-java-commons/src/test/java/io/qameta/allure/util/ReflectionUtilsTest.java
 create mode 100644 allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ActualExpectedStatusDetailsTests.java
 create mode 100644 allure-junit4/src/test/java/io/qameta/allure/junit4/samples/ActualExpectedStatusDetailsTest.java
 create mode 100644 allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ActualExpectedStatusDetailsTests.java
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ActualExpectedStatusDetailsTest.groovy

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
index 6946aca20..1c854f444 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/NamingUtils.java
@@ -18,7 +18,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -94,42 +93,12 @@ private static String extractProperties(final Object object, final String[] part
     }
 
     private static Object extractChild(final Object object, final String part) {
-        final Class<?> type = object == null ? Object.class : object.getClass();
+        Objects.requireNonNull(object, "object");
+        final Class<?> type = object.getClass();
         try {
-            return extractField(object, part, type);
+            return ReflectionUtils.getFieldValue(object, part);
         } catch (ReflectiveOperationException e) {
             throw new IllegalStateException("Unable to extract " + part + " value from " + type.getName(), e);
         }
     }
-
-    @SuppressWarnings("PMD.EmptyCatchBlock")
-    private static Object extractField(final Object object, final String part, final Class<?> type)
-            throws ReflectiveOperationException {
-        try {
-            final Field field = type.getField(part);
-            return fieldValue(object, field);
-        } catch (NoSuchFieldException e) {
-            Class<?> t = type;
-            while (t != null) {
-                try {
-                    final Field declaredField = t.getDeclaredField(part);
-                    return fieldValue(object, declaredField);
-                } catch (NoSuchFieldException ignore) {
-                    // Ignore
-                }
-                t = t.getSuperclass();
-            }
-            throw e;
-        }
-    }
-
-    @SuppressWarnings("PMD.AvoidAccessibilityAlteration")
-    private static Object fieldValue(final Object object, final Field field) throws IllegalAccessException {
-        try {
-            return field.get(object);
-        } catch (IllegalAccessException e) {
-            field.setAccessible(true);
-            return field.get(object);
-        }
-    }
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
new file mode 100644
index 000000000..ec2296640
--- /dev/null
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
@@ -0,0 +1,181 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Optional;
+
+/**
+ * Common reflection helpers.
+ */
+final class ReflectionUtils {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ReflectionUtils.class);
+    private static final String GET_PREFIX = "get";
+    private static final String IS_PREFIX = "is";
+    private static final String METHOD_READ_ERROR = "Unable to read value via method {}";
+    private static final String FIELD_READ_ERROR = "Unable to read value via field {}";
+
+    private ReflectionUtils() {
+        throw new IllegalStateException("Do not instance");
+    }
+
+    static Object getValue(final Object target, final String propertyName) {
+        if (target == null || propertyName == null || propertyName.isEmpty()) {
+            return null;
+        }
+        final Optional<Method> method = findGetter(target.getClass(), propertyName);
+        if (method.isPresent()) {
+            try {
+                return invokeMethod(target, method.get());
+            } catch (ReflectiveOperationException | SecurityException e) {
+                LOGGER.trace(METHOD_READ_ERROR, method.get().getName(), e);
+                return null;
+            }
+        }
+        try {
+            return getFieldValue(target, propertyName);
+        } catch (ReflectiveOperationException | SecurityException e) {
+            LOGGER.trace(FIELD_READ_ERROR, propertyName, e);
+            return null;
+        }
+    }
+
+    static Boolean getBooleanValue(final Object target, final String propertyName) {
+        if (target == null || propertyName == null || propertyName.isEmpty()) {
+            return absentBooleanValue();
+        }
+        final Optional<Method> method = findPrimitiveBooleanGetter(target.getClass(), propertyName);
+        if (method.isPresent()) {
+            return invokeBooleanMethod(target, method.get());
+        }
+        return toBooleanValue(getValue(target, propertyName), propertyName);
+    }
+
+    @SuppressWarnings("PMD.EmptyCatchBlock")
+    static Object getFieldValue(final Object target, final String fieldName) throws ReflectiveOperationException {
+        final Class<?> type = target.getClass();
+        try {
+            final Field field = type.getField(fieldName);
+            return getFieldValue(target, field);
+        } catch (NoSuchFieldException e) {
+            Class<?> currentType = type;
+            while (currentType != null) {
+                try {
+                    final Field declaredField = currentType.getDeclaredField(fieldName);
+                    return getFieldValue(target, declaredField);
+                } catch (NoSuchFieldException ignore) {
+                    // Ignore
+                }
+                currentType = currentType.getSuperclass();
+            }
+            throw e;
+        }
+    }
+
+    @SuppressWarnings("PMD.AvoidAccessibilityAlteration")
+    private static Object getFieldValue(final Object target, final Field field) throws IllegalAccessException {
+        try {
+            return field.get(target);
+        } catch (IllegalAccessException e) {
+            field.setAccessible(true);
+            return field.get(target);
+        }
+    }
+
+    @SuppressWarnings("PMD.AvoidAccessibilityAlteration")
+    private static Object invokeMethod(final Object target, final Method method) throws ReflectiveOperationException {
+        try {
+            return method.invoke(target);
+        } catch (IllegalAccessException e) {
+            method.setAccessible(true);
+            return method.invoke(target);
+        }
+    }
+
+    private static Optional<Method> findGetter(final Class<?> type, final String propertyName) {
+        final String capitalizedName = capitalize(propertyName);
+        final String[] methodNames = {GET_PREFIX + capitalizedName, propertyName};
+        Class<?> currentType = type;
+        while (currentType != null) {
+            for (String methodName : methodNames) {
+                try {
+                    return Optional.of(currentType.getDeclaredMethod(methodName));
+                } catch (NoSuchMethodException ignored) {
+                    // Ignore
+                } catch (SecurityException e) {
+                    LOGGER.trace(METHOD_READ_ERROR, methodName, e);
+                    return Optional.empty();
+                }
+            }
+            currentType = currentType.getSuperclass();
+        }
+        return Optional.empty();
+    }
+
+    private static Optional<Method> findPrimitiveBooleanGetter(final Class<?> type, final String propertyName) {
+        final String methodName = IS_PREFIX + capitalize(propertyName);
+        Class<?> currentType = type;
+        while (currentType != null) {
+            try {
+                final Method method = currentType.getDeclaredMethod(methodName);
+                return method.getReturnType() == boolean.class ? Optional.of(method) : Optional.empty();
+            } catch (NoSuchMethodException ignored) {
+                // Ignore
+            } catch (SecurityException e) {
+                LOGGER.trace(METHOD_READ_ERROR, methodName, e);
+                return Optional.empty();
+            }
+            currentType = currentType.getSuperclass();
+        }
+        return Optional.empty();
+    }
+
+    private static String capitalize(final String value) {
+        return Character.toUpperCase(value.charAt(0)) + value.substring(1);
+    }
+
+    private static Boolean invokeBooleanMethod(final Object target, final Method method) {
+        try {
+            return Boolean.class.cast(invokeMethod(target, method));
+        } catch (ReflectiveOperationException | SecurityException e) {
+            LOGGER.trace(METHOD_READ_ERROR, method.getName(), e);
+            return absentBooleanValue();
+        }
+    }
+
+    private static Boolean toBooleanValue(final Object value, final String propertyName) {
+        if (value instanceof Boolean) {
+            return (Boolean) value;
+        }
+        if (value != null) {
+            LOGGER.trace(
+                    "Unable to read boolean value {}: actual value type is {}",
+                    propertyName,
+                    value.getClass().getName()
+            );
+        }
+        return absentBooleanValue();
+    }
+
+    private static Boolean absentBooleanValue() {
+        return Optional.<Boolean>empty().orElse(null);
+    }
+}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index 9e8b28ed9..03a08b0eb 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -105,6 +105,9 @@ public final class ResultsUtils {
     private static final String ALLURE_DESCRIPTIONS_FOLDER = "META-INF/allureDescriptions/";
     private static final String MD_5 = "MD5";
     private static final String DOT = ".";
+    private static final String ACTUAL = "actual";
+    private static final String EXPECTED = "expected";
+    private static final String DEFINED_PROPERTY_SUFFIX = "Defined";
 
     private static String cachedHost;
 
@@ -335,13 +338,17 @@ public static Optional<Status> getStatus(final Throwable throwable) {
 
     public static Optional<StatusDetails> getStatusDetails(final Throwable e) {
         return Optional.ofNullable(e)
-                .map(throwable -> new StatusDetails()
-                        .setMessage(Optional
-                                .ofNullable(throwable.getMessage())
-                                .orElse(throwable.getClass().getName())
-                        )
-                        .setTrace(getStackTraceAsString(throwable))
-                );
+                .map(throwable -> {
+                    final StatusDetails details = new StatusDetails()
+                            .setMessage(Optional
+                                    .ofNullable(throwable.getMessage())
+                                    .orElse(throwable.getClass().getName())
+                            )
+                            .setTrace(getStackTraceAsString(throwable));
+                    getRichErrorProperty(throwable, ACTUAL).ifPresent(details::setActual);
+                    getRichErrorProperty(throwable, EXPECTED).ifPresent(details::setExpected);
+                    return details;
+                });
     }
 
     public static Optional<String> getJavadocDescription(final ClassLoader classLoader,
@@ -440,6 +447,20 @@ private static String getStackTraceAsString(final Throwable throwable) {
         return stringWriter.toString();
     }
 
+    private static Optional<String> getRichErrorProperty(final Throwable throwable, final String propertyName) {
+        final Boolean propertyDefined = ReflectionUtils.getBooleanValue(
+                throwable,
+                propertyName + DEFINED_PROPERTY_SUFFIX
+        );
+        // Some assertion libraries expose isActualDefined/isExpectedDefined to distinguish absent values
+        // from values that are present but null.
+        if (Boolean.FALSE.equals(propertyDefined)) {
+            return Optional.empty();
+        }
+        final Object value = ReflectionUtils.getValue(throwable, propertyName);
+        return Optional.ofNullable(value).map(ObjectUtils::toString);
+    }
+
     public static void processDescription(final ClassLoader classLoader,
                                           final Method method,
                                           final Consumer<String> setDescription,
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
index 4433340f4..7086876b2 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
@@ -15,6 +15,7 @@
  */
 package io.qameta.allure;
 
+import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.TestResult;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -73,6 +74,24 @@ void shouldWriteTitlePath(@TempDir final Path folder) throws IOException {
                 .contains("\"child\"");
     }
 
+    @Test
+    void shouldWriteStatusDetailsActualAndExpected(@TempDir final Path folder) throws IOException {
+        FileSystemResultsWriter writer = new FileSystemResultsWriter(folder);
+        final String uuid = UUID.randomUUID().toString();
+        final TestResult testResult = new TestResult()
+                .setUuid(uuid)
+                .setStatusDetails(new StatusDetails()
+                        .setActual("actual value")
+                        .setExpected("expected value"));
+
+        writer.write(testResult);
+
+        final String payload = Files.readString(folder.resolve(generateTestResultName(uuid)));
+        assertThat(payload)
+                .contains("\"actual\":\"actual value\"")
+                .contains("\"expected\":\"expected value\"");
+    }
+
     @Test
     void shouldPreserveOldResultsWhenCleanIsDisabled(@TempDir final Path folder) throws IOException {
         Path existingFile = folder.resolve("existing-result.json");
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
index a6ee55ed1..7576938e8 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
@@ -17,12 +17,15 @@
 
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.github.glytching.junit.extension.system.SystemPropertyExtension;
+import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.util.ResultsUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.opentest4j.AssertionFailedError;
+import org.opentest4j.ValueWrapper;
 
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
@@ -240,6 +243,108 @@ public void shouldCreateLink(final String value,
         }
     }
 
+    @Test
+    void shouldExtractActualAndExpectedFromJunit4LikeComparisonFailure() {
+        final Junit4LikeComparisonFailure error = new Junit4LikeComparisonFailure(
+                "values differ",
+                "expected value",
+                "actual value"
+        );
+
+        final StatusDetails details = ResultsUtils.getStatusDetails(error).get();
+
+        assertThat(details.getActual()).isEqualTo("actual value");
+        assertThat(details.getExpected()).isEqualTo("expected value");
+    }
+
+    @Test
+    void shouldExtractActualAndExpectedFromOpenTest4jAssertionFailedError() {
+        final AssertionFailedError error = new AssertionFailedError(
+                "values differ",
+                "expected value",
+                "actual value"
+        );
+
+        final StatusDetails details = ResultsUtils.getStatusDetails(error).get();
+
+        assertThat(details.getActual()).startsWith("actual value (");
+        assertThat(details.getExpected()).startsWith("expected value (");
+    }
+
+    @Test
+    void shouldUseOpenTest4jValueWrapperToString() {
+        final AssertionFailedError error = new AssertionFailedError(
+                "values differ",
+                ValueWrapper.create("expected value", "expected representation"),
+                ValueWrapper.create("actual value", "actual representation")
+        );
+
+        final StatusDetails details = ResultsUtils.getStatusDetails(error).get();
+
+        assertThat(details.getActual()).startsWith("actual representation (");
+        assertThat(details.getExpected()).startsWith("expected representation (");
+    }
+
+    @Test
+    void shouldPreserveOpenTest4jNullValues() {
+        final AssertionFailedError error = new AssertionFailedError("values differ", null, null);
+
+        final StatusDetails details = ResultsUtils.getStatusDetails(error).get();
+
+        assertThat(details.getActual()).isEqualTo("null");
+        assertThat(details.getExpected()).isEqualTo("null");
+    }
+
+    @Test
+    void shouldSkipUndefinedOpenTest4jValues() {
+        final AssertionFailedError error = new AssertionFailedError("values differ");
+
+        final StatusDetails details = ResultsUtils.getStatusDetails(error).get();
+
+        assertThat(details.getActual()).isNull();
+        assertThat(details.getExpected()).isNull();
+    }
+
+    @Test
+    void shouldExtractActualAndExpectedFromGenericAssertionError() {
+        final StatusDetails details = ResultsUtils.getStatusDetails(new GenericRichAssertionError()).get();
+
+        assertThat(details.getActual()).isEqualTo("[1, 2]");
+        assertThat(details.getExpected()).isEqualTo("expected value");
+    }
+
+    @Test
+    void shouldExtractActualAndExpectedFromFieldAssertionError() {
+        final StatusDetails details = ResultsUtils.getStatusDetails(new FieldRichAssertionError()).get();
+
+        assertThat(details.getActual()).isEqualTo("actual value");
+        assertThat(details.getExpected()).isEqualTo("expected value");
+    }
+
+    @Test
+    void shouldExtractActualAndExpectedFromRecordStyleAssertionError() {
+        final StatusDetails details = ResultsUtils.getStatusDetails(new RecordStyleRichAssertionError()).get();
+
+        assertThat(details.getActual()).isEqualTo("actual value");
+        assertThat(details.getExpected()).isEqualTo("expected value");
+    }
+
+    @Test
+    void shouldSkipNullActualAndUnavailableExpected() {
+        final StatusDetails details = ResultsUtils.getStatusDetails(new PartiallyAvailableAssertionError()).get();
+
+        assertThat(details.getActual()).isNull();
+        assertThat(details.getExpected()).isNull();
+    }
+
+    @Test
+    void shouldRespectGenericDefinedFlags() {
+        final StatusDetails details = ResultsUtils.getStatusDetails(new UndefinedActualAssertionError()).get();
+
+        assertThat(details.getActual()).isNull();
+        assertThat(details.getExpected()).isEqualTo("expected value");
+    }
+
     public void clearSystemProperty(final String type, final String sysProp) {
         if (Objects.nonNull(type) && Objects.nonNull(sysProp)) {
             System.clearProperty(getLinkTypePatternPropertyName(type));
@@ -262,4 +367,96 @@ String getName() {
             return name;
         }
     }
+
+    public static class Junit4LikeComparisonFailure extends AssertionError {
+
+        private static final long serialVersionUID = 1L;
+
+        private final String expected;
+        private final String actual;
+
+        public Junit4LikeComparisonFailure(final String message,
+                                           final String expected,
+                                           final String actual) {
+            super(message);
+            this.expected = expected;
+            this.actual = actual;
+        }
+
+        public String getExpected() {
+            return expected;
+        }
+
+        public String getActual() {
+            return actual;
+        }
+    }
+
+    public static class GenericRichAssertionError extends AssertionError {
+
+        private static final long serialVersionUID = 1L;
+
+        public Object getActual() {
+            return new int[]{1, 2};
+        }
+
+        public Object getExpected() {
+            return "expected value";
+        }
+    }
+
+    public static class PartiallyAvailableAssertionError extends AssertionError {
+
+        private static final long serialVersionUID = 1L;
+
+        public Object getActual() {
+            return null;
+        }
+
+        public Object getExpected() {
+            throw new IllegalStateException("not available");
+        }
+    }
+
+    public static class FieldRichAssertionError extends AssertionError {
+
+        private static final long serialVersionUID = 1L;
+
+        private final Object actual = "actual value";
+        private final Object expected = "expected value";
+    }
+
+    public static class RecordStyleRichAssertionError extends AssertionError {
+
+        private static final long serialVersionUID = 1L;
+
+        public Object actual() {
+            return "actual value";
+        }
+
+        public Object expected() {
+            return "expected value";
+        }
+    }
+
+    public static class UndefinedActualAssertionError extends AssertionError {
+
+        private static final long serialVersionUID = 1L;
+
+        public boolean isActualDefined() {
+            return false;
+        }
+
+        public Object getActual() {
+            return "actual value";
+        }
+
+        public boolean isExpectedDefined() {
+            return true;
+        }
+
+        public Object getExpected() {
+            return "expected value";
+        }
+    }
 }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/ReflectionUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/ReflectionUtilsTest.java
new file mode 100644
index 000000000..d44db6179
--- /dev/null
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/ReflectionUtilsTest.java
@@ -0,0 +1,180 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ReflectionUtilsTest {
+
+    @Test
+    void shouldReadValueFromGetter() {
+        final Object value = ReflectionUtils.getValue(new GetterSample(), "value");
+
+        assertThat(value).isEqualTo("getter value");
+    }
+
+    @Test
+    void shouldPreferGetterOverField() {
+        final Object value = ReflectionUtils.getValue(new GetterAndFieldSample(), "value");
+
+        assertThat(value).isEqualTo("getter value");
+    }
+
+    @Test
+    void shouldReadValueFromRecordStyleMethod() {
+        final Object value = ReflectionUtils.getValue(new RecordStyleSample(), "value");
+
+        assertThat(value).isEqualTo("record value");
+    }
+
+    @Test
+    void shouldReadValueFromField() {
+        final Object value = ReflectionUtils.getValue(new FieldSample(), "value");
+
+        assertThat(value).isEqualTo("field value");
+    }
+
+    @Test
+    void shouldReadValueFromInheritedField() {
+        final Object value = ReflectionUtils.getValue(new ChildFieldSample(), "value");
+
+        assertThat(value).isEqualTo("parent field value");
+    }
+
+    @Test
+    void shouldReturnNullForMissingValue() {
+        final Object value = ReflectionUtils.getValue(new GetterSample(), "missing");
+
+        assertThat(value).isNull();
+    }
+
+    @Test
+    void shouldReadBooleanValueFromPrimitiveIsGetter() {
+        final Boolean value = ReflectionUtils.getBooleanValue(new PrimitiveBooleanSample(), "value");
+
+        assertThat(value).isFalse();
+    }
+
+    @Test
+    void shouldPreferPrimitiveIsGetterForBooleanValue() {
+        final Boolean value = ReflectionUtils.getBooleanValue(new PrimitiveIsAndGetSample(), "value");
+
+        assertThat(value).isFalse();
+    }
+
+    @Test
+    void shouldReadBooleanValueFromGetter() {
+        final Boolean value = ReflectionUtils.getBooleanValue(new BooleanGetterSample(), "value");
+
+        assertThat(value).isTrue();
+    }
+
+    @Test
+    void shouldReadBooleanValueFromField() {
+        final Boolean value = ReflectionUtils.getBooleanValue(new BooleanFieldSample(), "value");
+
+        assertThat(value).isFalse();
+    }
+
+    @Test
+    void shouldIgnoreBoxedBooleanIsGetter() {
+        final Boolean value = ReflectionUtils.getBooleanValue(new BoxedBooleanIsSample(), "value");
+
+        assertThat(value).isNull();
+    }
+
+    @Test
+    void shouldReturnNullForNonBooleanValue() {
+        final Boolean value = ReflectionUtils.getBooleanValue(new GetterSample(), "value");
+
+        assertThat(value).isNull();
+    }
+
+    static class GetterSample {
+
+        public String getValue() {
+            return "getter value";
+        }
+    }
+
+    static class GetterAndFieldSample {
+
+        private final String value = "field value";
+
+        public String getValue() {
+            return "getter value";
+        }
+    }
+
+    static class RecordStyleSample {
+
+        public String value() {
+            return "record value";
+        }
+    }
+
+    static class FieldSample {
+
+        private final String value = "field value";
+    }
+
+    static class ParentFieldSample {
+
+        private final String value = "parent field value";
+    }
+
+    static class ChildFieldSample extends ParentFieldSample {
+    }
+
+    static class PrimitiveBooleanSample {
+
+        public boolean isValue() {
+            return false;
+        }
+    }
+
+    static class PrimitiveIsAndGetSample {
+
+        public boolean isValue() {
+            return false;
+        }
+
+        public Boolean getValue() {
+            return true;
+        }
+    }
+
+    static class BooleanGetterSample {
+
+        public Boolean getValue() {
+            return true;
+        }
+    }
+
+    static class BooleanFieldSample {
+
+        private final Boolean value = false;
+    }
+
+    static class BoxedBooleanIsSample {
+
+        public Boolean isValue() {
+            return true;
+        }
+    }
+}
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index f33f45e54..a4eb3cc77 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -488,6 +488,10 @@ private void failFixture(final Map<String, String> keyValue) {
                     .ifPresent(fixtureResult.getStatusDetails()::setMessage);
             Optional.of(keyValue.get("trace"))
                     .ifPresent(fixtureResult.getStatusDetails()::setTrace);
+            Optional.of(keyValue.get("actual"))
+                    .ifPresent(fixtureResult.getStatusDetails()::setActual);
+            Optional.of(keyValue.get("expected"))
+                    .ifPresent(fixtureResult.getStatusDetails()::setExpected);
         });
         getLifecycle().stopFixture(uuid);
     }
@@ -634,6 +638,14 @@ private void stopTestCase(final TestIdentifier testIdentifier,
                         .map(StatusDetails::getTrace)
                         .ifPresent(currentSd::setTrace);
 
+                Optional.of(statusDetails)
+                        .map(StatusDetails::getActual)
+                        .ifPresent(currentSd::setActual);
+
+                Optional.of(statusDetails)
+                        .map(StatusDetails::getExpected)
+                        .ifPresent(currentSd::setExpected);
+
                 currentSd.setMuted(currentSd.isMuted() || statusDetails.isMuted());
                 currentSd.setFlaky(currentSd.isFlaky() || statusDetails.isFlaky());
                 currentSd.setKnown(currentSd.isKnown() || statusDetails.isKnown());
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
index 7e0b6e53f..32ef1fd01 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -17,6 +17,7 @@
 
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.qameta.allure.Issue;
+import io.qameta.allure.junitplatform.features.ActualExpectedStatusDetailsTests;
 import io.qameta.allure.junitplatform.features.AllureIdAnnotationSupport;
 import io.qameta.allure.junitplatform.features.BrokenInAfterAllTests;
 import io.qameta.allure.junitplatform.features.BrokenInBeforeAllTests;
@@ -169,6 +170,21 @@ void shouldProcessFailedTests() {
 
     }
 
+    @Test
+    @AllureFeatures.FailedTests
+    void shouldReportActualAndExpectedStatusDetails() {
+        final AllureResults results = runClasses(ActualExpectedStatusDetailsTests.class);
+        final TestResult testResult = results.getTestResults().stream()
+                .filter(result -> ("io.qameta.allure.junitplatform.features.ActualExpectedStatusDetailsTests"
+                        + ".failingComparison").equals(result.getFullName()))
+                .findFirst()
+                .get();
+
+        assertThat(testResult.getStatus()).isEqualTo(Status.FAILED);
+        assertThat(testResult.getStatusDetails().getActual()).startsWith("actual value (");
+        assertThat(testResult.getStatusDetails().getExpected()).startsWith("expected value (");
+    }
+
     @Test
     @AllureFeatures.BrokenTests
     void shouldProcessBrokenTests() {
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ActualExpectedStatusDetailsTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ActualExpectedStatusDetailsTests.java
new file mode 100644
index 000000000..7f210cd91
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ActualExpectedStatusDetailsTests.java
@@ -0,0 +1,31 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform.features;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author baev (Dmitry Baev).
+ */
+public class ActualExpectedStatusDetailsTests {
+
+    @Test
+    void failingComparison() {
+        assertEquals("expected value", "actual value");
+    }
+}
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
index 31018cf62..02cb9cf73 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
@@ -16,6 +16,7 @@
 package io.qameta.allure.junit4;
 
 import io.qameta.allure.Step;
+import io.qameta.allure.junit4.samples.ActualExpectedStatusDetailsTest;
 import io.qameta.allure.junit4.samples.AssumptionFailedTest;
 import io.qameta.allure.junit4.samples.BrokenTest;
 import io.qameta.allure.junit4.samples.BrokenWithoutMessageTest;
@@ -143,6 +144,24 @@ void shouldProcessFailedTest() {
                 .containsExactly(Status.FAILED);
     }
 
+    @Test
+    @AllureFeatures.FailedTests
+    void shouldReportActualAndExpectedStatusDetails() {
+        final AllureResults results = runClasses(ActualExpectedStatusDetailsTest.class);
+
+        assertThat(results.getTestResults())
+                .filteredOn("fullName",
+                        "io.qameta.allure.junit4.samples.ActualExpectedStatusDetailsTest.failingComparison")
+                .extracting(
+                        TestResult::getStatus,
+                        testResult -> testResult.getStatusDetails().getActual(),
+                        testResult -> testResult.getStatusDetails().getExpected()
+                )
+                .containsExactly(
+                        tuple(Status.FAILED, "actual value", "expected value")
+                );
+    }
+
     @Test
     @AllureFeatures.BrokenTests
     void shouldProcessBrokenTest() {
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/ActualExpectedStatusDetailsTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/ActualExpectedStatusDetailsTest.java
new file mode 100644
index 000000000..1fd1c4b0c
--- /dev/null
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/ActualExpectedStatusDetailsTest.java
@@ -0,0 +1,31 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit4.samples;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author baev (Dmitry Baev).
+ */
+public class ActualExpectedStatusDetailsTest {
+
+    @Test
+    public void failingComparison() {
+        assertEquals("expected value", "actual value");
+    }
+}
diff --git a/allure-jupiter/src/main/java/io/qameta/allure/jupiter/AllureJupiter.java b/allure-jupiter/src/main/java/io/qameta/allure/jupiter/AllureJupiter.java
index 1641ed1f7..f48a1de7f 100644
--- a/allure-jupiter/src/main/java/io/qameta/allure/jupiter/AllureJupiter.java
+++ b/allure-jupiter/src/main/java/io/qameta/allure/jupiter/AllureJupiter.java
@@ -200,6 +200,8 @@ public Map<String, String> buildFailureEvent(final String type,
         final Optional<StatusDetails> maybeDetails = ResultsUtils.getStatusDetails(throwable);
         maybeDetails.map(StatusDetails::getMessage).ifPresent(message -> map.put("message", message));
         maybeDetails.map(StatusDetails::getTrace).ifPresent(trace -> map.put("trace", trace));
+        maybeDetails.map(StatusDetails::getActual).ifPresent(actual -> map.put("actual", actual));
+        maybeDetails.map(StatusDetails::getExpected).ifPresent(expected -> map.put("expected", expected));
         return map;
     }
 
diff --git a/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
index 66d102e2a..a2ca022cb 100644
--- a/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
+++ b/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
@@ -17,6 +17,7 @@
 
 import io.qameta.allure.Issue;
 import io.qameta.allure.Step;
+import io.qameta.allure.junit5.features.ActualExpectedStatusDetailsTests;
 import io.qameta.allure.junit5.features.AfterEachFixtureBrokenSupport;
 import io.qameta.allure.junit5.features.AllFixtureSupport;
 import io.qameta.allure.junit5.features.BeforeAllFixtureFailureSupport;
@@ -148,6 +149,20 @@ void shouldSupportParamAnnotationForParameters() {
 
     }
 
+    @Test
+    void shouldReportActualAndExpectedStatusDetails() {
+        final AllureResults results = runClasses(ActualExpectedStatusDetailsTests.class);
+        final TestResult testResult = results.getTestResults().stream()
+                .filter(result -> "io.qameta.allure.junit5.features.ActualExpectedStatusDetailsTests.failingComparison"
+                        .equals(result.getFullName()))
+                .findFirst()
+                .get();
+
+        assertThat(testResult.getStatus()).isEqualTo(Status.FAILED);
+        assertThat(testResult.getStatusDetails().getActual()).startsWith("actual value (");
+        assertThat(testResult.getStatusDetails().getExpected()).startsWith("expected value (");
+    }
+
     @Test
     void shouldSkipReportingOfTestInjectablesTestReporterForRegularTest() {
         final AllureResults results = runClasses(SkipOtherInjectables.class);
diff --git a/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ActualExpectedStatusDetailsTests.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ActualExpectedStatusDetailsTests.java
new file mode 100644
index 000000000..7ce270618
--- /dev/null
+++ b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ActualExpectedStatusDetailsTests.java
@@ -0,0 +1,31 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5.features;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author baev (Dmitry Baev).
+ */
+public class ActualExpectedStatusDetailsTests {
+
+    @Test
+    void failingComparison() {
+        assertEquals("expected value", "actual value");
+    }
+}
diff --git a/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java b/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java
index 10ca653f5..38be0caa9 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/StatusDetails.java
@@ -34,6 +34,8 @@ public class StatusDetails implements Serializable {
     private boolean flaky;
     private String message;
     private String trace;
+    private String actual;
+    private String expected;
 
     /**
      * Is known boolean.
@@ -135,6 +137,46 @@ public StatusDetails setTrace(final String value) {
         return this;
     }
 
+    /**
+     * Gets actual.
+     *
+     * @return the actual
+     */
+    public String getActual() {
+        return actual;
+    }
+
+    /**
+     * Sets actual.
+     *
+     * @param value the value
+     * @return self for method chaining
+     */
+    public StatusDetails setActual(final String value) {
+        this.actual = value;
+        return this;
+    }
+
+    /**
+     * Gets expected.
+     *
+     * @return the expected
+     */
+    public String getExpected() {
+        return expected;
+    }
+
+    /**
+     * Sets expected.
+     *
+     * @param value the value
+     * @return self for method chaining
+     */
+    public StatusDetails setExpected(final String value) {
+        this.expected = value;
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -148,7 +190,9 @@ public boolean equals(final Object o) {
         }
         final StatusDetails that = (StatusDetails) o;
         return Objects.equals(message, that.message)
-                && Objects.equals(trace, that.trace);
+                && Objects.equals(trace, that.trace)
+                && Objects.equals(actual, that.actual)
+                && Objects.equals(expected, that.expected);
     }
 
     /**
@@ -156,6 +200,6 @@ public boolean equals(final Object o) {
      */
     @Override
     public int hashCode() {
-        return Objects.hash(message, trace);
+        return Objects.hash(message, trace, actual, expected);
     }
 }
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
index 3771a655d..24f0b27c4 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -26,6 +26,7 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
+import io.qameta.allure.spock2.samples.ActualExpectedStatusDetailsTest;
 import io.qameta.allure.spock2.samples.BrokenTest;
 import io.qameta.allure.spock2.samples.DataDrivenTest;
 import io.qameta.allure.spock2.samples.DerivedSpec;
@@ -245,6 +246,17 @@ void shouldProcessFailedTest() {
                 .containsExactly(Status.FAILED);
     }
 
+    @Test
+    void shouldReportActualAndExpectedStatusDetails() {
+        final AllureResults results = runClasses(ActualExpectedStatusDetailsTest.class);
+        final TestResult testResult = results.getTestResults().get(0);
+
+        assertThat(results.getTestResults()).hasSize(1);
+        assertThat(testResult.getStatus()).isEqualTo(Status.FAILED);
+        assertThat(testResult.getStatusDetails().getActual()).startsWith("actual value\n (");
+        assertThat(testResult.getStatusDetails().getExpected()).startsWith("expected value\n (");
+    }
+
     @Test
     void shouldProcessBrokenTest() {
         final AllureResults results = runClasses(BrokenTest.class);
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ActualExpectedStatusDetailsTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ActualExpectedStatusDetailsTest.groovy
new file mode 100644
index 000000000..cab9f3626
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ActualExpectedStatusDetailsTest.groovy
@@ -0,0 +1,29 @@
+/*
+ *  Copyright 2016-2026 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.spock2.samples
+
+import spock.lang.Specification
+
+/**
+ * @author baev (Dmitry Baev).
+ */
+class ActualExpectedStatusDetailsTest extends Specification {
+
+    def "failing comparison"() {
+        expect:
+        "actual value" == "expected value"
+    }
+}
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
index d49ebe232..2569828ae 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
@@ -913,6 +913,8 @@ private Consumer<TestResult> setStatus(final Status status, final StatusDetails
             if (nonNull(details)) {
                 result.getStatusDetails().setTrace(details.getTrace());
                 result.getStatusDetails().setMessage(details.getMessage());
+                result.getStatusDetails().setActual(details.getActual());
+                result.getStatusDetails().setExpected(details.getExpected());
             }
         };
     }

From d0e2e5f8fcbdbc197550f390a1cbd50057212f34 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 15 May 2026 20:52:20 +0100
Subject: [PATCH 233/233] align code style and quality checks across Allure
 Java (via #1274)

---
 .../qameta/allure/assertj/AllureAspectJ.java  |  44 ++-
 .../allure/assertj/AssertJMethodSupport.java  |  60 ++--
 .../allure/assertj/AssertJOperation.java      |   2 +-
 .../allure/assertj/AssertJRecorder.java       |   2 -
 .../allure/assertj/AssertJValueRenderer.java  |  10 +-
 .../allure/assertj/AllureAspectJTest.java     |  18 +-
 .../allure/attachment/AttachmentRenderer.java |   1 -
 .../FreemarkerAttachmentRendererTest.java     |   1 -
 .../awaitility/AllureAwaitilityListener.java  |   9 +-
 .../ConditionListenersPositiveTest.java       |  78 ++---
 .../GlobalSettingsNegativeTest.java           |  59 ++--
 .../GlobalSettingsPositiveTest.java           |  72 ++--
 .../awaitility/MultipleConditionsTest.java    |  22 +-
 .../io/qameta/allure/citrus/AllureCitrus.java |  27 +-
 .../cucumber4jvm/AllureCucumber4Jvm.java      |  74 ++--
 .../allure/cucumber4jvm/LabelBuilder.java     |  42 ++-
 .../qameta/allure/cucumber4jvm/TagParser.java |   6 +-
 .../cucumber4jvm/AllureCucumber4JvmTest.java  |  65 ++--
 .../cucumber4jvm/samples/AmbigiousSteps.java  |   2 +-
 .../cucumber4jvm/samples/AttachmentSteps.java |  12 +-
 .../samples/DatatableFeatureSteps.java        |   2 +-
 .../cucumber4jvm/samples/HookSteps.java       |   8 +-
 .../cucumber4jvm/samples/RuntimeApiSteps.java |   4 +-
 .../cucumber5jvm/AllureCucumber5Jvm.java      |  73 ++--
 .../allure/cucumber5jvm/LabelBuilder.java     |  44 ++-
 .../qameta/allure/cucumber5jvm/TagParser.java |   6 +-
 .../testsourcemodel/TestSourcesModel.java     |  16 +-
 .../cucumber5jvm/AllureCucumber5JvmTest.java  |  65 ++--
 .../cucumber5jvm/samples/AmbigiousSteps.java  |   2 +-
 .../cucumber5jvm/samples/AttachmentSteps.java |  16 +-
 .../cucumber5jvm/samples/HookSteps.java       |   8 +-
 .../cucumber5jvm/samples/RuntimeApiSteps.java |   4 +-
 .../cucumber6jvm/AllureCucumber6Jvm.java      |  75 ++--
 .../allure/cucumber6jvm/LabelBuilder.java     |  42 ++-
 .../qameta/allure/cucumber6jvm/TagParser.java |   6 +-
 .../testsourcemodel/TestSourcesModel.java     |  18 +-
 .../cucumber6jvm/AllureCucumber6JvmTest.java  |  64 ++--
 .../cucumber6jvm/samples/AmbigiousSteps.java  |   2 +-
 .../cucumber6jvm/samples/AttachmentSteps.java |   2 +-
 .../cucumber6jvm/samples/HookSteps.java       |   8 +-
 .../cucumber6jvm/samples/RuntimeApiSteps.java |   4 +-
 .../cucumber7jvm/AllureCucumber7Jvm.java      |  82 +++--
 .../allure/cucumber7jvm/LabelBuilder.java     |  42 ++-
 .../qameta/allure/cucumber7jvm/TagParser.java |   6 +-
 .../testsourcemodel/TestSourcesModel.java     |  15 +-
 .../cucumber7jvm/AllureCucumber7JvmTest.java  |  64 ++--
 .../cucumber7jvm/samples/AmbigiousSteps.java  |   2 +-
 .../cucumber7jvm/samples/AttachmentSteps.java |   2 +-
 .../cucumber7jvm/samples/HookSteps.java       |   8 +-
 .../cucumber7jvm/samples/RuntimeApiSteps.java |   6 +-
 .../JavaDocDescriptionRenderer.java           |  35 +-
 .../JavaDocDescriptionsProcessor.java         |  13 +-
 .../JavaDocDescriptionRendererTest.java       |  78 ++---
 .../description/ProcessDescriptionsTest.java  |  20 +-
 .../io/qameta/allure/grpc/AllureGrpc.java     | 244 +++++++------
 .../io/qameta/allure/grpc/AllureGrpcTest.java | 201 ++++++-----
 .../allure/hamcrest/AllureHamcrestAssert.java |  17 +-
 ...AllureHamcrestCollectionsMatchersTest.java |   2 +-
 .../AllureHamcrestTextMatchersTest.java       |   1 -
 .../httpclient/AllureHttpClientRequest.java   |  22 +-
 .../httpclient/AllureHttpClientResponse.java  |   6 +-
 .../httpclient/AllureHttpClientTest.java      |  48 ++-
 .../AllureHttpClient5Response.java            |  14 +-
 .../AllureHttpClient5DeleteTest.java          |   8 +-
 .../httpclient5/AllureHttpClient5GetTest.java |  21 +-
 .../AllureHttpClient5PostTest.java            |  21 +-
 .../io/qameta/allure/test/AllureResults.java  |   8 +-
 .../allure/test/AllureTestCommonsUtils.java   |  33 +-
 .../java/io/qameta/allure/test/RunUtils.java  |  32 +-
 .../io/qameta/allure/test/RunUtilsTest.java   |  24 +-
 .../qameta/allure/test/TestUtilitiesTest.java |   8 +-
 .../main/java/io/qameta/allure/Allure.java    |  20 +-
 .../io/qameta/allure/AllureLifecycle.java     |   8 +-
 .../allure/FileSystemResultsWriter.java       |   6 +-
 .../allure/aspects/AttachmentsAspects.java    |  14 +-
 .../qameta/allure/aspects/StepsAspects.java   |  16 +-
 .../allure/internal/Allure2ModelJackson.java  |  18 +-
 .../allure/listener/LifecycleNotifier.java    |  10 +-
 .../qameta/allure/util/AnnotationUtils.java   |  31 +-
 .../io/qameta/allure/util/ObjectUtils.java    |  10 +-
 .../io/qameta/allure/util/ResultsUtils.java   |  33 +-
 .../io/qameta/allure/AllureLifecycleTest.java |  15 +-
 .../allure/FileSystemResultsWriterTest.java   |  10 +-
 .../io/qameta/allure/ResultsUtilsTest.java    |  26 +-
 .../allure/aspects/StepsAspectsTest.java      |  40 ++-
 .../allure/util/AnnotationUtilsTest.java      | 106 ++++--
 .../qameta/allure/util/NamingUtilsTest.java   |   6 +-
 .../io/qameta/allure/jaxrs/AllureJaxRs.java   |   6 +-
 .../allure/httpclient/AllureJaxRsTest.java    |  12 +-
 .../qameta/allure/jbehave/AllureJbehave.java  |   2 -
 .../allure/jbehave/AllureJbehaveTest.java     |  34 +-
 .../allure/jbehave5/AllureJbehave5.java       |  18 +-
 .../allure/jbehave5/AllureJbehave5Test.java   |  34 +-
 .../io/qameta/allure/jooq/AllureJooq.java     |  12 +-
 .../io/qameta/allure/jooq/AllureJooqTest.java |   1 +
 .../jsonunit/AbstractJsonPatchMatcher.java    |   7 +-
 .../allure/jsonunit/JsonPatchListener.java    |   3 +-
 .../allure/jsonunit/JsonPatchMatcher.java     |  10 +-
 .../jsonunit/JsonPatchListenerTest.java       |   4 +-
 .../jsonunit/JsonPatchMatcherTests.java       |  34 +-
 .../junitplatform/AllureJunitPlatform.java    | 126 +++----
 .../AllureJunitPlatformTest.java              |  85 +++--
 .../AllurePostDiscoveryFilterTest.java        |  80 +++--
 .../junitplatform/features/DynamicTests.java  |  13 +-
 .../features/FilterSimpleTests.java           |   2 +-
 .../features/MarkerAnnotationSupport.java     |  10 +-
 .../junitplatform/features/PassedTests.java   |   2 +-
 .../features/ReportEntryParameter.java        |  43 ++-
 .../features/SkippedInBeforeAllTests.java     |   4 +-
 .../junitplatform/features/TaggedTests.java   |   3 +-
 .../features/TestWithClassLabels.java         |  10 +-
 .../features/TestWithClassLinks.java          |  33 +-
 .../features/TestWithMethodLabels.java        |  10 +-
 .../features/TestWithMethodLinks.java         |  33 +-
 .../junitplatform/features/TestWithSteps.java |   7 +-
 .../features/TestsWithAllureId.java           |   2 +-
 .../junit4/aspect/AllureJunit4AspectTest.java |   8 +-
 .../io/qameta/allure/junit4/AllureJunit4.java |  51 ++-
 .../allure/junit4/AllureJunit4Filter.java     |   2 +-
 .../allure/junit4/AllureJunit4Utils.java      |   3 +-
 .../java/io/qameta/allure/junit4/Tags.java    |   2 +-
 .../allure/junit4/AllureJunit4Test.java       |  28 +-
 .../allure/junit4/samples/TaggedTests.java    |   9 +-
 .../junit4/samples/TestWithAnnotations.java   |  10 +-
 .../jupiterassert/AllureJupiterAssert.java    |  20 +-
 .../junit5assert/AllureJunit5AssertTest.java  | 129 ++++---
 .../qameta/allure/jupiter/AllureJupiter.java  |  90 +++--
 .../AllureJunit5Junit6CompatibilityTest.java  |  84 ++---
 .../allure/junit5/AllureJunit5Test.java       |   6 +-
 .../ParameterisedPrimitivesTests.java         |   1 -
 .../junit5/features/ParameterisedTests.java   |   1 -
 .../allure/karate/AllureKarateTest.java       |  10 +-
 .../qameta/allure/model/ExecutableItem.java   |   8 +-
 .../io/qameta/allure/model/TestResult.java    |   6 +-
 .../qameta/allure/model/TestResultTest.java   |   8 +-
 .../io/qameta/allure/okhttp/AllureOkHttp.java |   1 -
 .../allure/okhttp/AllureOkHttp3Test.java      |  16 +-
 .../qameta/allure/okhttp3/AllureOkHttp3.java  |   1 -
 .../allure/okhttp3/AllureOkHttp3Test.java     |  10 +-
 .../allure/playwright/AllurePlaywright.java   |  10 +-
 .../playwright/AllurePlaywrightAspect.java    |  66 ++--
 .../playwright/AllurePlaywrightRegistry.java  |   2 -
 .../playwright/DefaultTraceSession.java       |   1 -
 .../allure/playwright/PlaywrightAction.java   | 116 ++++---
 .../playwright/AllurePlaywrightTest.java      |  23 +-
 .../allure/reader/AllureEnumDeserializer.java |   3 +-
 .../reader/AllureObjectMapperFactoryTest.java |  40 +--
 .../allure/restassured/AllureRestAssured.java |   2 +-
 .../restassured/AllureRestAssuredTest.java    | 128 ++++---
 .../allure/scalatest/AllureScalatest.scala    |  93 ++---
 .../scalatest/AllureScalatestTest.scala       |  32 +-
 .../scalatest/testdata/AllureApiSpec.scala    |  31 +-
 .../testdata/AnnotationsOnClassSpec.scala     |   6 +-
 .../scalatest/testdata/BrokenSpec.scala       |   3 +-
 .../scalatest/testdata/CancelledSpec.scala    |   3 +-
 .../scalatest/testdata/FailedSpec.scala       |   3 +-
 .../scalatest/testdata/IgnoredSpec.scala      |   6 +-
 .../scalatest/testdata/SeveritySpec.scala     |   6 +-
 .../scalatest/testdata/SimpleSpec.scala       |   6 +-
 .../allure/selenide/AllureSelenide.java       |   1 -
 .../allure/selenide/AllureSelenideTest.java   |  23 +-
 .../seleniumbidi/BiDiAttachmentStorage.java   |  28 +-
 .../allure/seleniumbidi/BiDiNetworkEvent.java |  10 +-
 .../allure/seleniumbidi/HeaderRedactor.java   |  16 +-
 .../SeleniumBiDiSessionFactory.java           |   1 -
 .../seleniumbidi/AllureWebDriverBiDiTest.java |  34 +-
 .../HttpServletAttachmentBuilder.java         |  10 +-
 .../HttpServletAttachmentBuilderTest.java     |   9 +-
 .../io/qameta/allure/spock/AllureSpock.java   |  83 +++--
 .../allure/spock/samples/FailedTest.groovy    |  12 +-
 .../spock/samples/TestWithAnnotations.groovy  |  13 +-
 .../samples/TestWithAnnotationsOnClass.groovy |  12 +-
 .../io/qameta/allure/spock2/AllureSpock2.java |  64 ++--
 ...StatementsLabelsToStepsTransformation.java |  38 +-
 .../allure/spock2/AllureSpock2Test.java       |  42 ++-
 .../allure/spock2/samples/FailedTest.groovy   |  12 +-
 .../spock2/samples/HelloSpockSpec.groovy      |  18 +-
 .../allure/spock2/samples/SpecFixtures.groovy |   1 -
 .../spock2/samples/SpecInheritanceSpec.groovy |  32 +-
 .../spock2/samples/TestWithAnnotations.groovy |  13 +-
 .../samples/TestWithAnnotationsOnClass.groovy |  12 +-
 .../allure/springweb/AllureRestTemplate.java  |   3 +-
 .../springweb/AllureRestTemplateTest.java     |   6 +-
 .../io/qameta/allure/testfilter/TestPlan.java |   8 +-
 .../allure/testfilter/TestPlanV1_0.java       |   2 +-
 .../testfilter/FileTestPlanSupplierTest.java  |  14 +-
 .../allure/testfilter/TestPlanV1_0Test.java   |  24 +-
 .../io/qameta/allure/testng/AllureTestNg.java | 125 ++++---
 .../allure/testng/AllureTestNgTestFilter.java |  21 +-
 .../testng/config/AllureTestNgConfig.java     |   2 +-
 .../allure/testng/AllureTestNgTest.java       | 113 +++---
 .../samples/AfterFixturesCombination.java     |   2 +-
 .../allure/testng/samples/AllFeatures.java    |   5 +-
 .../allure/testng/samples/BaseTest.java       |   1 -
 .../samples/DataProviderWithAttachment.java   |   2 +-
 .../allure/testng/samples/LinksOnTests.java   |  30 +-
 .../samples/ParallelDataProviderSample.java   |  26 +-
 .../testng/samples/ParallelMethods.java       |   1 -
 .../testng/samples/PerSuiteFixtures.java      |   2 +-
 .../allure/testng/samples/PriorityTests.java  |   5 +-
 .../testng/samples/TestsWithIdForFilter.java  |   3 +-
 build.gradle.kts                              |  26 +-
 .../quality-configs/checkstyle/checkstyle.xml | 328 +++++-------------
 .../checkstyle/import-control.xml             |  15 +
 gradle/quality-configs/pmd/pmd.xml            | 259 +++++++-------
 gradle/quality-configs/spotbugs/exclude.xml   |   6 +
 .../spotless/eclipse-jdt.prefs                |  19 +
 gradle/quality-configs/spotless/scalafmt.conf |   7 +
 208 files changed, 3192 insertions(+), 2598 deletions(-)
 create mode 100644 gradle/quality-configs/checkstyle/import-control.xml
 create mode 100644 gradle/quality-configs/spotless/eclipse-jdt.prefs
 create mode 100644 gradle/quality-configs/spotless/scalafmt.conf

diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
index 00af9c095..7ba05d2f8 100644
--- a/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
@@ -17,7 +17,6 @@
 
 import io.qameta.allure.Allure;
 import io.qameta.allure.AllureLifecycle;
-import org.assertj.core.api.AbstractAssert;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.After;
@@ -26,6 +25,7 @@
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.assertj.core.api.AbstractAssert;
 
 import java.util.function.Supplier;
 
@@ -51,22 +51,26 @@ protected AllureLifecycle initialValue() {
 
     private static final ThreadLocal<Boolean> RECORDING_MUTED = ThreadLocal.withInitial(() -> false);
 
-    @Pointcut("("
-            + "call(public static * org.assertj.core.api.Assertions*.assertThat*(..))"
-            + " || call(public static * org.assertj.core.api.BDDAssertions*.then*(..))"
-            + " || call(public * org.assertj.core.api.*SoftAssertionsProvider+.assertThat*(..))"
-            + " || call(public * org.assertj.core.api.*SoftAssertionsProvider+.then*(..))"
-            + ")")
+    @Pointcut(
+        "("
+                + "call(public static * org.assertj.core.api.Assertions*.assertThat*(..))"
+                + " || call(public static * org.assertj.core.api.BDDAssertions*.then*(..))"
+                + " || call(public * org.assertj.core.api.*SoftAssertionsProvider+.assertThat*(..))"
+                + " || call(public * org.assertj.core.api.*SoftAssertionsProvider+.then*(..))"
+                + ")"
+    )
     public void assertFactoryCall() {
         //pointcut body, should be empty
     }
 
-    @Pointcut("("
-            + "call(public * org.assertj.core.api.AbstractAssert+.*(..))"
-            + " || call(public * org.assertj.core.api.Assert+.*(..))"
-            + " || call(public * org.assertj.core.api.Descriptable+.*(..))"
-            + ")"
-            + " && target(assertion)")
+    @Pointcut(
+        "("
+                + "call(public * org.assertj.core.api.AbstractAssert+.*(..))"
+                + " || call(public * org.assertj.core.api.Assert+.*(..))"
+                + " || call(public * org.assertj.core.api.Descriptable+.*(..))"
+                + ")"
+                + " && target(assertion)"
+    )
     public void assertOperationCall(final AbstractAssert<?, ?> assertion) {
         //pointcut body, should be empty
     }
@@ -76,7 +80,10 @@ public void userCodeCall() {
         //pointcut body, should be empty
     }
 
-    @AfterReturning(pointcut = "assertFactoryCall() && userCodeCall()", returning = "result")
+    @AfterReturning(
+            pointcut = "assertFactoryCall() && userCodeCall()",
+            returning = "result"
+    )
     public void logAssertCreation(final JoinPoint joinPoint, final Object result) {
         if (isRecordingMuted() || !(result instanceof AbstractAssert)) {
             return;
@@ -88,7 +95,8 @@ public void logAssertCreation(final JoinPoint joinPoint, final Object result) {
 
     @Around("assertOperationCall(assertion) && userCodeCall()")
     public Object logAssertOperation(final ProceedingJoinPoint joinPoint,
-                                     final AbstractAssert<?, ?> assertion) throws Throwable {
+                                     final AbstractAssert<?, ?> assertion)
+            throws Throwable {
         final String methodName = getMethodName(joinPoint);
         if (isRecordingMuted() || getRecorder().isIgnored(methodName)) {
             return joinPoint.proceed();
@@ -110,8 +118,10 @@ public Object logAssertOperation(final ProceedingJoinPoint joinPoint,
         }
     }
 
-    @After("execution(public void org.assertj.core.api.DefaultAssertionErrorCollector.collectAssertionError("
-            + "java.lang.AssertionError)) && args(error)")
+    @After(
+        "execution(public void org.assertj.core.api.DefaultAssertionErrorCollector.collectAssertionError("
+                + "java.lang.AssertionError)) && args(error)"
+    )
     public void softAssertionFailed(final AssertionError error) {
         getRecorder().softAssertionFailed(error);
     }
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJMethodSupport.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJMethodSupport.java
index 685e51bf0..455b28039 100644
--- a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJMethodSupport.java
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJMethodSupport.java
@@ -37,35 +37,37 @@ final class AssertJMethodSupport {
             "toString"
     );
 
-    private static final Set<String> NAVIGATION_METHODS = new HashSet<>(Arrays.asList(
-            "asBase64Decoded",
-            "asBoolean",
-            "asByte",
-            "asDouble",
-            "asFloat",
-            "asInstanceOf",
-            "asInt",
-            "asList",
-            "asLong",
-            "asShort",
-            "asString",
-            "bytes",
-            "decodedAsBase64",
-            "element",
-            "elements",
-            "extracting",
-            "extractingResultOf",
-            "first",
-            "flatExtracting",
-            "flatMap",
-            "last",
-            "map",
-            "rootCause",
-            "singleElement",
-            "size",
-            "usingRecursiveAssertion",
-            "usingRecursiveComparison"
-    ));
+    private static final Set<String> NAVIGATION_METHODS = new HashSet<>(
+            Arrays.asList(
+                    "asBase64Decoded",
+                    "asBoolean",
+                    "asByte",
+                    "asDouble",
+                    "asFloat",
+                    "asInstanceOf",
+                    "asInt",
+                    "asList",
+                    "asLong",
+                    "asShort",
+                    "asString",
+                    "bytes",
+                    "decodedAsBase64",
+                    "element",
+                    "elements",
+                    "extracting",
+                    "extractingResultOf",
+                    "first",
+                    "flatExtracting",
+                    "flatMap",
+                    "last",
+                    "map",
+                    "rootCause",
+                    "singleElement",
+                    "size",
+                    "usingRecursiveAssertion",
+                    "usingRecursiveComparison"
+            )
+    );
 
     private AssertJMethodSupport() {
         throw new IllegalStateException("do not instantiate");
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJOperation.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJOperation.java
index d79b025fc..f06b8be49 100644
--- a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJOperation.java
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJOperation.java
@@ -15,8 +15,8 @@
  */
 package io.qameta.allure.assertj;
 
-import io.qameta.allure.model.Stage;
 import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.StepResult;
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJRecorder.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJRecorder.java
index 423d5a48d..50bc77531 100644
--- a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJRecorder.java
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJRecorder.java
@@ -221,12 +221,10 @@ private boolean isNavigationResult(final AssertJOperation activeOperation) {
         return activeOperation != null && activeOperation.isNavigation();
     }
 
-    @SuppressWarnings("PMD.CompareObjectsWithEquals")
     private boolean isInternalCallOnSameChain(final AssertJOperation activeOperation, final AssertJChain chain) {
         return activeOperation != null && activeOperation.getChain() == chain;
     }
 
-    @SuppressWarnings("PMD.CompareObjectsWithEquals")
     private void pop(final AssertJOperation operation) {
         if (operation.isNested()) {
             operation.leaveNested();
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJValueRenderer.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJValueRenderer.java
index d7bee7c89..3e33ae78c 100644
--- a/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJValueRenderer.java
+++ b/allure-assertj/src/main/java/io/qameta/allure/assertj/AssertJValueRenderer.java
@@ -70,10 +70,12 @@ List<Parameter> renderParameters(final String methodName, final Object[] args) {
             if (renderedOperation.contains(value)) {
                 continue;
             }
-            parameters.add(new Parameter()
-                    .setName(parameterName(methodName, index))
-                    .setValue(value)
-                    .setMode(Parameter.Mode.DEFAULT));
+            parameters.add(
+                    new Parameter()
+                            .setName(parameterName(methodName, index))
+                            .setValue(value)
+                            .setMode(Parameter.Mode.DEFAULT)
+            );
         }
         return parameters;
     }
diff --git a/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java b/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
index 1567e7e11..71e14e7ca 100644
--- a/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
+++ b/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
@@ -150,10 +150,12 @@ void shouldRenderSmallArraysAsValues() {
     @Test
     void shouldRenderTuplesAsValues() {
         final AllureResults results = runWithinTestContext(() -> {
-            assertThat(Arrays.asList(
-                    tuple("first", Status.PASSED),
-                    tuple("second", Status.FAILED)
-            ))
+            assertThat(
+                    Arrays.asList(
+                            tuple("first", Status.PASSED),
+                            tuple("second", Status.FAILED)
+                    )
+            )
                     .containsExactly(
                             tuple("first", Status.PASSED),
                             tuple("second", Status.FAILED)
@@ -465,9 +467,11 @@ void shouldMarkTheFailedSoftAssertionOperationBeforeAssertAll() {
     void shouldAttachNestedAssertionsUnderCallbackOperations() {
         final AllureResults results = runWithinTestContext(() -> {
             assertThat("alpha")
-                    .satisfies(value -> assertThat(value)
-                            .startsWith("al")
-                            .endsWith("ha"));
+                    .satisfies(
+                            value -> assertThat(value)
+                                    .startsWith("al")
+                                    .endsWith("ha")
+                    );
         }, AllureAspectJ::setLifecycle);
 
         final TestResult result = assertOnlyOneResult(results);
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
index 15423fc86..44029cc85 100644
--- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
+++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
@@ -19,7 +19,6 @@
  * @param <T> the type of attachment data
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("PMD.AvoidUncheckedExceptionsInSignatures")
 @FunctionalInterface
 public interface AttachmentRenderer<T extends AttachmentData> {
 
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
index 4f0c235e8..3c37c53ab 100644
--- a/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
+++ b/allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
@@ -35,7 +35,6 @@ class FreemarkerAttachmentRendererTest {
     private static final String FILE_EXTENSION = "fileExtension";
     private static final String HTML = ".html";
 
-
     @AllureFeatures.Attachments
     @Test
     void shouldRenderRequestAttachment() {
diff --git a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
index 451e3fd9b..a19e5e31e 100644
--- a/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
+++ b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
@@ -77,8 +77,7 @@ public class AllureAwaitilityListener implements ConditionEvaluationListener<Obj
 
     private String currentConditionStepUUID;
 
-    private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE
-            = new InheritableThreadLocal<AllureLifecycle>() {
+    private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE = new InheritableThreadLocal<AllureLifecycle>() {
         @Override
         protected AllureLifecycle initialValue() {
             return Allure.getLifecycle();
@@ -225,7 +224,8 @@ public void exceptionIgnored(final IgnoredException ignoredException) {
             getLifecycle().updateStep(awaitilityCondition -> {
                 final String currentExceptionIgnoredStepUUID = UUID.randomUUID().toString();
                 final String message = String.format(
-                        onExceptionStepTextPattern, ignoredException.getThrowable().getMessage());
+                        onExceptionStepTextPattern, ignoredException.getThrowable().getMessage()
+                );
                 final StringWriter stringWriter = new StringWriter();
                 ignoredException.getThrowable().printStackTrace(new PrintWriter(stringWriter));
                 final String stackTrace = stringWriter.toString();
@@ -239,7 +239,8 @@ public void exceptionIgnored(final IgnoredException ignoredException) {
                 );
                 getLifecycle().addAttachment(
                         ignoredException.getThrowable().getMessage(), "text/plain", ".txt",
-                        stackTrace.getBytes(StandardCharsets.UTF_8));
+                        stackTrace.getBytes(StandardCharsets.UTF_8)
+                );
                 getLifecycle().stopStep(currentExceptionIgnoredStepUUID);
             });
         }
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
index 592078479..9eb6d7d6f 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
@@ -58,27 +58,27 @@ static void setup() {
     @TestFactory
     Stream<DynamicNode> globalSettingsAwaitWoAliasCheckTopLevelPassedStep() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
-                    final AtomicInteger atomicInteger = new AtomicInteger(0);
-                    await().with()
-                            .conditionEvaluationListener(new AllureAwaitilityListener())
-                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
-                            .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
-                            .until(atomicInteger::getAndIncrement, is(3));
-                },
+            final AtomicInteger atomicInteger = new AtomicInteger(0);
+            await().with()
+                    .conditionEvaluationListener(new AllureAwaitilityListener())
+                    .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                    .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+                    .until(atomicInteger::getAndIncrement, is(3));
+        },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
 
         return Stream.of(
-                DynamicTest.dynamicTest("Exactly 1 top level step for 1 awaitility condition", () ->
-                        assertThat(testResult.get(0).getSteps())
+                DynamicTest.dynamicTest(
+                        "Exactly 1 top level step for 1 awaitility condition", () -> assertThat(testResult.get(0).getSteps())
                                 .hasSize(1)
                 ),
-                DynamicTest.dynamicTest("Top level step has passed status", () ->
-                        assertThat(testResult.get(0).getSteps())
+                DynamicTest.dynamicTest(
+                        "Top level step has passed status", () -> assertThat(testResult.get(0).getSteps())
                                 .allMatch(step -> Status.PASSED.equals(step.getStatus()))
                 ),
-                DynamicTest.dynamicTest("Top level step has default name because await() wo alias", () ->
-                        assertThat(testResult.get(0).getSteps())
+                DynamicTest.dynamicTest(
+                        "Top level step has default name because await() wo alias", () -> assertThat(testResult.get(0).getSteps())
                                 .extracting(StepResult::getName)
                                 .containsExactly("Awaitility: Starting evaluation")
                 )
@@ -96,13 +96,13 @@ Stream<DynamicNode> globalSettingsAwaitWoAliasCheckTopLevelPassedStep() {
     @Test
     void globalSettingsAwaitWithAliasCheckTopLevelPassedStep() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
-                    final AtomicInteger atomicInteger = new AtomicInteger(0);
-                    await("Counter should be at least 3").with()
-                            .conditionEvaluationListener(new AllureAwaitilityListener())
-                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
-                            .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
-                            .until(atomicInteger::getAndIncrement, is(3));
-                },
+            final AtomicInteger atomicInteger = new AtomicInteger(0);
+            await("Counter should be at least 3").with()
+                    .conditionEvaluationListener(new AllureAwaitilityListener())
+                    .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                    .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+                    .until(atomicInteger::getAndIncrement, is(3));
+        },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
         assertEquals(
@@ -125,51 +125,51 @@ void globalSettingsAwaitWithAliasCheckTopLevelPassedStep() {
     @TestFactory
     Stream<DynamicNode> globalSettingsCheckAwaitWoAliasSecondLevelPassedSteps() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
-                    final AtomicInteger atomicInteger = new AtomicInteger(0);
-                    await().with()
-                            .conditionEvaluationListener(new AllureAwaitilityListener())
-                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
-                            .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
-                            .until(atomicInteger::getAndIncrement, is(3));
-                },
+            final AtomicInteger atomicInteger = new AtomicInteger(0);
+            await().with()
+                    .conditionEvaluationListener(new AllureAwaitilityListener())
+                    .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                    .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+                    .until(atomicInteger::getAndIncrement, is(3));
+        },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
 
         return Stream.of(
-                dynamicTest("Exactly 4 second level steps for 4 polling iterations", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps())
+                dynamicTest(
+                        "Exactly 4 second level steps for 4 polling iterations", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps())
                                 .hasSize(4)
                 ),
-                dynamicTest("All second level steps has passed statuses", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps())
+                dynamicTest(
+                        "All second level steps has passed statuses", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps())
                                 .allMatch(x -> x.getStatus().equals(Status.PASSED))
                 ),
-                dynamicTest("Second level step 1 name", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
+                dynamicTest(
+                        "Second level step 1 name", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
                                 .contains("io.qameta.allure.awaitility.ConditionListenersPositiveTest")
                                 .contains("expected <3> but was <0>")
                                 .contains("elapsed time")
                                 .contains("remaining time")
                                 .contains("last poll interval was")
                 ),
-                dynamicTest("Second level step 2 name", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
+                dynamicTest(
+                        "Second level step 2 name", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
                                 .contains("io.qameta.allure.awaitility.ConditionListenersPositiveTest")
                                 .contains("expected <3> but was <1>")
                                 .contains("elapsed time")
                                 .contains("remaining time")
                                 .contains("last poll interval was")
                 ),
-                dynamicTest("Second level step 3 name", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(2).getName())
+                dynamicTest(
+                        "Second level step 3 name", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(2).getName())
                                 .contains("io.qameta.allure.awaitility.ConditionListenersPositiveTest")
                                 .contains("expected <3> but was <2>")
                                 .contains("elapsed time")
                                 .contains("remaining time")
                                 .contains("last poll interval was")
                 ),
-                dynamicTest("Second level step 4 name", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(3).getName())
+                dynamicTest(
+                        "Second level step 4 name", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(3).getName())
                                 .contains("io.qameta.allure.awaitility.ConditionListenersPositiveTest")
                                 .contains("reached its end value of <3> after")
                                 .contains("remaining time")
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
index b01c36cd6..c00fcf774 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
@@ -63,12 +63,12 @@ void setup() {
     @Test
     void globalSettingsAwaitWoAliasCheckTopLevelBrokenStep() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
-                    final AtomicInteger atomicInteger = new AtomicInteger(0);
-                    await().with()
-                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
-                            .pollInterval(Duration.of(500, ChronoUnit.MILLIS))
-                            .until(atomicInteger::getAndIncrement, is(3));
-                },
+            final AtomicInteger atomicInteger = new AtomicInteger(0);
+            await().with()
+                    .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                    .pollInterval(Duration.of(500, ChronoUnit.MILLIS))
+                    .until(atomicInteger::getAndIncrement, is(3));
+        },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
         assertEquals(
@@ -90,37 +90,42 @@ void globalSettingsAwaitWoAliasCheckTopLevelBrokenStep() {
     @TestFactory
     Stream<DynamicNode> globalSettingsCheckAwaitWoAliasSecondLevelTimeoutStep() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
-                    final AtomicInteger atomicInteger = new AtomicInteger(0);
-                    await().with()
-                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
-                            .pollInterval(Duration.of(500, ChronoUnit.MILLIS))
-                            .until(atomicInteger::getAndIncrement, is(3));
-                },
+            final AtomicInteger atomicInteger = new AtomicInteger(0);
+            await().with()
+                    .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                    .pollInterval(Duration.of(500, ChronoUnit.MILLIS))
+                    .until(atomicInteger::getAndIncrement, is(3));
+        },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
 
         return Stream.of(
-                dynamicTest("Second level steps count", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps())
+                dynamicTest(
+                        "Second level steps count", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps())
                                 .as("Exactly 2 second level steps for 2 polling iterations")
-                                .hasSize(2)),
-                dynamicTest("Second level step 1 name", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
+                                .hasSize(2)
+                ),
+                dynamicTest(
+                        "Second level step 1 name", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
                                 .contains("io.qameta.allure.awaitility.GlobalSettingsNegativeTest")
                                 .contains("expected <3> but was <0>")
                                 .contains("elapsed time")
                                 .contains("remaining time")
-                                .contains("last poll interval was")),
-                dynamicTest("Second level step 1 status", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getStatus())
-                                .isEqualTo(Status.PASSED)),
-                dynamicTest("Second level step 2 name", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
+                                .contains("last poll interval was")
+                ),
+                dynamicTest(
+                        "Second level step 1 status", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getStatus())
+                                .isEqualTo(Status.PASSED)
+                ),
+                dynamicTest(
+                        "Second level step 2 name", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
                                 .contains("Condition timeout.")
-                                .contains("io.qameta.allure.awaitility.GlobalSettingsNegativeTest")),
-                dynamicTest("Second level step 2 status", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getStatus())
-                                .isEqualTo(Status.BROKEN))
+                                .contains("io.qameta.allure.awaitility.GlobalSettingsNegativeTest")
+                ),
+                dynamicTest(
+                        "Second level step 2 status", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getStatus())
+                                .isEqualTo(Status.BROKEN)
+                )
         );
     }
 
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
index df782adac..dfb3ff3b7 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
@@ -65,29 +65,29 @@ void setup() {
     @Test
     Stream<DynamicNode> globalSettingsAwaitWoAliasCheckTopLevelPassedStep() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
-                    final AtomicInteger atomicInteger = new AtomicInteger(0);
-                    await().with()
-                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
-                            .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
-                            .until(atomicInteger::getAndIncrement, is(3));
-                },
+            final AtomicInteger atomicInteger = new AtomicInteger(0);
+            await().with()
+                    .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                    .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+                    .until(atomicInteger::getAndIncrement, is(3));
+        },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
 
         return Stream.of(
-                dynamicTest("Steps count", () ->
-                        assertThat(testResult.get(0).getSteps())
+                dynamicTest(
+                        "Steps count", () -> assertThat(testResult.get(0).getSteps())
                                 .as("Exactly 1 top level step for 1 awaitility condition")
                                 .hasSize(1)
                 ),
-                dynamicTest("Top level step status", () ->
-                        assertEquals(
+                dynamicTest(
+                        "Top level step status", () -> assertEquals(
                                 Status.PASSED, testResult.get(0).getSteps().get(0).getStatus(),
                                 "Top level step has passed status"
                         )
                 ),
-                dynamicTest("Top level step name", () ->
-                        assertEquals(
+                dynamicTest(
+                        "Top level step name", () -> assertEquals(
                                 "Awaitility: Starting evaluation",
                                 testResult.get(0).getSteps().get(0).getName(),
                                 "Top level step has default name because await() wo alias"
@@ -107,12 +107,12 @@ Stream<DynamicNode> globalSettingsAwaitWoAliasCheckTopLevelPassedStep() {
     @Test
     void globalSettingsAwaitWithAliasCheckTopLevelPassedStep() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
-                    final AtomicInteger atomicInteger = new AtomicInteger(0);
-                    await("Counter should be at least 3").with()
-                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
-                            .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
-                            .until(atomicInteger::getAndIncrement, is(3));
-                },
+            final AtomicInteger atomicInteger = new AtomicInteger(0);
+            await("Counter should be at least 3").with()
+                    .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                    .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+                    .until(atomicInteger::getAndIncrement, is(3));
+        },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
         assertEquals(
@@ -135,24 +135,24 @@ void globalSettingsAwaitWithAliasCheckTopLevelPassedStep() {
     @Test
     Stream<DynamicNode> globalSettingsCheckAwaitWoAliasSecondLevelPassedSteps() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
-                    final AtomicInteger atomicInteger = new AtomicInteger(0);
-                    await().with()
-                            .atMost(Duration.of(1000, ChronoUnit.MILLIS))
-                            .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
-                            .until(atomicInteger::getAndIncrement, is(3));
-                },
+            final AtomicInteger atomicInteger = new AtomicInteger(0);
+            await().with()
+                    .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+                    .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+                    .until(atomicInteger::getAndIncrement, is(3));
+        },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
 
         return Stream.of(
-                dynamicTest("Second level steps count", () ->
-                        assertEquals(
+                dynamicTest(
+                        "Second level steps count", () -> assertEquals(
                                 4, testResult.get(0).getSteps().get(0).getSteps().size(),
                                 "Exactly 4 second level steps for 4 polling iterations"
                         )
                 ),
-                dynamicTest("Second level steps all passed", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps())
+                dynamicTest(
+                        "Second level steps all passed", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps())
                                 .extracting(StepResult::getStatus)
                                 .containsExactlyInAnyOrder(
                                         Status.PASSED,
@@ -161,32 +161,32 @@ Stream<DynamicNode> globalSettingsCheckAwaitWoAliasSecondLevelPassedSteps() {
                                         Status.PASSED
                                 )
                 ),
-                dynamicTest("Second level step 1 name", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
+                dynamicTest(
+                        "Second level step 1 name", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
                                 .contains("io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
                                 .contains("expected <3> but was <0>")
                                 .contains("elapsed time")
                                 .contains("remaining time")
                                 .contains("last poll interval was")
                 ),
-                dynamicTest("Second level step 2 name", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
+                dynamicTest(
+                        "Second level step 2 name", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
                                 .contains("io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
                                 .contains("expected <3> but was <1>")
                                 .contains("elapsed time")
                                 .contains("remaining time")
                                 .contains("last poll interval was")
                 ),
-                dynamicTest("Second level step 3 name", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(2).getName())
+                dynamicTest(
+                        "Second level step 3 name", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(2).getName())
                                 .contains("io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
                                 .contains("expected <3> but was <2>")
                                 .contains("elapsed time")
                                 .contains("remaining time")
                                 .contains("last poll interval was")
                 ),
-                dynamicTest("Second level step 4 name", () ->
-                        assertThat(testResult.get(0).getSteps().get(0).getSteps().get(3).getName())
+                dynamicTest(
+                        "Second level step 4 name", () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(3).getName())
                                 .contains("io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
                                 .contains("java.util.concurrent.atomic.AtomicInteger:")
                                 .contains("reached its end value of <3> after")
diff --git a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java
index 8acb2782f..6b2fff5f9 100644
--- a/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/MultipleConditionsTest.java
@@ -43,24 +43,24 @@ void setup() {
     @TestFactory
     Stream<DynamicNode> bothAwaitilityStepsShouldAppearTest() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
-                    await().with()
-                            .alias("First waiting")
-                            .until(() -> true);
-                    await().with()
-                            .alias("Second waiting")
-                            .until(() -> true);
-                },
+            await().with()
+                    .alias("First waiting")
+                    .until(() -> true);
+            await().with()
+                    .alias("Second waiting")
+                    .until(() -> true);
+        },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
 
         return Stream.of(
-                DynamicTest.dynamicTest("Exactly 2 top level step for 2 awaitility condition", () ->
-                        assertThat(testResult.get(0).getSteps())
+                DynamicTest.dynamicTest(
+                        "Exactly 2 top level step for 2 awaitility condition", () -> assertThat(testResult.get(0).getSteps())
                                 .describedAs("Allure TestResult contains exactly 2 top level step for 2 awaitility condition")
                                 .hasSize(2)
                 ),
-                DynamicTest.dynamicTest("All top level step for all awaitility condition has PASSED", () ->
-                        assertThat(testResult.get(0).getSteps())
+                DynamicTest.dynamicTest(
+                        "All top level step for all awaitility condition has PASSED", () -> assertThat(testResult.get(0).getSteps())
                                 .describedAs("Allure TestResult contains all top level step for all awaitility with PASSED condition")
                                 .allMatch(step -> Status.PASSED.equals(step.getStatus()))
                 )
diff --git a/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java b/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
index 8aeac02d8..b50ec45df 100644
--- a/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
+++ b/allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java
@@ -167,23 +167,26 @@ private void startTestCase(final TestCase testCase) {
         final TestResult result = new TestResult()
                 .setUuid(uuid)
                 .setName(testCase.getName())
-                .setTitlePath(testClass
-                        .map(ResultsUtils::createTitlePathFromJavaClass)
-                        .orElseGet(() -> createTitlePath(testCase.getName())))
+                .setTitlePath(
+                        testClass
+                                .map(ResultsUtils::createTitlePathFromJavaClass)
+                                .orElseGet(() -> createTitlePath(testCase.getName()))
+                )
                 .setStage(Stage.RUNNING);
 
         result.getLabels().addAll(getProvidedLabels());
 
-
         testClass.map(this::getLabels).ifPresent(result.getLabels()::addAll);
         testClass.map(this::getLinks).ifPresent(result.getLinks()::addAll);
 
-        result.getLabels().addAll(Arrays.asList(
-                createHostLabel(),
-                createThreadLabel(),
-                createFrameworkLabel("citrus"),
-                createLanguageLabel("java")
-        ));
+        result.getLabels().addAll(
+                Arrays.asList(
+                        createHostLabel(),
+                        createThreadLabel(),
+                        createFrameworkLabel("citrus"),
+                        createLanguageLabel("java")
+                )
+        );
 
         testClass.ifPresent(aClass -> {
             final String suiteName = aClass.getCanonicalName();
@@ -221,7 +224,6 @@ private void stopTestCase(final TestCase testCase,
         getLifecycle().writeTestCase(uuid);
     }
 
-
     private String createUuid(final TestCase testCase) {
         final String uuid = UUID.randomUUID().toString();
         try {
@@ -269,7 +271,8 @@ private List<Link> getLinks(final AnnotatedElement annotatedElement) {
         return Stream.of(
                 getAnnotations(annotatedElement, io.qameta.allure.Link.class).map(ResultsUtils::createLink),
                 getAnnotations(annotatedElement, io.qameta.allure.Issue.class).map(ResultsUtils::createLink),
-                getAnnotations(annotatedElement, io.qameta.allure.TmsLink.class).map(ResultsUtils::createLink))
+                getAnnotations(annotatedElement, io.qameta.allure.TmsLink.class).map(ResultsUtils::createLink)
+        )
                 .reduce(Stream::concat).orElseGet(Stream::empty).collect(Collectors.toList());
     }
 
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
index 8f57e5005..7cfdc67e5 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
@@ -80,11 +80,14 @@
 /**
  * Allure plugin for Cucumber JVM 4.0.
  */
-@SuppressWarnings({
-        "ClassDataAbstractionCoupling",
-        "ClassFanOutComplexity",
-        "MultipleStringLiterals",
-})
+@SuppressWarnings(
+    {
+            "ClassDataAbstractionCoupling",
+            "ClassFanOutComplexity",
+            "MultipleStringLiterals",
+            "PMD.GodClass",
+    }
+)
 public class AllureCucumber4Jvm implements ConcurrentEventListener {
 
     private static final String COLON = ":";
@@ -146,11 +149,11 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
 
         final String name = testCase.getName();
 
-
         // the same way full name is generated for
         // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
         // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
-        final String fullName = String.format("%s:%d",
+        final String fullName = String.format(
+                "%s:%d",
                 getTestCaseUri(testCase),
                 testCase.getLine()
         );
@@ -171,11 +174,10 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
 
-        final ScenarioDefinition scenarioDefinition =
-                testSources.getScenarioDefinition(
-                        testCase.getUri(),
-                        testCase.getLine()
-                );
+        final ScenarioDefinition scenarioDefinition = testSources.getScenarioDefinition(
+                testCase.getUri(),
+                testCase.getLine()
+        );
 
         if (scenarioDefinition instanceof ScenarioOutline) {
             result.setParameters(
@@ -215,9 +217,10 @@ private void handleTestCaseFinished(final TestCaseFinished event) {
                 .setMuted(tagParser.isMuted())
                 .setKnown(tagParser.isKnown());
 
-        lifecycle.updateTestCase(uuid, testResult -> testResult
-                .setStatus(status)
-                .setStatusDetails(statusDetails)
+        lifecycle.updateTestCase(
+                uuid, testResult -> testResult
+                        .setStatus(status)
+                        .setStatusDetails(statusDetails)
         );
 
         lifecycle.stopTestCase(uuid);
@@ -303,13 +306,13 @@ private void handleStartFixtureHook(final TestCase testCase,
             return;
         }
 
-
         final String containerUuid = hookStepContainerUuid
                 .computeIfAbsent(hook, unused -> UUID.randomUUID().toString());
 
-        lifecycle.startTestContainer(new TestResultContainer()
-                .setUuid(containerUuid)
-                .setChildren(Collections.singletonList(uuid))
+        lifecycle.startTestContainer(
+                new TestResultContainer()
+                        .setUuid(containerUuid)
+                        .setChildren(Collections.singletonList(uuid))
         );
 
         final FixtureResult hookResult = new FixtureResult()
@@ -408,15 +411,14 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(
-            final ScenarioOutline scenario,
-            final TestCase localCurrentTestCase) {
-        final Optional<Examples> maybeExample =
-                scenario.getExamples().stream()
-                        .filter(example -> example.getTableBody().stream()
-                                .anyMatch(row -> row.getLocation().getLine()
-                                                 == localCurrentTestCase.getLine())
-                        )
-                        .findFirst();
+                                                    final ScenarioOutline scenario,
+                                                    final TestCase localCurrentTestCase) {
+        final Optional<Examples> maybeExample = scenario.getExamples().stream()
+                .filter(
+                        example -> example.getTableBody().stream()
+                                .anyMatch(row -> row.getLocation().getLine() == localCurrentTestCase.getLine())
+                )
+                .findFirst();
 
         if (!maybeExample.isPresent()) {
             return Collections.emptyList();
@@ -455,8 +457,10 @@ private void createDataTableAttachment(final PickleTable pickleTable) {
         }
         final String attachmentSource = lifecycle
                 .prepareAttachment("Data table", "text/tab-separated-values", "csv");
-        lifecycle.writeAttachment(attachmentSource,
-                new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
+        lifecycle.writeAttachment(
+                attachmentSource,
+                new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8))
+        );
     }
 
     private void handleStopHookStep(final Result eventResult,
@@ -477,9 +481,10 @@ private void handleStopHookStep(final Result eventResult,
         final StatusDetails statusDetails = getStatusDetails(eventResult.getError())
                 .orElseGet(StatusDetails::new);
 
-        lifecycle.updateFixture(uuid, result -> result
-                .setStatus(status)
-                .setStatusDetails(statusDetails)
+        lifecycle.updateFixture(
+                uuid, result -> result
+                        .setStatus(status)
+                        .setStatusDetails(statusDetails)
         );
         lifecycle.stopFixture(uuid);
 
@@ -500,8 +505,7 @@ private void handleStopStep(final TestCase testCase,
 
         final Status stepStatus = translateTestCaseStatus(eventResult);
 
-        final StatusDetails statusDetails
-                = eventResult.getStatus() == Result.Type.UNDEFINED
+        final StatusDetails statusDetails = eventResult.getStatus() == Result.Type.UNDEFINED
                 ? new StatusDetails().setMessage("Undefined Step. Please add step definition")
                 : getStatusDetails(eventResult.getError())
                         .orElse(new StatusDetails());
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
index 0424e6e15..1f54ea8f9 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java
@@ -49,7 +49,7 @@
 /**
  * Scenario labels and links builder.
  */
-@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"})
+@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals", "PMD.CognitiveComplexity"})
 final class LabelBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
     private static final String COMPOSITE_TAG_DELIMITER = "=";
@@ -116,17 +116,19 @@ final class LabelBuilder {
         final String uri = scenario.getUri();
 
         scenarioLabels.addAll(ResultsUtils.getProvidedLabels());
-        scenarioLabels.addAll(Arrays.asList(
-                createHostLabel(),
-                createThreadLabel(),
-                createFeatureLabel(featureName),
-                createStoryLabel(scenario.getName()),
-                createSuiteLabel(featureName),
-                createTestClassLabel(scenario.getName()),
-                createFrameworkLabel("cucumber4jvm"),
-                createLanguageLabel("java"),
-                createLabel("gherkin_uri", uri)
-        ));
+        scenarioLabels.addAll(
+                Arrays.asList(
+                        createHostLabel(),
+                        createThreadLabel(),
+                        createFeatureLabel(featureName),
+                        createStoryLabel(scenario.getName()),
+                        createSuiteLabel(featureName),
+                        createTestClassLabel(scenario.getName()),
+                        createFrameworkLabel("cucumber4jvm"),
+                        createLanguageLabel("java"),
+                        createLabel("gherkin_uri", uri)
+                )
+        );
 
         featurePackage(uri, featureName)
                 .map(ResultsUtils::createPackageLabel)
@@ -159,8 +161,10 @@ private void tryHandleNamedLink(final String tagString) {
             final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
             scenarioLinks.add(ResultsUtils.createLink(null, name, null, type));
         } else {
-            LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
-                    namedLinkPatternString);
+            LOGGER.warn(
+                    "Composite named tag {} does not match regex {}. Skipping", tagString,
+                    namedLinkPatternString
+            );
         }
     }
 
@@ -178,10 +182,12 @@ private Optional<String> featurePackage(final String uriString, final String fea
         final String schemeSpecificPart = uri.normalize().getSchemeSpecificPart();
         final Stream<String> folders = Stream.of(schemeSpecificPart.replaceAll("\\.", "_").split("/"));
         final Stream<String> name = Stream.of(featureName);
-        return Optional.of(Stream.concat(folders, name)
-                .filter(Objects::nonNull)
-                .filter(s -> !s.isEmpty())
-                .collect(Collectors.joining(".")));
+        return Optional.of(
+                Stream.concat(folders, name)
+                        .filter(Objects::nonNull)
+                        .filter(s -> !s.isEmpty())
+                        .collect(Collectors.joining("."))
+        );
     }
 
     private static Optional<URI> safeUri(final String uri) {
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
index 4839d4eac..cc4b120dc 100644
--- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
+++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/TagParser.java
@@ -52,9 +52,9 @@ public boolean isKnown() {
 
     private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
-                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName))
-               || feature.getTags().stream()
-                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+                .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName))
+                || feature.getTags().stream()
+                        .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
     public boolean isResultTag(final PickleTag tag) {
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
index a957cd88c..640148a10 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
@@ -182,7 +182,7 @@ void shouldSetDescription() {
         final AllureResults results = runFeature("features/description.feature");
 
         final String expected = "This is description for current feature.\n"
-                                + "It should appear on each scenario in report";
+                + "It should appear on each scenario in report";
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
@@ -199,7 +199,7 @@ void shouldSetScenarioDescription() {
         final AllureResults results = runFeature("features/scenario_description.feature");
 
         final String expected = "This is description for current feature.\n"
-                                + "It should appear on each scenario in report";
+                + "It should appear on each scenario in report";
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
@@ -237,11 +237,12 @@ void shouldAddDataTableAttachment() {
         final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
 
         assertThat(attachmentContent)
-                .isEqualTo("""
-                        name\tlogin\temail
-                        Viktor\tclicman\tclicman@ya.ru
-                        Viktor2\tclicman2\tclicman2@ya.ru
+                .isEqualTo(
                         """
+                                name\tlogin\temail
+                                Viktor\tclicman\tclicman@ya.ru
+                                Viktor2\tclicman2\tclicman2@ya.ru
+                                """
                 );
 
     }
@@ -380,8 +381,14 @@ void shouldAddTags() {
 
     @AllureFeatures.Links
     @ExtendWith(SystemPropertyExtension.class)
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
+    @SystemProperty(
+            name = "allure.link.issue.pattern",
+            value = "https://example.org/issue/{}"
+    )
+    @SystemProperty(
+            name = "allure.link.tms.pattern",
+            value = "https://example.org/tms/{}"
+    )
     @Test
     void shouldAddLinks() {
         final AllureResults results = runFeature("features/tags.feature");
@@ -510,8 +517,10 @@ void shouldSupportDryRunForSimpleFeatures() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForHooks() {
-        final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
-                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+        final AllureResults results = runFeature(
+                "features/hooks.feature", "--dry-run", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException"
+        );
 
         final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
 
@@ -651,8 +660,10 @@ void shouldProcessScenariosInParallelMode() {
     @AllureFeatures.Stages
     @Test
     void shouldDisplayHooksAsStages() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t",
-                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+        final AllureResults results = runFeature(
+                "features/hooks.feature", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException"
+        );
 
         final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
         final TestResult tr2 = results.getTestResultByName("Simple scenario with Before hook with Exception");
@@ -690,7 +701,6 @@ void shouldDisplayHooksAsStages() {
                         tuple("Then result is 15", Status.SKIPPED)
                 );
 
-
         assertThat(results.getTestResultContainersForTestResult(tr2))
                 .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
@@ -736,8 +746,14 @@ void shouldHandleAmbigiousStepsExceptions() {
                 );
     }
 
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm5-test-provided")
+    @ResourceLock(
+            value = SYSTEM_PROPERTIES,
+            mode = READ_WRITE
+    )
+    @SystemProperty(
+            name = "allure.label.x-provided",
+            value = "cucumberjvm5-test-provided"
+    )
     @Test
     void shouldSupportProvidedLabels() {
         final AllureResults results = runFeature("features/simple.feature");
@@ -782,7 +798,10 @@ void shouldSupportRuntimeApiInStepsWhenHooksAreUsed() {
                 );
     }
 
-    @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
+    @SystemProperty(
+            name = "cucumber.junit-platform.naming-strategy",
+            value = "long"
+    )
     @Step
     private AllureResults runFeature(final String featureResource,
                                      final String... moreOptions) {
@@ -790,17 +809,18 @@ private AllureResults runFeature(final String featureResource,
             final AllureCucumber4Jvm cucumber4Jvm = new AllureCucumber4Jvm(lifecycle);
             final ClassLoader classLoader = currentThread().getContextClassLoader();
             final ResourceLoader resourceLoader = new MultiLoader(classLoader);
-            final List<String> opts = new ArrayList<>(Arrays.asList(
-                    "--glue", "io.qameta.allure.cucumber4jvm.samples",
-                    "--plugin", "null_summary"
-            ));
+            final List<String> opts = new ArrayList<>(
+                    Arrays.asList(
+                            "--glue", "io.qameta.allure.cucumber4jvm.samples",
+                            "--plugin", "null_summary"
+                    )
+            );
             opts.addAll(Arrays.asList(moreOptions));
             final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
             final RuntimeOptions options = new CommandlineOptionsParser()
                     .parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();
 
-            final FeaturePathFeatureSupplier supplier
-                    = new FeaturePathFeatureSupplier(new FeatureLoader(resourceLoader), options);
+            final FeaturePathFeatureSupplier supplier = new FeaturePathFeatureSupplier(new FeatureLoader(resourceLoader), options);
 
             final Runtime runtime = Runtime.builder()
                     .withClassLoader(classLoader)
@@ -813,5 +833,4 @@ private AllureResults runFeature(final String featureResource,
         });
     }
 
-
 }
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
index 429e6290c..07de408cf 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
@@ -34,7 +34,7 @@ public void ambigious_2() {
     }
 
     @Then("^something bad should happen")
-    public void somethingBadStep(){
+    public void somethingBadStep() {
         //nothing here
     }
 }
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
index d83071100..75b44942f 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
@@ -19,25 +19,21 @@
 import io.cucumber.java.Before;
 import io.cucumber.java.en.Given;
 
-public class AttachmentSteps
-{
+public class AttachmentSteps {
     private Scenario scenario;
 
     @Before("@attachments")
-    public void setup(Scenario scenario)
-    {
+    public void setup(Scenario scenario) {
         this.scenario = scenario;
     }
 
     @Given("step with scenario write")
-    public void stepWithScenarioWrite()
-    {
+    public void stepWithScenarioWrite() {
         scenario.write("text attachment");
     }
 
     @Given("step with scenario embed")
-    public void stepWithScenarioEmbed()
-    {
+    public void stepWithScenarioEmbed() {
         scenario.embed("image attachment".getBytes(), "image/png");
     }
 }
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
index 158b5ece1..235af0322 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
@@ -15,8 +15,8 @@
  */
 package io.qameta.allure.cucumber4jvm.samples;
 
-import io.cucumber.java.en.Given;
 import io.cucumber.datatable.DataTable;
+import io.cucumber.java.en.Given;
 
 /**
  * @author charlie (Dmitry Baev).
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
index 2aa7f01ff..9c4666faf 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
@@ -25,22 +25,22 @@
 public class HookSteps {
 
     @Before("@WithHooks")
-    public void beforeHook(){
+    public void beforeHook() {
         // nothing
     }
 
     @After("@WithHooks")
-    public void afterHook(){
+    public void afterHook() {
         // nothing
     }
 
     @Before("@BeforeHookWithException")
-    public void beforeHookWithException(){
+    public void beforeHookWithException() {
         Assertions.fail("Exception in Hook step");
     }
 
     @After("@AfterHookWithException")
-    public void afterHookWithException(){
+    public void afterHookWithException() {
         Assertions.fail("Exception in Hook step");
     }
 
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java
index 4c768742d..16ac13201 100644
--- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java
+++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/RuntimeApiSteps.java
@@ -27,12 +27,12 @@
 public class RuntimeApiSteps {
 
     @Before("@beforeScenario")
-    public void beforeScenario(){
+    public void beforeScenario() {
         // nothing
     }
 
     @Before("@beforeFeature")
-    public void beforeFeature(){
+    public void beforeFeature() {
         // nothing
     }
 
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
index a0dec5f37..682cc3787 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java
@@ -76,11 +76,14 @@
 /**
  * Allure plugin for Cucumber JVM 5.0.
  */
-@SuppressWarnings({
-        "ClassDataAbstractionCoupling",
-        "ClassFanOutComplexity",
-        "MultipleStringLiterals",
-})
+@SuppressWarnings(
+    {
+            "ClassDataAbstractionCoupling",
+            "ClassFanOutComplexity",
+            "MultipleStringLiterals",
+            "PMD.GodClass",
+    }
+)
 public class AllureCucumber5Jvm implements ConcurrentEventListener {
 
     private static final String COLON = ":";
@@ -141,11 +144,11 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
 
         final String name = testCase.getName();
 
-
         // the same way full name is generated for
         // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
         // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
-        final String fullName = String.format("%s:%d",
+        final String fullName = String.format(
+                "%s:%d",
                 getTestCaseUri(testCase),
                 testCase.getLine()
         );
@@ -165,11 +168,10 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
 
-        final ScenarioDefinition scenarioDefinition =
-                testSources.getScenarioDefinition(
-                        testCase.getUri(),
-                        testCase.getLine()
-                );
+        final ScenarioDefinition scenarioDefinition = testSources.getScenarioDefinition(
+                testCase.getUri(),
+                testCase.getLine()
+        );
 
         if (scenarioDefinition instanceof ScenarioOutline) {
             result.setParameters(
@@ -205,9 +207,10 @@ private void handleTestCaseFinished(final TestCaseFinished event) {
                 .setMuted(tagParser.isMuted())
                 .setKnown(tagParser.isKnown());
 
-        lifecycle.updateTestCase(uuid, testResult -> testResult
-                .setStatus(status)
-                .setStatusDetails(statusDetails)
+        lifecycle.updateTestCase(
+                uuid, testResult -> testResult
+                        .setStatus(status)
+                        .setStatusDetails(statusDetails)
         );
 
         lifecycle.stopTestCase(uuid);
@@ -275,9 +278,10 @@ private void handleStartFixtureHook(final TestCase testCase,
         final String containerUuid = hookStepContainerUuid
                 .computeIfAbsent(hook, unused -> UUID.randomUUID().toString());
 
-        lifecycle.startTestContainer(new TestResultContainer()
-                .setUuid(containerUuid)
-                .setChildren(Collections.singletonList(uuid))
+        lifecycle.startTestContainer(
+                new TestResultContainer()
+                        .setUuid(containerUuid)
+                        .setChildren(Collections.singletonList(uuid))
         );
 
         final FixtureResult hookResult = new FixtureResult()
@@ -360,15 +364,14 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(
-            final ScenarioOutline scenario,
-            final TestCase localCurrentTestCase) {
-        final Optional<Examples> maybeExample =
-                scenario.getExamples().stream()
-                        .filter(example -> example.getTableBody().stream()
-                                .anyMatch(row -> row.getLocation().getLine()
-                                                 == localCurrentTestCase.getLine())
-                        )
-                        .findFirst();
+                                                    final ScenarioOutline scenario,
+                                                    final TestCase localCurrentTestCase) {
+        final Optional<Examples> maybeExample = scenario.getExamples().stream()
+                .filter(
+                        example -> example.getTableBody().stream()
+                                .anyMatch(row -> row.getLocation().getLine() == localCurrentTestCase.getLine())
+                )
+                .findFirst();
 
         if (!maybeExample.isPresent()) {
             return Collections.emptyList();
@@ -406,8 +409,10 @@ private void createDataTableAttachment(final DataTableArgument dataTableArgument
         }
         final String attachmentSource = lifecycle
                 .prepareAttachment("Data table", "text/tab-separated-values", "csv");
-        lifecycle.writeAttachment(attachmentSource,
-                new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
+        lifecycle.writeAttachment(
+                attachmentSource,
+                new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8))
+        );
     }
 
     private void handleStopHookStep(final Result eventResult,
@@ -428,9 +433,10 @@ private void handleStopHookStep(final Result eventResult,
         final StatusDetails statusDetails = getStatusDetails(eventResult.getError())
                 .orElseGet(StatusDetails::new);
 
-        lifecycle.updateFixture(uuid, result -> result
-                .setStatus(status)
-                .setStatusDetails(statusDetails)
+        lifecycle.updateFixture(
+                uuid, result -> result
+                        .setStatus(status)
+                        .setStatusDetails(statusDetails)
         );
         lifecycle.stopFixture(uuid);
 
@@ -451,8 +457,7 @@ private void handleStopStep(final TestCase testCase,
 
         final Status stepStatus = translateTestCaseStatus(eventResult);
 
-        final StatusDetails statusDetails
-                = eventResult.getStatus() == io.cucumber.plugin.event.Status.UNDEFINED
+        final StatusDetails statusDetails = eventResult.getStatus() == io.cucumber.plugin.event.Status.UNDEFINED
                 ? new StatusDetails().setMessage("Undefined Step. Please add step definition")
                 : getStatusDetails(eventResult.getError())
                         .orElse(new StatusDetails());
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
index 733211486..31d7d53f8 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java
@@ -15,8 +15,8 @@
  */
 package io.qameta.allure.cucumber5jvm;
 
-import io.cucumber.plugin.event.TestCase;
 import gherkin.ast.Feature;
+import io.cucumber.plugin.event.TestCase;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import io.qameta.allure.util.ResultsUtils;
@@ -48,7 +48,7 @@
 /**
  * Scenario labels and links builder.
  */
-@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"})
+@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals", "PMD.CognitiveComplexity"})
 class LabelBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
     private static final String COMPOSITE_TAG_DELIMITER = "=";
@@ -113,17 +113,19 @@ class LabelBuilder {
         final URI uri = scenario.getUri();
 
         scenarioLabels.addAll(ResultsUtils.getProvidedLabels());
-        scenarioLabels.addAll(Arrays.asList(
-                createHostLabel(),
-                createThreadLabel(),
-                createFeatureLabel(featureName),
-                createStoryLabel(scenario.getName()),
-                createSuiteLabel(featureName),
-                createTestClassLabel(scenario.getName()),
-                createFrameworkLabel("cucumber5jvm"),
-                createLanguageLabel("java"),
-                createLabel("gherkin_uri", uri.toString())
-        ));
+        scenarioLabels.addAll(
+                Arrays.asList(
+                        createHostLabel(),
+                        createThreadLabel(),
+                        createFeatureLabel(featureName),
+                        createStoryLabel(scenario.getName()),
+                        createSuiteLabel(featureName),
+                        createTestClassLabel(scenario.getName()),
+                        createFrameworkLabel("cucumber5jvm"),
+                        createLanguageLabel("java"),
+                        createLabel("gherkin_uri", uri.toString())
+                )
+        );
 
         featurePackage(uri.toString(), featureName)
                 .map(ResultsUtils::createPackageLabel)
@@ -156,8 +158,10 @@ private void tryHandleNamedLink(final String tagString) {
             final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
             scenarioLinks.add(ResultsUtils.createLink(null, name, null, type));
         } else {
-            LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
-                    namedLinkPatternString);
+            LOGGER.warn(
+                    "Composite named tag {} does not match regex {}. Skipping", tagString,
+                    namedLinkPatternString
+            );
         }
     }
 
@@ -175,10 +179,12 @@ private Optional<String> featurePackage(final String uriString, final String fea
         final String schemeSpecificPart = uri.normalize().getSchemeSpecificPart();
         final Stream<String> folders = Stream.of(schemeSpecificPart.replaceAll("\\.", "_").split("/"));
         final Stream<String> name = Stream.of(featureName);
-        return Optional.of(Stream.concat(folders, name)
-                .filter(Objects::nonNull)
-                .filter(s -> !s.isEmpty())
-                .collect(Collectors.joining(".")));
+        return Optional.of(
+                Stream.concat(folders, name)
+                        .filter(Objects::nonNull)
+                        .filter(s -> !s.isEmpty())
+                        .collect(Collectors.joining("."))
+        );
     }
 
     private static Optional<URI> safeUri(final String uri) {
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
index 5e980a981..e2e31d22f 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/TagParser.java
@@ -51,9 +51,9 @@ public boolean isKnown() {
 
     private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
-                       .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
-               || feature.getTags().stream()
-                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+                .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
+                || feature.getTags().stream()
+                        .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
     public boolean isResultTag(final String tag) {
diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java
index 356783cbf..7249c97a5 100644
--- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java
+++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java
@@ -28,6 +28,7 @@
 import gherkin.ast.Step;
 import gherkin.ast.TableRow;
 import io.cucumber.plugin.event.TestSourceRead;
+
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
@@ -38,7 +39,8 @@ public final class TestSourcesModel {
     private final Map<URI, Map<Integer, AstNode>> pathToNodeMap = new HashMap<>();
 
     public static ScenarioDefinition getScenarioDefinition(final AstNode astNode) {
-        return astNode.node instanceof ScenarioDefinition ? (ScenarioDefinition) astNode.node
+        return astNode.node instanceof ScenarioDefinition
+                ? (ScenarioDefinition) astNode.node
                 : (ScenarioDefinition) astNode.parent.parent.node;
     }
 
@@ -73,8 +75,10 @@ private void parseGherkinSource(final URI path) {
         final Parser<GherkinDocument> parser = new Parser<>(new AstBuilder());
         final TokenMatcher matcher = new TokenMatcher();
         try {
-            final GherkinDocument gherkinDocument = parser.parse(pathToReadEventMap.get(path).getSource(),
-                    matcher);
+            final GherkinDocument gherkinDocument = parser.parse(
+                    pathToReadEventMap.get(path).getSource(),
+                    matcher
+            );
             pathToAstMap.put(path, gherkinDocument);
             final Map<Integer, AstNode> nodeMap = new HashMap<>();
             final AstNode currentParent = new AstNode(gherkinDocument.getFeature(), null);
@@ -83,8 +87,10 @@ private void parseGherkinSource(final URI path) {
             }
             pathToNodeMap.put(path, nodeMap);
         } catch (ParserException e) {
-            throw new IllegalStateException("You are using a plugin that only supports till Gherkin 5.\n"
-                    + "Please check if the Gherkin provided follows the standard of Gherkin 5\n", e
+            throw new IllegalStateException(
+                    "You are using a plugin that only supports till Gherkin 5.\n"
+                            + "Please check if the Gherkin provided follows the standard of Gherkin 5\n",
+                    e
             );
         }
     }
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
index ff4a2e24e..11f282717 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
@@ -185,7 +185,7 @@ void shouldSetDescription() {
         final AllureResults results = runFeature("features/description.feature");
 
         final String expected = "This is description for current feature.\n"
-                                + "It should appear on each scenario in report";
+                + "It should appear on each scenario in report";
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
@@ -202,7 +202,7 @@ void shouldSetScenarioDescription() {
         final AllureResults results = runFeature("features/scenario_description.feature");
 
         final String expected = "This is description for current feature.\n"
-                                + "It should appear on each scenario in report";
+                + "It should appear on each scenario in report";
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
@@ -240,11 +240,12 @@ void shouldAddDataTableAttachment() {
         final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
 
         assertThat(attachmentContent)
-                .isEqualTo("""
-                        name\tlogin\temail
-                        Viktor\tclicman\tclicman@ya.ru
-                        Viktor2\tclicman2\tclicman2@ya.ru
+                .isEqualTo(
                         """
+                                name\tlogin\temail
+                                Viktor\tclicman\tclicman@ya.ru
+                                Viktor2\tclicman2\tclicman2@ya.ru
+                                """
                 );
 
     }
@@ -383,8 +384,14 @@ void shouldAddTags() {
 
     @AllureFeatures.Links
     @ExtendWith(SystemPropertyExtension.class)
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
+    @SystemProperty(
+            name = "allure.link.issue.pattern",
+            value = "https://example.org/issue/{}"
+    )
+    @SystemProperty(
+            name = "allure.link.tms.pattern",
+            value = "https://example.org/tms/{}"
+    )
     @Test
     void shouldAddLinks() {
         final AllureResults results = runFeature("features/tags.feature");
@@ -513,8 +520,10 @@ void shouldSupportDryRunForSimpleFeatures() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForHooks() {
-        final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
-                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+        final AllureResults results = runFeature(
+                "features/hooks.feature", "--dry-run", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException"
+        );
 
         final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
 
@@ -654,8 +663,10 @@ void shouldProcessScenariosInParallelMode() {
     @AllureFeatures.Stages
     @Test
     void shouldDisplayHooksAsStages() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t",
-                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+        final AllureResults results = runFeature(
+                "features/hooks.feature", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException"
+        );
 
         final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
         final TestResult tr2 = results.getTestResultByName("Simple scenario with Before hook with Exception");
@@ -693,7 +704,6 @@ void shouldDisplayHooksAsStages() {
                         tuple("Then result is 15", Status.SKIPPED)
                 );
 
-
         assertThat(results.getTestResultContainersForTestResult(tr2))
                 .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
@@ -739,8 +749,14 @@ void shouldHandleAmbigiousStepsExceptions() {
                 );
     }
 
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm5-test-provided")
+    @ResourceLock(
+            value = SYSTEM_PROPERTIES,
+            mode = READ_WRITE
+    )
+    @SystemProperty(
+            name = "allure.label.x-provided",
+            value = "cucumberjvm5-test-provided"
+    )
     @Test
     void shouldSupportProvidedLabels() {
         final AllureResults results = runFeature("features/simple.feature");
@@ -785,17 +801,22 @@ void shouldSupportRuntimeApiInStepsWhenHooksAreUsed() {
                 );
     }
 
-    @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
+    @SystemProperty(
+            name = "cucumber.junit-platform.naming-strategy",
+            value = "long"
+    )
     @Step
     private AllureResults runFeature(final String featureResource,
                                      final String... moreOptions) {
         return RunUtils.runTests(lifecycle -> {
             final AllureCucumber5Jvm cucumber5jvm = new AllureCucumber5Jvm(lifecycle);
             final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
-            final List<String> opts = new ArrayList<>(Arrays.asList(
-                    "--glue", "io.qameta.allure.cucumber5jvm.samples",
-                    "--plugin", "null_summary"
-            ));
+            final List<String> opts = new ArrayList<>(
+                    Arrays.asList(
+                            "--glue", "io.qameta.allure.cucumber5jvm.samples",
+                            "--plugin", "null_summary"
+                    )
+            );
             opts.addAll(Arrays.asList(moreOptions));
             final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
             final RuntimeOptions options = new CommandlineOptionsParser()
@@ -803,8 +824,7 @@ private AllureResults runFeature(final String featureResource,
 
             final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
             final FeatureParser parser = new FeatureParser(bus::generateId);
-            final FeaturePathFeatureSupplier supplier
-                    = new FeaturePathFeatureSupplier(classLoader, options, parser);
+            final FeaturePathFeatureSupplier supplier = new FeaturePathFeatureSupplier(classLoader, options, parser);
 
             final Runtime runtime = Runtime.builder()
                     .withClassLoader(classLoader)
@@ -817,5 +837,4 @@ private AllureResults runFeature(final String featureResource,
         });
     }
 
-
 }
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java
index 3e605bb67..fe41e55b3 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AmbigiousSteps.java
@@ -34,7 +34,7 @@ public void ambigious_2() {
     }
 
     @Then("^something bad should happen")
-    public void somethingBadStep(){
+    public void somethingBadStep() {
         //nothing here
     }
 }
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java
index a4489b086..1310cb9d4 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/AttachmentSteps.java
@@ -15,29 +15,25 @@
  */
 package io.qameta.allure.cucumber5jvm.samples;
 
-import io.cucumber.java.Scenario;
 import io.cucumber.java.Before;
+import io.cucumber.java.Scenario;
 import io.cucumber.java.en.Given;
 
-public class AttachmentSteps
-{
+public class AttachmentSteps {
     private Scenario scenario;
 
     @Before("@attachments")
-    public void setup(Scenario scenario)
-    {
+    public void setup(Scenario scenario) {
         this.scenario = scenario;
     }
 
     @Given("step with scenario write")
-    public void stepWithScenarioWrite()
-    {
+    public void stepWithScenarioWrite() {
         scenario.write("text attachment");
     }
 
     @Given("step with scenario embed")
-    public void stepWithScenarioEmbed()
-    {
-        scenario.embed("image attachment".getBytes(), "image/png","ImageAttachment");
+    public void stepWithScenarioEmbed() {
+        scenario.embed("image attachment".getBytes(), "image/png", "ImageAttachment");
     }
 }
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java
index 775d90860..8c7162e77 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/HookSteps.java
@@ -25,22 +25,22 @@
 public class HookSteps {
 
     @Before("@WithHooks")
-    public void beforeHook(){
+    public void beforeHook() {
         // nothing
     }
 
     @After("@WithHooks")
-    public void afterHook(){
+    public void afterHook() {
         // nothing
     }
 
     @Before("@BeforeHookWithException")
-    public void beforeHookWithException(){
+    public void beforeHookWithException() {
         Assertions.fail("Exception in Hook step");
     }
 
     @After("@AfterHookWithException")
-    public void afterHookWithException(){
+    public void afterHookWithException() {
         Assertions.fail("Exception in Hook step");
     }
 
diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java
index 581b2afe5..f507b64ad 100644
--- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java
+++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/samples/RuntimeApiSteps.java
@@ -27,12 +27,12 @@
 public class RuntimeApiSteps {
 
     @Before("@beforeScenario")
-    public void beforeScenario(){
+    public void beforeScenario() {
         // nothing
     }
 
     @Before("@beforeFeature")
-    public void beforeFeature(){
+    public void beforeFeature() {
         // nothing
     }
 
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
index 67f11b0a8..c7384b9ba 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
@@ -74,13 +74,16 @@
 /**
  * Allure plugin for Cucumber JVM 6.0.
  */
-@SuppressWarnings({
-        "ClassDataAbstractionCoupling",
-        "ClassFanOutComplexity",
-})
+@SuppressWarnings(
+    {
+            "ClassDataAbstractionCoupling",
+            "ClassFanOutComplexity",
+    }
+)
 public class AllureCucumber6Jvm implements ConcurrentEventListener {
 
     private static final String COLON = ":";
+    private static final String NEW_LINE = "\n";
 
     private final AllureLifecycle lifecycle;
 
@@ -136,11 +139,11 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
 
         final String name = testCase.getName();
 
-
         // the same way full name is generated for
         // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
         // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
-        final String fullName = String.format("%s:%d",
+        final String fullName = String.format(
+                "%s:%d",
                 getTestCaseUri(testCase),
                 testCase.getLocation().getLine()
         );
@@ -160,11 +163,10 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
 
-        final Scenario scenarioDefinition =
-                testSources.getScenarioDefinition(
-                        testCase.getUri(),
-                        testCase.getLocation().getLine()
-                );
+        final Scenario scenarioDefinition = testSources.getScenarioDefinition(
+                testCase.getUri(),
+                testCase.getLocation().getLine()
+        );
 
         if (scenarioDefinition.getExamplesList() != null) {
             result.setParameters(
@@ -175,7 +177,7 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         final String description = Stream.of(feature.getDescription(), scenarioDefinition.getDescription())
                 .filter(Objects::nonNull)
                 .filter(s -> !s.isEmpty())
-                .collect(Collectors.joining("\n"));
+                .collect(Collectors.joining(NEW_LINE));
 
         if (!description.isEmpty()) {
             result.setDescription(description);
@@ -200,9 +202,10 @@ private void handleTestCaseFinished(final TestCaseFinished event) {
                 .setMuted(tagParser.isMuted())
                 .setKnown(tagParser.isKnown());
 
-        lifecycle.updateTestCase(uuid, testResult -> testResult
-                .setStatus(status)
-                .setStatusDetails(statusDetails)
+        lifecycle.updateTestCase(
+                uuid, testResult -> testResult
+                        .setStatus(status)
+                        .setStatusDetails(statusDetails)
         );
 
         lifecycle.stopTestCase(uuid);
@@ -262,9 +265,10 @@ private void handleStartFixtureHook(final TestCase testCase,
         final String containerUuid = hookStepContainerUuid
                 .computeIfAbsent(hookId, unused -> UUID.randomUUID().toString());
 
-        lifecycle.startTestContainer(new TestResultContainer()
-                .setUuid(containerUuid)
-                .setChildren(Collections.singletonList(uuid))
+        lifecycle.startTestContainer(
+                new TestResultContainer()
+                        .setUuid(containerUuid)
+                        .setChildren(Collections.singletonList(uuid))
         );
 
         final FixtureResult hookResult = new FixtureResult()
@@ -345,15 +349,14 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(
-            final Scenario scenario,
-            final TestCase localCurrentTestCase) {
-        final Optional<Examples> maybeExample =
-                scenario.getExamplesList().stream()
-                        .filter(example -> example.getTableBodyList().stream()
-                                .anyMatch(row -> row.getLocation().getLine()
-                                                 == localCurrentTestCase.getLocation().getLine())
-                        )
-                        .findFirst();
+                                                    final Scenario scenario,
+                                                    final TestCase localCurrentTestCase) {
+        final Optional<Examples> maybeExample = scenario.getExamplesList().stream()
+                .filter(
+                        example -> example.getTableBodyList().stream()
+                                .anyMatch(row -> row.getLocation().getLine() == localCurrentTestCase.getLocation().getLine())
+                )
+                .findFirst();
 
         if (!maybeExample.isPresent()) {
             return Collections.emptyList();
@@ -385,14 +388,16 @@ private void createDataTableAttachment(final DataTableArgument dataTableArgument
         final StringBuilder dataTableCsv = new StringBuilder();
         for (List<String> columns : rowsInTable) {
             if (!columns.isEmpty()) {
-                final String rowValue = columns.stream().collect(Collectors.joining("\t", "", "\n"));
+                final String rowValue = columns.stream().collect(Collectors.joining("\t", "", NEW_LINE));
                 dataTableCsv.append(rowValue);
             }
         }
         final String attachmentSource = lifecycle
                 .prepareAttachment("Data table", "text/tab-separated-values", "csv");
-        lifecycle.writeAttachment(attachmentSource,
-                new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
+        lifecycle.writeAttachment(
+                attachmentSource,
+                new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8))
+        );
     }
 
     private void handleStopHookStep(final Result eventResult,
@@ -409,9 +414,10 @@ private void handleStopHookStep(final Result eventResult,
         final StatusDetails statusDetails = getStatusDetails(eventResult.getError())
                 .orElseGet(StatusDetails::new);
 
-        lifecycle.updateFixture(uuid, result -> result
-                .setStatus(status)
-                .setStatusDetails(statusDetails)
+        lifecycle.updateFixture(
+                uuid, result -> result
+                        .setStatus(status)
+                        .setStatusDetails(statusDetails)
         );
         lifecycle.stopFixture(uuid);
 
@@ -426,8 +432,7 @@ private void handleStopStep(final TestCase testCase,
 
         final Status stepStatus = translateTestCaseStatus(eventResult);
 
-        final StatusDetails statusDetails
-                = eventResult.getStatus() == io.cucumber.plugin.event.Status.UNDEFINED
+        final StatusDetails statusDetails = eventResult.getStatus() == io.cucumber.plugin.event.Status.UNDEFINED
                 ? new StatusDetails().setMessage("Undefined Step. Please add step definition")
                 : getStatusDetails(eventResult.getError())
                         .orElse(new StatusDetails());
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
index 9684b9d51..794b78aff 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
@@ -48,7 +48,7 @@
 /**
  * Scenario labels and links builder.
  */
-@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"})
+@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals", "PMD.CognitiveComplexity"})
 class LabelBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
     private static final String COMPOSITE_TAG_DELIMITER = "=";
@@ -113,17 +113,19 @@ class LabelBuilder {
         final URI uri = scenario.getUri();
 
         scenarioLabels.addAll(ResultsUtils.getProvidedLabels());
-        scenarioLabels.addAll(Arrays.asList(
-                createHostLabel(),
-                createThreadLabel(),
-                createFeatureLabel(featureName),
-                createStoryLabel(scenario.getName()),
-                createSuiteLabel(featureName),
-                createTestClassLabel(scenario.getName()),
-                createFrameworkLabel("cucumber6jvm"),
-                createLanguageLabel("java"),
-                createLabel("gherkin_uri", uri.toString())
-        ));
+        scenarioLabels.addAll(
+                Arrays.asList(
+                        createHostLabel(),
+                        createThreadLabel(),
+                        createFeatureLabel(featureName),
+                        createStoryLabel(scenario.getName()),
+                        createSuiteLabel(featureName),
+                        createTestClassLabel(scenario.getName()),
+                        createFrameworkLabel("cucumber6jvm"),
+                        createLanguageLabel("java"),
+                        createLabel("gherkin_uri", uri.toString())
+                )
+        );
 
         featurePackage(uri.toString(), featureName)
                 .map(ResultsUtils::createPackageLabel)
@@ -156,8 +158,10 @@ private void tryHandleNamedLink(final String tagString) {
             final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
             scenarioLinks.add(ResultsUtils.createLink(null, name, null, type));
         } else {
-            LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
-                    namedLinkPatternString);
+            LOGGER.warn(
+                    "Composite named tag {} does not match regex {}. Skipping", tagString,
+                    namedLinkPatternString
+            );
         }
     }
 
@@ -175,10 +179,12 @@ private Optional<String> featurePackage(final String uriString, final String fea
         final String schemeSpecificPart = uri.normalize().getSchemeSpecificPart();
         final Stream<String> folders = Stream.of(schemeSpecificPart.replaceAll("\\.", "_").split("/"));
         final Stream<String> name = Stream.of(featureName);
-        return Optional.of(Stream.concat(folders, name)
-                .filter(Objects::nonNull)
-                .filter(s -> !s.isEmpty())
-                .collect(Collectors.joining(".")));
+        return Optional.of(
+                Stream.concat(folders, name)
+                        .filter(Objects::nonNull)
+                        .filter(s -> !s.isEmpty())
+                        .collect(Collectors.joining("."))
+        );
     }
 
     private static Optional<URI> safeUri(final String uri) {
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
index 3d31fdef5..66644299e 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
@@ -51,9 +51,9 @@ public boolean isKnown() {
 
     private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
-                       .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
-               || feature.getTagsList().stream()
-                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+                .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
+                || feature.getTagsList().stream()
+                        .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
     public boolean isResultTag(final String tag) {
diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
index 2a338e95f..2fa406eac 100644
--- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
@@ -73,14 +73,16 @@ private void parseGherkinSource(final URI path) {
         final String source = pathToReadEventMap.get(path).getSource();
 
         final List<Messages.Envelope> sources = singletonList(
-                makeSourceEnvelope(source, path.toString()));
+                makeSourceEnvelope(source, path.toString())
+        );
 
         final List<Messages.Envelope> envelopes = Gherkin.fromSources(
                 sources,
                 true,
                 true,
                 true,
-                () -> String.valueOf(UUID.randomUUID())).collect(toList());
+                () -> String.valueOf(UUID.randomUUID())
+        ).collect(toList());
 
         final GherkinDocument gherkinDocument = envelopes.stream()
                 .filter(Messages.Envelope::hasGherkinDocument)
@@ -99,7 +101,7 @@ private void parseGherkinSource(final URI path) {
     }
 
     private void processFeatureDefinition(
-            final Map<Integer, AstNode> nodeMap, final FeatureChild child, final AstNode currentParent) {
+                                          final Map<Integer, AstNode> nodeMap, final FeatureChild child, final AstNode currentParent) {
         if (child.hasBackground()) {
             processBackgroundDefinition(nodeMap, child.getBackground(), currentParent);
         } else if (child.hasScenario()) {
@@ -114,8 +116,7 @@ private void processFeatureDefinition(
     }
 
     private void processBackgroundDefinition(
-            final Map<Integer, AstNode> nodeMap, final Background background, final AstNode currentParent
-    ) {
+                                             final Map<Integer, AstNode> nodeMap, final Background background, final AstNode currentParent) {
         final AstNode childNode = createAstNode(background, currentParent);
         nodeMap.put(background.getLocation().getLine(), childNode);
         for (Step step : background.getStepsList()) {
@@ -124,7 +125,7 @@ private void processBackgroundDefinition(
     }
 
     private void processScenarioDefinition(
-            final Map<Integer, AstNode> nodeMap, final Scenario child, final AstNode currentParent) {
+                                           final Map<Integer, AstNode> nodeMap, final Scenario child, final AstNode currentParent) {
         final AstNode childNode = createAstNode(child, currentParent);
         nodeMap.put(child.getLocation().getLine(), childNode);
         for (Step step : child.getStepsList()) {
@@ -136,7 +137,7 @@ private void processScenarioDefinition(
     }
 
     private void processRuleDefinition(
-            final Map<Integer, AstNode> nodeMap, final RuleChild child, final AstNode currentParent) {
+                                       final Map<Integer, AstNode> nodeMap, final RuleChild child, final AstNode currentParent) {
         if (child.hasBackground()) {
             processBackgroundDefinition(nodeMap, child.getBackground(), currentParent);
         } else if (child.hasScenario()) {
@@ -145,8 +146,7 @@ private void processRuleDefinition(
     }
 
     private void processScenarioOutlineExamples(
-            final Map<Integer, AstNode> nodeMap, final Scenario scenarioOutline, final AstNode parent
-    ) {
+                                                final Map<Integer, AstNode> nodeMap, final Scenario scenarioOutline, final AstNode parent) {
         for (Examples examples : scenarioOutline.getExamplesList()) {
             final AstNode examplesNode = createAstNode(examples, parent);
             final TableRow headerRow = examples.getTableHeader();
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
index 50c32afab..6788dc6c5 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
@@ -185,7 +185,7 @@ void shouldSetDescription() {
         final AllureResults results = runFeature("features/description.feature");
 
         final String expected = "This is description for current feature.\n"
-                                + "It should appear on each scenario in report";
+                + "It should appear on each scenario in report";
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
@@ -202,7 +202,7 @@ void shouldSetScenarioDescription() {
         final AllureResults results = runFeature("features/scenario_description.feature");
 
         final String expected = "This is description for current feature.\n"
-                                + "It should appear on each scenario in report";
+                + "It should appear on each scenario in report";
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
@@ -240,11 +240,12 @@ void shouldAddDataTableAttachment() {
         final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
 
         assertThat(attachmentContent)
-                .isEqualTo("""
-                        name\tlogin\temail
-                        Viktor\tclicman\tclicman@ya.ru
-                        Viktor2\tclicman2\tclicman2@ya.ru
+                .isEqualTo(
                         """
+                                name\tlogin\temail
+                                Viktor\tclicman\tclicman@ya.ru
+                                Viktor2\tclicman2\tclicman2@ya.ru
+                                """
                 );
 
     }
@@ -383,8 +384,14 @@ void shouldAddTags() {
 
     @AllureFeatures.Links
     @ExtendWith(SystemPropertyExtension.class)
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
+    @SystemProperty(
+            name = "allure.link.issue.pattern",
+            value = "https://example.org/issue/{}"
+    )
+    @SystemProperty(
+            name = "allure.link.tms.pattern",
+            value = "https://example.org/tms/{}"
+    )
     @Test
     void shouldAddLinks() {
         final AllureResults results = runFeature("features/tags.feature");
@@ -513,8 +520,10 @@ void shouldSupportDryRunForSimpleFeatures() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForHooks() {
-        final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
-                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+        final AllureResults results = runFeature(
+                "features/hooks.feature", "--dry-run", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException"
+        );
 
         final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
 
@@ -654,8 +663,10 @@ void shouldProcessScenariosInParallelMode() {
     @AllureFeatures.Stages
     @Test
     void shouldDisplayHooksAsStages() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t",
-                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+        final AllureResults results = runFeature(
+                "features/hooks.feature", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException"
+        );
 
         final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
         final TestResult tr2 = results.getTestResultByName("Simple scenario with Before hook with Exception");
@@ -693,7 +704,6 @@ void shouldDisplayHooksAsStages() {
                         tuple("Then result is 15", Status.SKIPPED)
                 );
 
-
         assertThat(results.getTestResultContainersForTestResult(tr2))
                 .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
@@ -739,8 +749,14 @@ void shouldHandleAmbigiousStepsExceptions() {
                 );
     }
 
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm6-test-provided")
+    @ResourceLock(
+            value = SYSTEM_PROPERTIES,
+            mode = READ_WRITE
+    )
+    @SystemProperty(
+            name = "allure.label.x-provided",
+            value = "cucumberjvm6-test-provided"
+    )
     @Test
     void shouldSupportProvidedLabels() {
         final AllureResults results = runFeature("features/simple.feature");
@@ -785,17 +801,22 @@ void shouldSupportRuntimeApiInStepsWhenHooksAreUsed() {
                 );
     }
 
-    @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
+    @SystemProperty(
+            name = "cucumber.junit-platform.naming-strategy",
+            value = "long"
+    )
     @Step
     private AllureResults runFeature(final String featureResource,
                                      final String... moreOptions) {
         return RunUtils.runTests(lifecycle -> {
             final AllureCucumber6Jvm cucumber6jvm = new AllureCucumber6Jvm(lifecycle);
             final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
-            final List<String> opts = new ArrayList<>(Arrays.asList(
-                    "--glue", "io.qameta.allure.cucumber6jvm.samples",
-                    "--plugin", "null_summary"
-            ));
+            final List<String> opts = new ArrayList<>(
+                    Arrays.asList(
+                            "--glue", "io.qameta.allure.cucumber6jvm.samples",
+                            "--plugin", "null_summary"
+                    )
+            );
             opts.addAll(Arrays.asList(moreOptions));
             final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
             final RuntimeOptions options = new CommandlineOptionsParser(System.out)
@@ -803,8 +824,7 @@ private AllureResults runFeature(final String featureResource,
 
             final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
             final FeatureParser parser = new FeatureParser(bus::generateId);
-            final FeaturePathFeatureSupplier supplier
-                    = new FeaturePathFeatureSupplier(classLoader, options, parser);
+            final FeaturePathFeatureSupplier supplier = new FeaturePathFeatureSupplier(classLoader, options, parser);
 
             final Runtime runtime = Runtime.builder()
                     .withClassLoader(classLoader)
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
index 5a2e5a126..22a70c07f 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
@@ -34,7 +34,7 @@ public void ambigious_2() {
     }
 
     @Then("^something bad should happen")
-    public void somethingBadStep(){
+    public void somethingBadStep() {
         //nothing here
     }
 }
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
index 6a9393a89..2b72de701 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
@@ -15,8 +15,8 @@
  */
 package io.qameta.allure.cucumber6jvm.samples;
 
-import io.cucumber.java.Scenario;
 import io.cucumber.java.Before;
+import io.cucumber.java.Scenario;
 import io.cucumber.java.en.Given;
 
 public class AttachmentSteps {
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
index d7fe2a8e0..5ca9cc61a 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
@@ -25,22 +25,22 @@
 public class HookSteps {
 
     @Before("@WithHooks")
-    public void beforeHook(){
+    public void beforeHook() {
         // nothing
     }
 
     @After("@WithHooks")
-    public void afterHook(){
+    public void afterHook() {
         // nothing
     }
 
     @Before("@BeforeHookWithException")
-    public void beforeHookWithException(){
+    public void beforeHookWithException() {
         Assertions.fail("Exception in Hook step");
     }
 
     @After("@AfterHookWithException")
-    public void afterHookWithException(){
+    public void afterHookWithException() {
         Assertions.fail("Exception in Hook step");
     }
 
diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java
index 7438ea192..4fd9281df 100644
--- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/RuntimeApiSteps.java
@@ -27,12 +27,12 @@
 public class RuntimeApiSteps {
 
     @Before("@beforeScenario")
-    public void beforeScenario(){
+    public void beforeScenario() {
         // nothing
     }
 
     @Before("@beforeFeature")
-    public void beforeFeature(){
+    public void beforeFeature() {
         // nothing
     }
 
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
index adac06dfd..ac4ca986e 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
@@ -75,13 +75,16 @@
 /**
  * Allure plugin for Cucumber JVM 7.0.
  */
-@SuppressWarnings({
-        "ClassDataAbstractionCoupling",
-        "ClassFanOutComplexity",
-})
+@SuppressWarnings(
+    {
+            "ClassDataAbstractionCoupling",
+            "ClassFanOutComplexity",
+    }
+)
 public class AllureCucumber7Jvm implements ConcurrentEventListener {
 
     private static final String COLON = ":";
+    private static final String NEW_LINE = "\n";
 
     private final AllureLifecycle lifecycle;
 
@@ -137,11 +140,11 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
 
         final String name = testCase.getName();
 
-
         // the same way full name is generated for
         // org.junit.platform.engine.support.descriptor.ClasspathResourceSource
         // to support io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
-        final String fullName = String.format("%s:%d",
+        final String fullName = String.format(
+                "%s:%d",
                 getTestCaseUri(testCase),
                 testCase.getLocation().getLine()
         );
@@ -161,11 +164,10 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
 
-        final Scenario scenarioDefinition =
-                testSources.getScenarioDefinition(
-                        testCase.getUri(),
-                        testCase.getLocation().getLine()
-                );
+        final Scenario scenarioDefinition = testSources.getScenarioDefinition(
+                testCase.getUri(),
+                testCase.getLocation().getLine()
+        );
 
         if (scenarioDefinition.getExamples() != null) {
             result.setParameters(
@@ -176,7 +178,7 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         final String description = Stream.of(feature.getDescription(), scenarioDefinition.getDescription())
                 .filter(Objects::nonNull)
                 .filter(s -> !s.isEmpty())
-                .collect(Collectors.joining("\n"));
+                .collect(Collectors.joining(NEW_LINE));
 
         if (!description.isEmpty()) {
             result.setDescription(description);
@@ -201,9 +203,10 @@ private void handleTestCaseFinished(final TestCaseFinished event) {
                 .setMuted(tagParser.isMuted())
                 .setKnown(tagParser.isKnown());
 
-        lifecycle.updateTestCase(uuid, testResult -> testResult
-                .setStatus(status)
-                .setStatusDetails(statusDetails)
+        lifecycle.updateTestCase(
+                uuid, testResult -> testResult
+                        .setStatus(status)
+                        .setStatusDetails(statusDetails)
         );
 
         lifecycle.stopTestCase(uuid);
@@ -263,9 +266,10 @@ private void handleStartFixtureHook(final TestCase testCase,
         final String containerUuid = hookStepContainerUuid
                 .computeIfAbsent(hookId, unused -> UUID.randomUUID().toString());
 
-        lifecycle.startTestContainer(new TestResultContainer()
-                .setUuid(containerUuid)
-                .setChildren(Collections.singletonList(uuid))
+        lifecycle.startTestContainer(
+                new TestResultContainer()
+                        .setUuid(containerUuid)
+                        .setChildren(Collections.singletonList(uuid))
         );
 
         final FixtureResult hookResult = new FixtureResult()
@@ -346,16 +350,15 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(
-            final Scenario scenario,
-            final TestCase localCurrentTestCase) {
+                                                    final Scenario scenario,
+                                                    final TestCase localCurrentTestCase) {
 
-        final Optional<Examples> maybeExample =
-                scenario.getExamples().stream()
-                        .filter(example -> example.getTableBody().stream()
-                                .anyMatch(row -> row.getLocation().getLine()
-                                                 == localCurrentTestCase.getLocation().getLine())
-                        )
-                        .findFirst();
+        final Optional<Examples> maybeExample = scenario.getExamples().stream()
+                .filter(
+                        example -> example.getTableBody().stream()
+                                .anyMatch(row -> row.getLocation().getLine() == localCurrentTestCase.getLocation().getLine())
+                )
+                .findFirst();
 
         if (!maybeExample.isPresent()) {
             return Collections.emptyList();
@@ -376,9 +379,10 @@ private List<Parameter> getExamplesAsParameters(
 
         final List<String> headerNames = examples.getTableHeader()
                 .map(TableRow::getCells)
-                .map(rows -> rows.stream()
-                        .map(TableCell::getValue)
-                        .collect(Collectors.toList())
+                .map(
+                        rows -> rows.stream()
+                                .map(TableCell::getValue)
+                                .collect(Collectors.toList())
                 )
                 .orElse(null);
 
@@ -398,14 +402,16 @@ private void createDataTableAttachment(final DataTableArgument dataTableArgument
         final StringBuilder dataTableCsv = new StringBuilder();
         for (List<String> columns : rowsInTable) {
             if (!columns.isEmpty()) {
-                final String rowValue = columns.stream().collect(Collectors.joining("\t", "", "\n"));
+                final String rowValue = columns.stream().collect(Collectors.joining("\t", "", NEW_LINE));
                 dataTableCsv.append(rowValue);
             }
         }
         final String attachmentSource = lifecycle
                 .prepareAttachment("Data table", "text/tab-separated-values", "csv");
-        lifecycle.writeAttachment(attachmentSource,
-                new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
+        lifecycle.writeAttachment(
+                attachmentSource,
+                new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8))
+        );
     }
 
     private void handleStopHookStep(final Result eventResult,
@@ -422,9 +428,10 @@ private void handleStopHookStep(final Result eventResult,
         final StatusDetails statusDetails = getStatusDetails(eventResult.getError())
                 .orElseGet(StatusDetails::new);
 
-        lifecycle.updateFixture(uuid, result -> result
-                .setStatus(status)
-                .setStatusDetails(statusDetails)
+        lifecycle.updateFixture(
+                uuid, result -> result
+                        .setStatus(status)
+                        .setStatusDetails(statusDetails)
         );
         lifecycle.stopFixture(uuid);
 
@@ -439,8 +446,7 @@ private void handleStopStep(final TestCase testCase,
 
         final Status stepStatus = translateTestCaseStatus(eventResult);
 
-        final StatusDetails statusDetails
-                = eventResult.getStatus() == io.cucumber.plugin.event.Status.UNDEFINED
+        final StatusDetails statusDetails = eventResult.getStatus() == io.cucumber.plugin.event.Status.UNDEFINED
                 ? new StatusDetails().setMessage("Undefined Step. Please add step definition")
                 : getStatusDetails(eventResult.getError())
                         .orElse(new StatusDetails());
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
index e4d96d5ff..62123bdfc 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
@@ -48,7 +48,7 @@
 /**
  * Scenario labels and links builder.
  */
-@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"})
+@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals", "PMD.CognitiveComplexity"})
 class LabelBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class);
     private static final String COMPOSITE_TAG_DELIMITER = "=";
@@ -117,17 +117,19 @@ class LabelBuilder {
         final URI uri = scenario.getUri();
 
         scenarioLabels.addAll(ResultsUtils.getProvidedLabels());
-        scenarioLabels.addAll(Arrays.asList(
-                createHostLabel(),
-                createThreadLabel(),
-                createFeatureLabel(featureName),
-                createStoryLabel(scenario.getName()),
-                createSuiteLabel(featureName),
-                createTestClassLabel(scenario.getName()),
-                createFrameworkLabel("cucumber4jvm"),
-                createLanguageLabel("java"),
-                createLabel("gherkin_uri", uri.toString())
-        ));
+        scenarioLabels.addAll(
+                Arrays.asList(
+                        createHostLabel(),
+                        createThreadLabel(),
+                        createFeatureLabel(featureName),
+                        createStoryLabel(scenario.getName()),
+                        createSuiteLabel(featureName),
+                        createTestClassLabel(scenario.getName()),
+                        createFrameworkLabel("cucumber4jvm"),
+                        createLanguageLabel("java"),
+                        createLabel("gherkin_uri", uri.toString())
+                )
+        );
 
         featurePackage(uri.toString(), featureName)
                 .map(ResultsUtils::createPackageLabel)
@@ -160,8 +162,10 @@ private void tryHandleNamedLink(final String tagString) {
             final String name = tagString.split(COMPOSITE_TAG_DELIMITER)[1];
             scenarioLinks.add(ResultsUtils.createLink(null, name, null, type));
         } else {
-            LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
-                    namedLinkPatternString);
+            LOGGER.warn(
+                    "Composite named tag {} does not match regex {}. Skipping", tagString,
+                    namedLinkPatternString
+            );
         }
     }
 
@@ -179,10 +183,12 @@ private Optional<String> featurePackage(final String uriString, final String fea
         final String schemeSpecificPart = uri.normalize().getSchemeSpecificPart();
         final Stream<String> folders = Stream.of(schemeSpecificPart.replaceAll("\\.", "_").split("/"));
         final Stream<String> name = Stream.of(featureName);
-        return Optional.of(Stream.concat(folders, name)
-                .filter(Objects::nonNull)
-                .filter(s -> !s.isEmpty())
-                .collect(Collectors.joining(".")));
+        return Optional.of(
+                Stream.concat(folders, name)
+                        .filter(Objects::nonNull)
+                        .filter(s -> !s.isEmpty())
+                        .collect(Collectors.joining("."))
+        );
     }
 
     private static Optional<URI> safeUri(final String uri) {
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
index ea7e10eff..faca7e91e 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
@@ -51,9 +51,9 @@ public boolean isKnown() {
 
     private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
-                       .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
-               || feature.getTags().stream()
-                       .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+                .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
+                || feature.getTags().stream()
+                        .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
     public boolean isResultTag(final String tag) {
diff --git a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
index 479ada73a..91e4e185f 100644
--- a/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
@@ -73,7 +73,8 @@ private void parseGherkinSource(final URI path) {
                 .build();
 
         final Stream<Envelope> envelopes = parser.parse(
-                Envelope.of(new Source(path.toString(), source, SourceMediaType.TEXT_X_CUCUMBER_GHERKIN_PLAIN)));
+                Envelope.of(new Source(path.toString(), source, SourceMediaType.TEXT_X_CUCUMBER_GHERKIN_PLAIN))
+        );
 
         // TODO: What about empty gherkin docs?
         final GherkinDocument gherkinDocument = envelopes
@@ -97,7 +98,7 @@ private void parseGherkinSource(final URI path) {
     }
 
     private void processFeatureDefinition(
-            final Map<Long, AstNode> nodeMap, final FeatureChild child, final AstNode currentParent) {
+                                          final Map<Long, AstNode> nodeMap, final FeatureChild child, final AstNode currentParent) {
         child.getBackground().ifPresent(background -> processBackgroundDefinition(nodeMap, background, currentParent));
         child.getScenario().ifPresent(scenario -> processScenarioDefinition(nodeMap, scenario, currentParent));
         child.getRule().ifPresent(rule -> {
@@ -108,8 +109,7 @@ private void processFeatureDefinition(
     }
 
     private void processBackgroundDefinition(
-            final Map<Long, AstNode> nodeMap, final Background background, final AstNode currentParent
-    ) {
+                                             final Map<Long, AstNode> nodeMap, final Background background, final AstNode currentParent) {
         final AstNode childNode = createAstNode(background, currentParent);
         nodeMap.put(background.getLocation().getLine(), childNode);
         for (Step step : background.getSteps()) {
@@ -118,7 +118,7 @@ private void processBackgroundDefinition(
     }
 
     private void processScenarioDefinition(
-            final Map<Long, AstNode> nodeMap, final Scenario child, final AstNode currentParent) {
+                                           final Map<Long, AstNode> nodeMap, final Scenario child, final AstNode currentParent) {
         final AstNode childNode = createAstNode(child, currentParent);
         nodeMap.put(child.getLocation().getLine(), childNode);
         for (Step step : child.getSteps()) {
@@ -130,14 +130,13 @@ private void processScenarioDefinition(
     }
 
     private void processRuleDefinition(
-            final Map<Long, AstNode> nodeMap, final RuleChild child, final AstNode currentParent) {
+                                       final Map<Long, AstNode> nodeMap, final RuleChild child, final AstNode currentParent) {
         child.getBackground().ifPresent(background -> processBackgroundDefinition(nodeMap, background, currentParent));
         child.getScenario().ifPresent(scenario -> processScenarioDefinition(nodeMap, scenario, currentParent));
     }
 
     private void processScenarioOutlineExamples(
-            final Map<Long, AstNode> nodeMap, final Scenario scenarioOutline, final AstNode parent
-    ) {
+                                                final Map<Long, AstNode> nodeMap, final Scenario scenarioOutline, final AstNode parent) {
         for (Examples examples : scenarioOutline.getExamples()) {
             final AstNode examplesNode = createAstNode(examples, parent);
             // TODO: Can tables without headers even exist?
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
index ed1acc536..ea50e510d 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
@@ -185,7 +185,7 @@ void shouldSetDescription() {
         final AllureResults results = runFeature("features/description.feature");
 
         final String expected = "This is description for current feature.\n"
-                                + "It should appear on each scenario in report";
+                + "It should appear on each scenario in report";
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
@@ -202,7 +202,7 @@ void shouldSetScenarioDescription() {
         final AllureResults results = runFeature("features/scenario_description.feature");
 
         final String expected = "This is description for current feature.\n"
-                                + "It should appear on each scenario in report";
+                + "It should appear on each scenario in report";
 
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
@@ -240,11 +240,12 @@ void shouldAddDataTableAttachment() {
         final String attachmentContent = new String(bytes, StandardCharsets.UTF_8);
 
         assertThat(attachmentContent)
-                .isEqualTo("""
-                        name\tlogin\temail
-                        Viktor\tclicman\tclicman@ya.ru
-                        Viktor2\tclicman2\tclicman2@ya.ru
+                .isEqualTo(
                         """
+                                name\tlogin\temail
+                                Viktor\tclicman\tclicman@ya.ru
+                                Viktor2\tclicman2\tclicman2@ya.ru
+                                """
                 );
 
     }
@@ -383,8 +384,14 @@ void shouldAddTags() {
 
     @AllureFeatures.Links
     @ExtendWith(SystemPropertyExtension.class)
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
+    @SystemProperty(
+            name = "allure.link.issue.pattern",
+            value = "https://example.org/issue/{}"
+    )
+    @SystemProperty(
+            name = "allure.link.tms.pattern",
+            value = "https://example.org/tms/{}"
+    )
     @Test
     void shouldAddLinks() {
         final AllureResults results = runFeature("features/tags.feature");
@@ -513,8 +520,10 @@ void shouldSupportDryRunForSimpleFeatures() {
     @AllureFeatures.Base
     @Test
     void shouldSupportDryRunForHooks() {
-        final AllureResults results = runFeature("features/hooks.feature", "--dry-run", "-t",
-                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+        final AllureResults results = runFeature(
+                "features/hooks.feature", "--dry-run", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException"
+        );
 
         final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
 
@@ -654,8 +663,10 @@ void shouldProcessScenariosInParallelMode() {
     @AllureFeatures.Stages
     @Test
     void shouldDisplayHooksAsStages() {
-        final AllureResults results = runFeature("features/hooks.feature", "-t",
-                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+        final AllureResults results = runFeature(
+                "features/hooks.feature", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException"
+        );
 
         final TestResult tr1 = results.getTestResultByName("Simple scenario with Before and After hooks");
         final TestResult tr2 = results.getTestResultByName("Simple scenario with Before hook with Exception");
@@ -693,7 +704,6 @@ void shouldDisplayHooksAsStages() {
                         tuple("Then result is 15", Status.SKIPPED)
                 );
 
-
         assertThat(results.getTestResultContainersForTestResult(tr2))
                 .flatExtracting(TestResultContainer::getBefores)
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
@@ -739,8 +749,14 @@ void shouldHandleAmbigiousStepsExceptions() {
                 );
     }
 
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm7-test-provided")
+    @ResourceLock(
+            value = SYSTEM_PROPERTIES,
+            mode = READ_WRITE
+    )
+    @SystemProperty(
+            name = "allure.label.x-provided",
+            value = "cucumberjvm7-test-provided"
+    )
     @Test
     void shouldSupportProvidedLabels() {
         final AllureResults results = runFeature("features/simple.feature");
@@ -785,7 +801,10 @@ void shouldSupportRuntimeApiInStepsWhenHooksAreUsed() {
                 );
     }
 
-    @SystemProperty(name = "cucumber.junit-platform.naming-strategy", value = "long")
+    @SystemProperty(
+            name = "cucumber.junit-platform.naming-strategy",
+            value = "long"
+    )
     @Step
     private AllureResults runFeature(final String featureResource,
                                      final String... moreOptions) {
@@ -793,10 +812,12 @@ private AllureResults runFeature(final String featureResource,
         return RunUtils.runTests(lifecycle -> {
             final AllureCucumber7Jvm cucumber7jvm = new AllureCucumber7Jvm(lifecycle);
             final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
-            final List<String> opts = new ArrayList<>(Arrays.asList(
-                    "--glue", "io.qameta.allure.cucumber7jvm.samples",
-                    "--no-summary"
-            ));
+            final List<String> opts = new ArrayList<>(
+                    Arrays.asList(
+                            "--glue", "io.qameta.allure.cucumber7jvm.samples",
+                            "--no-summary"
+                    )
+            );
             opts.addAll(Arrays.asList(moreOptions));
             final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
             final RuntimeOptions options = new CommandlineOptionsParser(System.out)
@@ -804,8 +825,7 @@ private AllureResults runFeature(final String featureResource,
 
             final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
             final FeatureParser parser = new FeatureParser(bus::generateId);
-            final FeaturePathFeatureSupplier supplier
-                    = new FeaturePathFeatureSupplier(classLoader, options, parser);
+            final FeaturePathFeatureSupplier supplier = new FeaturePathFeatureSupplier(classLoader, options, parser);
 
             final Runtime runtime = Runtime.builder()
                     .withClassLoader(classLoader)
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
index 0406db2f3..b5fec46cd 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
@@ -34,7 +34,7 @@ public void ambigious_2() {
     }
 
     @Then("^something bad should happen")
-    public void somethingBadStep(){
+    public void somethingBadStep() {
         //nothing here
     }
 }
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
index 455aaffe7..bd1fb2a48 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
@@ -15,8 +15,8 @@
  */
 package io.qameta.allure.cucumber7jvm.samples;
 
-import io.cucumber.java.Scenario;
 import io.cucumber.java.Before;
+import io.cucumber.java.Scenario;
 import io.cucumber.java.en.Given;
 
 public class AttachmentSteps {
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
index b85751afa..46ca418ac 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
@@ -25,22 +25,22 @@
 public class HookSteps {
 
     @Before("@WithHooks")
-    public void beforeHook(){
+    public void beforeHook() {
         // nothing
     }
 
     @After("@WithHooks")
-    public void afterHook(){
+    public void afterHook() {
         // nothing
     }
 
     @Before("@BeforeHookWithException")
-    public void beforeHookWithException(){
+    public void beforeHookWithException() {
         Assertions.fail("Exception in Hook step");
     }
 
     @After("@AfterHookWithException")
-    public void afterHookWithException(){
+    public void afterHookWithException() {
         Assertions.fail("Exception in Hook step");
     }
 
diff --git a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java
index e76d71acc..50eabea7e 100644
--- a/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/RuntimeApiSteps.java
@@ -16,9 +16,9 @@
 package io.qameta.allure.cucumber7jvm.samples;
 
 import io.cucumber.java.Before;
+import io.cucumber.java.en.And;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import io.cucumber.java.en.And;
 import io.qameta.allure.Allure;
 
 /**
@@ -27,12 +27,12 @@
 public class RuntimeApiSteps {
 
     @Before("@beforeScenario")
-    public void beforeScenario(){
+    public void beforeScenario() {
         // nothing
     }
 
     @Before("@beforeFeature")
-    public void beforeFeature(){
+    public void beforeFeature() {
         // nothing
     }
 
diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionRenderer.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionRenderer.java
index 6546dbb48..1985af5f6 100644
--- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionRenderer.java
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionRenderer.java
@@ -47,6 +47,7 @@
  * description path suitable for open source projects where comments may evolve over time and where
  * security is more important than pixel-perfect parity with the standard doclet.</p>
  */
+@SuppressWarnings({"PMD.GodClass", "PMD.TooManyMethods"})
 final class JavaDocDescriptionRenderer {
 
     private static final String PARAGRAPH_BREAK = "\n\n";
@@ -58,6 +59,7 @@ final class JavaDocDescriptionRenderer {
     private static final String CODE_TAG = "code";
     private static final String HTML_TAG_END = ">";
     private static final String CLOSING_TAG_PREFIX = "</";
+    private static final String NEW_LINE = "\n";
 
     /**
      * Converts raw JavaDoc comment text into the description format stored by the annotation
@@ -84,7 +86,7 @@ String render(final String rawDocComment) {
     }
 
     private String extractDescriptionBody(final String rawDocComment) {
-        final String[] lines = normalize(rawDocComment).split("\n", -1);
+        final String[] lines = normalize(rawDocComment).split(NEW_LINE, -1);
         final StringBuilder body = new StringBuilder();
         int inlineTagDepth = 0;
 
@@ -107,7 +109,7 @@ private boolean startsBlockTag(final String line) {
         return trimmed.length() > 1 && trimmed.charAt(0) == '@' && Character.isJavaIdentifierStart(trimmed.charAt(1));
     }
 
-    @SuppressWarnings("checkstyle:CyclomaticComplexity")
+    @SuppressWarnings({"checkstyle:CyclomaticComplexity", "PMD.CognitiveComplexity"})
     private void renderFragment(final String fragment, final StringBuilder rendered) {
         int index = 0;
         while (index < fragment.length()) {
@@ -182,10 +184,13 @@ private int renderInlineTag(final String fragment, final int start, final String
         return end + 1;
     }
 
-    @SuppressWarnings({
-            "checkstyle:CyclomaticComplexity",
-            "checkstyle:NPathComplexity",
-            "checkstyle:ReturnCount"})
+    @SuppressWarnings(
+        {
+                "checkstyle:CyclomaticComplexity",
+                "checkstyle:NPathComplexity",
+                "PMD.CognitiveComplexity",
+                "checkstyle:ReturnCount"}
+    )
     private int renderHtmlTag(final String fragment, final int start, final StringBuilder rendered) {
         if (start + 1 >= fragment.length() || Character.isWhitespace(fragment.charAt(start + 1))) {
             return start;
@@ -317,7 +322,7 @@ private void appendLineBreak(final StringBuilder rendered) {
     }
 
     private String cleanup(final String rendered) {
-        final String[] lines = normalize(rendered).split("\n", -1);
+        final String[] lines = normalize(rendered).split(NEW_LINE, -1);
         final StringBuilder cleaned = new StringBuilder();
         boolean blankLinePending = false;
 
@@ -331,7 +336,7 @@ private String cleanup(final String rendered) {
             }
 
             if (cleaned.length() > 0) {
-                cleaned.append(blankLinePending ? PARAGRAPH_BREAK : "\n");
+                cleaned.append(blankLinePending ? PARAGRAPH_BREAK : NEW_LINE);
             }
             cleaned.append(trimmed);
             blankLinePending = false;
@@ -341,7 +346,7 @@ private String cleanup(final String rendered) {
     }
 
     private String trimBlankLines(final String value) {
-        final String[] lines = normalize(value).split("\n", -1);
+        final String[] lines = normalize(value).split(NEW_LINE, -1);
         int start = 0;
         int end = lines.length;
 
@@ -452,7 +457,7 @@ private String trimTrailingWhitespace(final String line) {
     }
 
     private String normalize(final String value) {
-        return value.replace("\r\n", "\n").replace('\r', '\n');
+        return value.replace("\r\n", NEW_LINE).replace('\r', '\n');
     }
 
     private boolean isBlank(final String value) {
@@ -479,10 +484,12 @@ private int renderEntityReference(final String fragment, final int start, final
         return end + 1;
     }
 
-    @SuppressWarnings({
-            "checkstyle:CyclomaticComplexity",
-            "checkstyle:NPathComplexity",
-            "checkstyle:ReturnCount"})
+    @SuppressWarnings(
+        {
+                "checkstyle:CyclomaticComplexity",
+                "checkstyle:NPathComplexity",
+                "checkstyle:ReturnCount"}
+    )
     private String decodeEntity(final String entity) {
         if (entity.isEmpty()) {
             return null;
diff --git a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
index acc1d5559..289c5f43a 100644
--- a/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
+++ b/allure-descriptions-javadoc/src/main/java/io/qameta/allure/description/JavaDocDescriptionsProcessor.java
@@ -31,6 +31,7 @@
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
+
 import java.io.IOException;
 import java.io.Writer;
 import java.math.BigInteger;
@@ -96,14 +97,18 @@ public boolean process(final Set<? extends TypeElement> annotations, final Round
                     method.getEnclosingElement().toString(), name, typeParams
             );
             try {
-                final FileObject file = filer.createResource(StandardLocation.CLASS_OUTPUT, "",
-                        ALLURE_DESCRIPTIONS_FOLDER + hash);
+                final FileObject file = filer.createResource(
+                        StandardLocation.CLASS_OUTPUT, "",
+                        ALLURE_DESCRIPTIONS_FOLDER + hash
+                );
                 try (Writer writer = file.openWriter()) {
                     writer.write(docs);
                 }
             } catch (IOException e) {
-                messager.printMessage(Diagnostic.Kind.WARNING,
-                        "Unable to create resource from docs comment of method " + name + typeParams);
+                messager.printMessage(
+                        Diagnostic.Kind.WARNING,
+                        "Unable to create resource from docs comment of method " + name + typeParams
+                );
             }
         });
 
diff --git a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/JavaDocDescriptionRendererTest.java b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/JavaDocDescriptionRendererTest.java
index 180d2b03a..b82f4c476 100644
--- a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/JavaDocDescriptionRendererTest.java
+++ b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/JavaDocDescriptionRendererTest.java
@@ -29,10 +29,10 @@ class JavaDocDescriptionRendererTest {
     void shouldRenderPlainTextAndTrimBlankLines() {
         final String rendered = renderer.render(
                 "\r\n"
-                + "  First line   \r\n"
-                + "\r\n"
-                + "  Second line\t\r\n"
-                + "\r\n"
+                        + "  First line   \r\n"
+                        + "\r\n"
+                        + "  Second line\t\r\n"
+                        + "\r\n"
         );
 
         assertThat(rendered)
@@ -43,7 +43,7 @@ void shouldRenderPlainTextAndTrimBlankLines() {
     void shouldReturnEmptyStringWhenBodyContainsOnlyBlockTags() {
         final String rendered = renderer.render(
                 "@param value description\n"
-                + "@throws Exception description"
+                        + "@throws Exception description"
         );
 
         assertThat(rendered)
@@ -54,9 +54,9 @@ void shouldReturnEmptyStringWhenBodyContainsOnlyBlockTags() {
     void shouldIgnoreBlockTagsAndEverythingAfterThem() {
         final String rendered = renderer.render(
                 "Summary paragraph.\n"
-                + "\n"
-                + "@param value Description of the value.\n"
-                + "Continuation that should also be ignored."
+                        + "\n"
+                        + "@param value Description of the value.\n"
+                        + "Continuation that should also be ignored."
         );
 
         assertThat(rendered)
@@ -95,7 +95,7 @@ void shouldIgnoreStandardBlockTagsAfterMainDescription() {
     void shouldNotTreatAtSignsInsideTextAsBlockTags() {
         final String rendered = renderer.render(
                 "Email support@example.com\n"
-                + "Use @smoke in prose."
+                        + "Use @smoke in prose."
         );
 
         assertThat(rendered)
@@ -106,7 +106,7 @@ void shouldNotTreatAtSignsInsideTextAsBlockTags() {
     void shouldDecodeEscapedAtEntityBeforeBlockTags() {
         final String rendered = renderer.render(
                 "&#064;version stays in prose.\n"
-                + "@version 2.4.0"
+                        + "@version 2.4.0"
         );
 
         assertThat(rendered)
@@ -135,9 +135,9 @@ void shouldDecodeSupportedNamedAndNumericEntities() {
     void shouldRenderSupportedInlineTags() {
         final String rendered = renderer.render(
                 "Use {@code a < b}, {@literal <safe>}, "
-                + "{@link java.lang.String}, "
-                + "{@linkplain java.lang.String#valueOf(Object)}, "
-                + "{@link java.util.List list docs}."
+                        + "{@link java.lang.String}, "
+                        + "{@linkplain java.lang.String#valueOf(Object)}, "
+                        + "{@link java.util.List list docs}."
         );
 
         assertThat(rendered)
@@ -158,9 +158,9 @@ void shouldSupportBalancedBracesInsideInlineTags() {
     void shouldNotTreatAtLinesInsideBalancedInlineTagsAsBlockTags() {
         final String rendered = renderer.render(
                 "Summary {@literal first line\n"
-                + "@notATag\n"
-                + "last line}\n"
-                + "@param ignored"
+                        + "@notATag\n"
+                        + "last line}\n"
+                        + "@param ignored"
         );
 
         assertThat(rendered)
@@ -181,14 +181,14 @@ void shouldRenderNestedInlineTagsInsideLinkLabels() {
     void shouldSafelyDegradeUnsupportedStandardInlineTags() {
         final String rendered = renderer.render(
                 "Fallbacks: {@docRoot}, {@inheritDoc}, {@index release}, "
-                + "{@summary quick summary}, {@systemProperty user.home}, "
-                + "{@value java.lang.Integer#MAX_VALUE}."
+                        + "{@summary quick summary}, {@systemProperty user.home}, "
+                        + "{@value java.lang.Integer#MAX_VALUE}."
         );
 
         assertThat(rendered)
                 .isEqualTo(
                         "Fallbacks: docRoot, inheritDoc, index release, summary quick summary, "
-                        + "systemProperty user.home, value java.lang.Integer#MAX_VALUE."
+                                + "systemProperty user.home, value java.lang.Integer#MAX_VALUE."
                 );
     }
 
@@ -196,9 +196,9 @@ void shouldSafelyDegradeUnsupportedStandardInlineTags() {
     void shouldSafelyDegradeSnippetTags() {
         final String rendered = renderer.render(
                 "Snippet {@snippet :\n"
-                + "int answer = 42;\n"
-                + "@highlight substring=\"answer\"\n"
-                + "}."
+                        + "int answer = 42;\n"
+                        + "@highlight substring=\"answer\"\n"
+                        + "}."
         );
 
         assertThat(rendered)
@@ -301,28 +301,28 @@ void shouldDropUnknownHtmlTagsButKeepTheirTextContentEscaped() {
     void shouldRenderComplexModernJavadocExampleSafely() {
         final String rendered = renderer.render(
                 "Fetches release metadata for the current build.\n"
-                + "\n"
-                + "<p>Use {@link java.net.URI URIs} for endpoint configuration.</p>\n"
-                + "<ul>\n"
-                + "<li>Supports café, Привет, 東京, and λ.</li>\n"
-                + "<li>See the <a href=\"https://docs.oracle.com/\">Javadoc specification</a> "
-                + "and {@linkplain java.lang.String#formatted(Object...) formatted examples}.</li>\n"
-                + "</ul>\n"
-                + "Example: <code>client.fetch(\"v2\")</code>\n"
-                + "&#064;beta remains prose.\n"
-                + "@author Jane Doe\n"
-                + "@version 2.3.0\n"
-                + "@since 2.0"
+                        + "\n"
+                        + "<p>Use {@link java.net.URI URIs} for endpoint configuration.</p>\n"
+                        + "<ul>\n"
+                        + "<li>Supports café, Привет, 東京, and λ.</li>\n"
+                        + "<li>See the <a href=\"https://docs.oracle.com/\">Javadoc specification</a> "
+                        + "and {@linkplain java.lang.String#formatted(Object...) formatted examples}.</li>\n"
+                        + "</ul>\n"
+                        + "Example: <code>client.fetch(\"v2\")</code>\n"
+                        + "&#064;beta remains prose.\n"
+                        + "@author Jane Doe\n"
+                        + "@version 2.3.0\n"
+                        + "@since 2.0"
         );
 
         assertThat(rendered)
                 .isEqualTo(
                         "Fetches release metadata for the current build.\n\n"
-                        + "Use URIs for endpoint configuration.\n\n"
-                        + "- Supports café, Привет, 東京, and λ.\n"
-                        + "- See the Javadoc specification and formatted examples.\n\n"
-                        + "Example: `client.fetch(\"v2\")`\n"
-                        + "@beta remains prose."
+                                + "Use URIs for endpoint configuration.\n\n"
+                                + "- Supports café, Привет, 東京, and λ.\n"
+                                + "- See the Javadoc specification and formatted examples.\n\n"
+                                + "Example: `client.fetch(\"v2\")`\n"
+                                + "@beta remains prose."
                 );
     }
 }
diff --git a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
index 29f80277e..49ab0437a 100644
--- a/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
+++ b/allure-descriptions-javadoc/src/test/java/io/qameta/allure/description/ProcessDescriptionsTest.java
@@ -237,10 +237,10 @@ void shouldIgnoreBlockTagsAndRenderSafeMarkdown() {
                 .contentsAsUtf8String()
                 .isEqualTo(
                         "This is my test description with `sample` and &lt;safe&gt;.\n\n"
-                        + "Use String for values.\n\n"
-                        + "- first item\n"
-                        + "- second item\n\n"
-                        + "alert(\"xss\")"
+                                + "Use String for values.\n\n"
+                                + "- first item\n"
+                                + "- second item\n\n"
+                                + "alert(\"xss\")"
                 );
     }
 
@@ -290,12 +290,12 @@ void shouldCaptureComplexModernJavadocDescriptionSafely() {
                 .contentsAsUtf8String()
                 .isEqualTo(
                         "Fetches release metadata for the current build.\n\n"
-                        + "Use URIs for endpoint configuration.\n\n"
-                        + "- Supports café, Привет, 東京, and λ.\n"
-                        + "- See the Javadoc specification\n"
-                        + "and formatted examples.\n\n"
-                        + "Example: `client.fetch(\"v2\")`\n"
-                        + "@beta remains prose."
+                                + "Use URIs for endpoint configuration.\n\n"
+                                + "- Supports café, Привет, 東京, and λ.\n"
+                                + "- See the Javadoc specification\n"
+                                + "and formatted examples.\n\n"
+                                + "Example: `client.fetch(\"v2\")`\n"
+                                + "@beta remains prose."
                 );
     }
 }
diff --git a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
index ce71871a8..73c0fa527 100644
--- a/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
@@ -34,6 +34,9 @@
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StepResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -42,19 +45,20 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Allure interceptor logger for gRPC.
  *
  * @author dtuchs (Dmitry Tuchs).
  */
-@SuppressWarnings({
-    "checkstyle:ClassFanOutComplexity",
-    "checkstyle:AnonInnerLength",
-    "checkstyle:JavaNCSS"
-})
+@SuppressWarnings(
+    {
+            "checkstyle:ClassFanOutComplexity",
+            "checkstyle:AnonInnerLength",
+            "checkstyle:JavaNCSS",
+            "PMD.GodClass"
+    }
+)
 public class AllureGrpc implements ClientInterceptor {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureGrpc.class);
@@ -69,17 +73,18 @@ public class AllureGrpc implements ClientInterceptor {
     private final String responseTemplatePath;
 
     public AllureGrpc() {
-        this(Allure.getLifecycle(), true, false,
-            "grpc-request.ftl", "grpc-response.ftl");
+        this(
+                Allure.getLifecycle(), true, false,
+                "grpc-request.ftl", "grpc-response.ftl"
+        );
     }
 
     public AllureGrpc(
-        final AllureLifecycle lifecycle,
-        final boolean markStepFailedOnNonZeroCode,
-        final boolean interceptResponseMetadata,
-        final String requestTemplatePath,
-        final String responseTemplatePath
-    ) {
+                      final AllureLifecycle lifecycle,
+                      final boolean markStepFailedOnNonZeroCode,
+                      final boolean interceptResponseMetadata,
+                      final String requestTemplatePath,
+                      final String responseTemplatePath) {
         this.lifecycle = lifecycle;
         this.markStepFailedOnNonZeroCode = markStepFailedOnNonZeroCode;
         this.interceptResponseMetadata = interceptResponseMetadata;
@@ -89,10 +94,9 @@ public AllureGrpc(
 
     @Override
     public <T, R> ClientCall<T, R> interceptCall(
-        final MethodDescriptor<T, R> methodDescriptor,
-        final CallOptions callOptions,
-        final Channel nextChannel
-    ) {
+                                                 final MethodDescriptor<T, R> methodDescriptor,
+                                                 final CallOptions callOptions,
+                                                 final Channel nextChannel) {
         final AllureLifecycle current = lifecycle;
         final String parent = current.getCurrentTestCaseOrStep().orElse(null);
         final String stepUuid = UUID.randomUUID().toString();
@@ -109,12 +113,12 @@ public <T, R> ClientCall<T, R> interceptCall(
         }
 
         final StepContext<T, R> stepContext = new StepContext<>(
-            stepUuid, methodDescriptor, current, clientMessages,
-            serverMessages, initialHeaders, trailers
+                stepUuid, methodDescriptor, current, clientMessages,
+                serverMessages, initialHeaders, trailers
         );
 
         return new ForwardingClientCall.SimpleForwardingClientCall<T, R>(
-            nextChannel.newCall(methodDescriptor, callOptions)
+                nextChannel.newCall(methodDescriptor, callOptions)
         ) {
             @Override
             public void start(final Listener<R> responseListener, final Metadata requestHeaders) {
@@ -154,59 +158,59 @@ public void sendMessage(final T message) {
     }
 
     private void addRawJsonAttachment(
-        final String stepUuid,
-        final String attachmentName,
-        final String jsonBody,
-        final AllureLifecycle lifecycle
-    ) {
+                                      final String stepUuid,
+                                      final String attachmentName,
+                                      final String jsonBody,
+                                      final AllureLifecycle lifecycle) {
         if (jsonBody == null || jsonBody.isEmpty()) {
             return;
         }
         final String source = UUID.randomUUID() + ".json";
-        lifecycle.updateStep(stepUuid, step -> step.getAttachments().add(
-            new Attachment()
-                .setName(attachmentName)
-                .setSource(source)
-                .setType("application/json")
-        ));
+        lifecycle.updateStep(
+                stepUuid, step -> step.getAttachments().add(
+                        new Attachment()
+                                .setName(attachmentName)
+                                .setSource(source)
+                                .setType("application/json")
+                )
+        );
         lifecycle.writeAttachment(
-            source,
-            new ByteArrayInputStream(jsonBody.getBytes(StandardCharsets.UTF_8))
+                source,
+                new ByteArrayInputStream(jsonBody.getBytes(StandardCharsets.UTF_8))
         );
     }
 
     private void handleClose(
-        final io.grpc.Status status,
-        final Metadata responseTrailers,
-        final StepContext<?, ?> stepContext
-    ) {
+                             final io.grpc.Status status,
+                             final Metadata responseTrailers,
+                             final StepContext<?, ?> stepContext) {
         try {
             if (interceptResponseMetadata && responseTrailers != null) {
                 copyAsciiResponseMetadata(responseTrailers, stepContext.getTrailers());
             }
             attachRequestIfPresent(
-                stepContext.getStepUuid(),
-                stepContext.getMethodDescriptor(),
-                stepContext.getClientMessages(),
-                stepContext.getLifecycle()
+                    stepContext.getStepUuid(),
+                    stepContext.getMethodDescriptor(),
+                    stepContext.getClientMessages(),
+                    stepContext.getLifecycle()
             );
             attachResponse(
-                stepContext.getStepUuid(),
-                stepContext.getServerMessages(),
-                status,
-                stepContext.getInitialHeaders(),
-                stepContext.getTrailers(),
-                stepContext.getLifecycle()
+                    stepContext.getStepUuid(),
+                    stepContext.getServerMessages(),
+                    status,
+                    stepContext.getInitialHeaders(),
+                    stepContext.getTrailers(),
+                    stepContext.getLifecycle()
             );
             stepContext.getLifecycle().updateStep(
-                stepContext.getStepUuid(),
-                step -> step.setStatus(convertStatus(status))
+                    stepContext.getStepUuid(),
+                    step -> step.setStatus(convertStatus(status))
             );
         } catch (Throwable throwable) {
             LOGGER.error("Failed to finalize Allure step for gRPC call", throwable);
             stepContext.getLifecycle().updateStep(
-                stepContext.getStepUuid(),
-                step -> step.setStatus(Status.BROKEN)
+                    stepContext.getStepUuid(),
+                    step -> step.setStatus(Status.BROKEN)
             );
         } finally {
             stopStepSafely(stepContext.getLifecycle(), stepContext.getStepUuid());
@@ -244,45 +248,43 @@ private <R> void handleServerMessage(final R message, final List<String> destina
     }
 
     private <T, R> void attachRequestIfPresent(
-        final String stepUuid,
-        final MethodDescriptor<T, R> methodDescriptor,
-        final List<String> clientMessages,
-        final AllureLifecycle lifecycle
-    ) {
+                                               final String stepUuid,
+                                               final MethodDescriptor<T, R> methodDescriptor,
+                                               final List<String> clientMessages,
+                                               final AllureLifecycle lifecycle) {
         final String body = toJsonBody(clientMessages);
         if (body == null) {
             return;
         }
         final String name = clientMessages.size() > 1
-            ? "gRPC request (collection of elements from Client stream)"
-            : "gRPC request";
+                ? "gRPC request (collection of elements from Client stream)"
+                : "gRPC request";
         final GrpcRequestAttachment requestAttachment = GrpcRequestAttachment.Builder
-            .create(name, methodDescriptor.getFullMethodName())
-            .setBody(body)
-            .build();
+                .create(name, methodDescriptor.getFullMethodName())
+                .setBody(body)
+                .build();
 
         addRenderedAttachmentToStep(
-            stepUuid,
-            requestAttachment.getName(),
-            requestAttachment,
-            requestTemplatePath,
-            lifecycle
+                stepUuid,
+                requestAttachment.getName(),
+                requestAttachment,
+                requestTemplatePath,
+                lifecycle
         );
         addRawJsonAttachment(stepUuid, name + JSON_SUFFIX, body, lifecycle);
     }
 
     private void attachResponse(
-        final String stepUuid,
-        final List<String> serverMessages,
-        final io.grpc.Status status,
-        final Map<String, String> initialHeaders,
-        final Map<String, String> trailers,
-        final AllureLifecycle lifecycle
-    ) {
+                                final String stepUuid,
+                                final List<String> serverMessages,
+                                final io.grpc.Status status,
+                                final Map<String, String> initialHeaders,
+                                final Map<String, String> trailers,
+                                final AllureLifecycle lifecycle) {
         final String body = toJsonBody(serverMessages);
         final String name = serverMessages.size() > 1
-            ? "gRPC response (collection of elements from Server stream)"
-            : "gRPC response";
+                ? "gRPC response (collection of elements from Server stream)"
+                : "gRPC response";
 
         final Map<String, String> metadata = new LinkedHashMap<>();
         if (interceptResponseMetadata) {
@@ -291,8 +293,8 @@ private void attachResponse(
         }
 
         final GrpcResponseAttachment.Builder builder = GrpcResponseAttachment.Builder
-            .create(name)
-            .setStatus(status.toString());
+                .create(name)
+                .setStatus(status.toString());
 
         if (body != null) {
             builder.setBody(body);
@@ -303,11 +305,11 @@ private void attachResponse(
 
         final GrpcResponseAttachment responseAttachment = builder.build();
         addRenderedAttachmentToStep(
-            stepUuid,
-            responseAttachment.getName(),
-            responseAttachment,
-            responseTemplatePath,
-            lifecycle
+                stepUuid,
+                responseAttachment.getName(),
+                responseAttachment,
+                responseTemplatePath,
+                lifecycle
         );
         if (body != null) {
             addRawJsonAttachment(stepUuid, name + JSON_SUFFIX, body, lifecycle);
@@ -330,14 +332,13 @@ private Status convertStatus(final io.grpc.Status grpcStatus) {
     }
 
     private static String buildStepName(
-        final Channel channel,
-        final MethodDescriptor<?, ?> methodDescriptor
-    ) {
+                                        final Channel channel,
+                                        final MethodDescriptor<?, ?> methodDescriptor) {
         final String authority = channel != null ? channel.authority() : null;
         final String safeAuthority = authority != null ? authority : UNKNOWN;
         final String type = toSnakeCase(methodDescriptor.getType());
         return "Send " + type + " gRPC request to "
-            + safeAuthority + "/" + methodDescriptor.getFullMethodName();
+                + safeAuthority + "/" + methodDescriptor.getFullMethodName();
     }
 
     private static String toSnakeCase(final MethodDescriptor.MethodType methodType) {
@@ -348,21 +349,19 @@ private static String toSnakeCase(final MethodDescriptor.MethodType methodType)
     }
 
     private void addRenderedAttachmentToStep(
-        final String stepUuid,
-        final String attachmentName,
-        final AttachmentData data,
-        final String templatePath,
-        final AllureLifecycle lifecycle
-    ) {
-        final AttachmentRenderer<AttachmentData> renderer =
-            new FreemarkerAttachmentRenderer(templatePath);
+                                             final String stepUuid,
+                                             final String attachmentName,
+                                             final AttachmentData data,
+                                             final String templatePath,
+                                             final AllureLifecycle lifecycle) {
+        final AttachmentRenderer<AttachmentData> renderer = new FreemarkerAttachmentRenderer(templatePath);
         final io.qameta.allure.attachment.AttachmentContent content;
         try {
             content = renderer.render(data);
         } catch (Throwable throwable) {
             LOGGER.warn(
-                "Could not render attachment '{}' using template '{}'",
-                attachmentName, templatePath, throwable
+                    "Could not render attachment '{}' using template '{}'",
+                    attachmentName, templatePath, throwable
             );
             return;
         }
@@ -376,21 +375,21 @@ private void addRenderedAttachmentToStep(
         }
         final String source = UUID.randomUUID() + fileExtension;
         lifecycle.updateStep(
-            stepUuid,
-            step -> step.getAttachments().add(
-                new Attachment()
-                    .setName(attachmentName)
-                    .setSource(source)
-                    .setType(
-                        content.getContentType() != null
-                            ? content.getContentType()
-                            : "text/html"
-                    )
-            )
+                stepUuid,
+                step -> step.getAttachments().add(
+                        new Attachment()
+                                .setName(attachmentName)
+                                .setSource(source)
+                                .setType(
+                                        content.getContentType() != null
+                                                ? content.getContentType()
+                                                : "text/html"
+                                )
+                )
         );
         lifecycle.writeAttachment(
-            source,
-            new ByteArrayInputStream(content.getContent().getBytes(StandardCharsets.UTF_8))
+                source,
+                new ByteArrayInputStream(content.getContent().getBytes(StandardCharsets.UTF_8))
         );
     }
 
@@ -406,9 +405,8 @@ private static String toJsonBody(final List<String> items) {
     }
 
     private static void copyAsciiResponseMetadata(
-        final Metadata source,
-        final Map<String, String> target
-    ) {
+                                                  final Metadata source,
+                                                  final Map<String, String> target) {
         for (String key : source.keys()) {
             if (key == null) {
                 continue;
@@ -416,8 +414,7 @@ private static void copyAsciiResponseMetadata(
             if (key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
                 continue;
             }
-            final Metadata.Key<String> keyAscii =
-                Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
+            final Metadata.Key<String> keyAscii = Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
             final String value = source.get(keyAscii);
             if (value != null) {
                 target.put(key, value);
@@ -435,14 +432,13 @@ private static final class StepContext<T, R> {
         private final Map<String, String> trailers;
 
         StepContext(
-            final String stepUuid,
-            final MethodDescriptor<T, R> methodDescriptor,
-            final AllureLifecycle lifecycle,
-            final List<String> clientMessages,
-            final List<String> serverMessages,
-            final Map<String, String> initialHeaders,
-            final Map<String, String> trailers
-        ) {
+                    final String stepUuid,
+                    final MethodDescriptor<T, R> methodDescriptor,
+                    final AllureLifecycle lifecycle,
+                    final List<String> clientMessages,
+                    final List<String> serverMessages,
+                    final Map<String, String> initialHeaders,
+                    final Map<String, String> trailers) {
             this.stepUuid = stepUuid;
             this.methodDescriptor = methodDescriptor;
             this.lifecycle = lifecycle;
diff --git a/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java b/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
index a98e09e70..ec5d55ca1 100644
--- a/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
+++ b/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
@@ -61,37 +61,47 @@ class AllureGrpcTest {
     @BeforeEach
     void configureMockServer() {
         managedChannel = ManagedChannelBuilder
-            .forAddress("localhost", GrpcMock.getGlobalPort())
-            .usePlaintext()
-            .directExecutor()
-            .build();
-
-        GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod())
-            .willReturn(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build()));
-
-        GrpcMock.stubFor(serverStreamingMethod(TestServiceGrpc.getCalculateServerStreamMethod())
-            .willReturn(asList(
-                Response.newBuilder().setMessage(RESPONSE_MESSAGE).build(),
-                Response.newBuilder().setMessage(RESPONSE_MESSAGE).build()
-            )));
-
-        GrpcMock.stubFor(clientStreamingMethod(TestServiceGrpc.getCalculateClientStreamMethod())
-            .willReturn(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build()));
-
-        GrpcMock.stubFor(bidiStreamingMethod(TestServiceGrpc.getCalculateBidiStreamMethod())
-            .willProxyTo(responseObserver -> new StreamObserver<Request>() {
-                @Override
-                public void onNext(Request request) {
-                    responseObserver.onNext(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build());
-                }
-                @Override
-                public void onError(Throwable throwable) {
-                }
-                @Override
-                public void onCompleted() {
-                    responseObserver.onCompleted();
-                }
-            }));
+                .forAddress("localhost", GrpcMock.getGlobalPort())
+                .usePlaintext()
+                .directExecutor()
+                .build();
+
+        GrpcMock.stubFor(
+                unaryMethod(TestServiceGrpc.getCalculateMethod())
+                        .willReturn(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build())
+        );
+
+        GrpcMock.stubFor(
+                serverStreamingMethod(TestServiceGrpc.getCalculateServerStreamMethod())
+                        .willReturn(
+                                asList(
+                                        Response.newBuilder().setMessage(RESPONSE_MESSAGE).build(),
+                                        Response.newBuilder().setMessage(RESPONSE_MESSAGE).build()
+                                )
+                        )
+        );
+
+        GrpcMock.stubFor(
+                clientStreamingMethod(TestServiceGrpc.getCalculateClientStreamMethod())
+                        .willReturn(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build())
+        );
+
+        GrpcMock.stubFor(
+                bidiStreamingMethod(TestServiceGrpc.getCalculateBidiStreamMethod())
+                        .willProxyTo(responseObserver -> new StreamObserver<Request>() {
+                            @Override
+                            public void onNext(Request request) {
+                                responseObserver.onNext(Response.newBuilder().setMessage(RESPONSE_MESSAGE).build());
+                            }
+                            @Override
+                            public void onError(Throwable throwable) {
+                            }
+                            @Override
+                            public void onCompleted() {
+                                responseObserver.onCompleted();
+                            }
+                        })
+        );
     }
 
     @AfterEach
@@ -102,8 +112,8 @@ void shutdownChannel() {
     @Test
     void shouldCreateRequestAttachment() {
         Request request = Request.newBuilder()
-            .setTopic("1")
-            .build();
+                .setTopic("1")
+                .build();
 
         Status errorStatus = Status.NOT_FOUND;
         GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod()).willReturn(errorStatus));
@@ -111,40 +121,40 @@ void shouldCreateRequestAttachment() {
         AllureResults allureResults = executeUnaryExpectingException(request);
 
         assertThat(allureResults.getTestResults().get(0).getSteps().get(0).getStatus())
-            .isEqualTo(io.qameta.allure.model.Status.FAILED);
+                .isEqualTo(io.qameta.allure.model.Status.FAILED);
 
         assertThat(allureResults.getTestResults().get(0).getSteps())
-            .flatExtracting(StepResult::getAttachments)
-            .extracting(Attachment::getName)
-            .contains("gRPC request", "gRPC response");
+                .flatExtracting(StepResult::getAttachments)
+                .extracting(Attachment::getName)
+                .contains("gRPC request", "gRPC response");
     }
 
     @Test
     void shouldCreateResponseAttachment() {
         Request request = Request.newBuilder()
-            .setTopic("1")
-            .build();
+                .setTopic("1")
+                .build();
 
         AllureResults allureResults = executeUnary(request);
 
         assertThat(allureResults.getTestResults().get(0).getSteps())
-            .flatExtracting(StepResult::getAttachments)
-            .extracting(Attachment::getName)
-            .contains("gRPC response");
+                .flatExtracting(StepResult::getAttachments)
+                .extracting(Attachment::getName)
+                .contains("gRPC response");
     }
 
     @Test
     void shouldCreateResponseAttachmentForServerStreamingResponse() {
         Request request = Request.newBuilder()
-            .setTopic("1")
-            .build();
+                .setTopic("1")
+                .build();
 
         AllureResults allureResults = executeServerStreaming(request);
 
         assertThat(allureResults.getTestResults().get(0).getSteps())
-            .flatExtracting(StepResult::getAttachments)
-            .extracting(Attachment::getName)
-            .contains("gRPC response (collection of elements from Server stream)");
+                .flatExtracting(StepResult::getAttachments)
+                .extracting(Attachment::getName)
+                .contains("gRPC response (collection of elements from Server stream)");
     }
 
     @Test
@@ -153,18 +163,18 @@ void shouldCreateResponseAttachmentOnStatusException() {
         GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod()).willReturn(notFoundStatus));
 
         Request request = Request.newBuilder()
-            .setTopic("2")
-            .build();
+                .setTopic("2")
+                .build();
 
         AllureResults allureResults = executeUnaryExpectingException(request);
 
         assertThat(allureResults.getTestResults().get(0).getSteps().get(0).getStatus())
-            .isEqualTo(io.qameta.allure.model.Status.FAILED);
+                .isEqualTo(io.qameta.allure.model.Status.FAILED);
 
         assertThat(allureResults.getTestResults().get(0).getSteps())
-            .flatExtracting(StepResult::getAttachments)
-            .extracting(Attachment::getName)
-            .contains("gRPC response");
+                .flatExtracting(StepResult::getAttachments)
+                .extracting(Attachment::getName)
+                .contains("gRPC response");
     }
 
     @Test
@@ -173,8 +183,7 @@ void shouldCreateAttachmentsForClientStreamingWithAsynchronousStub() {
         Request secondClientRequest = Request.newBuilder().setTopic("B").build();
 
         runWithinTestContext(() -> {
-            TestServiceGrpc.TestServiceStub asynchronousStub =
-                TestServiceGrpc.newStub(managedChannel).withInterceptors(new AllureGrpc());
+            TestServiceGrpc.TestServiceStub asynchronousStub = TestServiceGrpc.newStub(managedChannel).withInterceptors(new AllureGrpc());
 
             final List<Response> receivedResponses = new ArrayList<Response>();
 
@@ -209,16 +218,22 @@ void shouldCreateAttachmentsForBidirectionalStreamingWithAsynchronousStub() {
         Request secondBidirectionalRequest = Request.newBuilder().setTopic("D").build();
 
         runWithinTestContext(() -> {
-            TestServiceGrpc.TestServiceStub asynchronousStub =
-                TestServiceGrpc.newStub(managedChannel).withInterceptors(new AllureGrpc());
+            TestServiceGrpc.TestServiceStub asynchronousStub = TestServiceGrpc.newStub(managedChannel).withInterceptors(new AllureGrpc());
 
             List<Response> receivedResponses = new ArrayList<>();
 
             Allure.step("async-root-bidi-stream", () -> {
                 StreamObserver<Response> responseObserver = new StreamObserver<Response>() {
-                    @Override public void onNext(Response value) { receivedResponses.add(value); }
-                    @Override public void onError(Throwable throwable) { }
-                    @Override public void onCompleted() { }
+                    @Override
+                    public void onNext(Response value) {
+                        receivedResponses.add(value);
+                    }
+                    @Override
+                    public void onError(Throwable throwable) {
+                    }
+                    @Override
+                    public void onCompleted() {
+                    }
                 };
 
                 StreamObserver<Request> requestObserver = asynchronousStub.calculateBidiStream(responseObserver);
@@ -235,14 +250,15 @@ void shouldCreateAttachmentsForBidirectionalStreamingWithAsynchronousStub() {
 
     @Test
     void unaryRequestBodyIsCapturedAsJsonObject() throws Exception {
-        GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod())
-            .willReturn(Response.newBuilder().setMessage("ok").build()));
+        GrpcMock.stubFor(
+                unaryMethod(TestServiceGrpc.getCalculateMethod())
+                        .willReturn(Response.newBuilder().setMessage("ok").build())
+        );
 
         Request request = Request.newBuilder().setTopic("topic-1").build();
 
         AllureResults allureResults = runWithinTestContext(() -> {
-            TestServiceGrpc.TestServiceBlockingStub stub =
-                TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+            TestServiceGrpc.TestServiceBlockingStub stub = TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
             Response response = stub.calculate(request);
             assertThat(response.getMessage()).isEqualTo("ok");
         });
@@ -256,14 +272,15 @@ void unaryRequestBodyIsCapturedAsJsonObject() throws Exception {
 
     @Test
     void unaryResponseBodyIsCapturedAsJsonObject() throws Exception {
-        GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod())
-            .willReturn(Response.newBuilder().setMessage("hello-world").build()));
+        GrpcMock.stubFor(
+                unaryMethod(TestServiceGrpc.getCalculateMethod())
+                        .willReturn(Response.newBuilder().setMessage("hello-world").build())
+        );
 
         Request request = Request.newBuilder().setTopic("x").build();
 
         AllureResults allureResults = runWithinTestContext(() -> {
-            TestServiceGrpc.TestServiceBlockingStub stub =
-                TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+            TestServiceGrpc.TestServiceBlockingStub stub = TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
             Response response = stub.calculate(request);
             assertThat(response.getMessage()).isEqualTo("hello-world");
         });
@@ -277,17 +294,20 @@ void unaryResponseBodyIsCapturedAsJsonObject() throws Exception {
 
     @Test
     void serverStreamingResponseBodyIsJsonArrayInOrder() throws Exception {
-        GrpcMock.stubFor(serverStreamingMethod(TestServiceGrpc.getCalculateServerStreamMethod())
-            .willReturn(asList(
-                Response.newBuilder().setMessage("first").build(),
-                Response.newBuilder().setMessage("second").build()
-            )));
+        GrpcMock.stubFor(
+                serverStreamingMethod(TestServiceGrpc.getCalculateServerStreamMethod())
+                        .willReturn(
+                                asList(
+                                        Response.newBuilder().setMessage("first").build(),
+                                        Response.newBuilder().setMessage("second").build()
+                                )
+                        )
+        );
 
         Request request = Request.newBuilder().setTopic("stream-topic").build();
 
         AllureResults allureResults = runWithinTestContext(() -> {
-            TestServiceGrpc.TestServiceBlockingStub stub =
-                TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+            TestServiceGrpc.TestServiceBlockingStub stub = TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
             Iterator<Response> responseIterator = stub.calculateServerStream(request);
             assertThat(responseIterator.hasNext()).isTrue();
             assertThat(responseIterator.next().getMessage()).isEqualTo("first");
@@ -297,7 +317,7 @@ void serverStreamingResponseBodyIsJsonArrayInOrder() throws Exception {
         });
 
         String jsonPayload = readJsonAttachmentByName(
-            allureResults, "gRPC response (collection of elements from Server stream) (json)"
+                allureResults, "gRPC response (collection of elements from Server stream) (json)"
         );
         JsonNode actualJsonArray = JSON.readTree(jsonPayload);
 
@@ -310,10 +330,10 @@ private static String readJsonAttachmentByName(AllureResults allureResults, Stri
         TestResult test = allureResults.getTestResults().get(0);
 
         Attachment matchedAttachment = flattenSteps(test.getSteps()).stream()
-            .flatMap(step -> step.getAttachments().stream())
-            .filter(attachment -> jsonAttachmentName.equals(attachment.getName()))
-            .findFirst()
-            .orElseThrow(() -> new IllegalStateException("Attachment not found: " + jsonAttachmentName));
+                .flatMap(step -> step.getAttachments().stream())
+                .filter(attachment -> jsonAttachmentName.equals(attachment.getName()))
+                .findFirst()
+                .orElseThrow(() -> new IllegalStateException("Attachment not found: " + jsonAttachmentName));
 
         String attachmentSourceKey = matchedAttachment.getSource();
         Map<String, byte[]> attachmentsContent = allureResults.getAttachments();
@@ -327,8 +347,7 @@ private static String readJsonAttachmentByName(AllureResults allureResults, Stri
     protected final AllureResults executeUnary(Request request) {
         return runWithinTestContext(() -> {
             try {
-                TestServiceGrpc.TestServiceBlockingStub stub =
-                    TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+                TestServiceGrpc.TestServiceBlockingStub stub = TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
                 Response response = stub.calculate(request);
                 assertThat(response.getMessage()).isEqualTo(RESPONSE_MESSAGE);
             } catch (Exception exception) {
@@ -340,8 +359,7 @@ protected final AllureResults executeUnary(Request request) {
     protected final AllureResults executeServerStreaming(Request request) {
         return runWithinTestContext(() -> {
             try {
-                TestServiceGrpc.TestServiceBlockingStub stub =
-                    TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+                TestServiceGrpc.TestServiceBlockingStub stub = TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
                 Iterator<Response> responseIterator = stub.calculateServerStream(request);
                 int responseCount = 0;
                 while (responseIterator.hasNext()) {
@@ -356,14 +374,13 @@ protected final AllureResults executeServerStreaming(Request request) {
     }
 
     protected final AllureResults executeUnaryExpectingException(Request request) {
-        return runWithinTestContext(() ->
-            assertThatExceptionOfType(StatusRuntimeException.class)
-                .isThrownBy(() -> {
-                    TestServiceGrpc.TestServiceBlockingStub stub =
-                        TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
-                    Response response = stub.calculate(request);
-                    assertThat(response.getMessage()).isEqualTo("ok");
-                })
+        return runWithinTestContext(
+                () -> assertThatExceptionOfType(StatusRuntimeException.class)
+                        .isThrownBy(() -> {
+                            TestServiceGrpc.TestServiceBlockingStub stub = TestServiceGrpc.newBlockingStub(managedChannel).withInterceptors(new AllureGrpc());
+                            Response response = stub.calculate(request);
+                            assertThat(response.getMessage()).isEqualTo("ok");
+                        })
         );
     }
 
diff --git a/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java b/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
index 60153b143..4a1782edc 100644
--- a/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
+++ b/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
@@ -15,17 +15,17 @@
  */
 package io.qameta.allure.hamcrest;
 
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.AfterReturning;
 import io.qameta.allure.Allure;
 import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.util.ObjectUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
 import org.hamcrest.Matcher;
 import org.hamcrest.StringDescription;
 
@@ -106,7 +106,10 @@ public void catchAndStartStep(final JoinPoint joinPoint) {
         }
     }
 
-    @AfterThrowing(pointcut = "initAssertThat()", throwing = "e")
+    @AfterThrowing(
+            pointcut = "initAssertThat()",
+            throwing = "e"
+    )
     public void stepFailed(final Throwable e) {
         getLifecycle().updateStep(s -> s.setStatus(getStatus(e).orElse(Status.BROKEN)));
         getLifecycle().stopStep();
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
index 21f2e5ee1..acdd8900c 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
@@ -54,7 +54,7 @@ public class AllureHamcrestCollectionsMatchersTest {
     @Test
     void hamcrestAssertNameForArrayMatchers() {
         final TestResult testResult = runWithinTestContext(
-                () -> assertThat(new Integer[]{1,2,3}, is(array(equalTo(1), equalTo(2), equalTo(3)))),
+                () -> assertThat(new Integer[]{1, 2, 3}, is(array(equalTo(1), equalTo(2), equalTo(3)))),
                 AllureHamcrestAssert::setLifecycle
         ).getTestResults().get(0);
 
diff --git a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java
index 6c3932a0d..515f6ecbb 100644
--- a/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java
@@ -20,7 +20,6 @@
 import org.assertj.core.api.Assertions;
 import org.hamcrest.Matcher;
 import org.junit.jupiter.api.TestInstance;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
diff --git a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java
index e988f9226..833f45bca 100644
--- a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java
+++ b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientRequest.java
@@ -43,8 +43,9 @@ public class AllureHttpClientRequest implements HttpRequestInterceptor {
     private final AttachmentProcessor<AttachmentData> processor;
 
     public AllureHttpClientRequest() {
-        this(new FreemarkerAttachmentRenderer("http-request.ftl"),
-             new DefaultAttachmentProcessor()
+        this(
+                new FreemarkerAttachmentRenderer("http-request.ftl"),
+                new DefaultAttachmentProcessor()
         );
     }
 
@@ -55,20 +56,25 @@ public AllureHttpClientRequest(final AttachmentRenderer<AttachmentData> renderer
     }
 
     private static String getAttachmentName(final HttpRequest request) {
-        return String.format("Request_%s_%s", request.getRequestLine().getMethod(),
-                             request.getRequestLine().getUri());
+        return String.format(
+                "Request_%s_%s", request.getRequestLine().getMethod(),
+                request.getRequestLine().getUri()
+        );
     }
 
     @Override
     public void process(final HttpRequest request,
-                        final HttpContext context) throws IOException {
+                        final HttpContext context)
+            throws IOException {
 
-        final HttpRequestAttachment.Builder builder = create(getAttachmentName(request),
-                                                             request.getRequestLine().getUri())
+        final HttpRequestAttachment.Builder builder = create(
+                getAttachmentName(request),
+                request.getRequestLine().getUri()
+        )
                 .setMethod(request.getRequestLine().getMethod());
 
         Stream.of(request.getAllHeaders())
-              .forEach(header -> builder.setHeader(header.getName(), header.getValue()));
+                .forEach(header -> builder.setHeader(header.getName(), header.getValue()));
 
         if (request instanceof HttpEntityEnclosingRequest) {
             final HttpEntity entity = ((HttpEntityEnclosingRequest) request).getEntity();
diff --git a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
index d34476b6c..5e8daec13 100644
--- a/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
+++ b/allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
@@ -41,7 +41,8 @@ public class AllureHttpClientResponse implements HttpResponseInterceptor {
     private final AttachmentProcessor<AttachmentData> processor;
 
     public AllureHttpClientResponse() {
-        this(new FreemarkerAttachmentRenderer("http-response.ftl"),
+        this(
+                new FreemarkerAttachmentRenderer("http-response.ftl"),
                 new DefaultAttachmentProcessor()
         );
     }
@@ -54,7 +55,8 @@ public AllureHttpClientResponse(final AttachmentRenderer<AttachmentData> rendere
 
     @Override
     public void process(final HttpResponse response,
-                        final HttpContext context) throws IOException {
+                        final HttpContext context)
+            throws IOException {
 
         final HttpResponseAttachment.Builder builder = create("Response")
                 .setResponseCode(response.getStatusLine().getStatusCode());
diff --git a/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java b/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
index 4126ca325..8ed24f1f4 100644
--- a/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
+++ b/allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
@@ -62,16 +62,26 @@ void setUp() {
         server.start();
         configureFor(server.port());
 
-        stubFor(get(urlEqualTo("/hello"))
-                .willReturn(aResponse()
-                        .withBody(BODY_STRING)));
-
-        stubFor(get(urlEqualTo("/empty"))
-                .willReturn(aResponse()
-                        .withStatus(304)));
-
-        stubFor(delete(urlEqualTo("/hello"))
-                .willReturn(noContent()));
+        stubFor(
+                get(urlEqualTo("/hello"))
+                        .willReturn(
+                                aResponse()
+                                        .withBody(BODY_STRING)
+                        )
+        );
+
+        stubFor(
+                get(urlEqualTo("/empty"))
+                        .willReturn(
+                                aResponse()
+                                        .withStatus(304)
+                        )
+        );
+
+        stubFor(
+                delete(urlEqualTo("/hello"))
+                        .willReturn(noContent())
+        );
     }
 
     @AfterEach
@@ -169,7 +179,7 @@ void shouldCreateRequestAttachmentWithEmptyBodyWhenNoContentIsReturned() throws
         final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
 
         final HttpClientBuilder builder = HttpClientBuilder.create()
-                                                           .addInterceptorLast(new AllureHttpClientRequest(renderer, processor));
+                .addInterceptorLast(new AllureHttpClientRequest(renderer, processor));
 
         try (CloseableHttpClient httpClient = builder.build()) {
             final HttpDelete httpDelete = new HttpDelete(String.format("http://localhost:%d/hello", server.port()));
@@ -195,16 +205,16 @@ void shouldNotConsumeBody() throws Exception {
         final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
 
         final HttpClientBuilder builder = HttpClientBuilder.create()
-                                                           .addInterceptorLast(new AllureHttpClientResponse(renderer, processor));
+                .addInterceptorLast(new AllureHttpClientResponse(renderer, processor));
 
         try (CloseableHttpClient httpClient = builder.build()) {
-          final HttpGet httpGet = new HttpGet(String.format("http://localhost:%d/hello", server.port()));
-          try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
-              response.getStatusLine().getStatusCode();
-              BufferedHttpEntity ent = new BufferedHttpEntity(response.getEntity());
-              assertThat(EntityUtils.toString(ent))
-                      .isEqualTo(BODY_STRING);
-          }
+            final HttpGet httpGet = new HttpGet(String.format("http://localhost:%d/hello", server.port()));
+            try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
+                response.getStatusLine().getStatusCode();
+                BufferedHttpEntity ent = new BufferedHttpEntity(response.getEntity());
+                assertThat(EntityUtils.toString(ent))
+                        .isEqualTo(BODY_STRING);
+            }
         }
     }
 }
diff --git a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
index 5c9683b47..90cdd03ac 100644
--- a/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
+++ b/allure-httpclient5/src/main/java/io/qameta/allure/httpclient5/AllureHttpClient5Response.java
@@ -37,9 +37,11 @@
 /**
  * @author a-simeshin (Simeshin Artem)
  */
-@SuppressWarnings({
-        "checkstyle:ParameterAssignment",
-        "PMD.AvoidReassigningParameters"})
+@SuppressWarnings(
+    {
+            "checkstyle:ParameterAssignment",
+            "PMD.AvoidReassigningParameters"}
+)
 public class AllureHttpClient5Response implements HttpResponseInterceptor {
     private final AttachmentRenderer<AttachmentData> renderer;
     private final AttachmentProcessor<AttachmentData> processor;
@@ -71,7 +73,8 @@ public AllureHttpClient5Response(final AttachmentRenderer<AttachmentData> render
     @Override
     public void process(final HttpResponse response,
                         EntityDetails entity,
-                        final HttpContext context) throws IOException {
+                        final HttpContext context)
+            throws IOException {
         final HttpResponseAttachment.Builder builder = create("Response");
         builder.setResponseCode(response.getCode());
 
@@ -82,8 +85,7 @@ public void process(final HttpResponse response,
             // Looks like a bug or completely new logic. It's not enough to replace chaining EntityDetails entity.
             // To read the response body twice, It needs to put in the context also
             entity = new BufferedHttpEntity(originalHttpEntity);
-            final BasicClassicHttpResponse responseEntity =
-                    (BasicClassicHttpResponse) context.getAttribute("http.response");
+            final BasicClassicHttpResponse responseEntity = (BasicClassicHttpResponse) context.getAttribute("http.response");
             responseEntity.setEntity((HttpEntity) entity);
 
             final String responseBody = AllureHttpEntityUtils.getBody((HttpEntity) entity);
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
index 0b9688566..89ad99f75 100644
--- a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5DeleteTest.java
@@ -58,9 +58,11 @@ void setUp() {
         server.start();
         configureFor(server.port());
 
-        stubFor(delete(HELLO_RESOURCE_PATH).willReturn(
-                aResponse()
-                        .withStatus(204))
+        stubFor(
+                delete(HELLO_RESOURCE_PATH).willReturn(
+                        aResponse()
+                                .withStatus(204)
+                )
         );
     }
 
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
index d750d5cc2..468f25803 100644
--- a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5GetTest.java
@@ -53,7 +53,6 @@ class AllureHttpClient5GetTest {
     private static final String HELLO_GET_RETURN_BODY = "http://localhost:%d/hello";
     private static final String HELLO_GET_201_NO_BODY = "http://localhost:%d/empty";
 
-
     private WireMockServer server;
 
     @BeforeEach
@@ -62,14 +61,18 @@ void setUp() {
         server.start();
         configureFor(server.port());
 
-        stubFor(get(HELLO_RESOURCE_PATH).willReturn(
-                aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(BODY_STRING)
-        ));
-        stubFor(get("/empty").willReturn(
-                aResponse()
-                        .withStatus(200))
+        stubFor(
+                get(HELLO_RESOURCE_PATH).willReturn(
+                        aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(BODY_STRING)
+                )
+        );
+        stubFor(
+                get("/empty").willReturn(
+                        aResponse()
+                                .withStatus(200)
+                )
         );
     }
 
diff --git a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
index 3346e1835..e2a375df8 100644
--- a/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
+++ b/allure-httpclient5/src/test/java/io/qameta/allure/httpclient5/AllureHttpClient5PostTest.java
@@ -56,7 +56,6 @@ class AllureHttpClient5PostTest {
     private static final String HELLO_POST_RETURN_BODY = "http://localhost:%d/hello";
     private static final String HELLO_POST_201_NO_BODY = "http://localhost:%d/empty";
 
-
     private WireMockServer server;
 
     @BeforeEach
@@ -65,14 +64,18 @@ void setUp() {
         server.start();
         configureFor(server.port());
 
-        stubFor(post(HELLO_RESOURCE_PATH).willReturn(
-                aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(BODY_STRING)
-        ));
-        stubFor(post("/empty").willReturn(
-                aResponse()
-                        .withStatus(201))
+        stubFor(
+                post(HELLO_RESOURCE_PATH).willReturn(
+                        aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(BODY_STRING)
+                )
+        );
+        stubFor(
+                post("/empty").willReturn(
+                        aResponse()
+                                .withStatus(201)
+                )
         );
     }
 
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
index bc9225725..d41aacf98 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureResults.java
@@ -39,9 +39,11 @@ default TestResult getTestResultByName(final String name) {
         return getTestResults().stream()
                 .filter(tr -> Objects.equals(name, tr.getName()))
                 .findFirst()
-                .orElseThrow(() -> new NoSuchElementException(
-                        "test result with name " + name + " is not found"
-                ));
+                .orElseThrow(
+                        () -> new NoSuchElementException(
+                                "test result with name " + name + " is not found"
+                        )
+                );
     }
 
     default List<TestResultContainer> getTestResultContainersForTestResult(final TestResult testResult) {
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
index 75fa00300..1065f8119 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureTestCommonsUtils.java
@@ -51,10 +51,11 @@ public final class AllureTestCommonsUtils {
             .configure(USE_WRAPPER_NAME_AS_PROPERTY_NAME, true)
             .serializationInclusion(NON_DEFAULT)
             .build()
-            .registerModule(new SimpleModule()
-                    .addSerializer(Status.class, new StatusSerializer())
-                    .addSerializer(Stage.class, new StageSerializer())
-                    .addSerializer(Parameter.Mode.class, new ParameterModeSerializer())
+            .registerModule(
+                    new SimpleModule()
+                            .addSerializer(Status.class, new StatusSerializer())
+                            .addSerializer(Stage.class, new StageSerializer())
+                            .addSerializer(Parameter.Mode.class, new ParameterModeSerializer())
             )
             .writerWithDefaultPrettyPrinter();
 
@@ -92,13 +93,14 @@ public static void attach(final AllureResults allureResults) {
             }
         });
 
-        allureResults.getAttachments().forEach((fileName, body) -> Allure
-                .addAttachment(
-                        fileName,
-                        type(fileName),
-                        new ByteArrayInputStream(body),
-                        extension(fileName)
-                )
+        allureResults.getAttachments().forEach(
+                (fileName, body) -> Allure
+                        .addAttachment(
+                                fileName,
+                                type(fileName),
+                                new ByteArrayInputStream(body),
+                                extension(fileName)
+                        )
         );
     }
 
@@ -131,7 +133,8 @@ protected ParameterModeSerializer() {
         @Override
         public void serialize(final Parameter.Mode value,
                               final JsonGenerator gen,
-                              final SerializerProvider provider) throws IOException {
+                              final SerializerProvider provider)
+                throws IOException {
             gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
         }
     }
@@ -147,7 +150,8 @@ protected StageSerializer() {
         @Override
         public void serialize(final Stage value,
                               final JsonGenerator gen,
-                              final SerializerProvider provider) throws IOException {
+                              final SerializerProvider provider)
+                throws IOException {
             gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
         }
     }
@@ -163,7 +167,8 @@ protected StatusSerializer() {
         @Override
         public void serialize(final Status value,
                               final JsonGenerator gen,
-                              final SerializerProvider provider) throws IOException {
+                              final SerializerProvider provider)
+                throws IOException {
             gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
         }
     }
diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
index d28a685e9..6faf95660 100644
--- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/RunUtils.java
@@ -41,7 +41,7 @@ private RunUtils() {
     }
 
     public static AllureResults runTests(
-            final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable) {
+                                         final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable) {
         return runTests(
                 runnable,
                 Allure::setLifecycle,
@@ -51,8 +51,8 @@ public static AllureResults runTests(
     }
 
     public static AllureResults runTests(
-            final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
-            final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable) {
+                                         final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
+                                         final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable) {
         return runTests(
                 lifecycleFactory,
                 runnable,
@@ -64,16 +64,16 @@ public static AllureResults runTests(
 
     @SafeVarargs
     public static AllureResults runTests(
-            final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable,
-            final Consumer<AllureLifecycle>... configurers) {
+                                         final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable,
+                                         final Consumer<AllureLifecycle>... configurers) {
         return runTests(AllureLifecycle::new, runnable, configurers);
     }
 
     @SafeVarargs
     public static AllureResults runTests(
-            final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
-            final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable,
-            final Consumer<AllureLifecycle>... configurers) {
+                                         final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
+                                         final Allure.ThrowableContextRunnableVoid<AllureLifecycle> runnable,
+                                         final Consumer<AllureLifecycle>... configurers) {
         final AllureResultsWriterStub writer = new AllureResultsWriterStub();
         final AllureLifecycle lifecycle = lifecycleFactory.apply(writer);
 
@@ -94,28 +94,28 @@ public static AllureResults runTests(
     }
 
     public static AllureResults runWithinTestContext(
-            final Runnable runnable) {
+                                                     final Runnable runnable) {
         return runTests(lifecycle -> withTestContext(runnable, lifecycle));
     }
 
     public static AllureResults runWithinTestContext(
-            final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
-            final Runnable runnable) {
+                                                     final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
+                                                     final Runnable runnable) {
         return runTests(lifecycleFactory, lifecycle -> withTestContext(runnable, lifecycle));
     }
 
     @SafeVarargs
     public static AllureResults runWithinTestContext(
-            final Runnable runnable,
-            final Consumer<AllureLifecycle>... configurers) {
+                                                     final Runnable runnable,
+                                                     final Consumer<AllureLifecycle>... configurers) {
         return runTests(lifecycle -> withTestContext(runnable, lifecycle), configurers);
     }
 
     @SafeVarargs
     public static AllureResults runWithinTestContext(
-            final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
-            final Runnable runnable,
-            final Consumer<AllureLifecycle>... configurers) {
+                                                     final Function<AllureResultsWriter, AllureLifecycle> lifecycleFactory,
+                                                     final Runnable runnable,
+                                                     final Consumer<AllureLifecycle>... configurers) {
         return runTests(lifecycleFactory, lifecycle -> withTestContext(runnable, lifecycle), configurers);
     }
 
diff --git a/allure-java-commons-test/src/test/java/io/qameta/allure/test/RunUtilsTest.java b/allure-java-commons-test/src/test/java/io/qameta/allure/test/RunUtilsTest.java
index 12bd9c5d5..265ae9f9f 100644
--- a/allure-java-commons-test/src/test/java/io/qameta/allure/test/RunUtilsTest.java
+++ b/allure-java-commons-test/src/test/java/io/qameta/allure/test/RunUtilsTest.java
@@ -27,10 +27,9 @@ class RunUtilsTest {
 
     @Test
     void shouldCaptureFailureStatusWithinSyntheticTestContext() {
-        final AllureResults results = Allure.step("Execute a synthetic test context that raises an assertion error", () ->
-                RunUtils.runWithinTestContext(() -> {
-                    throw new AssertionError("boom");
-                })
+        final AllureResults results = Allure.step("Execute a synthetic test context that raises an assertion error", () -> RunUtils.runWithinTestContext(() -> {
+            throw new AssertionError("boom");
+        })
         );
 
         Allure.step("Verify the captured synthetic test result is marked as failed", () -> {
@@ -42,19 +41,20 @@ void shouldCaptureFailureStatusWithinSyntheticTestContext() {
 
     @Test
     void shouldAttachNestedRunArtifactsToOuterLifecycle() {
-        final AllureResults results = Allure.step("Execute a nested synthetic run and capture its emitted attachments", () ->
-                RunUtils.runWithinTestContext(() ->
-                        RunUtils.runWithinTestContext(() -> {
-                        })
+        final AllureResults results = Allure
+                .step("Execute a nested synthetic run and capture its emitted attachments", () -> RunUtils.runWithinTestContext(() -> RunUtils.runWithinTestContext(() -> {
+                })
                 )
-        );
+                );
 
         Allure.addAttachment("nested-attachment-keys", String.join("\n", results.getAttachments().keySet()));
         Allure.step("Verify the outer lifecycle receives serialized artifacts from the nested run", () -> {
             assertFalse(results.getAttachments().isEmpty());
-            assertTrue(results.getAttachments().values().stream()
-                    .map(bytes -> new String(bytes, java.nio.charset.StandardCharsets.UTF_8))
-                    .anyMatch(body -> body.contains("\"uuid\"")));
+            assertTrue(
+                    results.getAttachments().values().stream()
+                            .map(bytes -> new String(bytes, java.nio.charset.StandardCharsets.UTF_8))
+                            .anyMatch(body -> body.contains("\"uuid\""))
+            );
         });
     }
 }
diff --git a/allure-java-commons-test/src/test/java/io/qameta/allure/test/TestUtilitiesTest.java b/allure-java-commons-test/src/test/java/io/qameta/allure/test/TestUtilitiesTest.java
index d7fb298d1..2ecb62921 100644
--- a/allure-java-commons-test/src/test/java/io/qameta/allure/test/TestUtilitiesTest.java
+++ b/allure-java-commons-test/src/test/java/io/qameta/allure/test/TestUtilitiesTest.java
@@ -15,8 +15,8 @@
  */
 package io.qameta.allure.test;
 
-import io.qameta.allure.Allure;
 import io.github.benas.randombeans.api.EnhancedRandom;
+import io.qameta.allure.Allure;
 import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.atomic.AtomicReference;
@@ -32,8 +32,8 @@ class TestUtilitiesTest {
     void shouldGenerateStableThreadLocalRandomPerThread() throws Exception {
         final EnhancedRandom mainThread = ThreadLocalEnhancedRandom.current();
         final AtomicReference<EnhancedRandom> workerThread = new AtomicReference<>();
-        final Thread thread = new Thread(() ->
-                workerThread.set(ThreadLocalEnhancedRandom.current())
+        final Thread thread = new Thread(
+                () -> workerThread.set(ThreadLocalEnhancedRandom.current())
         );
 
         Allure.step("Resolve thread-local random generators on two threads and compare their identities", () -> {
@@ -42,7 +42,7 @@ void shouldGenerateStableThreadLocalRandomPerThread() throws Exception {
             Allure.addAttachment(
                     "thread-local-random-identities",
                     "main=" + System.identityHashCode(mainThread)
-                    + "\nworker=" + System.identityHashCode(workerThread.get())
+                            + "\nworker=" + System.identityHashCode(workerThread.get())
             );
             assertSame(mainThread, ThreadLocalEnhancedRandom.current());
             assertNotSame(mainThread, workerThread.get());
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
index 25092818e..6b9d32a82 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
@@ -45,6 +45,7 @@
 /**
  * The class contains some useful methods to work with {@link AllureLifecycle}.
  */
+@SuppressWarnings("PMD.TooManyMethods")
 public final class Allure {
 
     private static final String TXT_EXTENSION = ".txt";
@@ -181,9 +182,11 @@ public static <T> T step(final ThrowableContextRunnable<T, StepContext> runnable
             getLifecycle().updateStep(uuid, step -> step.setStatus(Status.PASSED));
             return result;
         } catch (Throwable throwable) {
-            getLifecycle().updateStep(s -> s
-                    .setStatus(getStatus(throwable).orElse(Status.BROKEN))
-                    .setStatusDetails(getStatusDetails(throwable).orElse(null)));
+            getLifecycle().updateStep(
+                    s -> s
+                            .setStatus(getStatus(throwable).orElse(Status.BROKEN))
+                            .setStatusDetails(getStatusDetails(throwable).orElse(null))
+            );
             throw ExceptionUtils.sneakyThrow(throwable);
         } finally {
             getLifecycle().stopStep(uuid);
@@ -458,24 +461,23 @@ public static void addAttachment(final String name, final String type,
     }
 
     public static CompletableFuture<byte[]> addByteAttachmentAsync(
-            final String name, final String type, final Supplier<byte[]> body) {
+                                                                   final String name, final String type, final Supplier<byte[]> body) {
         return addByteAttachmentAsync(name, type, "", body);
     }
 
     public static CompletableFuture<byte[]> addByteAttachmentAsync(
-            final String name, final String type, final String fileExtension, final Supplier<byte[]> body) {
+                                                                   final String name, final String type, final String fileExtension, final Supplier<byte[]> body) {
         final String source = getLifecycle().prepareAttachment(name, type, fileExtension);
-        return supplyAsync(body).whenComplete((result, ex) ->
-                getLifecycle().writeAttachment(source, new ByteArrayInputStream(result)));
+        return supplyAsync(body).whenComplete((result, ex) -> getLifecycle().writeAttachment(source, new ByteArrayInputStream(result)));
     }
 
     public static CompletableFuture<InputStream> addStreamAttachmentAsync(
-            final String name, final String type, final Supplier<InputStream> body) {
+                                                                          final String name, final String type, final Supplier<InputStream> body) {
         return addStreamAttachmentAsync(name, type, "", body);
     }
 
     public static CompletableFuture<InputStream> addStreamAttachmentAsync(
-            final String name, final String type, final String fileExtension, final Supplier<InputStream> body) {
+                                                                          final String name, final String type, final String fileExtension, final Supplier<InputStream> body) {
         final String source = lifecycle.prepareAttachment(name, type, fileExtension);
         return supplyAsync(body).whenComplete((result, ex) -> lifecycle.writeAttachment(source, result));
     }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
index dc3f9d3b6..46e7d4479 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/AllureLifecycle.java
@@ -49,7 +49,7 @@
 /**
  * The class contains Allure context and methods to change it.
  */
-@SuppressWarnings("PMD.AvoidSynchronizedStatement")
+@SuppressWarnings({"PMD.AvoidSynchronizedStatement", "PMD.TooManyMethods"})
 public class AllureLifecycle {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureLifecycle.class);
@@ -641,9 +641,11 @@ private static FileSystemResultsWriter getDefaultWriter() {
         final Properties properties = PropertiesUtils.loadAllureProperties();
         final String path = properties.getProperty("allure.results.directory", "allure-results");
         final boolean cleanBeforeRun = Boolean.parseBoolean(
-                properties.getProperty("allure.results.clean.before.run", "false"));
+                properties.getProperty("allure.results.clean.before.run", "false")
+        );
         final boolean cleanOnlyOnce = Boolean.parseBoolean(
-                properties.getProperty("allure.results.clean.only.once", "true"));
+                properties.getProperty("allure.results.clean.only.once", "true")
+        );
         return new FileSystemResultsWriter(Paths.get(path), cleanBeforeRun, cleanOnlyOnce);
     }
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java b/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
index f4b0e3313..14216c0a7 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsWriter.java
@@ -29,8 +29,8 @@
 import java.util.Comparator;
 import java.util.Objects;
 import java.util.UUID;
-import java.util.stream.Stream;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Stream;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -54,8 +54,8 @@ public FileSystemResultsWriter(final Path outputDirectory) {
     }
 
     public FileSystemResultsWriter(final Path outputDirectory,
-                                    final boolean cleanBeforeRun,
-                                    final boolean cleanOnlyOnce) {
+                                   final boolean cleanBeforeRun,
+                                   final boolean cleanOnlyOnce) {
         this.outputDirectory = outputDirectory;
         this.cleanBeforeRun = cleanBeforeRun;
         this.cleanOnlyOnce = cleanOnlyOnce;
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java b/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
index 106a8069b..6db4164a7 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java
@@ -39,8 +39,7 @@
 @Aspect
 public class AttachmentsAspects {
 
-    private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE =
-            new InheritableThreadLocal<AllureLifecycle>() {
+    private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE = new InheritableThreadLocal<AllureLifecycle>() {
         @Override
         protected AllureLifecycle initialValue() {
             return Allure.getLifecycle();
@@ -70,13 +69,18 @@ public void anyMethod() {
      * @param joinPoint the join point to process.
      * @param result    the returned value.
      */
-    @AfterReturning(pointcut = "anyMethod() && withAttachmentAnnotation()", returning = "result")
+    @AfterReturning(
+            pointcut = "anyMethod() && withAttachmentAnnotation()",
+            returning = "result"
+    )
     public void attachment(final JoinPoint joinPoint, final Object result) {
         final MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
         final Attachment attachment = methodSignature.getMethod()
                 .getAnnotation(Attachment.class);
-        final byte[] bytes = (result instanceof byte[]) ? (byte[]) result : Objects.toString(result)
-                .getBytes(StandardCharsets.UTF_8);
+        final byte[] bytes = (result instanceof byte[])
+                ? (byte[]) result
+                : Objects.toString(result)
+                        .getBytes(StandardCharsets.UTF_8);
 
         final String name = attachment.value().isEmpty()
                 ? methodSignature.getName()
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java b/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
index 8f59189d3..77e29082a 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
@@ -45,8 +45,7 @@
 @Aspect
 public class StepsAspects {
 
-    private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE
-            = new InheritableThreadLocal<AllureLifecycle>() {
+    private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE = new InheritableThreadLocal<AllureLifecycle>() {
         @Override
         protected AllureLifecycle initialValue() {
             return Allure.getLifecycle();
@@ -79,11 +78,16 @@ public void stepStart(final JoinPoint joinPoint) {
         getLifecycle().startStep(uuid, result);
     }
 
-    @AfterThrowing(pointcut = "anyMethod() && withStepAnnotation()", throwing = "e")
+    @AfterThrowing(
+            pointcut = "anyMethod() && withStepAnnotation()",
+            throwing = "e"
+    )
     public void stepFailed(final Throwable e) {
-        getLifecycle().updateStep(s -> s
-                .setStatus(getStatus(e).orElse(Status.BROKEN))
-                .setStatusDetails(getStatusDetails(e).orElse(null)));
+        getLifecycle().updateStep(
+                s -> s
+                        .setStatus(getStatus(e).orElse(Status.BROKEN))
+                        .setStatusDetails(getStatusDetails(e).orElse(null))
+        );
         getLifecycle().stopStep();
     }
 
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
index 21d2250ff..93d46e354 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
@@ -52,10 +52,11 @@ public static ObjectMapper createMapper() {
                 .serializationInclusion(NON_NULL)
                 .configure(INDENT_OUTPUT, Boolean.getBoolean(INDENT_OUTPUT_PROPERTY_NAME))
                 .build()
-                .registerModule(new SimpleModule()
-                        .addSerializer(Status.class, new StatusSerializer())
-                        .addSerializer(Stage.class, new StageSerializer())
-                        .addSerializer(Parameter.Mode.class, new ParameterModeSerializer())
+                .registerModule(
+                        new SimpleModule()
+                                .addSerializer(Status.class, new StatusSerializer())
+                                .addSerializer(Stage.class, new StageSerializer())
+                                .addSerializer(Parameter.Mode.class, new ParameterModeSerializer())
                 );
     }
 
@@ -70,7 +71,8 @@ protected ParameterModeSerializer() {
         @Override
         public void serialize(final Parameter.Mode value,
                               final JsonGenerator gen,
-                              final SerializerProvider provider) throws IOException {
+                              final SerializerProvider provider)
+                throws IOException {
             gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
         }
     }
@@ -86,7 +88,8 @@ protected StageSerializer() {
         @Override
         public void serialize(final Stage value,
                               final JsonGenerator gen,
-                              final SerializerProvider provider) throws IOException {
+                              final SerializerProvider provider)
+                throws IOException {
             gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
         }
     }
@@ -102,7 +105,8 @@ protected StatusSerializer() {
         @Override
         public void serialize(final Status value,
                               final JsonGenerator gen,
-                              final SerializerProvider provider) throws IOException {
+                              final SerializerProvider provider)
+                throws IOException {
             gen.writeString(value.name().toLowerCase(Locale.ENGLISH));
         }
     }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
index 29174eceb..7684b66d8 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/listener/LifecycleNotifier.java
@@ -28,8 +28,13 @@
 /**
  * @since 2.0
  */
-public class LifecycleNotifier implements ContainerLifecycleListener,
-        TestLifecycleListener, FixtureLifecycleListener, StepLifecycleListener {
+@SuppressWarnings("PMD.TooManyMethods")
+public class LifecycleNotifier
+        implements
+            ContainerLifecycleListener,
+            TestLifecycleListener,
+            FixtureLifecycleListener,
+            StepLifecycleListener {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LifecycleNotifier.class);
 
@@ -51,7 +56,6 @@ public LifecycleNotifier(final List<ContainerLifecycleListener> containerListene
         this.stepListeners = stepListeners;
     }
 
-
     @Override
     public void beforeTestSchedule(final TestResult result) {
         runSafely(testListeners, TestLifecycleListener::beforeTestSchedule, result);
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
index b032b35cf..1e6ad1246 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
@@ -141,9 +141,9 @@ public static Set<Label> getLabels(final Collection<Annotation> annotations) {
     }
 
     private static <T, U extends Annotation> Stream<T> extractMetaAnnotations(
-            final Class<U> annotationType,
-            final BiFunction<U, Annotation, Stream<T>> mapper,
-            final Collection<Annotation> candidates) {
+                                                                              final Class<U> annotationType,
+                                                                              final BiFunction<U, Annotation, Stream<T>> mapper,
+                                                                              final Collection<Annotation> candidates) {
         final Set<Annotation> visited = new HashSet<>();
         return candidates.stream()
                 .flatMap(AnnotationUtils::extractRepeatable)
@@ -151,15 +151,18 @@ private static <T, U extends Annotation> Stream<T> extractMetaAnnotations(
     }
 
     private static <T, U extends Annotation> Stream<T> extractMetaAnnotations(
-            final Class<U> annotationType,
-            final BiFunction<U, Annotation, Stream<T>> mapper,
-            final Annotation candidate,
-            final Set<Annotation> visited) {
+                                                                              final Class<U> annotationType,
+                                                                              final BiFunction<U, Annotation, Stream<T>> mapper,
+                                                                              final Annotation candidate,
+                                                                              final Set<Annotation> visited) {
         if (!isInJavaLangAnnotationPackage(candidate.annotationType()) && visited.add(candidate)) {
             final Stream<T> children = Stream.of(candidate.annotationType().getAnnotations())
                     .flatMap(AnnotationUtils::extractRepeatable)
-                    .flatMap(annotation -> extractMetaAnnotations(
-                            annotationType, mapper, annotation, visited));
+                    .flatMap(
+                            annotation -> extractMetaAnnotations(
+                                    annotationType, mapper, annotation, visited
+                            )
+                    );
             final Stream<T> current = Stream.of(candidate.annotationType().getAnnotationsByType(annotationType))
                     .flatMap(marker -> mapper.apply(marker, candidate));
             return Stream.concat(current, children);
@@ -203,10 +206,12 @@ private static Stream<String> callValueMethod(final Annotation annotation) {
         }
     }
 
-    @SuppressWarnings({
-            "CyclomaticComplexity",
-            "ReturnCount",
-    })
+    @SuppressWarnings(
+        {
+                "CyclomaticComplexity",
+                "ReturnCount",
+        }
+    )
     private static Stream<String> objectToStringStream(final Object object) {
         if (Objects.nonNull(object) && object.getClass().isArray()) {
             if (object instanceof Object[]) {
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
index f37ab44b4..4f93dd4e8 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ObjectUtils.java
@@ -43,10 +43,12 @@ private ObjectUtils() {
      * @param object the given object.
      * @return the string representation of given object.
      */
-    @SuppressWarnings({
-            "CyclomaticComplexity",
-            "ReturnCount",
-    })
+    @SuppressWarnings(
+        {
+                "CyclomaticComplexity",
+                "ReturnCount",
+        }
+    )
     public static String toString(final Object object) {
         try {
             if (Objects.nonNull(object) && object.getClass().isArray()) {
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index 03a08b0eb..ee584df95 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -66,10 +66,14 @@
 /**
  * The collection of Allure utils methods.
  */
-@SuppressWarnings({
-        "ClassFanOutComplexity",
-        "ClassDataAbstractionCoupling",
-})
+@SuppressWarnings(
+    {
+            "ClassFanOutComplexity",
+            "ClassDataAbstractionCoupling",
+            "PMD.GodClass",
+            "PMD.TooManyMethods",
+    }
+)
 public final class ResultsUtils {
 
     public static final String ALLURE_HOST_NAME_SYSPROP = "allure.hostName";
@@ -108,6 +112,7 @@ public final class ResultsUtils {
     private static final String ACTUAL = "actual";
     private static final String EXPECTED = "expected";
     private static final String DEFINED_PROPERTY_SUFFIX = "Defined";
+    private static final String NEW_LINE = "\n";
 
     private static String cachedHost;
 
@@ -340,9 +345,10 @@ public static Optional<StatusDetails> getStatusDetails(final Throwable e) {
         return Optional.ofNullable(e)
                 .map(throwable -> {
                     final StatusDetails details = new StatusDetails()
-                            .setMessage(Optional
-                                    .ofNullable(throwable.getMessage())
-                                    .orElse(throwable.getClass().getName())
+                            .setMessage(
+                                    Optional
+                                            .ofNullable(throwable.getMessage())
+                                            .orElse(throwable.getClass().getName())
                             )
                             .setTrace(getStackTraceAsString(throwable));
                     getRichErrorProperty(throwable, ACTUAL).ifPresent(details::setActual);
@@ -361,7 +367,8 @@ public static Optional<String> getJavadocDescription(final ClassLoader classLoad
         final String signatureHash = generateMethodSignatureHash(
                 method.getDeclaringClass().getName(),
                 name,
-                parameterTypes);
+                parameterTypes
+        );
 
         return readResource(classLoader, ALLURE_DESCRIPTIONS_FOLDER + signatureHash)
                 .map(desc -> separateLines() ? toMarkdownLineBreaks(desc) : desc);
@@ -435,10 +442,12 @@ private static String getRealHostName() {
     }
 
     private static String getRealThreadName() {
-        return String.format("%s.%s(%s)",
+        return String.format(
+                "%s.%s(%s)",
                 ManagementFactory.getRuntimeMXBean().getName(),
                 Thread.currentThread().getName(),
-                Thread.currentThread().getId());
+                Thread.currentThread().getId()
+        );
     }
 
     private static String getStackTraceAsString(final Throwable throwable) {
@@ -478,13 +487,13 @@ public static void processDescription(final ClassLoader classLoader,
     }
 
     private static String toMarkdownLineBreaks(final String description) {
-        final String[] lines = description.split("\n", -1);
+        final String[] lines = description.split(NEW_LINE, -1);
         final StringBuilder markdown = new StringBuilder();
         for (int index = 0; index < lines.length; index++) {
             if (index > 0) {
                 final String previousLine = lines[index - 1];
                 final String currentLine = lines[index];
-                markdown.append(previousLine.isEmpty() || currentLine.isEmpty() ? "\n" : "  \n");
+                markdown.append(previousLine.isEmpty() || currentLine.isEmpty() ? NEW_LINE : "  \n");
             }
             markdown.append(lines[index]);
         }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
index b24e489f0..25432cde6 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/AllureLifecycleTest.java
@@ -324,10 +324,16 @@ void shouldAttachAsync() {
         final String attachment2Content = randomString(100);
 
         final AllureResults writer = RunUtils.runWithinTestContext(() -> {
-            features.add(addStreamAttachmentAsync(
-                    attachment1Name, "video/mp4", getStreamWithTimeout(2, attachment1Content)));
-            features.add(addStreamAttachmentAsync(
-                    attachment2Name, "text/plain", getStreamWithTimeout(1, attachment2Content)));
+            features.add(
+                    addStreamAttachmentAsync(
+                            attachment1Name, "video/mp4", getStreamWithTimeout(2, attachment1Content)
+                    )
+            );
+            features.add(
+                    addStreamAttachmentAsync(
+                            attachment2Name, "text/plain", getStreamWithTimeout(1, attachment2Content)
+                    )
+            );
 
             allOf(features.toArray(new CompletableFuture[0])).join();
         });
@@ -352,7 +358,6 @@ void shouldAttachAsync() {
                 .map(io.qameta.allure.model.Attachment::getSource)
                 .toArray(String[]::new);
 
-
         final Map<String, byte[]> attachmentFiles = writer.getAttachments();
         assertThat(attachmentFiles)
                 .containsKeys(sources);
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
index 7086876b2..5dd3c59b9 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/FileSystemResultsWriterTest.java
@@ -80,9 +80,11 @@ void shouldWriteStatusDetailsActualAndExpected(@TempDir final Path folder) throw
         final String uuid = UUID.randomUUID().toString();
         final TestResult testResult = new TestResult()
                 .setUuid(uuid)
-                .setStatusDetails(new StatusDetails()
-                        .setActual("actual value")
-                        .setExpected("expected value"));
+                .setStatusDetails(
+                        new StatusDetails()
+                                .setActual("actual value")
+                                .setExpected("expected value")
+                );
 
         writer.write(testResult);
 
@@ -126,7 +128,7 @@ void shouldCleanOnlyOnceWhenCleanOnlyOnceEnabled(@TempDir final Path folder) thr
         Files.writeString(existingFile, "{}");
 
         FileSystemResultsWriter writer = new FileSystemResultsWriter(folder, true, true);
-        
+
         final String uuid1 = UUID.randomUUID().toString();
         final TestResult testResult1 = current().nextObject(TestResult.class, "steps").setUuid(uuid1);
         writer.write(testResult1);
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
index 7576938e8..ffdd61b3d 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/ResultsUtilsTest.java
@@ -113,7 +113,10 @@ public String type() {
                 .hasFieldOrPropertyWithValue("type", "d_from_annotation");
     }
 
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
+    @SystemProperty(
+            name = "allure.link.issue.pattern",
+            value = "https://example.org/issue/{}"
+    )
     @Test
     void shouldCreateIssueLink() {
         io.qameta.allure.model.Link actual = createIssueLink("issue_link");
@@ -124,7 +127,10 @@ void shouldCreateIssueLink() {
                 .hasFieldOrPropertyWithValue("type", ISSUE_LINK_TYPE);
     }
 
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
+    @SystemProperty(
+            name = "allure.link.issue.pattern",
+            value = "https://example.org/issue/{}"
+    )
     @Test
     void shouldCreateIssueLinkFromAnnotation() {
         io.qameta.allure.model.Link actual = createLink(new Issue() {
@@ -145,7 +151,10 @@ public String value() {
                 .hasFieldOrPropertyWithValue("type", ISSUE_LINK_TYPE);
     }
 
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
+    @SystemProperty(
+            name = "allure.link.tms.pattern",
+            value = "https://example.org/tms/{}"
+    )
     @Test
     void shouldCreateTmsLink() {
         io.qameta.allure.model.Link actual = createTmsLink("tms_link");
@@ -156,7 +165,10 @@ void shouldCreateTmsLink() {
                 .hasFieldOrPropertyWithValue("type", TMS_LINK_TYPE);
     }
 
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
+    @SystemProperty(
+            name = "allure.link.tms.pattern",
+            value = "https://example.org/tms/{}"
+    )
     @Test
     void shouldCreateTmsLinkFromAnnotation() {
         io.qameta.allure.model.Link actual = createLink(new TmsLink() {
@@ -179,8 +191,7 @@ public String value() {
 
     @Test
     void shouldGetSerializedLambdaName() {
-        final Function<LambdaSubject, String> getter =
-                (Function<LambdaSubject, String> & Serializable) LambdaSubject::getName;
+        final Function<LambdaSubject, String> getter = (Function<LambdaSubject, String> & Serializable) LambdaSubject::getName;
 
         assertThat(ResultsUtils.getLambdaName(getter))
                 .hasValue("LambdaSubject::getName");
@@ -188,8 +199,7 @@ void shouldGetSerializedLambdaName() {
 
     @Test
     void shouldIgnoreGeneratedSerializedLambdaBody() {
-        final Function<LambdaSubject, String> getter =
-                (Function<LambdaSubject, String> & Serializable) subject -> subject.getName();
+        final Function<LambdaSubject, String> getter = (Function<LambdaSubject, String> & Serializable) subject -> subject.getName();
 
         assertThat(ResultsUtils.getLambdaName(getter))
                 .isEmpty();
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java
index a3add35c7..e877efccc 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java
@@ -224,13 +224,15 @@ void shouldTransformPlaceholdersToPropertyValues() {
         assertThat(results.getTestResults())
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
-                .containsExactly("\"[test1@email.com, test2@email.com, null]\"," +
-                        " \"[{address='test1@email.com', attachments='[txt, png]'}," +
-                        " {address='test2@email.com', attachments='[jpg, mp4]'}," +
-                        " null]\"," +
-                        " \"[[txt, png], [jpg, mp4], null]\"," +
-                        " \"12345678\", \"{}\","
-                        + " \"1111222233334444\", \"{missing}\", true");
+                .containsExactly(
+                        "\"[test1@email.com, test2@email.com, null]\"," +
+                                " \"[{address='test1@email.com', attachments='[txt, png]'}," +
+                                " {address='test2@email.com', attachments='[jpg, mp4]'}," +
+                                " null]\"," +
+                                " \"[[txt, png], [jpg, mp4], null]\"," +
+                                " \"12345678\", \"{}\","
+                                + " \"1111222233334444\", \"{missing}\", true"
+                );
     }
 
     @Test
@@ -310,10 +312,19 @@ void shouldProcessParamAnnotation() {
 
     @Step
     void stepWithParamAnnotation(
-            @Param("Named") final String named,
-            @Param(name = "Excluded", excluded = true) final String excluded,
-            @Param(name = "Masked", mode = Parameter.Mode.MASKED) final String masked,
-            @Param(name = "Masked", mode = Parameter.Mode.HIDDEN) final String hidden) {
+                                 @Param("Named") final String named,
+                                 @Param(
+                                         name = "Excluded",
+                                         excluded = true
+                                 ) final String excluded,
+                                 @Param(
+                                         name = "Masked",
+                                         mode = Parameter.Mode.MASKED
+                                 ) final String masked,
+                                 @Param(
+                                         name = "Masked",
+                                         mode = Parameter.Mode.HIDDEN
+                                 ) final String hidden) {
     }
 
     @Step
@@ -362,8 +373,10 @@ void stepWithAssertion() {
     void stepWithVarargs(final String... values) {
     }
 
-    @Step("\"{user.emails.address}\", \"{user.emails}\", \"{user.emails.attachments}\", \"{user.password}\", \"{}\"," +
-            " \"{user.card.number}\", \"{missing}\", {staySignedIn}")
+    @Step(
+        "\"{user.emails.address}\", \"{user.emails}\", \"{user.emails.attachments}\", \"{user.password}\", \"{}\"," +
+                " \"{user.card.number}\", \"{missing}\", {staySignedIn}"
+    )
     private void loginWith(final DummyUser user, final boolean staySignedIn) {
     }
 
@@ -414,5 +427,4 @@ public String toString() {
         }
     }
 
-
 }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
index 16629b7b3..06e2afaa3 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
@@ -88,10 +88,12 @@ void shouldExtractRepeatableLabels() {
                 );
     }
 
-    @Epics({
-            @Epic("e1"),
-            @Epic("e2")
-    })
+    @Epics(
+        {
+                @Epic("e1"),
+                @Epic("e2")
+        }
+    )
     class DirectRepeatableAnnotations {
     }
 
@@ -155,7 +157,10 @@ void shouldSupportMultiValueAnnotations() {
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.METHOD, ElementType.TYPE})
-    @LabelAnnotation(name = "custom", value = "fixed")
+    @LabelAnnotation(
+            name = "custom",
+            value = "fixed"
+    )
     @interface CustomFixed {
     }
 
@@ -175,10 +180,22 @@ void shouldSupportCustomFixedAnnotations() {
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.METHOD, ElementType.TYPE})
-    @LabelAnnotation(name = "a", value = "a1")
-    @LabelAnnotation(name = "a", value = "a2")
-    @LabelAnnotation(name = "b", value = "b1")
-    @LabelAnnotation(name = "b", value = "b2")
+    @LabelAnnotation(
+            name = "a",
+            value = "a1"
+    )
+    @LabelAnnotation(
+            name = "a",
+            value = "a2"
+    )
+    @LabelAnnotation(
+            name = "b",
+            value = "b1"
+    )
+    @LabelAnnotation(
+            name = "b",
+            value = "b2"
+    )
     @interface CustomMultiLabel {
     }
 
@@ -200,34 +217,56 @@ void shouldSupportCustomMultiLabelAnnotations() {
     }
 
     @Link(name = "LINK-1")
-    @Links({
-            @Link(name = "LINK-2", url = "https://example.org/link/2"),
-            @Link(url = "https://example.org/some-custom-link")
-    })
+    @Links(
+        {
+                @Link(
+                        name = "LINK-2",
+                        url = "https://example.org/link/2"
+                ),
+                @Link(url = "https://example.org/some-custom-link")
+        }
+    )
     @TmsLink("TMS-1")
-    @TmsLinks({
-            @TmsLink("TMS-2"),
-            @TmsLink("TMS-3")
-    })
+    @TmsLinks(
+        {
+                @TmsLink("TMS-2"),
+                @TmsLink("TMS-3")
+        }
+    )
     @Issue("ISSUE-1")
-    @Issues({
-            @Issue("ISSUE-2"),
-            @Issue("ISSUE-3")
-    })
+    @Issues(
+        {
+                @Issue("ISSUE-2"),
+                @Issue("ISSUE-3")
+        }
+    )
     class WithLinks {
     }
 
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
-    @SystemProperty(name = "allure.link.custom.pattern", value = "https://example.org/custom/{}")
+    @ResourceLock(
+            value = SYSTEM_PROPERTIES,
+            mode = READ_WRITE
+    )
+    @SystemProperty(
+            name = "allure.link.issue.pattern",
+            value = "https://example.org/issue/{}"
+    )
+    @SystemProperty(
+            name = "allure.link.tms.pattern",
+            value = "https://example.org/tms/{}"
+    )
+    @SystemProperty(
+            name = "allure.link.custom.pattern",
+            value = "https://example.org/custom/{}"
+    )
     @Test
     void shouldExtractLinks() {
         assertThat(getLinks(WithLinks.class))
                 .extracting(
                         io.qameta.allure.model.Link::getName,
                         io.qameta.allure.model.Link::getType,
-                        io.qameta.allure.model.Link::getUrl)
+                        io.qameta.allure.model.Link::getUrl
+                )
                 .contains(
                         tuple("LINK-1", "custom", "https://example.org/custom/LINK-1"),
                         tuple("LINK-2", "custom", "https://example.org/link/2"),
@@ -261,9 +300,18 @@ void shouldExtractLinks() {
     class WithCustomLink {
     }
 
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "allure.link.custom.pattern", value = "https://example.org/custom/{}")
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
+    @ResourceLock(
+            value = SYSTEM_PROPERTIES,
+            mode = READ_WRITE
+    )
+    @SystemProperty(
+            name = "allure.link.custom.pattern",
+            value = "https://example.org/custom/{}"
+    )
+    @SystemProperty(
+            name = "allure.link.issue.pattern",
+            value = "https://example.org/issue/{}"
+    )
     @Test
     void shouldExtractCustomLinks() {
         assertThat(getLinks(WithCustomLink.class))
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
index 37d21a70c..9911b095e 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/NamingUtilsTest.java
@@ -33,7 +33,6 @@
  */
 class NamingUtilsTest {
 
-
     public static Stream<Arguments> data() {
         return Stream.of(
                 Arguments.of("", Collections.singletonMap("a", "b"), ""),
@@ -52,7 +51,10 @@ public static Stream<Arguments> data() {
                 Arguments.of("Password: {user.password}", Collections.singletonMap("user", new DummyUser(null, "123", null)), "Password: 123"),
                 Arguments.of("Passwords: {users.password}", Collections.singletonMap("users", new DummyUser[]{new DummyUser(null, "123", null)}), "Passwords: [123]"),
                 Arguments.of("Passwords: {users.password}", Collections.singletonMap("users", new DummyUser[]{null, new DummyUser(null, "123", null)}), "Passwords: [null, 123]"),
-                Arguments.of("Passwords: {users.password}", Collections.singletonMap("users", new DummyUser[][]{null, {null, new DummyUser(null, "123", null)}}), "Passwords: [null, [null, 123]]")
+                Arguments.of(
+                        "Passwords: {users.password}", Collections.singletonMap("users", new DummyUser[][]{null, {null, new DummyUser(null, "123", null)}}),
+                        "Passwords: [null, [null, 123]]"
+                )
         );
     }
 
diff --git a/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java b/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
index c6f831273..7dc06a537 100644
--- a/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
+++ b/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
@@ -28,6 +28,7 @@
 import javax.ws.rs.client.ClientResponseContext;
 import javax.ws.rs.client.ClientResponseFilter;
 import javax.ws.rs.core.MultivaluedMap;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -84,7 +85,8 @@ public void filter(final ClientRequestContext requestContext) {
 
     @Override
     public void filter(final ClientRequestContext requestContext,
-                       final ClientResponseContext responseContext) throws IOException {
+                       final ClientResponseContext responseContext)
+            throws IOException {
 
         final HttpResponseAttachment.Builder responseAttachmentBuilder = HttpResponseAttachment.Builder
                 .create("Response")
@@ -106,7 +108,7 @@ private static Map<String, String> toMapConverter(final MultivaluedMap<String, O
 
     private String getBody(final ClientResponseContext responseContext) throws IOException {
         try (InputStream stream = responseContext.getEntityStream();
-             ByteArrayOutputStream result = new ByteArrayOutputStream()) {
+                ByteArrayOutputStream result = new ByteArrayOutputStream()) {
             final byte[] buffer = new byte[1024];
 
             int length = stream.read(buffer);
diff --git a/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java b/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java
index 30b1d7245..888b6f3f0 100644
--- a/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java
+++ b/allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java
@@ -30,6 +30,7 @@
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
+
 import java.net.URI;
 import java.util.List;
 import java.util.Objects;
@@ -63,9 +64,13 @@ void setUp() {
         server.start();
         configureFor(server.port());
 
-        stubFor(get(urlEqualTo("/hello"))
-                .willReturn(aResponse()
-                        .withBody(BODY_STRING)));
+        stubFor(
+                get(urlEqualTo("/hello"))
+                        .willReturn(
+                                aResponse()
+                                        .withBody(BODY_STRING)
+                        )
+        );
     }
 
     @AfterEach
@@ -137,7 +142,6 @@ void shouldCreateResponseAttachment() {
             }
         }
 
-
         final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
         verify(processor, times(1))
                 .addAttachment(captor.capture(), eq(responseRenderer));
diff --git a/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java b/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
index 0c19cd243..63a42cda3 100644
--- a/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
+++ b/allure-jbehave/src/main/java/io/qameta/allure/jbehave/AllureJbehave.java
@@ -197,7 +197,6 @@ public void failed(final String step, final Throwable cause) {
                 ? cause.getCause()
                 : cause;
 
-
         final Status status = getStatus(unwrapped).orElse(Status.FAILED);
         final StatusDetails statusDetails = getStatusDetails(unwrapped).orElseGet(StatusDetails::new);
 
@@ -214,7 +213,6 @@ public void failed(final String step, final Throwable cause) {
         getLifecycle().stopStep();
     }
 
-
     public AllureLifecycle getLifecycle() {
         return lifecycle;
     }
diff --git a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
index 1a4650777..06b80f752 100644
--- a/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
+++ b/allure-jbehave/src/test/java/io/qameta/allure/jbehave/AllureJbehaveTest.java
@@ -99,7 +99,6 @@ void shouldSetStatus() {
                 .containsExactlyInAnyOrder(Status.PASSED);
     }
 
-
     @Test
     void shouldSetFailedStatus() {
         final AllureResults results = runStories("stories/failed.story");
@@ -176,7 +175,7 @@ void shouldSetDescription() {
         final AllureResults results = runStories("stories/description.story");
 
         final String expected = "This is description for current story.\n"
-                                + "It should appear on each scenario in report";
+                + "It should appear on each scenario in report";
 
         assertThat(results.getTestResults())
                 .extracting(TestResult::getDescription)
@@ -270,22 +269,25 @@ private AllureResults runStories(final String... storyResources) {
         return RunUtils.runTests(lifecycle -> {
             final Embedder embedder = new Embedder();
             embedder.useEmbedderMonitor(new NullEmbedderMonitor());
-            embedder.useEmbedderControls(new EmbedderControls()
-                    .doGenerateViewAfterStories(false)
-                    .doFailOnStoryTimeout(false)
-                    .doBatch(false)
-                    .doIgnoreFailureInStories(true)
-                    .doIgnoreFailureInView(true)
-                    .doVerboseFailures(false)
-                    .doVerboseFiltering(false)
+            embedder.useEmbedderControls(
+                    new EmbedderControls()
+                            .doGenerateViewAfterStories(false)
+                            .doFailOnStoryTimeout(false)
+                            .doBatch(false)
+                            .doIgnoreFailureInStories(true)
+                            .doIgnoreFailureInView(true)
+                            .doVerboseFailures(false)
+                            .doVerboseFiltering(false)
             );
             final AllureJbehave allureJbehave = new AllureJbehave(lifecycle);
-            embedder.useConfiguration(new MostUsefulConfiguration()
-                    .useStoryLoader(new LoadFromClasspath(this.getClass()))
-                    .useStoryReporterBuilder(new ReportlessStoryReporterBuilder(temp.toFile())
-                            .withReporters(allureJbehave)
-                    )
-                    .useDefaultStoryReporter(new NullStoryReporter())
+            embedder.useConfiguration(
+                    new MostUsefulConfiguration()
+                            .useStoryLoader(new LoadFromClasspath(this.getClass()))
+                            .useStoryReporterBuilder(
+                                    new ReportlessStoryReporterBuilder(temp.toFile())
+                                            .withReporters(allureJbehave)
+                            )
+                            .useDefaultStoryReporter(new NullStoryReporter())
             );
             final InjectableStepsFactory stepsFactory = new InstanceStepsFactory(
                     embedder.configuration(),
diff --git a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
index 1e54bd0d8..06e03a207 100644
--- a/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
+++ b/allure-jbehave5/src/main/java/io/qameta/allure/jbehave5/AllureJbehave5.java
@@ -195,7 +195,6 @@ public void failed(final String step, final Throwable cause) {
                 ? cause.getCause()
                 : cause;
 
-
         final Status status = getStatus(unwrapped).orElse(Status.FAILED);
         final StatusDetails statusDetails = getStatusDetails(unwrapped).orElseGet(StatusDetails::new);
 
@@ -212,7 +211,6 @@ public void failed(final String step, final Throwable cause) {
         getLifecycle().stopStep();
     }
 
-
     public AllureLifecycle getLifecycle() {
         return lifecycle;
     }
@@ -229,13 +227,15 @@ protected void startTestCase(final String uuid,
                 .map(entry -> createParameter(entry.getKey(), entry.getValue()))
                 .collect(Collectors.toList());
 
-        final List<Label> labels = new ArrayList<>(Arrays.asList(
-                createStoryLabel(story.getName()),
-                createHostLabel(),
-                createThreadLabel(),
-                createFrameworkLabel("jbehave"),
-                createLanguageLabel("java")
-        ));
+        final List<Label> labels = new ArrayList<>(
+                Arrays.asList(
+                        createStoryLabel(story.getName()),
+                        createHostLabel(),
+                        createThreadLabel(),
+                        createFrameworkLabel("jbehave"),
+                        createLanguageLabel("java")
+                )
+        );
 
         labels.addAll(ResultsUtils.getProvidedLabels());
 
diff --git a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
index 1b9596d51..30ad5203e 100644
--- a/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
+++ b/allure-jbehave5/src/test/java/io/qameta/allure/jbehave5/AllureJbehave5Test.java
@@ -98,7 +98,6 @@ void shouldSetStatus() {
                 .containsExactlyInAnyOrder(Status.PASSED);
     }
 
-
     @Test
     void shouldSetFailedStatus() {
         final AllureResults results = runStories("stories/failed.story");
@@ -175,7 +174,7 @@ void shouldSetDescription() {
         final AllureResults results = runStories("stories/description.story");
 
         final String expected = "This is description for current story.\n"
-                                + "It should appear on each scenario in report";
+                + "It should appear on each scenario in report";
 
         assertThat(results.getTestResults())
                 .extracting(TestResult::getDescription)
@@ -309,22 +308,25 @@ private AllureResults runStories(final String... storyResources) {
         return RunUtils.runTests(lifecycle -> {
             final Embedder embedder = new Embedder();
             embedder.useEmbedderMonitor(new NullEmbedderMonitor());
-            embedder.useEmbedderControls(new EmbedderControls()
-                    .doGenerateViewAfterStories(false)
-                    .doFailOnStoryTimeout(false)
-                    .doBatch(false)
-                    .doIgnoreFailureInStories(true)
-                    .doIgnoreFailureInView(true)
-                    .doVerboseFailures(false)
-                    .doVerboseFiltering(false)
+            embedder.useEmbedderControls(
+                    new EmbedderControls()
+                            .doGenerateViewAfterStories(false)
+                            .doFailOnStoryTimeout(false)
+                            .doBatch(false)
+                            .doIgnoreFailureInStories(true)
+                            .doIgnoreFailureInView(true)
+                            .doVerboseFailures(false)
+                            .doVerboseFiltering(false)
             );
             final AllureJbehave5 allureJbehave5 = new AllureJbehave5(lifecycle);
-            embedder.useConfiguration(new MostUsefulConfiguration()
-                    .useStoryLoader(new LoadFromClasspath(this.getClass()))
-                    .useStoryReporterBuilder(new ReportlessStoryReporterBuilder(temp.toFile())
-                            .withReporters(allureJbehave5)
-                    )
-                    .useDefaultStoryReporter(new NullStoryReporter())
+            embedder.useConfiguration(
+                    new MostUsefulConfiguration()
+                            .useStoryLoader(new LoadFromClasspath(this.getClass()))
+                            .useStoryReporterBuilder(
+                                    new ReportlessStoryReporterBuilder(temp.toFile())
+                                            .withReporters(allureJbehave5)
+                            )
+                            .useDefaultStoryReporter(new NullStoryReporter())
             );
             final InjectableStepsFactory stepsFactory = new InstanceStepsFactory(
                     embedder.configuration(),
diff --git a/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
index c9f4600c9..ae7538cc8 100644
--- a/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
+++ b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
@@ -34,13 +34,10 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("PMD.NonSerializableClass")
 public class AllureJooq implements ExecuteListener {
 
-    private static final String STEP_UUID
-            = "io.qameta.allure.jooq.AllureJooq.STEP_UUID";
-    private static final String DO_BUFFER
-            = "io.qameta.allure.jooq.AllureJooq.DO_BUFFER";
+    private static final String STEP_UUID = "io.qameta.allure.jooq.AllureJooq.STEP_UUID";
+    private static final String DO_BUFFER = "io.qameta.allure.jooq.AllureJooq.DO_BUFFER";
 
     private final AllureLifecycle lifecycle;
 
@@ -61,8 +58,9 @@ public void renderEnd(final ExecuteContext ctx) {
         final String stepName = stepName(ctx);
         final String uuid = UUID.randomUUID().toString();
         ctx.data(STEP_UUID, uuid);
-        lifecycle.startStep(uuid, new StepResult()
-                .setName(stepName)
+        lifecycle.startStep(
+                uuid, new StepResult()
+                        .setName(stepName)
         );
     }
 
diff --git a/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java b/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
index bd0b241b3..799a44c41 100644
--- a/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
+++ b/allure-jooq/src/test/java/io/qameta/allure/jooq/AllureJooqTest.java
@@ -36,6 +36,7 @@
 import org.junit.jupiter.api.Test;
 
 import javax.sql.DataSource;
+
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
index ba0f06472..ba99c1b41 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/AbstractJsonPatchMatcher.java
@@ -15,10 +15,6 @@
  */
 package io.qameta.allure.jsonunit;
 
-import java.math.BigDecimal;
-
-import org.hamcrest.Matcher;
-
 import net.javacrumbs.jsonunit.core.Configuration;
 import net.javacrumbs.jsonunit.core.ConfigurationWhen.ApplicableForPath;
 import net.javacrumbs.jsonunit.core.ConfigurationWhen.PathsParam;
@@ -26,6 +22,9 @@
 import net.javacrumbs.jsonunit.core.internal.Diff;
 import net.javacrumbs.jsonunit.core.internal.Options;
 import net.javacrumbs.jsonunit.core.listener.DifferenceListener;
+import org.hamcrest.Matcher;
+
+import java.math.BigDecimal;
 
 /**
  * Contains basic matcher functionality and implementation of methods for matching configuration.
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
index 2744359bf..2ab2941e7 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchListener.java
@@ -99,7 +99,8 @@ public DiffModel getDiffModel() {
         return new DiffModel(
                 writeAsString(context.getActualSource(), "actual"),
                 writeAsString(context.getExpectedSource(), "expected"),
-                getJsonPatch());
+                getJsonPatch()
+        );
     }
 
     @SuppressWarnings({"all", "unchecked"})
diff --git a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
index 078c99579..a832b3d4c 100644
--- a/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
+++ b/allure-jsonunit/src/main/java/io/qameta/allure/jsonunit/JsonPatchMatcher.java
@@ -19,7 +19,6 @@
 import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
 import net.javacrumbs.jsonunit.ConfigurableJsonMatcher;
 import net.javacrumbs.jsonunit.core.listener.DifferenceListener;
-
 import org.hamcrest.Description;
 
 /**
@@ -30,7 +29,8 @@
  */
 @SuppressWarnings("unused")
 public final class JsonPatchMatcher<T> extends AbstractJsonPatchMatcher<ConfigurableJsonMatcher<T>>
-        implements ConfigurableJsonMatcher<T> {
+        implements
+            ConfigurableJsonMatcher<T> {
 
     private final Object expected;
 
@@ -68,7 +68,9 @@ public void _dont_implement_Matcher___instead_extend_BaseMatcher_() {
     protected void render(final DifferenceListener listener) {
         final JsonPatchListener jsonDiffListener = (JsonPatchListener) listener;
         final DiffAttachment attachment = new DiffAttachment(jsonDiffListener.getDiffModel());
-        new DefaultAttachmentProcessor().addAttachment(attachment,
-                new FreemarkerAttachmentRenderer("diff.ftl"));
+        new DefaultAttachmentProcessor().addAttachment(
+                attachment,
+                new FreemarkerAttachmentRenderer("diff.ftl")
+        );
     }
 }
diff --git a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java
index 74a96e5fe..d09adab78 100644
--- a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java
+++ b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchListenerTest.java
@@ -80,7 +80,6 @@ void shouldSeeEmptyForCheckAnyStringNode() {
         assertThat(listener.getJsonPatch()).isEqualTo("{}");
     }
 
-
     @Test
     void shouldSeeChangedStringNode() {
         Diff diff = Diff.create("{\"test\": \"1\"}", "{\"test\": \"2\"}", "", "", commonConfig());
@@ -149,8 +148,7 @@ void shouldSeeNullNode() {
     void shouldWorkWhenIgnoringArrayOrder() {
         Diff diff = Diff.create("{\"test\": [[1,2],[2,3]]}", "{\"test\":[[4,2],[1,2]]}", "", "", commonConfig().when(Option.IGNORING_ARRAY_ORDER));
         diff.similar();
-        assertThat(listener.getJsonPatch()).
-                isEqualTo("{\"test\":{\"0\":{\"0\":[3,4],\"_t\":\"a\"},\"_t\":\"a\"}}");
+        assertThat(listener.getJsonPatch()).isEqualTo("{\"test\":{\"0\":{\"0\":[3,4],\"_t\":\"a\"},\"_t\":\"a\"}}");
     }
 
     @Test
diff --git a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java
index e0dcbdfbc..3bfa9cf36 100644
--- a/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java
+++ b/allure-jsonunit/src/test/java/io/qameta/allure/jsonunit/JsonPatchMatcherTests.java
@@ -15,30 +15,28 @@
  */
 package io.qameta.allure.jsonunit;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import net.javacrumbs.jsonunit.core.Configuration;
+import net.javacrumbs.jsonunit.core.Option;
+import net.javacrumbs.jsonunit.core.internal.Options;
+import net.javacrumbs.jsonunit.core.listener.DifferenceListener;
+import org.hamcrest.Description;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
 
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.util.function.BiConsumer;
+
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.mockito.ArgumentCaptor.forClass;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.ArgumentCaptor.forClass;
-
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
-import java.util.function.BiConsumer;
-
-import org.hamcrest.Description;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-import net.javacrumbs.jsonunit.core.Configuration;
-import net.javacrumbs.jsonunit.core.Option;
-import net.javacrumbs.jsonunit.core.internal.Options;
-import net.javacrumbs.jsonunit.core.listener.DifferenceListener;
 
 class JsonPatchMatcherTests {
 
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index a4eb3cc77..9e583fbef 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -84,15 +84,18 @@
 /**
  * @author ehborisov
  */
-@SuppressWarnings({
-        "ClassDataAbstractionCoupling",
-        "ClassFanOutComplexity",
-        "MultipleStringLiterals",
-})
+@SuppressWarnings(
+    {
+            "ClassDataAbstractionCoupling",
+            "ClassFanOutComplexity",
+            "MultipleStringLiterals",
+            "PMD.GodClass",
+            "PMD.TooManyMethods",
+    }
+)
 public class AllureJunitPlatform implements TestExecutionListener {
 
-    public static final String ALLURE_REPORT_ENTRY_BLANK_PREFIX
-            = "ALLURE_REPORT_ENTRY_BLANK_PREFIX__";
+    public static final String ALLURE_REPORT_ENTRY_BLANK_PREFIX = "ALLURE_REPORT_ENTRY_BLANK_PREFIX__";
 
     public static final String ALLURE_PARAMETER = "allure.parameter";
     public static final String ALLURE_PARAMETER_VALUE_KEY = "value";
@@ -113,20 +116,15 @@ public class AllureJunitPlatform implements TestExecutionListener {
     private static final String TEXT_PLAIN = "text/plain";
     private static final String TXT_EXTENSION = ".txt";
 
-    private static final boolean HAS_SPOCK2_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.spock2.AllureSpock2");
+    private static final boolean HAS_SPOCK2_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.spock2.AllureSpock2");
 
-    private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm");
+    private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm");
 
-    private static final boolean HAS_CUCUMBERJVM6_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.cucumber6jvm.AllureCucumber6Jvm");
+    private static final boolean HAS_CUCUMBERJVM6_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.cucumber6jvm.AllureCucumber6Jvm");
 
-    private static final boolean HAS_CUCUMBERJVM5_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.cucumber5jvm.AllureCucumber5Jvm");
+    private static final boolean HAS_CUCUMBERJVM5_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.cucumber5jvm.AllureCucumber5Jvm");
 
-    private static final boolean HAS_CUCUMBERJVM4_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm");
+    private static final boolean HAS_CUCUMBERJVM4_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm");
 
     private static final String ENGINE_SPOCK2 = "spock";
     private static final String ENGINE_CUCUMBER = "cucumber";
@@ -176,13 +174,11 @@ private boolean shouldSkipReportingFor(final TestIdentifier testIdentifier) {
 
         final String engine = maybeEngine.get();
 
-
         return HAS_SPOCK2_IN_CLASSPATH && ENGINE_SPOCK2.equals(engine)
-               || (HAS_CUCUMBERJVM7_IN_CLASSPATH
-                   || HAS_CUCUMBERJVM6_IN_CLASSPATH
-                   || HAS_CUCUMBERJVM5_IN_CLASSPATH
-                   || HAS_CUCUMBERJVM4_IN_CLASSPATH
-                  ) && ENGINE_CUCUMBER.equals(engine);
+                || (HAS_CUCUMBERJVM7_IN_CLASSPATH
+                        || HAS_CUCUMBERJVM6_IN_CLASSPATH
+                        || HAS_CUCUMBERJVM5_IN_CLASSPATH
+                        || HAS_CUCUMBERJVM4_IN_CLASSPATH) && ENGINE_CUCUMBER.equals(engine);
     }
 
     private Optional<String> getEngine(final TestIdentifier testIdentifier) {
@@ -311,14 +307,14 @@ public void reportingEntryPublished(final TestIdentifier testIdentifier,
     private Map<String, String> unwrap(final Map<String, String> data) {
         final Map<String, String> res = new HashMap<>();
         data.forEach((key, value) -> {
-                    if (Objects.nonNull(value)
-                        && value.trim().isEmpty()
-                        && value.startsWith(ALLURE_REPORT_ENTRY_BLANK_PREFIX)) {
-                        res.put(key, value.substring(ALLURE_REPORT_ENTRY_BLANK_PREFIX.length()));
-                    } else {
-                        res.put(key, value);
-                    }
-                }
+            if (Objects.nonNull(value)
+                    && value.trim().isEmpty()
+                    && value.startsWith(ALLURE_REPORT_ENTRY_BLANK_PREFIX)) {
+                res.put(key, value.substring(ALLURE_REPORT_ENTRY_BLANK_PREFIX.length()));
+            } else {
+                res.put(key, value);
+            }
+        }
         );
         return res;
     }
@@ -349,8 +345,9 @@ private void processParameterEvent(final Map<String, String> keyValuePairs) {
                     .ifPresent(parameter::setExcluded);
         }
 
-        getLifecycle().updateTestCase(tr -> tr.getParameters()
-                .add(parameter)
+        getLifecycle().updateTestCase(
+                tr -> tr.getParameters()
+                        .add(parameter)
         );
     }
 
@@ -523,31 +520,36 @@ private void startTestCase(final TestIdentifier testIdentifier) {
 
         final TestResult result = new TestResult()
                 .setUuid(uuid)
-                .setName(testTemplate && maybeParent.isPresent()
-                        ? maybeParent.get().getDisplayName() + " " + testIdentifier.getDisplayName()
-                        : testIdentifier.getDisplayName()
+                .setName(
+                        testTemplate && maybeParent.isPresent()
+                                ? maybeParent.get().getDisplayName() + " " + testIdentifier.getDisplayName()
+                                : testIdentifier.getDisplayName()
                 )
                 .setTitlePath(getTitlePath(testIdentifier, testClass))
                 .setLabels(getTags(testIdentifier))
-                .setTestCaseId(testTemplate
-                        ? maybeParent.map(TestIdentifier::getUniqueId)
-                        .orElseGet(testIdentifier::getUniqueId)
-                        : testIdentifier.getUniqueId()
+                .setTestCaseId(
+                        testTemplate
+                                ? maybeParent.map(TestIdentifier::getUniqueId)
+                                        .orElseGet(testIdentifier::getUniqueId)
+                                : testIdentifier.getUniqueId()
+                )
+                .setTestCaseName(
+                        testTemplate
+                                ? maybeParent.map(TestIdentifier::getDisplayName)
+                                        .orElseGet(testIdentifier::getDisplayName)
+                                : testIdentifier.getDisplayName()
                 )
-                .setTestCaseName(testTemplate
-                        ? maybeParent.map(TestIdentifier::getDisplayName)
-                        .orElseGet(testIdentifier::getDisplayName)
-                        : testIdentifier.getDisplayName())
                 .setHistoryId(getHistoryId(testIdentifier))
                 .setStage(Stage.RUNNING);
 
         if (testTemplate) {
             // history id is ignored in Allure TestOps, so we add a hidden parameter
             // to make sure different results are not considered as retries
-            result.getParameters().add(new Parameter()
-                    .setMode(Parameter.Mode.HIDDEN)
-                    .setName("UniqueId")
-                    .setValue(testIdentifier.getUniqueId())
+            result.getParameters().add(
+                    new Parameter()
+                            .setMode(Parameter.Mode.HIDDEN)
+                            .setName("UniqueId")
+                            .setValue(testIdentifier.getUniqueId())
             );
         }
 
@@ -570,12 +572,14 @@ private void startTestCase(final TestIdentifier testIdentifier) {
         testClass.map(AnnotationUtils::getLinks).ifPresent(result.getLinks()::addAll);
         testMethod.map(AnnotationUtils::getLinks).ifPresent(result.getLinks()::addAll);
 
-        result.getLabels().addAll(Arrays.asList(
-                createHostLabel(),
-                createThreadLabel(),
-                createFrameworkLabel("junit-platform"),
-                createLanguageLabel("java")
-        ));
+        result.getLabels().addAll(
+                Arrays.asList(
+                        createHostLabel(),
+                        createThreadLabel(),
+                        createFrameworkLabel("junit-platform"),
+                        createLanguageLabel("java")
+                )
+        );
 
         testSource.flatMap(AllureJunitPlatformUtils::getFullName).ifPresent(result::setFullName);
         testSource.map(this::getSourceLabels).ifPresent(result.getLabels()::addAll);
@@ -600,12 +604,14 @@ private void startTestCase(final TestIdentifier testIdentifier) {
                 .map(ResultsUtils::createSeverityLabel)
                 .ifPresent(result.getLabels()::add);
 
-        testMethod.ifPresent(method -> ResultsUtils.processDescription(
-                method.getDeclaringClass().getClassLoader(),
-                method,
-                result::setDescription,
-                result::setDescriptionHtml
-        ));
+        testMethod.ifPresent(
+                method -> ResultsUtils.processDescription(
+                        method.getDeclaringClass().getClassLoader(),
+                        method,
+                        result::setDescription,
+                        result::setDescriptionHtml
+                )
+        );
 
         getLifecycle().scheduleTestCase(result);
         getLifecycle().startTestCase(uuid);
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
index 32ef1fd01..d38fd7ea5 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -175,8 +175,10 @@ void shouldProcessFailedTests() {
     void shouldReportActualAndExpectedStatusDetails() {
         final AllureResults results = runClasses(ActualExpectedStatusDetailsTests.class);
         final TestResult testResult = results.getTestResults().stream()
-                .filter(result -> ("io.qameta.allure.junitplatform.features.ActualExpectedStatusDetailsTests"
-                        + ".failingComparison").equals(result.getFullName()))
+                .filter(
+                        result -> ("io.qameta.allure.junitplatform.features.ActualExpectedStatusDetailsTests"
+                                + ".failingComparison").equals(result.getFullName())
+                )
                 .findFirst()
                 .get();
 
@@ -216,7 +218,8 @@ void shouldProcessBrokenInBeforeAllTests() {
                 .extracting(
                         TestResult::getName,
                         TestResult::getStatus,
-                        tr -> Optional.of(tr).map(TestResult::getStatusDetails).map(StatusDetails::getMessage).orElse(null))
+                        tr -> Optional.of(tr).map(TestResult::getStatusDetails).map(StatusDetails::getMessage).orElse(null)
+                )
                 .containsExactlyInAnyOrder(
                         tuple("BrokenInBeforeAllTests", Status.BROKEN, "Exception in @BeforeAll")
                 );
@@ -233,7 +236,8 @@ void shouldProcessBrokenInAfterAllTests() {
                 .extracting(
                         TestResult::getName,
                         TestResult::getStatus,
-                        tr -> Optional.of(tr).map(TestResult::getStatusDetails).map(StatusDetails::getMessage).orElse(null))
+                        tr -> Optional.of(tr).map(TestResult::getStatusDetails).map(StatusDetails::getMessage).orElse(null)
+                )
                 .containsExactlyInAnyOrder(
                         tuple("BrokenInAfterAllTests", Status.BROKEN, "Exception in @AfterAll"),
                         tuple("parameterisedTest(String) [1] value=a", Status.PASSED, null),
@@ -459,10 +463,22 @@ void shouldProcessClassLabels() {
     }
 
     @AllureFeatures.Links
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
-    @SystemProperty(name = "allure.link.custom.pattern", value = "https://example.org/custom/{}")
+    @ResourceLock(
+            value = SYSTEM_PROPERTIES,
+            mode = READ_WRITE
+    )
+    @SystemProperty(
+            name = "allure.link.issue.pattern",
+            value = "https://example.org/issue/{}"
+    )
+    @SystemProperty(
+            name = "allure.link.tms.pattern",
+            value = "https://example.org/tms/{}"
+    )
+    @SystemProperty(
+            name = "allure.link.custom.pattern",
+            value = "https://example.org/custom/{}"
+    )
     @Test
     void shouldProcessMethodLinks() {
         final AllureResults results = runClasses(TestWithMethodLinks.class);
@@ -485,10 +501,22 @@ void shouldProcessMethodLinks() {
     }
 
     @AllureFeatures.Links
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
-    @SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
-    @SystemProperty(name = "allure.link.custom.pattern", value = "https://example.org/custom/{}")
+    @ResourceLock(
+            value = SYSTEM_PROPERTIES,
+            mode = READ_WRITE
+    )
+    @SystemProperty(
+            name = "allure.link.issue.pattern",
+            value = "https://example.org/issue/{}"
+    )
+    @SystemProperty(
+            name = "allure.link.tms.pattern",
+            value = "https://example.org/tms/{}"
+    )
+    @SystemProperty(
+            name = "allure.link.custom.pattern",
+            value = "https://example.org/custom/{}"
+    )
     @Test
     void shouldProcessClassLinks() {
         final AllureResults results = runClasses(TestWithClassLinks.class);
@@ -616,9 +644,15 @@ void shouldSetJavadocDescription() {
     }
 
     @AllureFeatures.Attachments
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+    @ResourceLock(
+            value = SYSTEM_PROPERTIES,
+            mode = READ_WRITE
+    )
     @SuppressWarnings("OptionalGetWithoutIsPresent")
-    @SystemProperty(name = "junit.platform.output.capture.stdout", value = "true")
+    @SystemProperty(
+            name = "junit.platform.output.capture.stdout",
+            value = "true"
+    )
     @Test
     void shouldCaptureSystemOut() {
         final AllureResults results = runClasses(TestWithSystemOut.class);
@@ -639,7 +673,6 @@ void shouldCaptureSystemOut() {
                 .findAny()
                 .get();
 
-
         final Map<String, byte[]> attachmentFiles = results.getAttachments();
         assertThat(attachmentFiles)
                 .containsKeys(found.getSource());
@@ -653,9 +686,15 @@ void shouldCaptureSystemOut() {
     }
 
     @AllureFeatures.Attachments
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+    @ResourceLock(
+            value = SYSTEM_PROPERTIES,
+            mode = READ_WRITE
+    )
     @SuppressWarnings("OptionalGetWithoutIsPresent")
-    @SystemProperty(name = "junit.platform.output.capture.stderr", value = "true")
+    @SystemProperty(
+            name = "junit.platform.output.capture.stderr",
+            value = "true"
+    )
     @Test
     void shouldCaptureSystemErr() {
         final AllureResults results = runClasses(TestWithSystemErr.class);
@@ -676,7 +715,6 @@ void shouldCaptureSystemErr() {
                 .findAny()
                 .get();
 
-
         final Map<String, byte[]> attachmentFiles = results.getAttachments();
         assertThat(attachmentFiles)
                 .containsKeys(found.getSource());
@@ -690,8 +728,14 @@ void shouldCaptureSystemErr() {
     }
 
     @AllureFeatures.Parallel
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "junit.jupiter.execution.parallel.enabled", value = "true")
+    @ResourceLock(
+            value = SYSTEM_PROPERTIES,
+            mode = READ_WRITE
+    )
+    @SystemProperty(
+            name = "junit.jupiter.execution.parallel.enabled",
+            value = "true"
+    )
     @Test
     void shouldRunTestsInParallel() {
         final AllureResults results = runClasses(ParallelTests.class);
@@ -871,7 +915,6 @@ void shouldSetDifferentUuidsInDifferentRuns() {
             launcher.execute(request);
         });
 
-
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .hasSize(2);
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
index 6c0b58a44..e9ec6c616 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
@@ -64,11 +64,13 @@ void shouldRunAllParameterizedTestsIfEmptyTestPlanProvided() {
 
     @Test
     void shouldFilterTestCasesByFullName() {
-        final TestPlan testPlan = new TestPlanV1_0().setTests(Arrays.asList(
-                new TestPlanV1_0.TestCase()
-                        .setSelector(String.format("%s.second", FilterSimpleTests.class.getCanonicalName())),
-                new TestPlanV1_0.TestCase()
-                        .setSelector(String.format("%s.first", FilterSimpleTests.class.getCanonicalName())))
+        final TestPlan testPlan = new TestPlanV1_0().setTests(
+                Arrays.asList(
+                        new TestPlanV1_0.TestCase()
+                                .setSelector(String.format("%s.second", FilterSimpleTests.class.getCanonicalName())),
+                        new TestPlanV1_0.TestCase()
+                                .setSelector(String.format("%s.first", FilterSimpleTests.class.getCanonicalName()))
+                )
         );
 
         final AllureResults results = runClasses(testPlan, FilterSimpleTests.class);
@@ -78,12 +80,14 @@ void shouldFilterTestCasesByFullName() {
 
     @Test
     void shouldFilterParameterizedTestCasesByFullName() {
-        final TestPlan testPlan = new TestPlanV1_0().setTests(Arrays.asList(
-                new TestPlanV1_0.TestCase()
-                        .setSelector(String.format("%s.second", FilterParameterizedTests.class.getCanonicalName())),
-                new TestPlanV1_0.TestCase()
-                        .setSelector(String.format("%s.first", FilterParameterizedTests.class.getCanonicalName()))
-        ));
+        final TestPlan testPlan = new TestPlanV1_0().setTests(
+                Arrays.asList(
+                        new TestPlanV1_0.TestCase()
+                                .setSelector(String.format("%s.second", FilterParameterizedTests.class.getCanonicalName())),
+                        new TestPlanV1_0.TestCase()
+                                .setSelector(String.format("%s.first", FilterParameterizedTests.class.getCanonicalName()))
+                )
+        );
 
         final AllureResults results = runClasses(testPlan, FilterParameterizedTests.class);
         assertThat(results.getTestResults())
@@ -92,12 +96,14 @@ void shouldFilterParameterizedTestCasesByFullName() {
 
     @Test
     void shouldFilterTestCasesByUniqueId() {
-        final TestPlan testPlan = new TestPlanV1_0().setTests(Arrays.asList(
-                new TestPlanV1_0.TestCase()
-                        .setSelector(testId(FilterSimpleTests.class, "first")),
-                new TestPlanV1_0.TestCase()
-                        .setSelector(testId(FilterSimpleTests.class, "third"))
-        ));
+        final TestPlan testPlan = new TestPlanV1_0().setTests(
+                Arrays.asList(
+                        new TestPlanV1_0.TestCase()
+                                .setSelector(testId(FilterSimpleTests.class, "first")),
+                        new TestPlanV1_0.TestCase()
+                                .setSelector(testId(FilterSimpleTests.class, "third"))
+                )
+        );
 
         final AllureResults results = runClasses(testPlan, FilterSimpleTests.class);
         assertThat(results.getTestResults())
@@ -106,14 +112,16 @@ void shouldFilterTestCasesByUniqueId() {
 
     @Test
     void shouldFilterTestCasesByAllureId() {
-        final TestPlan testPlan = new TestPlanV1_0().setTests(Arrays.asList(
-                new TestPlanV1_0.TestCase()
-                        .setId("10"),
-                new TestPlanV1_0.TestCase()
-                        .setId("20"),
-                new TestPlanV1_0.TestCase()
-                        .setId("30")
-        ));
+        final TestPlan testPlan = new TestPlanV1_0().setTests(
+                Arrays.asList(
+                        new TestPlanV1_0.TestCase()
+                                .setId("10"),
+                        new TestPlanV1_0.TestCase()
+                                .setId("20"),
+                        new TestPlanV1_0.TestCase()
+                                .setId("30")
+                )
+        );
 
         final AllureResults results = runClasses(testPlan, FilterSimpleTests.class);
         assertThat(results.getTestResults())
@@ -122,25 +130,27 @@ void shouldFilterTestCasesByAllureId() {
 
     @Test
     void shouldFilterParameterizedTestCasesByAllureId() {
-        final TestPlan testPlan = new TestPlanV1_0().setTests(Arrays.asList(
-                new TestPlanV1_0.TestCase()
-                        .setId("10"),
-                new TestPlanV1_0.TestCase()
-                        .setId("20")
-        ));
+        final TestPlan testPlan = new TestPlanV1_0().setTests(
+                Arrays.asList(
+                        new TestPlanV1_0.TestCase()
+                                .setId("10"),
+                        new TestPlanV1_0.TestCase()
+                                .setId("20")
+                )
+        );
 
         final AllureResults results = runClasses(testPlan, FilterParameterizedTests.class);
         assertThat(results.getTestResults())
                 .hasSize(4);
     }
 
-
     private String testId(final Class<?> testClass, String method) {
-        return String.format("[engine:%s]/[class:%s]/[method:%s()]",
+        return String.format(
+                "[engine:%s]/[class:%s]/[method:%s()]",
                 "junit-jupiter",
                 testClass.getCanonicalName(),
-                method);
+                method
+        );
     }
 
-
 }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java
index 3a7784178..c4f4e70d5 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/DynamicTests.java
@@ -42,16 +42,19 @@ public class DynamicTests {
     @Feature("feature2")
     @Feature("feature3")
     @Story("story1")
-    @Stories({
-            @Story("story2"),
-            @Story("story3")
-    })
+    @Stories(
+        {
+                @Story("story2"),
+                @Story("story3")
+        }
+    )
     @Owner("some-owner")
     @TestFactory
     Stream<DynamicTest> dynamicTestsFromStream() {
         return Stream.of("A", "B", "C").map(
                 str -> dynamicTest("test" + str, () -> {
-                }));
+                })
+        );
     }
 
 }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java
index cc323b52d..167a1840d 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java
@@ -25,7 +25,7 @@
 public class FilterSimpleTests {
 
     @BeforeAll
-    static void doNothing(){
+    static void doNothing() {
 
     }
 
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java
index 6a03203d0..75fb14a7f 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/MarkerAnnotationSupport.java
@@ -42,8 +42,14 @@ void single() {
     @Inherited
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.METHOD, ElementType.TYPE})
-    @LabelAnnotation(name = FEATURE_LABEL_NAME, value = "Basic framework support")
-    @LabelAnnotation(name = STORY_LABEL_NAME, value = "Core features")
+    @LabelAnnotation(
+            name = FEATURE_LABEL_NAME,
+            value = "Basic framework support"
+    )
+    @LabelAnnotation(
+            name = STORY_LABEL_NAME,
+            value = "Core features"
+    )
     public @interface Custom {
     }
 }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java
index 12587b378..6062e5e2e 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java
@@ -24,7 +24,7 @@
 public class PassedTests {
 
     @BeforeAll
-    static void doNothing(){
+    static void doNothing() {
 
     }
 
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java
index f51f82ecb..d6c30314d 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java
@@ -47,24 +47,30 @@ void multipleParameterEvent(TestReporter testReporter) {
 
     @Test
     void modeAndExcluded(TestReporter testReporter) {
-        testReporter.publishEntry(buildEvent(
-                "hidden excluded",
-                "hidden excluded value",
-                Parameter.Mode.HIDDEN,
-                true
-        ));
-        testReporter.publishEntry(buildEvent(
-                "default excluded",
-                "default excluded value",
-                Parameter.Mode.DEFAULT,
-                true
-        ));
-        testReporter.publishEntry(buildEvent(
-                "masked not excluded",
-                "masked not excluded value",
-                Parameter.Mode.MASKED,
-                false
-        ));
+        testReporter.publishEntry(
+                buildEvent(
+                        "hidden excluded",
+                        "hidden excluded value",
+                        Parameter.Mode.HIDDEN,
+                        true
+                )
+        );
+        testReporter.publishEntry(
+                buildEvent(
+                        "default excluded",
+                        "default excluded value",
+                        Parameter.Mode.DEFAULT,
+                        true
+                )
+        );
+        testReporter.publishEntry(
+                buildEvent(
+                        "masked not excluded",
+                        "masked not excluded value",
+                        Parameter.Mode.MASKED,
+                        false
+                )
+        );
     }
 
     private Map<String, String> buildEvent(final String name,
@@ -89,5 +95,4 @@ private Map<String, String> buildEvent(final String name,
         return data;
     }
 
-
 }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java
index f984955d7..6bfac8bf3 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java
@@ -22,8 +22,8 @@
 public class SkippedInBeforeAllTests {
 
     @BeforeAll
-    static void skip(){
-        Assumptions.assumeTrue(false,"Skip in @BeforeAll");
+    static void skip() {
+        Assumptions.assumeTrue(false, "Skip in @BeforeAll");
     }
     @Test
     void test() {
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java
index bacf18e4c..157d65571 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TaggedTests.java
@@ -29,5 +29,6 @@ public class TaggedTests {
 
     @Test
     @Tag(METHOD_TAG)
-    void taggedTest() {}
+    void taggedTest() {
+    }
 }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java
index 260a0bec6..89ca77faf 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLabels.java
@@ -32,10 +32,12 @@
 @Feature("feature2")
 @Feature("feature3")
 @Story("story1")
-@Stories({
-        @Story("story2"),
-        @Story("story3")
-})
+@Stories(
+    {
+            @Story("story2"),
+            @Story("story3")
+    }
+)
 @Owner("some-owner")
 public class TestWithClassLabels {
 
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java
index decfd287e..ac7034a24 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithClassLinks.java
@@ -24,20 +24,29 @@
 import org.junit.jupiter.api.Test;
 
 @Link(name = "LINK-1")
-@Links({
-        @Link(name = "LINK-2", url = "https://example.org/link/2"),
-        @Link(url = "https://example.org/some-custom-link")
-})
+@Links(
+    {
+            @Link(
+                    name = "LINK-2",
+                    url = "https://example.org/link/2"
+            ),
+            @Link(url = "https://example.org/some-custom-link")
+    }
+)
 @TmsLink("TMS-1")
-@TmsLinks({
-        @TmsLink("TMS-2"),
-        @TmsLink("TMS-3")
-})
+@TmsLinks(
+    {
+            @TmsLink("TMS-2"),
+            @TmsLink("TMS-3")
+    }
+)
 @Issue("ISSUE-1")
-@Issues({
-        @Issue("ISSUE-2"),
-        @Issue("ISSUE-3")
-})
+@Issues(
+    {
+            @Issue("ISSUE-2"),
+            @Issue("ISSUE-3")
+    }
+)
 public class TestWithClassLinks {
 
     @Test
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java
index 419036bb9..16374c3e8 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLabels.java
@@ -35,10 +35,12 @@ public class TestWithMethodLabels {
     @Feature("feature2")
     @Feature("feature3")
     @Story("story1")
-    @Stories({
-            @Story("story2"),
-            @Story("story3")
-    })
+    @Stories(
+        {
+                @Story("story2"),
+                @Story("story3")
+        }
+    )
     @Owner("some-owner")
     void someTest() {
     }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java
index 91ee2570f..f04fd7b6e 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithMethodLinks.java
@@ -27,20 +27,29 @@ public class TestWithMethodLinks {
 
     @Test
     @Link(name = "LINK-1")
-    @Links({
-            @Link(name = "LINK-2", url = "https://example.org/link/2"),
-            @Link(url = "https://example.org/some-custom-link")
-    })
+    @Links(
+        {
+                @Link(
+                        name = "LINK-2",
+                        url = "https://example.org/link/2"
+                ),
+                @Link(url = "https://example.org/some-custom-link")
+        }
+    )
     @TmsLink("TMS-1")
-    @TmsLinks({
-            @TmsLink("TMS-2"),
-            @TmsLink("TMS-3")
-    })
+    @TmsLinks(
+        {
+                @TmsLink("TMS-2"),
+                @TmsLink("TMS-3")
+        }
+    )
     @Issue("ISSUE-1")
-    @Issues({
-            @Issue("ISSUE-2"),
-            @Issue("ISSUE-3")
-    })
+    @Issues(
+        {
+                @Issue("ISSUE-2"),
+                @Issue("ISSUE-3")
+        }
+    )
     void someTest() {
     }
 
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java
index e33bea572..16e9ec954 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestWithSteps.java
@@ -37,9 +37,10 @@ void testWithSteps() {
     protected final void step(final String stepName) {
         final String uuid = UUID.randomUUID().toString();
         try {
-            Allure.getLifecycle().startStep(uuid, new StepResult()
-                    .setName(stepName)
-                    .setStatus(Status.PASSED)
+            Allure.getLifecycle().startStep(
+                    uuid, new StepResult()
+                            .setName(stepName)
+                            .setStatus(Status.PASSED)
             );
         } finally {
             Allure.getLifecycle().stopStep(uuid);
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
index d8f62c115..86b684b86 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
@@ -26,7 +26,7 @@
 public class TestsWithAllureId {
 
     @BeforeAll
-    static void doNothing(){
+    static void doNothing() {
 
     }
 
diff --git a/allure-junit4-aspect/src/test/java/io/qameta/allure/junit4/aspect/AllureJunit4AspectTest.java b/allure-junit4-aspect/src/test/java/io/qameta/allure/junit4/aspect/AllureJunit4AspectTest.java
index d76ba2075..5b0d0c5bc 100644
--- a/allure-junit4-aspect/src/test/java/io/qameta/allure/junit4/aspect/AllureJunit4AspectTest.java
+++ b/allure-junit4-aspect/src/test/java/io/qameta/allure/junit4/aspect/AllureJunit4AspectTest.java
@@ -65,12 +65,12 @@ void shouldAddListenerToPlainRunNotifier() throws Exception {
         final JoinPoint point = mock(JoinPoint.class);
         when(point.getThis()).thenReturn(notifier);
 
-        Allure.step("Invoke the listener aspect against a plain RunNotifier", () ->
-                new AllureJunit4ListenerAspect().addListener(point)
+        Allure.step(
+                "Invoke the listener aspect against a plain RunNotifier", () -> new AllureJunit4ListenerAspect().addListener(point)
         );
 
-        Allure.step("Verify the notifier now contains the Allure JUnit 4 listener", () ->
-                assertTrue(getListeners(notifier).stream().anyMatch(AllureJunit4.class::isInstance))
+        Allure.step(
+                "Verify the notifier now contains the Allure JUnit 4 listener", () -> assertTrue(getListeners(notifier).stream().anyMatch(AllureJunit4.class::isInstance))
         );
     }
 
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index 5acfd6abd..fc4dbf080 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -63,17 +63,13 @@
 @SuppressWarnings({"checkstyle:ClassFanOutComplexity"})
 public class AllureJunit4 extends RunListener {
 
-    private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm");
+    private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm");
 
-    private static final boolean HAS_CUCUMBERJVM6_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.cucumber6jvm.AllureCucumber6Jvm");
+    private static final boolean HAS_CUCUMBERJVM6_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.cucumber6jvm.AllureCucumber6Jvm");
 
-    private static final boolean HAS_CUCUMBERJVM5_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.cucumber5jvm.AllureCucumber5Jvm");
+    private static final boolean HAS_CUCUMBERJVM5_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.cucumber5jvm.AllureCucumber5Jvm");
 
-    private static final boolean HAS_CUCUMBERJVM4_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm");
+    private static final boolean HAS_CUCUMBERJVM4_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm");
 
     private final ThreadLocal<String> testCases = new InheritableThreadLocal<String>() {
         @Override
@@ -140,9 +136,10 @@ public void testFailure(final Failure failure) {
             return;
         }
         final String uuid = testCases.get();
-        getLifecycle().updateTestCase(uuid, testResult -> testResult
-                .setStatus(getStatus(failure.getException()).orElse(null))
-                .setStatusDetails(getStatusDetails(failure.getException()).orElse(null))
+        getLifecycle().updateTestCase(
+                uuid, testResult -> testResult
+                        .setStatus(getStatus(failure.getException()).orElse(null))
+                        .setStatusDetails(getStatusDetails(failure.getException()).orElse(null))
         );
     }
 
@@ -152,8 +149,8 @@ public void testAssumptionFailure(final Failure failure) {
             return;
         }
         final String uuid = testCases.get();
-        getLifecycle().updateTestCase(uuid, testResult ->
-                testResult.setStatus(Status.SKIPPED)
+        getLifecycle().updateTestCase(
+                uuid, testResult -> testResult.setStatus(Status.SKIPPED)
                         .setStatusDetails(getStatusDetails(failure.getException()).orElse(null))
         );
     }
@@ -248,7 +245,8 @@ private String getPackage(final Class<?> testClass) {
     private StatusDetails getIgnoredMessage(final Description description) {
         final Ignore ignore = description.getAnnotation(Ignore.class);
         final String message = Objects.nonNull(ignore) && !ignore.value().isEmpty()
-                ? ignore.value() : "Test ignored (without reason)!";
+                ? ignore.value()
+                : "Test ignored (without reason)!";
         return new StatusDetails().setMessage(message);
     }
 
@@ -269,16 +267,18 @@ private TestResult createTestResult(final String uuid, final Description descrip
                 .setTitlePath(createTitlePathFromPackageAndClass(getPackage(description.getTestClass()), suite));
 
         testResult.getLabels().addAll(getProvidedLabels());
-        testResult.getLabels().addAll(Arrays.asList(
-                createPackageLabel(getPackage(description.getTestClass())),
-                createTestClassLabel(className),
-                createTestMethodLabel(name),
-                createSuiteLabel(suite),
-                createHostLabel(),
-                createThreadLabel(),
-                createFrameworkLabel("junit4"),
-                createLanguageLabel("java")
-        ));
+        testResult.getLabels().addAll(
+                Arrays.asList(
+                        createPackageLabel(getPackage(description.getTestClass())),
+                        createTestClassLabel(className),
+                        createTestMethodLabel(name),
+                        createSuiteLabel(suite),
+                        createHostLabel(),
+                        createThreadLabel(),
+                        createFrameworkLabel("junit4"),
+                        createLanguageLabel("java")
+                )
+        );
         testResult.getLabels().addAll(extractLabels(description));
         testResult.getLinks().addAll(extractLinks(description));
 
@@ -293,8 +293,7 @@ private boolean shouldIgnore(final Description description) {
         return (HAS_CUCUMBERJVM7_IN_CLASSPATH
                 || HAS_CUCUMBERJVM6_IN_CLASSPATH
                 || HAS_CUCUMBERJVM5_IN_CLASSPATH
-                || HAS_CUCUMBERJVM4_IN_CLASSPATH
-               ) && AllureJunit4Utils.isCucumberTest(description);
+                || HAS_CUCUMBERJVM4_IN_CLASSPATH) && AllureJunit4Utils.isCucumberTest(description);
     }
 
     private static boolean isClassAvailableOnClasspath(final String clazz) {
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
index a4a46d585..f2d6516b4 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Filter.java
@@ -82,7 +82,7 @@ private boolean match(final TestPlanV1_0.TestCase tc,
                           final String allureId,
                           final String fullName) {
         return Objects.nonNull(tc.getId()) && tc.getId().equals(allureId)
-               || Objects.nonNull(tc.getSelector()) && tc.getSelector().equals(fullName);
+                || Objects.nonNull(tc.getSelector()) && tc.getSelector().equals(fullName);
     }
 
     private static Optional<String> findAllureId(final Description description) {
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
index 1f5ec302e..c17b08a85 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4Utils.java
@@ -62,7 +62,8 @@ public static String getFullName(final Description description) {
         final String className = description.getClassName();
         final String methodName = description.getMethodName();
         return Objects.nonNull(methodName)
-                ? String.format("%s.%s", className, methodName) : className;
+                ? String.format("%s.%s", className, methodName)
+                : className;
     }
 
     public static boolean isCucumberTest(final Description description) {
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
index 73e6c7794..4c74bf262 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
@@ -24,7 +24,7 @@
 /**
  * @author jkttt on 05.07.17.
  */
-@Target({ ElementType.TYPE, ElementType.METHOD })
+@Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface Tags {
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
index 02cb9cf73..7ab712794 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java
@@ -150,8 +150,10 @@ void shouldReportActualAndExpectedStatusDetails() {
         final AllureResults results = runClasses(ActualExpectedStatusDetailsTest.class);
 
         assertThat(results.getTestResults())
-                .filteredOn("fullName",
-                        "io.qameta.allure.junit4.samples.ActualExpectedStatusDetailsTest.failingComparison")
+                .filteredOn(
+                        "fullName",
+                        "io.qameta.allure.junit4.samples.ActualExpectedStatusDetailsTest.failingComparison"
+                )
                 .extracting(
                         TestResult::getStatus,
                         testResult -> testResult.getStatusDetails().getActual(),
@@ -374,10 +376,12 @@ void shouldSupportTestsNotBasedOnClasses() {
     void shouldFilterByFullName() {
         final AllureResults results = runClasses(
                 new TestPlanV1_0()
-                        .setTests(Collections.singletonList(
-                                new TestPlanV1_0.TestCase()
-                                        .setSelector("io.qameta.allure.junit4.samples.OneTest.simpleTest")
-                        )),
+                        .setTests(
+                                Collections.singletonList(
+                                        new TestPlanV1_0.TestCase()
+                                                .setSelector("io.qameta.allure.junit4.samples.OneTest.simpleTest")
+                                )
+                        ),
                 OneTest.class, FailedTest.class,
                 TaggedTests.class, BrokenTest.class
         );
@@ -393,11 +397,13 @@ void shouldFilterByFullName() {
     void shouldFilterByAllureId() {
         final AllureResults results = runClasses(
                 new TestPlanV1_0()
-                        .setTests(Collections.singletonList(
-                                new TestPlanV1_0.TestCase()
-                                        .setId("771")
-                                        .setSelector("invalid")
-                        )),
+                        .setTests(
+                                Collections.singletonList(
+                                        new TestPlanV1_0.TestCase()
+                                                .setId("771")
+                                                .setSelector("invalid")
+                                )
+                        ),
                 OneTest.class, FailedTest.class,
                 TaggedTests.class, BrokenTest.class,
                 FilterSimpleTests.class
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
index 6cd462d8b..284c4f214 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
@@ -31,7 +31,10 @@ public class TaggedTests {
     public static final String CLASS_TAG2 = "class_tag2";
 
     @Test
-    @Tags({@Tag(METHOD_TAG1),
-            @Tag(METHOD_TAG2)})
-    public void taggedTest() {}
+    @Tags(
+        {@Tag(METHOD_TAG1),
+                @Tag(METHOD_TAG2)}
+    )
+    public void taggedTest() {
+    }
 }
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java
index c0e9aaeec..0dc863a7b 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TestWithAnnotations.java
@@ -35,10 +35,12 @@ public class TestWithAnnotations {
     @Feature("feature2")
     @Feature("feature3")
     @Story("story1")
-    @Stories({
-            @Story("story2"),
-            @Story("story3")
-    })
+    @Stories(
+        {
+                @Story("story2"),
+                @Story("story3")
+        }
+    )
     @Owner("some-owner")
     public void someTest() throws Exception {
     }
diff --git a/allure-jupiter-assert/src/main/java/io/qameta/allure/jupiterassert/AllureJupiterAssert.java b/allure-jupiter-assert/src/main/java/io/qameta/allure/jupiterassert/AllureJupiterAssert.java
index a259fdbb1..adfb8f6da 100644
--- a/allure-jupiter-assert/src/main/java/io/qameta/allure/jupiterassert/AllureJupiterAssert.java
+++ b/allure-jupiter-assert/src/main/java/io/qameta/allure/jupiterassert/AllureJupiterAssert.java
@@ -82,9 +82,12 @@ public void stepStart(final JoinPoint joinPoint) {
                 final List<String> assertArray = Arrays.asList(assertName.split("(?=[A-Z])"));
                 if (assertArray.size() >= 3) {
                     name = String.format(assertArray.get(0) + " " + assertArray.get(1) + " '%s'", expected)
-                            + " " + String.format(assertArray.stream()
-                            .skip(2)
-                            .collect(Collectors.joining(" ")) + " '%s'", actual);
+                            + " " + String.format(
+                                    assertArray.stream()
+                                            .skip(2)
+                                            .collect(Collectors.joining(" ")) + " '%s'",
+                                    actual
+                            );
                 } else {
                     name = String.format(assertArray.get(0) + " '%s'", expected)
                             + " " + String.format(assertArray.get(1) + " '%s'", actual);
@@ -109,10 +112,15 @@ public void stepStart(final JoinPoint joinPoint) {
         }
     }
 
-    @AfterThrowing(pointcut = "anyAssert()", throwing = "e")
+    @AfterThrowing(
+            pointcut = "anyAssert()",
+            throwing = "e"
+    )
     public void stepFailed(final Throwable e) {
-        getLifecycle().updateStep(s -> s
-                .setStatus(getStatus(e).orElse(Status.BROKEN)));
+        getLifecycle().updateStep(
+                s -> s
+                        .setStatus(getStatus(e).orElse(Status.BROKEN))
+        );
         getLifecycle().stopStep();
     }
 
diff --git a/allure-jupiter-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java b/allure-jupiter-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
index d8ad7b7b9..6b526b4bf 100644
--- a/allure-jupiter-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
+++ b/allure-jupiter-assert/src/test/java/io/qameta/allure/junit5assert/AllureJunit5AssertTest.java
@@ -45,16 +45,21 @@ void shouldHandleAssertAll() {
         person.setFirstName(FIRST_NAME);
         person.setLastName(LAST_NAME);
 
-        final AllureResults results = runWithinTestContext(() -> assertAll("name",
-                () -> assertEquals(FIRST_NAME,
-                        person.getFirstName(),
-                        "The first name is incorrect"
-                ),
-                () -> assertEquals(LAST_NAME,
-                        person.getLastName(),
-                        "The last name is incorrect"
-                )
-        ), AllureJunit5Assert::setLifecycle);
+        final AllureResults results = runWithinTestContext(
+                () -> assertAll(
+                        "name",
+                        () -> assertEquals(
+                                FIRST_NAME,
+                                person.getFirstName(),
+                                "The first name is incorrect"
+                        ),
+                        () -> assertEquals(
+                                LAST_NAME,
+                                person.getLastName(),
+                                "The last name is incorrect"
+                        )
+                ), AllureJunit5Assert::setLifecycle
+        );
 
         final TestResult testResult = results.getTestResults().get(0);
 
@@ -62,17 +67,21 @@ void shouldHandleAssertAll() {
                 .flatExtracting(StepResult::getName)
                 .containsExactly("assert All in  'name'");
 
-        List<StepResult> childSteps = Objects.requireNonNull(testResult
-                .getSteps()
-                .stream()
-                .findFirst()
-                .orElse(null))
+        List<StepResult> childSteps = Objects.requireNonNull(
+                testResult
+                        .getSteps()
+                        .stream()
+                        .findFirst()
+                        .orElse(null)
+        )
                 .getSteps();
 
         assertThat(childSteps)
                 .flatExtracting(StepResult::getName)
-                .containsExactly("assert 'Jane' Equals 'Jane'",
-                        "assert 'Doe' Equals 'Doe'");
+                .containsExactly(
+                        "assert 'Jane' Equals 'Jane'",
+                        "assert 'Doe' Equals 'Doe'"
+                );
 
     }
 
@@ -85,16 +94,21 @@ void shouldHandleAssertAllFailure() {
         person.setFirstName(FIRST_NAME);
         person.setLastName("LAST_NAME");
 
-        final AllureResults results = runWithinTestContext(() -> assertAll("name",
-                () -> assertEquals(FIRST_NAME,
-                        person.getFirstName(),
-                        "The first name is incorrect"
-                ),
-                () -> assertEquals(LAST_NAME,
-                        person.getLastName(),
-                        "The last name is incorrect"
-                )
-        ), AllureJunit5Assert::setLifecycle);
+        final AllureResults results = runWithinTestContext(
+                () -> assertAll(
+                        "name",
+                        () -> assertEquals(
+                                FIRST_NAME,
+                                person.getFirstName(),
+                                "The first name is incorrect"
+                        ),
+                        () -> assertEquals(
+                                LAST_NAME,
+                                person.getLastName(),
+                                "The last name is incorrect"
+                        )
+                ), AllureJunit5Assert::setLifecycle
+        );
 
         final TestResult testResult = results.getTestResults().get(0);
 
@@ -105,14 +119,18 @@ void shouldHandleAssertAllFailure() {
         List<StepResult> childSteps = Objects.requireNonNull(testResult.getSteps().stream().findFirst().orElse(null)).getSteps();
         assertThat(childSteps)
                 .flatExtracting(StepResult::getName, StepResult::getStatus)
-                .containsExactly("assert 'Jane' Equals 'Jane'", Status.PASSED,
-                        "assert 'Doe' Equals 'LAST_NAME'", Status.FAILED);
+                .containsExactly(
+                        "assert 'Jane' Equals 'Jane'", Status.PASSED,
+                        "assert 'Doe' Equals 'LAST_NAME'", Status.FAILED
+                );
     }
 
     @Test
     void shouldHandleAssertEquals() {
-        final AllureResults results = runWithinTestContext(() -> assertEquals("expectedString", "actualString"),
-                AllureJunit5Assert::setLifecycle);
+        final AllureResults results = runWithinTestContext(
+                () -> assertEquals("expectedString", "actualString"),
+                AllureJunit5Assert::setLifecycle
+        );
         assertThat(results.getTestResults())
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
@@ -123,8 +141,10 @@ void shouldHandleAssertEquals() {
     void shouldHandleAssertArrayEquals() {
         final int[] ACTUAL = new int[]{2, 5, 7};
         final int[] EXPECTED = new int[]{2, 5, 7};
-        final AllureResults results = runWithinTestContext(() -> assertArrayEquals(EXPECTED, ACTUAL),
-                AllureJunit5Assert::setLifecycle);
+        final AllureResults results = runWithinTestContext(
+                () -> assertArrayEquals(EXPECTED, ACTUAL),
+                AllureJunit5Assert::setLifecycle
+        );
         assertThat(results.getTestResults())
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
@@ -133,8 +153,10 @@ void shouldHandleAssertArrayEquals() {
 
     @Test
     void shouldHandleAssertTrue() {
-        final AllureResults results = runWithinTestContext(() -> assertTrue(true),
-                AllureJunit5Assert::setLifecycle);
+        final AllureResults results = runWithinTestContext(
+                () -> assertTrue(true),
+                AllureJunit5Assert::setLifecycle
+        );
         assertThat(results.getTestResults())
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
@@ -145,20 +167,23 @@ void shouldHandleAssertTrue() {
     void shouldHandleAssertIterableEquals() {
         final List<Integer> FIRST = Arrays.asList(1, 2, 3);
         final List<Integer> SECOND = Arrays.asList(1, 2, 3);
-        final AllureResults results = runWithinTestContext(() -> assertIterableEquals(FIRST, SECOND),
-                AllureJunit5Assert::setLifecycle);
+        final AllureResults results = runWithinTestContext(
+                () -> assertIterableEquals(FIRST, SECOND),
+                AllureJunit5Assert::setLifecycle
+        );
         assertThat(results.getTestResults())
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
                 .containsExactly("assert Iterable '[1, 2, 3]' Equals '[1, 2, 3]'");
     }
 
-
     @Test
     void shouldHandleAssertNotNull() {
         String argument = "someArgument";
-        final AllureResults results = runWithinTestContext(() -> assertNotNull(argument),
-                AllureJunit5Assert::setLifecycle);
+        final AllureResults results = runWithinTestContext(
+                () -> assertNotNull(argument),
+                AllureJunit5Assert::setLifecycle
+        );
         assertThat(results.getTestResults())
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
@@ -167,8 +192,10 @@ void shouldHandleAssertNotNull() {
 
     @Test
     void shouldHandleAssertNull() {
-        final AllureResults results = runWithinTestContext(() -> assertNull(null),
-                AllureJunit5Assert::setLifecycle);
+        final AllureResults results = runWithinTestContext(
+                () -> assertNull(null),
+                AllureJunit5Assert::setLifecycle
+        );
         assertThat(results.getTestResults())
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
@@ -179,8 +206,10 @@ void shouldHandleAssertNull() {
     void shouldHandleAssertLinesMatch() {
         List<String> expected = Arrays.asList("Java", "\\d+", "JUnit");
         List<String> actual = Arrays.asList("Java", "11", "JUnit");
-        final AllureResults results = runWithinTestContext(() -> assertLinesMatch(expected, actual),
-                AllureJunit5Assert::setLifecycle);
+        final AllureResults results = runWithinTestContext(
+                () -> assertLinesMatch(expected, actual),
+                AllureJunit5Assert::setLifecycle
+        );
         assertThat(results.getTestResults())
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
@@ -189,8 +218,10 @@ void shouldHandleAssertLinesMatch() {
 
     @Test
     void shouldHandleAssertNotEquals() {
-        final AllureResults results = runWithinTestContext(() -> assertNotEquals(13, 0),
-                AllureJunit5Assert::setLifecycle);
+        final AllureResults results = runWithinTestContext(
+                () -> assertNotEquals(13, 0),
+                AllureJunit5Assert::setLifecycle
+        );
         assertThat(results.getTestResults())
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
@@ -201,8 +232,10 @@ void shouldHandleAssertNotEquals() {
     void shouldHandleAssertNotSame() {
         final List<Integer> FIRST = Arrays.asList(1, 2, 3);
         final List<Integer> SECOND = Arrays.asList(1, 2, 5);
-        final AllureResults results = runWithinTestContext(() -> assertNotSame(FIRST, SECOND),
-                AllureJunit5Assert::setLifecycle);
+        final AllureResults results = runWithinTestContext(
+                () -> assertNotSame(FIRST, SECOND),
+                AllureJunit5Assert::setLifecycle
+        );
         assertThat(results.getTestResults())
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
diff --git a/allure-jupiter/src/main/java/io/qameta/allure/jupiter/AllureJupiter.java b/allure-jupiter/src/main/java/io/qameta/allure/jupiter/AllureJupiter.java
index f48a1de7f..00b2bab87 100644
--- a/allure-jupiter/src/main/java/io/qameta/allure/jupiter/AllureJupiter.java
+++ b/allure-jupiter/src/main/java/io/qameta/allure/jupiter/AllureJupiter.java
@@ -57,7 +57,8 @@ public class AllureJupiter implements InvocationInterceptor {
     @Override
     public void interceptTestTemplateMethod(final Invocation<Void> invocation,
                                             final ReflectiveInvocationContext<Method> invocationContext,
-                                            final ExtensionContext extensionContext) throws Throwable {
+                                            final ExtensionContext extensionContext)
+            throws Throwable {
         if (!shouldHandle(extensionContext, "template", invocationContext.getExecutable())) {
             invocation.proceed();
             return;
@@ -66,6 +67,7 @@ public void interceptTestTemplateMethod(final Invocation<Void> invocation,
         invocation.proceed();
     }
 
+    @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
     private void sendParameterEvent(final ReflectiveInvocationContext<Method> invocationContext,
                                     final ExtensionContext extensionContext) {
         final Parameter[] parameters = invocationContext.getExecutable().getParameters();
@@ -106,62 +108,79 @@ private void sendParameterEvent(final ReflectiveInvocationContext<Method> invoca
 
     @Override
     public void interceptBeforeAllMethod(
-            final Invocation<Void> invocation,
-            final ReflectiveInvocationContext<Method> invocationContext,
-            final ExtensionContext extensionContext) throws Throwable {
+                                         final Invocation<Void> invocation,
+                                         final ReflectiveInvocationContext<Method> invocationContext,
+                                         final ExtensionContext extensionContext)
+            throws Throwable {
         processFixture(PREPARE, invocation, invocationContext, extensionContext);
     }
 
     @Override
     public void interceptAfterAllMethod(
-            final Invocation<Void> invocation,
-            final ReflectiveInvocationContext<Method> invocationContext,
-            final ExtensionContext extensionContext) throws Throwable {
+                                        final Invocation<Void> invocation,
+                                        final ReflectiveInvocationContext<Method> invocationContext,
+                                        final ExtensionContext extensionContext)
+            throws Throwable {
         processFixture(TEAR_DOWN, invocation, invocationContext, extensionContext);
     }
 
     @Override
     public void interceptBeforeEachMethod(
-            final Invocation<Void> invocation,
-            final ReflectiveInvocationContext<Method> invocationContext,
-            final ExtensionContext extensionContext) throws Throwable {
+                                          final Invocation<Void> invocation,
+                                          final ReflectiveInvocationContext<Method> invocationContext,
+                                          final ExtensionContext extensionContext)
+            throws Throwable {
         processFixture(PREPARE, invocation, invocationContext, extensionContext);
     }
 
     @Override
     public void interceptAfterEachMethod(
-            final Invocation<Void> invocation,
-            final ReflectiveInvocationContext<Method> invocationContext,
-            final ExtensionContext extensionContext) throws Throwable {
+                                         final Invocation<Void> invocation,
+                                         final ReflectiveInvocationContext<Method> invocationContext,
+                                         final ExtensionContext extensionContext)
+            throws Throwable {
         processFixture(TEAR_DOWN, invocation, invocationContext, extensionContext);
     }
 
     protected void processFixture(final String type,
                                   final Invocation<Void> invocation,
                                   final ReflectiveInvocationContext<Method> invocationContext,
-                                  final ExtensionContext extensionContext) throws Throwable {
+                                  final ExtensionContext extensionContext)
+            throws Throwable {
         if (!shouldHandle(extensionContext, type, invocationContext.getExecutable())) {
             invocation.proceed();
             return;
         }
         final String uuid = UUID.randomUUID().toString();
         try {
-            extensionContext.publishReportEntry(wrap(buildStartEvent(
-                    type,
-                    uuid,
-                    invocationContext.getExecutable()
-            )));
+            extensionContext.publishReportEntry(
+                    wrap(
+                            buildStartEvent(
+                                    type,
+                                    uuid,
+                                    invocationContext.getExecutable()
+                            )
+                    )
+            );
             invocation.proceed();
-            extensionContext.publishReportEntry(wrap(buildStopEvent(
-                    type,
-                    uuid
-            )));
+            extensionContext.publishReportEntry(
+                    wrap(
+                            buildStopEvent(
+                                    type,
+                                    uuid
+                            )
+                    )
+            );
         } catch (Throwable throwable) {
-            extensionContext.publishReportEntry(wrap(buildFailureEvent(
-                    type,
-                    uuid,
-                    throwable
-            )));
+            extensionContext.publishReportEntry(
+                    wrap(
+                            buildFailureEvent(
+                                    type,
+                                    uuid,
+                                    throwable
+                            )
+                    )
+            );
             throw throwable;
         }
     }
@@ -209,12 +228,12 @@ public Map<String, String> buildFailureEvent(final String type,
     public Map<String, String> wrap(final Map<String, String> data) {
         final Map<String, String> res = new HashMap<>();
         data.forEach((key, value) -> {
-                    if (Objects.isNull(value) || value.trim().isEmpty()) {
-                        res.put(key, ALLURE_REPORT_ENTRY_BLANK_PREFIX + value);
-                    } else {
-                        res.put(key, value);
-                    }
-                }
+            if (Objects.isNull(value) || value.trim().isEmpty()) {
+                res.put(key, ALLURE_REPORT_ENTRY_BLANK_PREFIX + value);
+            } else {
+                res.put(key, value);
+            }
+        }
         );
         return res;
     }
@@ -223,7 +242,8 @@ private boolean shouldHandle(final ExtensionContext extensionContext,
                                  final String eventType,
                                  final Method method) {
         final Object marker = new Object();
-        final String key = String.join(":",
+        final String key = String.join(
+                ":",
                 extensionContext.getUniqueId(),
                 eventType,
                 method.toGenericString()
diff --git a/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java
index c1d5171c5..f85e4294d 100644
--- a/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java
+++ b/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Junit6CompatibilityTest.java
@@ -86,21 +86,21 @@ void shouldCaptureParametersWithParamAnnotationOnJunit6() {
         assertThat(results.getTestResults()).isNotEmpty();
 
         List<Parameter> allParams = results.getTestResults().stream()
-            .flatMap(tr -> tr.getParameters().stream())
-            .toList();
+                .flatMap(tr -> tr.getParameters().stream())
+                .toList();
 
         assertThat(allParams)
-            .filteredOn(parameter -> "id".equals(parameter.getName()))
-            .extracting(Parameter::getName, Parameter::getValue)
-            .containsExactlyInAnyOrder(
-                tuple("id", "a"),
-                tuple("id", "b")
-            );
+                .filteredOn(parameter -> "id".equals(parameter.getName()))
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("id", "a"),
+                        tuple("id", "b")
+                );
 
         assertThat(allParams)
-            .filteredOn(parameter -> "id".equals(parameter.getName()))
-            .extracting(Parameter::getName, Parameter::getValue)
-            .doesNotHaveDuplicates();
+                .filteredOn(parameter -> "id".equals(parameter.getName()))
+                .extracting(Parameter::getName, Parameter::getValue)
+                .doesNotHaveDuplicates();
     }
 
     @Test
@@ -111,57 +111,57 @@ void shouldCaptureFixturesAndStepsOnJunit6() {
         TestResult testResult = results.getTestResults().get(0);
 
         assertThat(results.getTestResultContainers())
-            .flatExtracting(TestResultContainer::getChildren)
-            .contains(testResult.getUuid());
+                .flatExtracting(TestResultContainer::getChildren)
+                .contains(testResult.getUuid());
 
         assertThat(results.getTestResultContainers())
-            .flatExtracting(TestResultContainer::getBefores)
-            .extracting(FixtureResult::getName, FixtureResult::getStatus)
-            .containsExactly(
-                tuple("setUp", Status.PASSED)
-            );
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactly(
+                        tuple("setUp", Status.PASSED)
+                );
 
         assertThat(results.getTestResultContainers())
-            .flatExtracting(TestResultContainer::getAfters)
-            .extracting(FixtureResult::getName, FixtureResult::getStatus)
-            .containsExactly(
-                tuple("tearDown", Status.PASSED)
-            );
+                .flatExtracting(TestResultContainer::getAfters)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactly(
+                        tuple("tearDown", Status.PASSED)
+                );
 
         assertThat(results.getTestResultContainers())
-            .flatExtracting(TestResultContainer::getBefores)
-            .flatExtracting(FixtureResult::getSteps)
-            .extracting(StepResult::getName)
-            .containsExactly("before step");
+                .flatExtracting(TestResultContainer::getBefores)
+                .flatExtracting(FixtureResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("before step");
 
         assertThat(results.getTestResults())
-            .flatExtracting(TestResult::getSteps)
-            .extracting(StepResult::getName)
-            .containsExactly("test step");
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("test step");
 
         assertThat(results.getTestResultContainers())
-            .flatExtracting(TestResultContainer::getAfters)
-            .flatExtracting(FixtureResult::getSteps)
-            .extracting(StepResult::getName)
-            .containsExactly("after step");
+                .flatExtracting(TestResultContainer::getAfters)
+                .flatExtracting(FixtureResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("after step");
     }
 
     @io.qameta.allure.Step("Run classes {classes}")
     private AllureResults runWithLauncher(Class<?>... classes) {
         return RunUtils.runTests(lifecycle -> {
             ClassSelector[] selectors = Stream.of(classes)
-                .map(DiscoverySelectors::selectClass)
-                .toArray(ClassSelector[]::new);
+                    .map(DiscoverySelectors::selectClass)
+                    .toArray(ClassSelector[]::new);
 
             LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
-                .configurationParameter("junit.jupiter.extensions.autodetection.enabled", "true")
-                .selectors(selectors)
-                .build();
+                    .configurationParameter("junit.jupiter.extensions.autodetection.enabled", "true")
+                    .selectors(selectors)
+                    .build();
 
             LauncherConfig config = LauncherConfig.builder()
-                .enableTestExecutionListenerAutoRegistration(false)
-                .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
-                .build();
+                    .enableTestExecutionListenerAutoRegistration(false)
+                    .addTestExecutionListeners(new AllureJunitPlatform(lifecycle))
+                    .build();
 
             Launcher launcher = LauncherFactory.create(config);
             launcher.execute(request);
diff --git a/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
index a2ca022cb..b217ed99b 100644
--- a/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
+++ b/allure-jupiter/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
@@ -153,8 +153,10 @@ void shouldSupportParamAnnotationForParameters() {
     void shouldReportActualAndExpectedStatusDetails() {
         final AllureResults results = runClasses(ActualExpectedStatusDetailsTests.class);
         final TestResult testResult = results.getTestResults().stream()
-                .filter(result -> "io.qameta.allure.junit5.features.ActualExpectedStatusDetailsTests.failingComparison"
-                        .equals(result.getFullName()))
+                .filter(
+                        result -> "io.qameta.allure.junit5.features.ActualExpectedStatusDetailsTests.failingComparison"
+                                .equals(result.getFullName())
+                )
                 .findFirst()
                 .get();
 
diff --git a/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
index 62c3be094..4ac439458 100644
--- a/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
+++ b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
@@ -93,5 +93,4 @@ static Stream<Arguments> nulls() {
         );
     }
 
-
 }
diff --git a/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
index d0b67f080..578602e38 100644
--- a/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
+++ b/allure-jupiter/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
@@ -40,7 +40,6 @@ void second(String value) {
     void third(@Param("some value") String value) {
     }
 
-
     @ParameterizedTest
     @ValueSource(strings = {"a", "b"})
     void testReporterInjection(String value, TestReporter testReporter) {
diff --git a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
index 5dc65ac04..3254f2695 100644
--- a/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
+++ b/allure-karate/src/test/java/io/qameta/allure/karate/AllureKarateTest.java
@@ -342,9 +342,13 @@ void buildTest() {
 
         Runner.builder()
                 .path("classpath:testdata/greeting.feature")
-                .hook(new AllureKarate(new AllureLifecycle(
-                        new FileSystemResultsWriter(allureResults)
-                )))
+                .hook(
+                        new AllureKarate(
+                                new AllureLifecycle(
+                                        new FileSystemResultsWriter(allureResults)
+                                )
+                        )
+                )
                 .backupReportDir(false)
                 .reportDir(temp.resolve("karate-reports").toString())
                 .outputJunitXml(false)
diff --git a/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java b/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java
index 05bcc254c..c1d6f7f4d 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/ExecutableItem.java
@@ -24,7 +24,11 @@
  * @see FixtureResult
  * @see StepResult
  */
-public interface ExecutableItem extends WithAttachments,
-        WithParameters, WithStatusDetails, WithSteps {
+public interface ExecutableItem
+        extends
+            WithAttachments,
+            WithParameters,
+            WithStatusDetails,
+            WithSteps {
 
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/TestResult.java b/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
index 51213cb41..9e23f3693 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
+++ b/allure-model/src/main/java/io/qameta/allure/model/TestResult.java
@@ -34,6 +34,7 @@
  * @see io.qameta.allure.model.WithSteps
  * @since 2.0
  */
+@SuppressWarnings("PMD.TooManyMethods")
 public class TestResult implements Serializable, ExecutableItem, WithLinks {
 
     private static final long serialVersionUID = 1L;
@@ -198,7 +199,6 @@ public TestResult setLabels(final List<Label> labels) {
         return this;
     }
 
-
     /**
      * Gets links.
      *
@@ -261,7 +261,6 @@ public TestResult setStatus(final Status value) {
         return this;
     }
 
-
     /**
      * Gets status details.
      *
@@ -343,7 +342,6 @@ public TestResult setDescriptionHtml(final String value) {
         return this;
     }
 
-
     /**
      * Gets steps.
      *
@@ -386,7 +384,6 @@ public TestResult setAttachments(final List<Attachment> attachments) {
         return this;
     }
 
-
     /**
      * Gets parameters.
      *
@@ -437,7 +434,6 @@ public Long getStop() {
         return stop;
     }
 
-
     /**
      * Sets stop.
      *
diff --git a/allure-model/src/test/java/io/qameta/allure/model/TestResultTest.java b/allure-model/src/test/java/io/qameta/allure/model/TestResultTest.java
index 36a406297..c60a0e0f9 100644
--- a/allure-model/src/test/java/io/qameta/allure/model/TestResultTest.java
+++ b/allure-model/src/test/java/io/qameta/allure/model/TestResultTest.java
@@ -31,9 +31,11 @@ void shouldHaveEmptyTitlePathByDefault() {
 
     @Test
     void shouldSetTitlePath() {
-        assertThat(new TestResult()
-                .setTitlePath(Arrays.asList("parent", "child"))
-                .getTitlePath())
+        assertThat(
+                new TestResult()
+                        .setTitlePath(Arrays.asList("parent", "child"))
+                        .getTitlePath()
+        )
                 .containsExactly("parent", "child");
     }
 }
diff --git a/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java b/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
index 4987e0934..19890d2e8 100644
--- a/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
+++ b/allure-okhttp/src/main/java/io/qameta/allure/okhttp/AllureOkHttp.java
@@ -71,7 +71,6 @@ public AllureOkHttp withResponseTemplate(final String templatePath) {
         return setResponseTemplate(templatePath);
     }
 
-    @SuppressWarnings("PMD.CloseResource")
     @Override
     public Response intercept(final Chain chain) throws IOException {
         final AttachmentProcessor<AttachmentData> processor = new DefaultAttachmentProcessor();
diff --git a/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java b/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java
index c05b0e20a..7fbe6e031 100644
--- a/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java
+++ b/allure-okhttp/src/test/java/io/qameta/allure/okhttp/AllureOkHttp3Test.java
@@ -16,13 +16,13 @@
 package io.qameta.allure.okhttp;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
-import io.qameta.allure.model.Attachment;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.test.AllureResults;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Response;
 import com.squareup.okhttp.ResponseBody;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.test.AllureResults;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -57,9 +57,13 @@ void setUp() {
         server.start();
         configureFor(server.port());
 
-        stubFor(get(urlEqualTo("/hello"))
-                .willReturn(aResponse()
-                        .withBody(BODY_STRING)));
+        stubFor(
+                get(urlEqualTo("/hello"))
+                        .willReturn(
+                                aResponse()
+                                        .withBody(BODY_STRING)
+                        )
+        );
     }
 
     @AfterEach
diff --git a/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java b/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
index e843434d8..f1e6996e8 100644
--- a/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
+++ b/allure-okhttp3/src/main/java/io/qameta/allure/okhttp3/AllureOkHttp3.java
@@ -71,7 +71,6 @@ public AllureOkHttp3 withResponseTemplate(final String templatePath) {
         return setResponseTemplate(templatePath);
     }
 
-    @SuppressWarnings("PMD.CloseResource")
     @Override
     public Response intercept(final Chain chain) throws IOException {
         final AttachmentProcessor<AttachmentData> processor = new DefaultAttachmentProcessor();
diff --git a/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java b/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java
index 350790a03..549b2c3cd 100644
--- a/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java
+++ b/allure-okhttp3/src/test/java/io/qameta/allure/okhttp3/AllureOkHttp3Test.java
@@ -57,9 +57,13 @@ void setUp() {
         server.start();
         configureFor(server.port());
 
-        stubFor(get(urlEqualTo("/hello"))
-                .willReturn(aResponse()
-                        .withBody(BODY_STRING)));
+        stubFor(
+                get(urlEqualTo("/hello"))
+                        .willReturn(
+                                aResponse()
+                                        .withBody(BODY_STRING)
+                        )
+        );
     }
 
     @AfterEach
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywright.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywright.java
index ff5a9ad4d..aa01b216a 100644
--- a/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywright.java
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywright.java
@@ -41,6 +41,7 @@
 /**
  * Utility methods for attaching Playwright Java diagnostics to the current Allure test.
  */
+@SuppressWarnings({"PMD.GodClass", "PMD.TooManyMethods"})
 public final class AllurePlaywright {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllurePlaywright.class);
@@ -294,7 +295,6 @@ static <T> T withAspectSuppressed(final Supplier<T> supplier) {
         }
     }
 
-    @SuppressWarnings("PMD.CloseResource")
     static void clear() {
         for (DefaultTraceSession traceSession : AllurePlaywrightRegistry.getTraceSessions()) {
             traceSession.stopWithoutAttachment();
@@ -315,7 +315,6 @@ static void attachFailureArtifacts() {
         attachFailureTraces();
     }
 
-    @SuppressWarnings("PMD.CloseResource")
     static void attachRegisteredCloseArtifacts() {
         if (!hasAllureContext()) {
             return;
@@ -330,14 +329,12 @@ static void attachRegisteredCloseArtifacts() {
         }
     }
 
-    @SuppressWarnings("PMD.CloseResource")
     private static void collectBrowserCloseArtifacts(final Browser browser, final CloseArtifacts closeArtifacts) {
         for (BrowserContext context : contexts(browser)) {
             collectContextCloseArtifacts(context, closeArtifacts);
         }
     }
 
-    @SuppressWarnings("PMD.CloseResource")
     private static void collectContextCloseArtifacts(final BrowserContext context,
                                                      final CloseArtifacts closeArtifacts) {
         register(context);
@@ -365,28 +362,24 @@ private static void attachPageCloseLogs(final Page page) {
         }
     }
 
-    @SuppressWarnings("PMD.CloseResource")
     private static void attachCloseTraces(final BrowserContext context) {
         for (DefaultTraceSession traceSession : AllurePlaywrightRegistry.getTraceSessions(context)) {
             traceSession.attach();
         }
     }
 
-    @SuppressWarnings("PMD.CloseResource")
     private static void attachFailureScreenshots() {
         for (Page page : AllurePlaywrightRegistry.getPages()) {
             attachScreenshot(SCREENSHOT, page);
         }
     }
 
-    @SuppressWarnings("PMD.CloseResource")
     private static void attachFailurePageSources() {
         for (Page page : AllurePlaywrightRegistry.getPages()) {
             attachPageSource(PAGE_SOURCE, page);
         }
     }
 
-    @SuppressWarnings("PMD.CloseResource")
     private static void attachFailureTraces() {
         for (DefaultTraceSession traceSession : AllurePlaywrightRegistry.getTraceSessions()) {
             traceSession.attach();
@@ -487,6 +480,7 @@ private static Object readField(final Object target, final String name) {
         }
     }
 
+    @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
     private static String formatConsoleMessages(final List<ConsoleMessage> messages) {
         if (messages == null || messages.isEmpty()) {
             return "";
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightAspect.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightAspect.java
index 2601d27be..14df79d8c 100644
--- a/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightAspect.java
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightAspect.java
@@ -44,46 +44,55 @@ protected Integer initialValue() {
         }
     };
 
-    private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE =
-            new InheritableThreadLocal<AllureLifecycle>() {
-                @Override
-                protected AllureLifecycle initialValue() {
-                    return Allure.getLifecycle();
-                }
-            };
+    private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE = new InheritableThreadLocal<AllureLifecycle>() {
+        @Override
+        protected AllureLifecycle initialValue() {
+            return Allure.getLifecycle();
+        }
+    };
 
-    @Pointcut("execution(public * com.microsoft.playwright.Page+.*(..))"
-            + " || execution(public * com.microsoft.playwright.Frame+.*(..))"
-            + " || execution(public * com.microsoft.playwright.Locator+.*(..))"
-            + " || execution(public * com.microsoft.playwright.ElementHandle+.*(..))"
-            + " || execution(public * com.microsoft.playwright.assertions.*Assertions+.*(..))")
+    @Pointcut(
+        "execution(public * com.microsoft.playwright.Page+.*(..))"
+                + " || execution(public * com.microsoft.playwright.Frame+.*(..))"
+                + " || execution(public * com.microsoft.playwright.Locator+.*(..))"
+                + " || execution(public * com.microsoft.playwright.ElementHandle+.*(..))"
+                + " || execution(public * com.microsoft.playwright.assertions.*Assertions+.*(..))"
+    )
     public void playwrightApi() {
         //pointcut body, should be empty
     }
 
-    @Pointcut("execution(public byte[] com.microsoft.playwright.Page+.screenshot(..))"
-            + " || execution(public byte[] com.microsoft.playwright.Locator+.screenshot(..))"
-            + " || execution(public byte[] com.microsoft.playwright.ElementHandle+.screenshot(..))")
+    @Pointcut(
+        "execution(public byte[] com.microsoft.playwright.Page+.screenshot(..))"
+                + " || execution(public byte[] com.microsoft.playwright.Locator+.screenshot(..))"
+                + " || execution(public byte[] com.microsoft.playwright.ElementHandle+.screenshot(..))"
+    )
     public void screenshotApi() {
         //pointcut body, should be empty
     }
 
-    @Pointcut("execution(public com.microsoft.playwright.BrowserContext "
-            + "com.microsoft.playwright.Browser+.newContext(..))")
+    @Pointcut(
+        "execution(public com.microsoft.playwright.BrowserContext "
+                + "com.microsoft.playwright.Browser+.newContext(..))"
+    )
     public void newContextApi() {
         //pointcut body, should be empty
     }
 
-    @Pointcut("execution(public com.microsoft.playwright.Page com.microsoft.playwright.Browser+.newPage(..))"
-            + " || execution(public com.microsoft.playwright.Page "
-            + "com.microsoft.playwright.BrowserContext+.newPage(..))")
+    @Pointcut(
+        "execution(public com.microsoft.playwright.Page com.microsoft.playwright.Browser+.newPage(..))"
+                + " || execution(public com.microsoft.playwright.Page "
+                + "com.microsoft.playwright.BrowserContext+.newPage(..))"
+    )
     public void newPageApi() {
         //pointcut body, should be empty
     }
 
-    @Pointcut("execution(public void com.microsoft.playwright.Browser+.close(..))"
-            + " || execution(public void com.microsoft.playwright.BrowserContext+.close(..))"
-            + " || execution(public void com.microsoft.playwright.Page+.close(..))")
+    @Pointcut(
+        "execution(public void com.microsoft.playwright.Browser+.close(..))"
+                + " || execution(public void com.microsoft.playwright.BrowserContext+.close(..))"
+                + " || execution(public void com.microsoft.playwright.Page+.close(..))"
+    )
     public void closeApi() {
         //pointcut body, should be empty
     }
@@ -144,7 +153,8 @@ public static AllureLifecycle getLifecycle() {
     }
 
     private static Object runStep(final ProceedingJoinPoint joinPoint, final PlaywrightAction action,
-                                  final boolean screenshot) throws Throwable {
+                                  final boolean screenshot)
+            throws Throwable {
         final String uuid = UUID.randomUUID().toString();
         DEPTH.set(DEPTH.get() + 1);
         getLifecycle().startStep(uuid, new StepResult().setName(action.getName()));
@@ -156,9 +166,11 @@ private static Object runStep(final ProceedingJoinPoint joinPoint, final Playwri
             getLifecycle().updateStep(uuid, step -> step.setStatus(Status.PASSED));
             return result;
         } catch (Throwable e) {
-            getLifecycle().updateStep(uuid, step -> step
-                    .setStatus(getStatus(e).orElse(Status.BROKEN))
-                    .setStatusDetails(getStatusDetails(e).orElse(null)));
+            getLifecycle().updateStep(
+                    uuid, step -> step
+                            .setStatus(getStatus(e).orElse(Status.BROKEN))
+                            .setStatusDetails(getStatusDetails(e).orElse(null))
+            );
             throw e;
         } finally {
             getLifecycle().stopStep(uuid);
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightRegistry.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightRegistry.java
index 410b7ac05..42c3d8f13 100644
--- a/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightRegistry.java
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/AllurePlaywrightRegistry.java
@@ -64,7 +64,6 @@ static void registerPage(final Page page) {
         }
     }
 
-    @SuppressWarnings("PMD.CloseResource")
     static Set<Page> getPages() {
         final State state = STATE.get();
         for (BrowserContext context : state.contexts) {
@@ -81,7 +80,6 @@ static Set<DefaultTraceSession> getTraceSessions() {
         return STATE.get().traceSessions;
     }
 
-    @SuppressWarnings("PMD.CloseResource")
     static List<DefaultTraceSession> getTraceSessions(final BrowserContext context) {
         final List<DefaultTraceSession> result = new ArrayList<>();
         for (DefaultTraceSession traceSession : STATE.get().traceSessions) {
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/DefaultTraceSession.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/DefaultTraceSession.java
index e8eac1c00..100545816 100644
--- a/allure-playwright/src/main/java/io/qameta/allure/playwright/DefaultTraceSession.java
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/DefaultTraceSession.java
@@ -51,7 +51,6 @@ void stopWithoutAttachment() {
         stop(false);
     }
 
-    @SuppressWarnings("PMD.CompareObjectsWithEquals")
     boolean isFor(final BrowserContext candidate) {
         return context == candidate;
     }
diff --git a/allure-playwright/src/main/java/io/qameta/allure/playwright/PlaywrightAction.java b/allure-playwright/src/main/java/io/qameta/allure/playwright/PlaywrightAction.java
index 3d675888b..f15c7755b 100644
--- a/allure-playwright/src/main/java/io/qameta/allure/playwright/PlaywrightAction.java
+++ b/allure-playwright/src/main/java/io/qameta/allure/playwright/PlaywrightAction.java
@@ -22,12 +22,13 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
+@SuppressWarnings("PMD.GodClass")
 final class PlaywrightAction {
 
     private static final String METHOD_NAVIGATE = "navigate";
@@ -53,60 +54,69 @@ final class PlaywrightAction {
     private static final String LOCATOR = "locator";
     private static final String ELEMENT = "element";
     private static final String REDACTED = "<redacted>";
+    private static final String SPACE = " ";
 
-    private static final Set<String> ACTION_METHODS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
-            METHOD_NAVIGATE,
-            METHOD_CLICK,
-            METHOD_DBLCLICK,
-            METHOD_CHECK,
-            METHOD_UNCHECK,
-            METHOD_TAP,
-            METHOD_FILL,
-            METHOD_CLEAR,
-            METHOD_PRESS,
-            METHOD_TYPE,
-            METHOD_HOVER,
-            METHOD_DRAG_TO,
-            METHOD_DRAG_AND_DROP,
-            METHOD_SET_INPUT_FILES,
-            METHOD_SELECT_OPTION,
-            METHOD_DISPATCH_EVENT,
-            "focus",
-            "blur",
-            "setChecked",
-            "setContent",
-            "reload",
-            "goBack",
-            "goForward",
-            "bringToFront",
-            "close",
-            "waitForCondition",
-            "waitForClose",
-            "waitForConsoleMessage",
-            "waitForDownload",
-            "waitForFileChooser",
-            "waitForFunction",
-            "waitForLoadState",
-            "waitForNavigation",
-            "waitForPopup",
-            "waitForRequest",
-            "waitForRequestFinished",
-            "waitForResponse",
-            "waitForSelector",
-            "waitForTimeout",
-            "waitForURL",
-            "waitForWebSocket",
-            "waitForWorker"
-    )));
+    private static final Set<String> ACTION_METHODS = Collections.unmodifiableSet(
+            new HashSet<String>(
+                    Arrays.asList(
+                            METHOD_NAVIGATE,
+                            METHOD_CLICK,
+                            METHOD_DBLCLICK,
+                            METHOD_CHECK,
+                            METHOD_UNCHECK,
+                            METHOD_TAP,
+                            METHOD_FILL,
+                            METHOD_CLEAR,
+                            METHOD_PRESS,
+                            METHOD_TYPE,
+                            METHOD_HOVER,
+                            METHOD_DRAG_TO,
+                            METHOD_DRAG_AND_DROP,
+                            METHOD_SET_INPUT_FILES,
+                            METHOD_SELECT_OPTION,
+                            METHOD_DISPATCH_EVENT,
+                            "focus",
+                            "blur",
+                            "setChecked",
+                            "setContent",
+                            "reload",
+                            "goBack",
+                            "goForward",
+                            "bringToFront",
+                            "close",
+                            "waitForCondition",
+                            "waitForClose",
+                            "waitForConsoleMessage",
+                            "waitForDownload",
+                            "waitForFileChooser",
+                            "waitForFunction",
+                            "waitForLoadState",
+                            "waitForNavigation",
+                            "waitForPopup",
+                            "waitForRequest",
+                            "waitForRequestFinished",
+                            "waitForResponse",
+                            "waitForSelector",
+                            "waitForTimeout",
+                            "waitForURL",
+                            "waitForWebSocket",
+                            "waitForWorker"
+                    )
+            )
+    );
 
     private static final Map<String, String> ACTION_PREFIXES = createActionPrefixes();
 
-    private static final Set<String> IGNORED_METHODS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
-            "equals",
-            "hashCode",
-            "toString",
-            "not"
-    )));
+    private static final Set<String> IGNORED_METHODS = Collections.unmodifiableSet(
+            new HashSet<String>(
+                    Arrays.asList(
+                            "equals",
+                            "hashCode",
+                            "toString",
+                            "not"
+                    )
+            )
+    );
 
     private final boolean logged;
     private final String name;
@@ -149,7 +159,7 @@ private static boolean shouldLog(final JoinPoint joinPoint, final String method)
     private static String name(final JoinPoint joinPoint, final String method) {
         final String result;
         if (isAssertion(joinPoint)) {
-            result = "Expect " + target(joinPoint) + " " + method;
+            result = "Expect " + target(joinPoint) + SPACE + method;
         } else if (METHOD_NAVIGATE.equals(method)) {
             result = "Navigate to " + arg(joinPoint, 0, "url");
         } else if (METHOD_FILL.equals(method)) {
@@ -168,7 +178,7 @@ private static String name(final JoinPoint joinPoint, final String method) {
 
     private static String prefix(final String method) {
         final String prefix = ACTION_PREFIXES.get(method);
-        return prefix == null ? humanize(method) + " " : prefix;
+        return prefix == null ? humanize(method) + SPACE : prefix;
     }
 
     private static Map<String, String> createActionPrefixes() {
diff --git a/allure-playwright/src/test/java/io/qameta/allure/playwright/AllurePlaywrightTest.java b/allure-playwright/src/test/java/io/qameta/allure/playwright/AllurePlaywrightTest.java
index ce13316ca..62fb8e998 100644
--- a/allure-playwright/src/test/java/io/qameta/allure/playwright/AllurePlaywrightTest.java
+++ b/allure-playwright/src/test/java/io/qameta/allure/playwright/AllurePlaywrightTest.java
@@ -60,7 +60,10 @@
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
 
-@ResourceLock(value = "io.qameta.allure.playwright.lifecycle", mode = READ_WRITE)
+@ResourceLock(
+        value = "io.qameta.allure.playwright.lifecycle",
+        mode = READ_WRITE
+)
 class AllurePlaywrightTest {
 
     private static final byte[] PNG_HEADER = new byte[]{(byte) 0x89, 'P', 'N', 'G'};
@@ -76,9 +79,11 @@ class AllurePlaywrightTest {
     static void startBrowser() {
         try {
             playwright = Playwright.create();
-            browser = playwright.chromium().launch(new BrowserType.LaunchOptions()
-                    .setHeadless(true)
-                    .setArgs(Collections.singletonList("--no-sandbox")));
+            browser = playwright.chromium().launch(
+                    new BrowserType.LaunchOptions()
+                            .setHeadless(true)
+                            .setArgs(Collections.singletonList("--no-sandbox"))
+            );
         } catch (PlaywrightException e) {
             closeBrowser();
             assumeTrue(false, "Chromium is not available for Playwright integration tests: " + e.getMessage());
@@ -417,10 +422,12 @@ void shouldAttachPageLogsWhenContextIsClosed() {
         final Page page = context.newPage();
 
         final AllureResults results = runWithPlaywrightContext(() -> {
-            page.setContent("<script>"
-                    + "console.error('console boom');"
-                    + "setTimeout(() => { throw new Error('page boom'); }, 0);"
-                    + "</script>");
+            page.setContent(
+                    "<script>"
+                            + "console.error('console boom');"
+                            + "setTimeout(() => { throw new Error('page boom'); }, 0);"
+                            + "</script>"
+            );
             page.waitForTimeout(250);
             context.close();
         });
diff --git a/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
index 037cf28ac..077c473f5 100644
--- a/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
@@ -41,7 +41,8 @@ protected AllureEnumDeserializer(final Class<T> vc) {
 
     @Override
     public T deserialize(final JsonParser p,
-                         final DeserializationContext ctxt) throws IOException {
+                         final DeserializationContext ctxt)
+            throws IOException {
         final String value = p.readValueAs(String.class);
         if (Objects.isNull(value)) {
             return null;
diff --git a/allure-reader/src/test/java/io/qameta/allure/reader/AllureObjectMapperFactoryTest.java b/allure-reader/src/test/java/io/qameta/allure/reader/AllureObjectMapperFactoryTest.java
index 555849059..f289d55bf 100644
--- a/allure-reader/src/test/java/io/qameta/allure/reader/AllureObjectMapperFactoryTest.java
+++ b/allure-reader/src/test/java/io/qameta/allure/reader/AllureObjectMapperFactoryTest.java
@@ -35,13 +35,13 @@ void shouldCreateMapperThatReadsEnumsCaseInsensitively() throws Exception {
             final ObjectMapper mapper = AllureObjectMapperFactory.createMapper();
             return mapper.readValue(
                     "{"
-                    + "\"name\":\"demo\","
-                    + "\"titlePath\":[\"parent\",\"child\"],"
-                    + "\"status\":\"pAsSeD\","
-                    + "\"stage\":\"fInIsHeD\","
-                    + "\"parameters\":[{\"name\":\"secret\",\"value\":\"42\",\"mode\":\"MaSkEd\"}],"
-                    + "\"unknown\":\"ignored\""
-                    + "}",
+                            + "\"name\":\"demo\","
+                            + "\"titlePath\":[\"parent\",\"child\"],"
+                            + "\"status\":\"pAsSeD\","
+                            + "\"stage\":\"fInIsHeD\","
+                            + "\"parameters\":[{\"name\":\"secret\",\"value\":\"42\",\"mode\":\"MaSkEd\"}],"
+                            + "\"unknown\":\"ignored\""
+                            + "}",
                     TestResult.class
             );
         });
@@ -62,18 +62,18 @@ void deprecatedDeserializersShouldTrimInputAndReturnNullForUnknownValues() throw
 
         final DeprecatedEnumHolder trimmed = mapper.readValue(
                 "{"
-                + "\"status\":\" broken \","
-                + "\"stage\":\" pending \","
-                + "\"mode\":\" hidden \""
-                + "}",
+                        + "\"status\":\" broken \","
+                        + "\"stage\":\" pending \","
+                        + "\"mode\":\" hidden \""
+                        + "}",
                 DeprecatedEnumHolder.class
         );
         final DeprecatedEnumHolder unknown = mapper.readValue(
                 "{"
-                + "\"status\":\"not-a-status\","
-                + "\"stage\":\"   \","
-                + "\"mode\":\"not-a-mode\""
-                + "}",
+                        + "\"status\":\"not-a-status\","
+                        + "\"stage\":\"   \","
+                        + "\"mode\":\"not-a-mode\""
+                        + "}",
                 DeprecatedEnumHolder.class
         );
 
@@ -81,11 +81,11 @@ void deprecatedDeserializersShouldTrimInputAndReturnNullForUnknownValues() throw
             Allure.addAttachment(
                     "enum-deserialization-summary",
                     "trimmed.status=" + trimmed.status
-                    + "\ntrimmed.stage=" + trimmed.stage
-                    + "\ntrimmed.mode=" + trimmed.mode
-                    + "\nunknown.status=" + unknown.status
-                    + "\nunknown.stage=" + unknown.stage
-                    + "\nunknown.mode=" + unknown.mode
+                            + "\ntrimmed.stage=" + trimmed.stage
+                            + "\ntrimmed.mode=" + trimmed.mode
+                            + "\nunknown.status=" + unknown.status
+                            + "\nunknown.stage=" + unknown.stage
+                            + "\nunknown.mode=" + unknown.mode
             );
             assertEquals(Status.BROKEN, trimmed.status);
             assertEquals(Stage.PENDING, trimmed.stage);
diff --git a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
index 51c166ae2..d59e998ac 100644
--- a/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
+++ b/allure-rest-assured/src/main/java/io/qameta/allure/restassured/AllureRestAssured.java
@@ -150,7 +150,7 @@ public Response filter(final FilterableRequestSpecification requestSpec,
     }
 
     private static Map<String, String> toMapConverter(final Iterable<? extends NameAndValue> items,
-                                                          final Set<String> toHide) {
+                                                      final Set<String> toHide) {
         final Map<String, String> result = new HashMap<>();
         items.forEach(h -> result.put(h.getName(), toHide.contains(h.getName()) ? HIDDEN_PLACEHOLDER : h.getValue()));
         return result;
diff --git a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
index c35cef0d7..eed1c2f81 100644
--- a/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
+++ b/allure-rest-assured/src/test/java/io/qameta/allure/restassured/AllureRestAssuredTest.java
@@ -52,13 +52,19 @@ class AttachmentArgumentProvider implements ArgumentsProvider {
     public Stream<? extends Arguments> provideArguments(final ExtensionContext context) {
         return Stream.of(
                 arguments(ImmutableList.of("Request", "HTTP/1.1 200 OK"), new AllureRestAssured()),
-                arguments(ImmutableList.of("Allure Request", "Allure Response"), new AllureRestAssured()
-                        .setRequestAttachmentName("Allure Request")
-                        .setResponseAttachmentName("Allure Response")),
-                arguments(ImmutableList.of("Request", "Allure Response"), new AllureRestAssured()
-                        .setResponseAttachmentName("Allure Response")),
-                arguments(ImmutableList.of("Allure Request", "HTTP/1.1 200 OK"), new AllureRestAssured()
-                        .setRequestAttachmentName("Allure Request"))
+                arguments(
+                        ImmutableList.of("Allure Request", "Allure Response"), new AllureRestAssured()
+                                .setRequestAttachmentName("Allure Request")
+                                .setResponseAttachmentName("Allure Response")
+                ),
+                arguments(
+                        ImmutableList.of("Request", "Allure Response"), new AllureRestAssured()
+                                .setResponseAttachmentName("Allure Response")
+                ),
+                arguments(
+                        ImmutableList.of("Allure Request", "HTTP/1.1 200 OK"), new AllureRestAssured()
+                                .setRequestAttachmentName("Allure Request")
+                )
         );
     }
 }
@@ -105,8 +111,10 @@ class AllureRestAssuredTest {
     @ArgumentsSource(AttachmentArgumentProvider.class)
     void shouldCreateAttachment(final List<String> attachmentNames, final AllureRestAssured filter) {
         final AllureResults results = executeWithStub(
-                server -> WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
-                        .willReturn(WireMock.aResponse().withStatus(200).withBody("some body"))),
+                server -> WireMock.stubFor(
+                        WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
+                                .willReturn(WireMock.aResponse().withStatus(200).withBody("some body"))
+                ),
                 server -> RestAssured.given()
                         .contentType(ContentType.URLENC)
                         .formParams("Allure", "Form")
@@ -114,11 +122,13 @@ void shouldCreateAttachment(final List<String> attachmentNames, final AllureRest
                 filter
         );
 
-        assertThat(results.getTestResults()
-                .stream()
-                .map(TestResult::getAttachments)
-                .flatMap(Collection::stream)
-                .map(Attachment::getName))
+        assertThat(
+                results.getTestResults()
+                        .stream()
+                        .map(TestResult::getAttachments)
+                        .flatMap(Collection::stream)
+                        .map(Attachment::getName)
+        )
                 .containsExactlyElementsOf(attachmentNames);
     }
 
@@ -136,8 +146,10 @@ void shouldProperlySetAttachmentNameForSingleFilterInstance() {
 
         // Reuse the same filter instance for both requests to verify names are not cached.
         final AllureResults resultsOne = executeWithStub(
-                server -> WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
-                        .willReturn(responseBuilderOne)),
+                server -> WireMock.stubFor(
+                        WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
+                                .willReturn(responseBuilderOne)
+                ),
                 server -> RestAssured.given()
                         .contentType(ContentType.URLENC)
                         .formParams("Allure", "Form")
@@ -146,8 +158,10 @@ void shouldProperlySetAttachmentNameForSingleFilterInstance() {
         );
 
         final AllureResults resultsTwo = executeWithStub(
-                server -> WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
-                        .willReturn(responseBuilderTwo)),
+                server -> WireMock.stubFor(
+                        WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
+                                .willReturn(responseBuilderTwo)
+                ),
                 server -> RestAssured.given()
                         .contentType(ContentType.URLENC)
                         .formParams("Allure", "Form")
@@ -155,19 +169,23 @@ void shouldProperlySetAttachmentNameForSingleFilterInstance() {
                 filter
         );
 
-        assertThat(resultsOne.getTestResults()
-                .stream()
-                .map(TestResult::getAttachments)
-                .flatMap(Collection::stream)
-                .map(Attachment::getName))
+        assertThat(
+                resultsOne.getTestResults()
+                        .stream()
+                        .map(TestResult::getAttachments)
+                        .flatMap(Collection::stream)
+                        .map(Attachment::getName)
+        )
                 .hasSize(2)
                 .anyMatch(res -> res.equals("HTTP/1.1 200 OK"));
 
-        assertThat(resultsTwo.getTestResults()
-                .stream()
-                .map(TestResult::getAttachments)
-                .flatMap(Collection::stream)
-                .map(Attachment::getName))
+        assertThat(
+                resultsTwo.getTestResults()
+                        .stream()
+                        .map(TestResult::getAttachments)
+                        .flatMap(Collection::stream)
+                        .map(Attachment::getName)
+        )
                 .hasSize(2)
                 .anyMatch(res -> res.equals("HTTP/1.1 400 Bad Request"));
     }
@@ -176,8 +194,10 @@ void shouldProperlySetAttachmentNameForSingleFilterInstance() {
     @ArgumentsSource(AttachmentArgumentProvider.class)
     void shouldCatchAttachmentBody(final List<String> attachmentNames, final AllureRestAssured filter) {
         final AllureResults results = executeWithStub(
-                server -> WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
-                        .willReturn(WireMock.aResponse().withStatus(200).withBody("some body"))),
+                server -> WireMock.stubFor(
+                        WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
+                                .willReturn(WireMock.aResponse().withStatus(200).withBody("some body"))
+                ),
                 server -> RestAssured.given()
                         .contentType(ContentType.URLENC)
                         .formParams("Allure", "Form")
@@ -213,8 +233,10 @@ void shouldHideHeadersInAttachments(final Map<String, String> headers,
         RestAssured.config = new RestAssuredConfig().logConfig(LogConfig.logConfig().blacklistHeaders(List.of(hiddenHeader)));
 
         final AllureResults results = executeWithStub(
-                server -> WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
-                        .willReturn(responseBuilder)),
+                server -> WireMock.stubFor(
+                        WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
+                                .willReturn(responseBuilder)
+                ),
                 server -> RestAssured.with()
                         .headers(headers)
                         .contentType(ContentType.URLENC)
@@ -240,8 +262,10 @@ void responseJsonPrettified(final AllureRestAssured filter, final String formatt
                 .withStatus(200);
 
         final AllureResults results = executeWithStub(
-                server -> WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
-                        .willReturn(responseBuilder)),
+                server -> WireMock.stubFor(
+                        WireMock.get(WireMock.urlEqualTo("/hello?Allure=Form"))
+                                .willReturn(responseBuilder)
+                ),
                 server -> RestAssured.with()
                         .contentType(ContentType.URLENC)
                         .formParams("Allure", "Form")
@@ -271,19 +295,23 @@ void shouldRenderListValuedFormParams() {
                 .withBody("some body");
 
         final AllureResults results = executeWithStub(
-                server -> WireMock.stubFor(WireMock.post(WireMock.urlPathEqualTo("/hello"))
-                        .willReturn(responseBuilder)),
+                server -> WireMock.stubFor(
+                        WireMock.post(WireMock.urlPathEqualTo("/hello"))
+                                .willReturn(responseBuilder)
+                ),
                 server -> RestAssured.given()
                         .contentType(ContentType.URLENC)
                         .formParam("data", List.of("a", "b"))
                         .post(server.url("/hello")).then().statusCode(200)
         );
 
-        assertThat(results.getTestResults()
-                .stream()
-                .map(TestResult::getAttachments)
-                .flatMap(Collection::stream)
-                .map(Attachment::getName))
+        assertThat(
+                results.getTestResults()
+                        .stream()
+                        .map(TestResult::getAttachments)
+                        .flatMap(Collection::stream)
+                        .map(Attachment::getName)
+        )
                 .containsExactly("Request", "HTTP/1.1 200 OK");
 
         final Attachment requestAttachment = results.getTestResults()
@@ -313,19 +341,23 @@ void shouldNotFailForNullValuedFormParamsMap() {
         formParams.put("param2", null);
 
         final AllureResults results = executeWithStub(
-                server -> WireMock.stubFor(WireMock.post(WireMock.urlPathEqualTo("/hello"))
-                        .willReturn(responseBuilder)),
+                server -> WireMock.stubFor(
+                        WireMock.post(WireMock.urlPathEqualTo("/hello"))
+                                .willReturn(responseBuilder)
+                ),
                 server -> RestAssured.given()
                         .contentType(ContentType.URLENC)
                         .formParams(formParams)
                         .post(server.url("/hello")).then().statusCode(200)
         );
 
-        assertThat(results.getTestResults()
-                .stream()
-                .map(TestResult::getAttachments)
-                .flatMap(Collection::stream)
-                .map(Attachment::getName))
+        assertThat(
+                results.getTestResults()
+                        .stream()
+                        .map(TestResult::getAttachments)
+                        .flatMap(Collection::stream)
+                        .map(Attachment::getName)
+        )
                 .containsExactly("Request", "HTTP/1.1 200 OK");
     }
 
diff --git a/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala b/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
index 82cd18e0f..a9f3374ec 100644
--- a/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
+++ b/allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala
@@ -31,7 +31,8 @@ import scala.jdk.CollectionConverters._
 import scala.collection.mutable
 
 /**
-  * @author charlie (Dmitry Baev).
+  * @author
+  *   charlie (Dmitry Baev).
   */
 trait AllureScalatestContext {
   AllureScalatestContextHolder.populate()
@@ -89,15 +90,15 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
   def this() = this(Allure.getLifecycle)
 
   override def apply(event: Event): Unit = event match {
-    case event: SuiteStarting => startSuite(event)
+    case event: SuiteStarting  => startSuite(event)
     case event: SuiteCompleted => completeSuite(event)
-    case event: SuiteAborted => abortSuite(event)
-    case event: TestStarting => startTestCase(event)
-    case event: TestFailed => failTestCase(event)
-    case event: TestCanceled => cancelTestCase(event)
-    case event: TestSucceeded => passTestCase(event)
-    case event: TestIgnored => ignoreTestCase(event)
-    case _ => ()
+    case event: SuiteAborted   => abortSuite(event)
+    case event: TestStarting   => startTestCase(event)
+    case event: TestFailed     => failTestCase(event)
+    case event: TestCanceled   => cancelTestCase(event)
+    case event: TestSucceeded  => passTestCase(event)
+    case event: TestIgnored    => ignoreTestCase(event)
+    case _                     => ()
   }
 
   def startSuite(event: SuiteStarting): Unit = {
@@ -127,7 +128,7 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
     val throwable = event.throwable.getOrElse(new RuntimeException(event.message))
     val status = throwable match {
       case _: TestFailedException => Status.FAILED
-      case _ => Status.BROKEN
+      case _                      => Status.BROKEN
     }
     val statusDetails = getStatusDetails(throwable)
       .orElse(new StatusDetails().setMessage(event.message))
@@ -171,12 +172,7 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
     )
   }
 
-  private def startTest(suiteId: String,
-                        suiteName: String,
-                        suiteClassName: Option[String],
-                        location: Option[Location],
-                        testName: String,
-                        threadId: Option[String]): Unit = {
+  private def startTest(suiteId: String, suiteName: String, suiteClassName: Option[String], location: Option[Location], testName: String, threadId: Option[String]): Unit = {
     val uuid = UUID.randomUUID().toString
     var labels = mutable.ListBuffer(
       createSuiteLabel(suiteName),
@@ -195,27 +191,30 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
       .setUuid(uuid)
       .setTestCaseId(md5(suiteId + testName))
       .setHistoryId(md5(suiteId + testName))
-      .setTitlePath(suiteClassName
-        .map(createTitlePathFromQualifiedClassName)
-        .getOrElse(createTitlePath(suiteName)))
+      .setTitlePath(
+        suiteClassName
+          .map(createTitlePathFromQualifiedClassName)
+          .getOrElse(createTitlePath(suiteName))
+      )
 
     val testAnnotations = getAnnotations(location)
     val suiteAnnotations = getAnnotations(getSuiteLocation(suiteId))
 
     (testAnnotations ::: suiteAnnotations).foreach {
-      case annotation: Severity => labels += createSeverityLabel(annotation.value())
-      case annotation: Owner => labels += createOwnerLabel(annotation.value())
+      case annotation: Severity    => labels += createSeverityLabel(annotation.value())
+      case annotation: Owner       => labels += createOwnerLabel(annotation.value())
       case annotation: Description => result.setDescription(annotation.value())
-      case annotation: Epic => labels += createEpicLabel(annotation.value())
-      case annotation: Feature => labels += createFeatureLabel(annotation.value())
-      case annotation: Story => labels += createStoryLabel(annotation.value())
-      case annotation: Link => links += createLink(annotation)
-      case annotation: Issue => links += createIssueLink(annotation.value())
-      case annotation: TmsLink => links += createTmsLink(annotation.value())
-      case _ => None
+      case annotation: Epic        => labels += createEpicLabel(annotation.value())
+      case annotation: Feature     => labels += createFeatureLabel(annotation.value())
+      case annotation: Story       => labels += createStoryLabel(annotation.value())
+      case annotation: Link        => links += createLink(annotation)
+      case annotation: Issue       => links += createIssueLink(annotation.value())
+      case annotation: TmsLink     => links += createTmsLink(annotation.value())
+      case _                       => None
     }
 
-    suiteClassName.map(className => createTestClassLabel(className))
+    suiteClassName
+      .map(className => createTestClassLabel(className))
       .fold {} { value => labels += value }
 
     result.setLabels(labels.asJava)
@@ -223,34 +222,36 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
     lifecycle.scheduleTestCase(result)
     lifecycle.startTestCase(uuid)
 
-    //this should be called after test case scheduled
+    // this should be called after test case scheduled
     threadId.fold {} { thread => AllureScalatestContextHolder.add(thread, uuid) }
   }
 
-  private def stopTest(status: Option[Status],
-                       statusDetails: Option[StatusDetails],
-                       threadName: Option[String]): Unit = {
-    threadName.fold {} {
-      thread => {
-        AllureScalatestContextHolder.get(thread).fold {} {
-          uuid => {
-            lifecycle.updateTestCase(uuid, (result: TestResult) => {
-              status.fold {} { st => result.setStatus(st) }
-              statusDetails.fold {} { details => result.setStatusDetails(details) }
-            }: Unit)
+  private def stopTest(status: Option[Status], statusDetails: Option[StatusDetails], threadName: Option[String]): Unit = {
+    threadName.fold {} { thread =>
+      {
+        AllureScalatestContextHolder.get(thread).fold {} { uuid =>
+          {
+            lifecycle.updateTestCase(
+              uuid,
+              (result: TestResult) =>
+                {
+                  status.fold {} { st => result.setStatus(st) }
+                  statusDetails.fold {} { details => result.setStatusDetails(details) }
+                }: Unit
+            )
             lifecycle.stopTestCase(uuid)
             lifecycle.writeTestCase(uuid)
           }
-            AllureScalatestContextHolder.remove(thread)
+          AllureScalatestContextHolder.remove(thread)
         }
       }
     }
   }
 
   private def getAnnotations(location: Option[Location]): List[Annotation] = location match {
-    case Some(TopOfClass(className)) => Class.forName(className).getAnnotations.toList
+    case Some(TopOfClass(className))              => Class.forName(className).getAnnotations.toList
     case Some(TopOfMethod(className, methodName)) => Class.forName(className).getMethod(methodName).getDeclaredAnnotations.toList
-    case _ => List()
+    case _                                        => List()
   }
 
   private def setSuiteLocation(suiteId: String, location: Option[Location]): Unit = {
@@ -285,8 +286,8 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
   private def getScalaTestThreadName(threadId: Option[String]): String = {
     val fromProperty = System.getProperty(ALLURE_THREAD_NAME_SYSPROP)
     val fromEnv = System.getenv(ALLURE_THREAD_NAME_ENV)
-    val realThreadName = threadId.getOrElse {getThreadName}
-    Seq(fromProperty, fromEnv).find(el => Objects.nonNull(el)).getOrElse {realThreadName}
+    val realThreadName = threadId.getOrElse { getThreadName }
+    Seq(fromProperty, fromEnv).find(el => Objects.nonNull(el)).getOrElse { realThreadName }
   }
 
 }
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
index 0187f1a55..43bc97c58 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/AllureScalatestTest.scala
@@ -28,7 +28,8 @@ import scala.collection.mutable.ListBuffer
 import scala.jdk.CollectionConverters._
 
 /**
-  * @author charlie (Dmitry Baev).
+  * @author
+  *   charlie (Dmitry Baev).
   */
 class AllureScalatestTest {
 
@@ -38,7 +39,12 @@ class AllureScalatestTest {
     results.getTestResults.asScala
       .map(item => item.getName) should contain("test should be passed")
     results.getTestResults.asScala.head.getTitlePath.asScala.toList shouldBe List(
-      "io", "qameta", "allure", "scalatest", "testdata", "SimpleSpec"
+      "io",
+      "qameta",
+      "allure",
+      "scalatest",
+      "testdata",
+      "SimpleSpec"
     )
   }
 
@@ -47,7 +53,8 @@ class AllureScalatestTest {
     val results = run(classOf[SimpleSpec])
 
     val starts = results.getTestResults.asScala
-      .map(item => item.getStart).toList
+      .map(item => item.getStart)
+      .toList
 
     every(starts) should not be null
   }
@@ -101,7 +108,8 @@ class AllureScalatestTest {
     results.getTestResults should have length 1
 
     val statuses = results.getTestResults.asScala
-      .map(item => item.getStatus).toList
+      .map(item => item.getStatus)
+      .toList
 
     every(statuses) should be(Status.BROKEN)
   }
@@ -113,7 +121,8 @@ class AllureScalatestTest {
     results.getTestResults should have length 1
 
     val statuses = results.getTestResults.asScala
-      .map(item => item.getStatus).toList
+      .map(item => item.getStatus)
+      .toList
 
     every(statuses) should be(Status.SKIPPED)
   }
@@ -159,12 +168,14 @@ class AllureScalatestTest {
       .map(item => item.getName) should contain("test should be ignored")
 
     val statuses = results.getTestResults.asScala
-      .map(item => item.getStatus).toList
+      .map(item => item.getStatus)
+      .toList
 
     every(statuses) should be(null)
 
     val stages = results.getTestResults.asScala
-      .map(item => item.getStage).toList
+      .map(item => item.getStage)
+      .toList
 
     every(stages) should be(Stage.FINISHED)
   }
@@ -176,11 +187,12 @@ class AllureScalatestTest {
       .flatMap(item => item.getSteps.asScala)
 
     steps
-      .map(step => step.getName) should contain inOrder("first", "second", "third")
+      .map(step => step.getName) should contain inOrder ("first", "second", "third")
 
-    steps.filter(step => step.getName == "second")
+    steps
+      .filter(step => step.getName == "second")
       .flatMap(step => step.getSteps.asScala)
-      .map(step => step.getName) should contain inOrder("child1", "child2", "child3")
+      .map(step => step.getName) should contain inOrder ("child1", "child2", "child3")
 
   }
 
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala
index f3f978455..be797806a 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AllureApiSpec.scala
@@ -20,23 +20,30 @@ import io.qameta.allure.scalatest.AllureScalatestContext
 import org.scalatest.flatspec.AnyFlatSpec
 
 /**
-  * @author charlie (Dmitry Baev).
+  * @author
+  *   charlie (Dmitry Baev).
   */
 class AllureApiSpec extends AnyFlatSpec {
 
   "test" should "be passed" in new AllureScalatestContext {
     step("first")
-    step("second", () => {
-      step("child1")
-      step("child2")
-      step("child3")
-      () =>
-    })
-    step("third", (context: StepContext) => {
-      val a = context.parameter("a", 123L)
-      val b = context.parameter("b", "hello")
-      () =>
-    })
+    step(
+      "second",
+      () => {
+        step("child1")
+        step("child2")
+        step("child3")
+        () =>
+      }
+    )
+    step(
+      "third",
+      (context: StepContext) => {
+        val a = context.parameter("a", 123L)
+        val b = context.parameter("b", "hello")
+        () =>
+      }
+    )
   }
 
 }
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala
index 58b0d6a6d..477301326 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/AnnotationsOnClassSpec.scala
@@ -19,7 +19,8 @@ import io.qameta.allure._
 import org.scalatest.funsuite.AnyFunSuite
 
 /**
-  * @author charlie (Dmitry Baev).
+  * @author
+  *   charlie (Dmitry Baev).
   */
 @Owner("charlie")
 @Epic("E1")
@@ -30,7 +31,6 @@ import org.scalatest.funsuite.AnyFunSuite
 @TmsLink("https://example.org/tms/1")
 class AnnotationsOnClassSpec extends AnyFunSuite {
 
-  test("demo test") {
-  }
+  test("demo test") {}
 
 }
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala
index eef704813..3a2802caf 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/BrokenSpec.scala
@@ -19,7 +19,8 @@ import org.scalatest.matchers.should.Matchers._
 import org.scalatest.flatspec.AnyFlatSpec
 
 /**
-  * @author charlie (Dmitry Baev).
+  * @author
+  *   charlie (Dmitry Baev).
   */
 class BrokenSpec extends AnyFlatSpec {
 
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala
index 713b46b60..b74d3c720 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/CancelledSpec.scala
@@ -19,7 +19,8 @@ import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers._
 
 /**
-  * @author charlie (Dmitry Baev).
+  * @author
+  *   charlie (Dmitry Baev).
   */
 class CancelledSpec extends AnyFlatSpec {
 
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala
index 91ab06e5b..61fbbe91c 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/FailedSpec.scala
@@ -19,7 +19,8 @@ import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers._
 
 /**
-  * @author charlie (Dmitry Baev).
+  * @author
+  *   charlie (Dmitry Baev).
   */
 class FailedSpec extends AnyFlatSpec {
 
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala
index 642d554a7..55bf5d03d 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/IgnoredSpec.scala
@@ -19,12 +19,12 @@ import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.Ignore
 
 /**
-  * @author charlie (Dmitry Baev).
+  * @author
+  *   charlie (Dmitry Baev).
   */
 @Ignore
 class IgnoredSpec extends AnyFlatSpec {
 
-  "test" should "be ignored" in {
-  }
+  "test" should "be ignored" in {}
 
 }
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala
index c5e10b06b..93e987ba4 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SeveritySpec.scala
@@ -19,12 +19,12 @@ import io.qameta.allure.{Severity, SeverityLevel}
 import org.scalatest.flatspec.AnyFlatSpec
 
 /**
-  * @author charlie (Dmitry Baev).
+  * @author
+  *   charlie (Dmitry Baev).
   */
 @Severity(SeverityLevel.BLOCKER)
 class SeveritySpec extends AnyFlatSpec {
 
-  "test" should "be passed" in {
-  }
+  "test" should "be passed" in {}
 
 }
diff --git a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala
index a77849a10..98080b8cc 100644
--- a/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala
+++ b/allure-scalatest/src/test/scala/io/qameta/allure/scalatest/testdata/SimpleSpec.scala
@@ -18,11 +18,11 @@ package io.qameta.allure.scalatest.testdata
 import org.scalatest.flatspec.AnyFlatSpec
 
 /**
-  * @author charlie (Dmitry Baev).
+  * @author
+  *   charlie (Dmitry Baev).
   */
 class SimpleSpec extends AnyFlatSpec {
 
-  "test" should "be passed" in {
-  }
+  "test" should "be passed" in {}
 
 }
diff --git a/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java b/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
index 12f94213e..be4615002 100644
--- a/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
+++ b/allure-selenide/src/main/java/io/qameta/allure/selenide/AllureSelenide.java
@@ -169,7 +169,6 @@ public void afterEvent(final LogEvent event) {
         }
     }
 
-
     private boolean stepsShouldBeLogged(final LogEvent event) {
         //  other customer Loggers could be configured, they should be logged
         return includeSelenideLocatorsSteps || !(event instanceof SelenideLog);
diff --git a/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java b/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java
index 7db0358ad..a1bc17d5d 100644
--- a/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java
+++ b/allure-selenide/src/test/java/io/qameta/allure/selenide/AllureSelenideTest.java
@@ -30,8 +30,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.OutputType;
-import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebDriver.Options;
+import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.logging.LogEntries;
 import org.openqa.selenium.logging.LogEntry;
@@ -221,12 +221,12 @@ void shouldSavePageSourceOnFail() {
     void shouldNotFailIfBrowserIsNotOpened() {
         final AllureResults results = runWithinTestContext(() -> {
             final AllureSelenide selenide = new AllureSelenide()
-                .savePageSource(false)
-                .screenshots(true);
+                    .savePageSource(false)
+                    .screenshots(true);
             SelenideLogger.addListener(UUID.randomUUID().toString(), selenide);
             final SelenideLog log = SelenideLogger.beginStep(
-                "open",
-                "https://some.url"
+                    "open",
+                    "https://some.url"
             );
             SelenideLogger.commitStep(log, new WebDriverException("failed to open a browser"));
         });
@@ -263,10 +263,11 @@ void shouldSaveLogs() {
             SelenideLogger.addListener(UUID.randomUUID().toString(), selenide);
 
             final SelenideLog log = SelenideLogger.beginStep(
-                "dummy source",
-                "dummyMethod()",
-                "param1",
-                "param2");
+                    "dummy source",
+                    "dummyMethod()",
+                    "param1",
+                    "param2"
+            );
 
             SelenideLogger.commitStep(log, new Exception("something went wrong"));
         });
@@ -274,8 +275,8 @@ void shouldSaveLogs() {
         final StepResult selenideStep = extractStepFromResults(results);
         final Attachment attachment = selenideStep.getAttachments().iterator().next();
         final String attachmentContent = new String(
-            results.getAttachments().get(attachment.getSource()),
-            StandardCharsets.UTF_8
+                results.getAttachments().get(attachment.getSource()),
+                StandardCharsets.UTF_8
         );
 
         assertThat(selenideStep.getAttachments()).hasSize(1);
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiAttachmentStorage.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiAttachmentStorage.java
index 251bb2989..3743b74c8 100644
--- a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiAttachmentStorage.java
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiAttachmentStorage.java
@@ -77,19 +77,23 @@ void flush(final AllureLifecycle lifecycle) {
             }
 
             logsAttachment()
-                    .ifPresent(body -> lifecycle.addAttachment(
-                            LOG_ATTACHMENT_NAME,
-                            JSON_TYPE,
-                            JSON_EXTENSION,
-                            body
-                    ));
+                    .ifPresent(
+                            body -> lifecycle.addAttachment(
+                                    LOG_ATTACHMENT_NAME,
+                                    JSON_TYPE,
+                                    JSON_EXTENSION,
+                                    body
+                            )
+                    );
             networkAttachment()
-                    .ifPresent(body -> lifecycle.addAttachment(
-                            NETWORK_ATTACHMENT_NAME,
-                            JSON_TYPE,
-                            JSON_EXTENSION,
-                            body
-                    ));
+                    .ifPresent(
+                            body -> lifecycle.addAttachment(
+                                    NETWORK_ATTACHMENT_NAME,
+                                    JSON_TYPE,
+                                    JSON_EXTENSION,
+                                    body
+                            )
+                    );
         } finally {
             clear();
         }
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiNetworkEvent.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiNetworkEvent.java
index dc7da7d9f..d7bfa5c8c 100644
--- a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiNetworkEvent.java
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/BiDiNetworkEvent.java
@@ -187,10 +187,12 @@ private static Map<String, Object> initiator(final Initiator initiator) {
         initiator.getColumnNumber().ifPresent(column -> values.put("columnNumber", column));
         initiator.getLineNumber().ifPresent(line -> values.put("lineNumber", line));
         initiator.getRequestId().ifPresent(requestId -> values.put(BiDiJsonKeys.REQUEST_ID, requestId));
-        initiator.getStackTrace().ifPresent(stackTrace -> values.put(
-                "stackTrace",
-                BiDiLogEvent.stackTrace(stackTrace)
-        ));
+        initiator.getStackTrace().ifPresent(
+                stackTrace -> values.put(
+                        "stackTrace",
+                        BiDiLogEvent.stackTrace(stackTrace)
+                )
+        );
         return values;
     }
 }
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/HeaderRedactor.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/HeaderRedactor.java
index d20b32327..1367233dc 100644
--- a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/HeaderRedactor.java
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/HeaderRedactor.java
@@ -29,13 +29,15 @@ final class HeaderRedactor {
 
     static final String REDACTED = "[REDACTED]";
 
-    private static final Set<String> DEFAULT_HEADERS = new LinkedHashSet<>(Arrays.asList(
-            "authorization",
-            "proxy-authorization",
-            "cookie",
-            "set-cookie",
-            "x-api-key"
-    ));
+    private static final Set<String> DEFAULT_HEADERS = new LinkedHashSet<>(
+            Arrays.asList(
+                    "authorization",
+                    "proxy-authorization",
+                    "cookie",
+                    "set-cookie",
+                    "x-api-key"
+            )
+    );
 
     private final Set<String> headerNames;
 
diff --git a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/SeleniumBiDiSessionFactory.java b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/SeleniumBiDiSessionFactory.java
index 3a91fb1af..2285813d2 100644
--- a/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/SeleniumBiDiSessionFactory.java
+++ b/allure-selenium-bidi/src/main/java/io/qameta/allure/seleniumbidi/SeleniumBiDiSessionFactory.java
@@ -28,7 +28,6 @@
 final class SeleniumBiDiSessionFactory implements BiDiSessionFactory {
 
     @Override
-    @SuppressWarnings("PMD.CloseResource")
     public RecordingSession start(final WebDriver driver,
                                   final BiDiConfiguration configuration,
                                   final Consumer<BiDiLogEvent> logConsumer,
diff --git a/allure-selenium-bidi/src/test/java/io/qameta/allure/seleniumbidi/AllureWebDriverBiDiTest.java b/allure-selenium-bidi/src/test/java/io/qameta/allure/seleniumbidi/AllureWebDriverBiDiTest.java
index b8463bc3d..5a0e16e1b 100644
--- a/allure-selenium-bidi/src/test/java/io/qameta/allure/seleniumbidi/AllureWebDriverBiDiTest.java
+++ b/allure-selenium-bidi/src/test/java/io/qameta/allure/seleniumbidi/AllureWebDriverBiDiTest.java
@@ -65,7 +65,10 @@
 /**
  * Real browser integration tests for the Selenium WebDriver BiDi adapter.
  */
-@ResourceLock(value = "io.qameta.allure.seleniumbidi.lifecycle", mode = READ_WRITE)
+@ResourceLock(
+        value = "io.qameta.allure.seleniumbidi.lifecycle",
+        mode = READ_WRITE
+)
 class AllureWebDriverBiDiTest {
 
     private static final Json JSON = new Json();
@@ -604,8 +607,10 @@ private static void handleCustom(final HttpExchange exchange) throws IOException
                 exchange,
                 HTML_TYPE,
                 pageScript(
-                        fetchPing(header(CUSTOM_HEADER_NAME, CUSTOM_SECRET)
-                                + "," + header(TRACE_HEADER_NAME, VISIBLE_HEADER_VALUE))
+                        fetchPing(
+                                header(CUSTOM_HEADER_NAME, CUSTOM_SECRET)
+                                        + "," + header(TRACE_HEADER_NAME, VISIBLE_HEADER_VALUE)
+                        )
                 )
         );
     }
@@ -617,7 +622,8 @@ private static void handlePing(final HttpExchange exchange) throws IOException {
 
     private static void respond(final HttpExchange exchange,
                                 final String contentType,
-                                final String body) throws IOException {
+                                final String body)
+            throws IOException {
         final byte[] bytes = body.getBytes(StandardCharsets.UTF_8);
         exchange.getResponseHeaders().add("Content-Type", contentType);
         exchange.sendResponseHeaders(200, bytes.length);
@@ -627,21 +633,23 @@ private static void respond(final HttpExchange exchange,
     }
 
     private static AllureResults runTestWithSeleniumBidi(final ChromeOptions options,
-                                                        final WebDriverScenario scenario) throws IOException {
+                                                         final WebDriverScenario scenario)
+            throws IOException {
         return runTestWithSeleniumBidi(options, listener -> listener, false, scenario);
     }
 
     private static AllureResults runTestWithSeleniumBidi(final ChromeOptions options,
-                                                        final ListenerConfigurer configurer,
-                                                        final WebDriverScenario scenario) throws IOException {
+                                                         final ListenerConfigurer configurer,
+                                                         final WebDriverScenario scenario)
+            throws IOException {
         return runTestWithSeleniumBidi(options, configurer, false, scenario);
     }
 
     @Step("Run Selenium WebDriver BiDi test")
     private static AllureResults runTestWithSeleniumBidi(@Param(mode = HIDDEN) final ChromeOptions options,
-                                                        @Param(mode = HIDDEN) final ListenerConfigurer configurer,
-                                                        final boolean closeListener,
-                                                        @Param(mode = HIDDEN) final WebDriverScenario scenario)
+                                                         @Param(mode = HIDDEN) final ListenerConfigurer configurer,
+                                                         final boolean closeListener,
+                                                         @Param(mode = HIDDEN) final WebDriverScenario scenario)
             throws IOException {
         final HttpServer server = startServer();
         try {
@@ -796,7 +804,7 @@ private static String attachmentContent(@Param(mode = HIDDEN) final AllureResult
 
     @Step("Read JSON attachment {name}")
     private static Map<String, Object> attachmentPayload(@Param(mode = HIDDEN) final AllureResults results,
-                                                        final String name) {
+                                                         final String name) {
         return JSON.toType(attachmentContent(results, name), Json.MAP_TYPE);
     }
 
@@ -831,8 +839,8 @@ private static List<Map<String, Object>> objects(final Map<String, Object> paylo
     }
 
     private static Map<String, Object> networkEntry(final Map<String, Object> payload,
-                                                   final String event,
-                                                   final String path) {
+                                                    final String event,
+                                                    final String path) {
         return entries(payload).stream()
                 .filter(entry -> event.equals(entry.get("event")))
                 .filter(entry -> networkUrl(entry).contains(path))
diff --git a/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java b/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
index 314667b14..36d3d1ed5 100644
--- a/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
+++ b/allure-servlet-api/src/main/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilder.java
@@ -22,6 +22,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.Arrays;
@@ -61,8 +62,10 @@ public static HttpRequestAttachment buildRequest(final HttpServletRequest reques
     public static HttpResponseAttachment buildResponse(final HttpServletResponse response) {
         final HttpResponseAttachment.Builder responseBuilder = create("Response");
         response.getHeaderNames()
-                .forEach(name -> response.getHeaders(name)
-                        .forEach(value -> responseBuilder.setHeader(name, value)));
+                .forEach(
+                        name -> response.getHeaders(name)
+                                .forEach(value -> responseBuilder.setHeader(name, value))
+                );
         return responseBuilder.build();
     }
 
@@ -77,7 +80,8 @@ public static String getBody(final HttpServletRequest request) {
     }
 
     public static void readBody(final StringBuilder sb,
-                                final BufferedReader reader) throws IOException {
+                                final BufferedReader reader)
+            throws IOException {
         String line;
         while ((line = reader.readLine()) != null) {
             sb.append(line);
diff --git a/allure-servlet-api/src/test/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilderTest.java b/allure-servlet-api/src/test/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilderTest.java
index 4fca9bfc7..e9df3f772 100644
--- a/allure-servlet-api/src/test/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilderTest.java
+++ b/allure-servlet-api/src/test/java/io/qameta/allure/servletapi/HttpServletAttachmentBuilderTest.java
@@ -23,6 +23,7 @@
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
@@ -70,8 +71,8 @@ void shouldHandleRequestsWithoutCookies() throws Exception {
                 () -> assertDoesNotThrow(() -> HttpServletAttachmentBuilder.buildRequest(request))
         );
 
-        Allure.step("Verify the request attachment keeps an empty cookie map", () ->
-                assertTrue(attachment.getCookies().isEmpty())
+        Allure.step(
+                "Verify the request attachment keeps an empty cookie map", () -> assertTrue(attachment.getCookies().isEmpty())
         );
     }
 
@@ -92,8 +93,8 @@ void shouldReturnEmptyBodyWhenRequestReaderFails() throws Exception {
         final HttpServletRequest request = mock(HttpServletRequest.class);
         when(request.getReader()).thenThrow(new IOException("boom"));
 
-        final String body = Allure.step("Read the request body when the servlet reader throws", () ->
-                HttpServletAttachmentBuilder.getBody(request)
+        final String body = Allure.step(
+                "Read the request body when the servlet reader throws", () -> HttpServletAttachmentBuilder.getBody(request)
         );
 
         Allure.step("Verify the fallback body is empty", () -> assertEquals("", body));
diff --git a/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java b/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
index 686f03c2a..c03af2b2b 100644
--- a/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
+++ b/allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java
@@ -73,15 +73,16 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings({
-        "ClassFanOutComplexity",
-})
+@SuppressWarnings(
+    {
+            "ClassFanOutComplexity",
+    }
+)
 public class AllureSpock extends AbstractRunListener implements IGlobalExtension {
 
     private static final String MD_5 = "md5";
 
-    private final ThreadLocal<String> testResults
-            = InheritableThreadLocal.withInitial(() -> UUID.randomUUID().toString());
+    private final ThreadLocal<String> testResults = InheritableThreadLocal.withInitial(() -> UUID.randomUUID().toString());
 
     private final AllureLifecycle lifecycle;
 
@@ -122,16 +123,18 @@ public void beforeIteration(final IterationInfo iteration) {
         final String testClassName = feature.getDescription().getClassName();
         final String testMethodName = iteration.getName();
 
-        final List<Label> labels = new ArrayList<>(Arrays.asList(
-                createPackageLabel(packageName),
-                createTestClassLabel(testClassName),
-                createTestMethodLabel(testMethodName),
-                createSuiteLabel(specName),
-                createHostLabel(),
-                createThreadLabel(),
-                createFrameworkLabel("spock"),
-                createLanguageLabel("java")
-        ));
+        final List<Label> labels = new ArrayList<>(
+                Arrays.asList(
+                        createPackageLabel(packageName),
+                        createTestClassLabel(testClassName),
+                        createTestMethodLabel(testMethodName),
+                        createSuiteLabel(specName),
+                        createHostLabel(),
+                        createThreadLabel(),
+                        createFrameworkLabel("spock"),
+                        createLanguageLabel("java")
+                )
+        );
         if (Objects.nonNull(subSpec)) {
             labels.add(createSubSuiteLabel(subSpec.getName()));
         }
@@ -142,23 +145,30 @@ public void beforeIteration(final IterationInfo iteration) {
         labels.addAll(getProvidedLabels());
 
         final List<String> titlePath = new ArrayList<>(createTitlePathFromPackage(packageName));
-        titlePath.addAll(createTitlePath(
-                Objects.nonNull(superSpec) ? superSpec.getName() : null,
-                specName,
-                Objects.nonNull(subSpec) ? subSpec.getName() : null
-        ));
+        titlePath.addAll(
+                createTitlePath(
+                        Objects.nonNull(superSpec) ? superSpec.getName() : null,
+                        specName,
+                        Objects.nonNull(subSpec) ? subSpec.getName() : null
+                )
+        );
         final TestResult result = new TestResult()
                 .setUuid(uuid)
                 .setHistoryId(getHistoryId(getQualifiedName(iteration), parameters))
-                .setName(firstNonEmpty(
-                        testMethodName,
-                        feature.getDescription().getDisplayName(),
-                        getQualifiedName(iteration)).orElse("Unknown"))
+                .setName(
+                        firstNonEmpty(
+                                testMethodName,
+                                feature.getDescription().getDisplayName(),
+                                getQualifiedName(iteration)
+                        ).orElse("Unknown")
+                )
                 .setFullName(getQualifiedName(iteration))
                 .setTitlePath(titlePath)
-                .setStatusDetails(new StatusDetails()
-                        .setFlaky(isFlaky(iteration))
-                        .setMuted(isMuted(iteration)))
+                .setStatusDetails(
+                        new StatusDetails()
+                                .setFlaky(isFlaky(iteration))
+                                .setMuted(isMuted(iteration))
+                )
                 .setParameters(parameters)
                 .setLinks(getLinks(iteration))
                 .setLabels(labels);
@@ -171,15 +181,18 @@ private List<Label> getLabels(final IterationInfo iterationInfo) {
         final Set<Label> labels = AnnotationUtils.getLabels(
                 iterationInfo.getFeature().getDescription().getAnnotations()
         );
-        labels.addAll(AnnotationUtils.getLabels(
-                iterationInfo.getFeature().getSpec().getDescription().getAnnotations()
-        ));
+        labels.addAll(
+                AnnotationUtils.getLabels(
+                        iterationInfo.getFeature().getSpec().getDescription().getAnnotations()
+                )
+        );
         return new ArrayList<>(labels);
     }
 
     private void processDescription(final IterationInfo iterationInfo, final TestResult item) {
         final List<io.qameta.allure.Description> annotationsOnFeature = getFeatureAnnotations(
-                iterationInfo, io.qameta.allure.Description.class);
+                iterationInfo, io.qameta.allure.Description.class
+        );
         if (!annotationsOnFeature.isEmpty()) {
             item.setDescription(annotationsOnFeature.get(0).value());
         }
@@ -281,13 +294,13 @@ private <T extends Annotation> List<T> getSpecAnnotations(final IterationInfo it
         return getAnnotationsOnClass(spec.getDescription(), clazz);
     }
 
-
     @Override
     public void error(final ErrorInfo error) {
         final String uuid = testResults.get();
-        getLifecycle().updateTestCase(uuid, testResult -> testResult
-                .setStatus(getStatus(error.getException()).orElse(null))
-                .setStatusDetails(getStatusDetails(error.getException()).orElse(null))
+        getLifecycle().updateTestCase(
+                uuid, testResult -> testResult
+                        .setStatus(getStatus(error.getException()).orElse(null))
+                        .setStatusDetails(getStatusDetails(error.getException()).orElse(null))
         );
     }
 
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy
index 29ef77e96..18e1e4899 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/FailedTest.groovy
@@ -31,16 +31,16 @@ class FailedTest extends Specification {
 
     @Test
     @Links([
-            @Link("link-1"),
-            @Link("link-2")
+        @Link("link-1"),
+        @Link("link-2")
     ])
     @Issues([
-            @Issue("issue-1"),
-            @Issue("issue-2")
+        @Issue("issue-1"),
+        @Issue("issue-2")
     ])
     @TmsLinks([
-            @TmsLink("tms-1"),
-            @TmsLink("tms-2")
+        @TmsLink("tms-1"),
+        @TmsLink("tms-2")
     ])
     def "failedTest"() {
         expect:
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy
index 51af61540..b5b1996ee 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotations.groovy
@@ -35,19 +35,20 @@ class TestWithAnnotations extends Specification {
     @Test
     @Epic("epic1")
     @Epics([
-            @Epic("epic2"),
-            @Epic("epic3")
+        @Epic("epic2"),
+        @Epic("epic3")
     ])
 
     @Features([
-            @Feature("feature1"),
-            @Feature("feature2")
+        @Feature("feature1"),
+        @Feature("feature2")
     ])
     @Feature("feature3")
     @Story("story1")
     @Stories([
-            @Story("story2"),
-            @Story("story3")]
+        @Story("story2"),
+        @Story("story3")
+    ]
     )
     @Owner("some-owner")
     @Flaky
diff --git a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy
index fb1e63292..c91cd9bbf 100644
--- a/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy
+++ b/allure-spock/src/test/groovy/io/qameta/allure/spock/samples/TestWithAnnotationsOnClass.groovy
@@ -32,22 +32,22 @@ import spock.lang.Specification
  */
 @Epic("epic1")
 @Features([
-        @Feature("feature1"),
-        @Feature("feature2")
+    @Feature("feature1"),
+    @Feature("feature2")
 ])
 @Feature("feature3")
 @Story("story1")
 @Stories([
-        @Story("story2"),
-        @Story("story3")]
+    @Story("story2"),
+    @Story("story3")]
 )
 class TestWithAnnotationsOnClass extends Specification {
 
     @Test
     @Flaky
     @Epics([
-            @Epic("epic2"),
-            @Epic("epic3")
+        @Epic("epic2"),
+        @Epic("epic3")
     ])
     @Muted
     @Owner("some-owner")
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
index 8ba169b0f..cbfb2ee81 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -161,16 +161,18 @@ public void beforeIteration(final IterationInfo iteration) {
         final String testClassName = feature.getSpec().getReflection().getName();
         final String testMethodName = iteration.getDisplayName();
 
-        final List<Label> labels = new ArrayList<>(Arrays.asList(
-                createPackageLabel(packageName),
-                createTestClassLabel(testClassName),
-                createTestMethodLabel(testMethodName),
-                createSuiteLabel(specName),
-                createHostLabel(),
-                createThreadLabel(),
-                createFrameworkLabel("spock"),
-                createLanguageLabel("java")
-        ));
+        final List<Label> labels = new ArrayList<>(
+                Arrays.asList(
+                        createPackageLabel(packageName),
+                        createTestClassLabel(testClassName),
+                        createTestMethodLabel(testMethodName),
+                        createSuiteLabel(specName),
+                        createHostLabel(),
+                        createThreadLabel(),
+                        createFrameworkLabel("spock"),
+                        createLanguageLabel("java")
+                )
+        );
 
         if (Objects.nonNull(subSpec)) {
             labels.add(createSubSuiteLabel(subSpec.getName()));
@@ -195,11 +197,13 @@ public void beforeIteration(final IterationInfo iteration) {
 
         final String qualifiedName = getQualifiedName(iteration);
         final List<String> titlePath = new ArrayList<>(createTitlePathFromPackage(packageName));
-        titlePath.addAll(createTitlePath(
-                Objects.nonNull(superSpec) ? superSpec.getName() : null,
-                specName,
-                Objects.nonNull(subSpec) ? subSpec.getName() : null
-        ));
+        titlePath.addAll(
+                createTitlePath(
+                        Objects.nonNull(superSpec) ? superSpec.getName() : null,
+                        specName,
+                        Objects.nonNull(subSpec) ? subSpec.getName() : null
+                )
+        );
         final TestResult result = new TestResult()
                 .setUuid(uuid)
                 .setHistoryId(getHistoryId(qualifiedName, parameters))
@@ -211,9 +215,10 @@ public void beforeIteration(final IterationInfo iteration) {
                         firstNonEmpty(testMethodName, iteration.getName(), qualifiedName)
                                 .orElse("Unknown")
                 )
-                .setStatusDetails(new StatusDetails()
-                        .setFlaky(flaky)
-                        .setMuted(muted)
+                .setStatusDetails(
+                        new StatusDetails()
+                                .setFlaky(flaky)
+                                .setMuted(muted)
                 )
                 .setParameters(parameters)
                 .setLinks(links)
@@ -266,10 +271,12 @@ private boolean isSkipped(final FeatureInfo featureInfo) {
             return !Objects.isNull(tp.getTests()) && tp.getTests()
                     .stream()
                     .filter(Objects::nonNull)
-                    .noneMatch(tc -> this.match(
-                            tc,
-                            this.getAllureId(featureInfo),
-                            this.getQualifiedName(featureInfo))
+                    .noneMatch(
+                            tc -> this.match(
+                                    tc,
+                                    this.getAllureId(featureInfo),
+                                    this.getQualifiedName(featureInfo)
+                            )
                     );
         }
         return false;
@@ -293,9 +300,10 @@ public void error(final ErrorInfo error) {
         if (Objects.isNull(uuid)) {
             return;
         }
-        getLifecycle().updateTestCase(uuid, testResult -> testResult
-                .setStatus(getStatus(error.getException()).orElse(null))
-                .setStatusDetails(getStatusDetails(error.getException()).orElse(null))
+        getLifecycle().updateTestCase(
+                uuid, testResult -> testResult
+                        .setStatus(getStatus(error.getException()).orElse(null))
+                        .setStatusDetails(getStatusDetails(error.getException()).orElse(null))
         );
     }
 
@@ -337,8 +345,7 @@ public AllureLifecycle getLifecycle() {
      * from Allure context. But then we need to not forget to restore it to context, because
      * thread context is cleared on fixture start event.
      */
-    @SuppressWarnings("FinalClass")
-    private class AllureFeatureFixtureMethodInterceptor extends AllureSpecFixtureMethodInterceptor {
+    private final class AllureFeatureFixtureMethodInterceptor extends AllureSpecFixtureMethodInterceptor {
 
         private AllureFeatureFixtureMethodInterceptor() {
             this(UUID.randomUUID().toString());
@@ -434,8 +441,7 @@ public void intercept(final IMethodInvocation invocation) throws Throwable {
     /**
      * IMethodInterceptor that creates container per spec.
      */
-    @SuppressWarnings("FinalClass")
-    private class AllureContainerInterceptor implements IMethodInterceptor {
+    private final class AllureContainerInterceptor implements IMethodInterceptor {
 
         private final String containerUuid;
 
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
index 477edd5b0..31070f7bf 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
@@ -90,7 +90,7 @@ private void processSpec(final SourceUnit sourceUnit,
             } catch (Exception e) {
                 errorReporter.error(
                         "Unexpected error during compilation of spec '%s'."
-                        + " Please file a bug report at https://github.com/allure-framework/allure-java.",
+                                + " Please file a bug report at https://github.com/allure-framework/allure-java.",
                         e, clazz.getName()
                 );
             }
@@ -117,15 +117,19 @@ public void visitConstructor(final ConstructorNode node) {
         @Override
         public void visitMethod(final MethodNode node) {
             final List<Statement> newStatements = AstUtil.getStatements(node).stream()
-                    .flatMap(statement -> Stream.concat(
-                            getAllureStepStatements(statement),
-                            Stream.of(statement)
-                    ))
+                    .flatMap(
+                            statement -> Stream.concat(
+                                    getAllureStepStatements(statement),
+                                    Stream.of(statement)
+                            )
+                    )
                     .collect(Collectors.toList());
 
-            node.setCode(new BlockStatement(
-                    newStatements,
-                    ((BlockStatement) node.getCode()).getVariableScope())
+            node.setCode(
+                    new BlockStatement(
+                            newStatements,
+                            ((BlockStatement) node.getCode()).getVariableScope()
+                    )
             );
         }
 
@@ -142,7 +146,7 @@ public void visitProperty(final PropertyNode node) {
         @SuppressWarnings("PMD.AvoidDeeplyNestedIfStmts")
         private static Stream<Statement> getAllureStepStatements(final Statement statement) {
             if (Objects.nonNull(statement.getStatementLabels())
-                && !statement.getStatementLabels().isEmpty()) {
+                    && !statement.getStatementLabels().isEmpty()) {
                 final String labels = String.join(" ", statement.getStatementLabels());
                 final StringBuilder builder = new StringBuilder(labels);
 
@@ -158,15 +162,17 @@ private static Stream<Statement> getAllureStepStatements(final Statement stateme
 
                 final String stepName = builder.toString();
 
-                return Stream.of(new ExpressionStatement(
-                        new StaticMethodCallExpression(
-                                ALLURE,
-                                "step",
-                                new ArgumentListExpression(
-                                        new ConstantExpression(stepName)
+                return Stream.of(
+                        new ExpressionStatement(
+                                new StaticMethodCallExpression(
+                                        ALLURE,
+                                        "step",
+                                        new ArgumentListExpression(
+                                                new ConstantExpression(stepName)
+                                        )
                                 )
                         )
-                ));
+                );
             }
             return Stream.empty();
         }
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
index 24f0b27c4..d88289b17 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -59,10 +59,10 @@
 import org.junit.platform.launcher.core.LauncherConfig;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.platform.launcher.core.LauncherFactory;
+import org.mockito.ArgumentCaptor;
 import org.spockframework.runtime.GlobalExtensionRegistry;
 import org.spockframework.runtime.RunContext;
 import org.spockframework.runtime.SpockEngine;
-import org.mockito.ArgumentCaptor;
 
 import java.lang.reflect.Method;
 import java.time.Instant;
@@ -449,7 +449,6 @@ void shouldSupportFixtures() {
                         tuple("cleanup", "cleanup step 1, cleanup step 2")
                 );
 
-
         final TestResult tr1 = results.getTestResults().stream()
                 .filter(tr -> "First Test".equals(tr.getName()))
                 .findFirst()
@@ -521,26 +520,25 @@ private List<Triple<String, List<String>, List<String>>> getTrFixtures(final All
                 .collect(Collectors.groupingBy(Pair::getKey, Collectors.mapping(Pair::getValue, Collectors.toList())));
 
         return results.getTestResults().stream().map(tr -> {
-                    final List<TestResultContainer> containers = trContainers
-                            .getOrDefault(tr.getUuid(), Collections.emptyList());
-
-                    final List<String> befores = containers.stream()
-                            .map(TestResultContainer::getBefores)
-                            .flatMap(Collection::stream)
-                            .map(fr -> fr.getName() + " [ " + printSteps(fr) + " ] ")
-                            .sorted()
-                            .collect(Collectors.toList());
-
-
-                    final List<String> afters = containers.stream()
-                            .map(TestResultContainer::getAfters)
-                            .flatMap(Collection::stream)
-                            .map(fr -> fr.getName() + " [ " + printSteps(fr) + " ] ")
-                            .sorted()
-                            .collect(Collectors.toList());
-
-                    return Triple.of(tr.getName(), befores, afters);
-                })
+            final List<TestResultContainer> containers = trContainers
+                    .getOrDefault(tr.getUuid(), Collections.emptyList());
+
+            final List<String> befores = containers.stream()
+                    .map(TestResultContainer::getBefores)
+                    .flatMap(Collection::stream)
+                    .map(fr -> fr.getName() + " [ " + printSteps(fr) + " ] ")
+                    .sorted()
+                    .collect(Collectors.toList());
+
+            final List<String> afters = containers.stream()
+                    .map(TestResultContainer::getAfters)
+                    .flatMap(Collection::stream)
+                    .map(fr -> fr.getName() + " [ " + printSteps(fr) + " ] ")
+                    .sorted()
+                    .collect(Collectors.toList());
+
+            return Triple.of(tr.getName(), befores, afters);
+        })
                 .collect(Collectors.toList());
 
     }
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
index d264a1ba8..65ce3c6d6 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
@@ -24,16 +24,16 @@ import spock.lang.Specification
 class FailedTest extends Specification {
 
     @Links([
-            @Link("link-1"),
-            @Link("link-2")
+        @Link("link-1"),
+        @Link("link-2")
     ])
     @Issues([
-            @Issue("issue-1"),
-            @Issue("issue-2")
+        @Issue("issue-1"),
+        @Issue("issue-2")
     ])
     @TmsLinks([
-            @TmsLink("tms-1"),
-            @TmsLink("tms-2")
+        @TmsLink("tms-1"),
+        @TmsLink("tms-2")
     ])
     def "failedTest"() {
         expect:
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
index 4a65efb69..ae9800abf 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
@@ -18,14 +18,14 @@ package io.qameta.allure.spock2.samples
 import spock.lang.Specification
 
 class HelloSpockSpec extends Specification {
-  def "length of Spock's and his friends' names"() {
-    expect:
-    name.size() == length
+    def "length of Spock's and his friends' names"() {
+        expect:
+        name.size() == length
 
-    where:
-    name     | length
-    "Spock"  | 5
-    "Kirk"   | 4
-    "Scotty" | 6
-  }
+        where:
+        name     | length
+        "Spock"  | 5
+        "Kirk"   | 4
+        "Scotty" | 6
+    }
 }
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
index ef80eb4e3..e958eca54 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
@@ -40,5 +40,4 @@ class SpecFixtures extends Specification {
         expect:
         "the end"
     }
-
 }
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
index 9bea32a58..fdb09c61b 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
@@ -20,13 +20,21 @@ import spock.lang.Specification
 import static io.qameta.allure.Allure.step
 
 abstract class BaseSpec extends Specification {
-    def setupSpec() { step 'base setupSpec()' }
+    def setupSpec() {
+        step 'base setupSpec()'
+    }
 
-    def cleanupSpec() { step 'base cleanupSpec()' }
+    def cleanupSpec() {
+        step 'base cleanupSpec()'
+    }
 
-    def setup() { step 'base setup()' }
+    def setup() {
+        step 'base setup()'
+    }
 
-    def cleanup() { step 'base cleanup()' }
+    def cleanup() {
+        step 'base cleanup()'
+    }
 
     def baseSpecMethod() {
         setup:
@@ -35,13 +43,21 @@ abstract class BaseSpec extends Specification {
 }
 
 class DerivedSpec extends BaseSpec {
-    def setupSpec() { step 'derived setupSpec()' }
+    def setupSpec() {
+        step 'derived setupSpec()'
+    }
 
-    def cleanupSpec() { step 'derived cleanupSpec()' }
+    def cleanupSpec() {
+        step 'derived cleanupSpec()'
+    }
 
-    def setup() { step 'derived setup()' }
+    def setup() {
+        step 'derived setup()'
+    }
 
-    def cleanup() { step 'derived cleanup()' }
+    def cleanup() {
+        step 'derived cleanup()'
+    }
 
     def derivedSpecMethod() {
         setup:
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
index 844fce1d7..c4372c3d3 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
@@ -25,18 +25,19 @@ class TestWithAnnotations extends Specification {
 
     @Epic("epic1")
     @Epics([
-            @Epic("epic2"),
-            @Epic("epic3")
+        @Epic("epic2"),
+        @Epic("epic3")
     ])
     @Features([
-            @Feature("feature1"),
-            @Feature("feature2")
+        @Feature("feature1"),
+        @Feature("feature2")
     ])
     @Feature("feature3")
     @Story("story1")
     @Stories([
-            @Story("story2"),
-            @Story("story3")]
+        @Story("story2"),
+        @Story("story3")
+    ]
     )
     @Owner("some-owner")
     @Flaky
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
index 9e22496e3..f70aa8d25 100644
--- a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
@@ -23,21 +23,21 @@ import spock.lang.Specification
  */
 @Epic("epic1")
 @Features([
-        @Feature("feature1"),
-        @Feature("feature2")
+    @Feature("feature1"),
+    @Feature("feature2")
 ])
 @Feature("feature3")
 @Story("story1")
 @Stories([
-        @Story("story2"),
-        @Story("story3")]
+    @Story("story2"),
+    @Story("story3")]
 )
 class TestWithAnnotationsOnClass extends Specification {
 
     @Flaky
     @Epics([
-            @Epic("epic2"),
-            @Epic("epic3")
+        @Epic("epic2"),
+        @Epic("epic3")
     ])
     @Muted
     @Owner("some-owner")
diff --git a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
index bfc5611f7..05581fd5d 100644
--- a/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
+++ b/allure-spring-web/src/main/java/io/qameta/allure/springweb/AllureRestTemplate.java
@@ -81,7 +81,8 @@ protected AttachmentProcessor<AttachmentData> getAttachmentProcessor() {
     @SuppressWarnings("NullableProblems")
     @Override
     public ClientHttpResponse intercept(@NonNull final HttpRequest request, final byte[] body,
-                                        @NonNull final ClientHttpRequestExecution execution) throws IOException {
+                                        @NonNull final ClientHttpRequestExecution execution)
+            throws IOException {
         final AttachmentProcessor<AttachmentData> processor = getAttachmentProcessor();
 
         final HttpRequestAttachment.Builder requestAttachmentBuilder = HttpRequestAttachment.Builder
diff --git a/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java b/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
index f8b21eaac..fc2aea774 100644
--- a/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
+++ b/allure-spring-web/src/test/java/io/qameta/allure/springweb/AllureRestTemplateTest.java
@@ -72,8 +72,10 @@ void shouldCatchAttachmentBody(final SpringClientType clientType) {
 
         Stream.of("Request", "Response")
                 .map(attachmentName -> findAttachment(results, attachmentName))
-                .forEach(found -> assertThat(results.getAttachments())
-                        .containsKeys(found.getSource()));
+                .forEach(
+                        found -> assertThat(results.getAttachments())
+                                .containsKeys(found.getSource())
+                );
     }
 
     @ParameterizedTest
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
index 55a0b44f6..f431e6901 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
@@ -28,8 +28,10 @@
         property = "version",
         defaultImpl = TestPlanUnknown.class
 )
-@JsonSubTypes({
-        @JsonSubTypes.Type(TestPlanV1_0.class)
-})
+@JsonSubTypes(
+    {
+            @JsonSubTypes.Type(TestPlanV1_0.class)
+    }
+)
 public interface TestPlan {
 }
diff --git a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
index 71f7f793b..ef4215190 100644
--- a/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
@@ -26,7 +26,7 @@
  * @author charlie (Dmitry Baev).
  */
 @JsonTypeName("1.0")
-@SuppressWarnings({"TypeName"})
+@SuppressWarnings({"TypeName", "PMD.ClassNamingConventions"})
 public class TestPlanV1_0 implements TestPlan, Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/allure-test-filter/src/test/java/io/qameta/allure/testfilter/FileTestPlanSupplierTest.java b/allure-test-filter/src/test/java/io/qameta/allure/testfilter/FileTestPlanSupplierTest.java
index dda3d2de3..2e2071d82 100644
--- a/allure-test-filter/src/test/java/io/qameta/allure/testfilter/FileTestPlanSupplierTest.java
+++ b/allure-test-filter/src/test/java/io/qameta/allure/testfilter/FileTestPlanSupplierTest.java
@@ -31,8 +31,8 @@ class FileTestPlanSupplierTest {
 
     @Test
     void shouldReadPlanFromPrimaryEnvironmentVariable() throws Exception {
-        final ProbeResult result = Allure.step("Run the supplier probe with ALLURE_TESTPLAN_PATH", () ->
-                runProbe("ALLURE_TESTPLAN_PATH")
+        final ProbeResult result = Allure.step(
+                "Run the supplier probe with ALLURE_TESTPLAN_PATH", () -> runProbe("ALLURE_TESTPLAN_PATH")
         );
 
         recordProbe(result);
@@ -44,8 +44,8 @@ void shouldReadPlanFromPrimaryEnvironmentVariable() throws Exception {
 
     @Test
     void shouldReadPlanFromLegacyEnvironmentVariable() throws Exception {
-        final ProbeResult result = Allure.step("Run the supplier probe with AS_TESTPLAN_PATH", () ->
-                runProbe("AS_TESTPLAN_PATH")
+        final ProbeResult result = Allure.step(
+                "Run the supplier probe with AS_TESTPLAN_PATH", () -> runProbe("AS_TESTPLAN_PATH")
         );
 
         recordProbe(result);
@@ -60,9 +60,9 @@ private ProbeResult runProbe(final String variableName) throws IOException, Inte
         Files.writeString(
                 plan,
                 "{"
-                + "\"version\":\"1.0\","
-                + "\"tests\":[{\"id\":\"A-1\",\"selector\":\"pkg.Test#name\"}]"
-                + "}",
+                        + "\"version\":\"1.0\","
+                        + "\"tests\":[{\"id\":\"A-1\",\"selector\":\"pkg.Test#name\"}]"
+                        + "}",
                 StandardCharsets.UTF_8
         );
 
diff --git a/allure-test-filter/src/test/java/io/qameta/allure/testfilter/TestPlanV1_0Test.java b/allure-test-filter/src/test/java/io/qameta/allure/testfilter/TestPlanV1_0Test.java
index b66cf67c5..6bfab40ea 100644
--- a/allure-test-filter/src/test/java/io/qameta/allure/testfilter/TestPlanV1_0Test.java
+++ b/allure-test-filter/src/test/java/io/qameta/allure/testfilter/TestPlanV1_0Test.java
@@ -31,10 +31,12 @@ class TestPlanV1_0Test {
 
     @Test
     void shouldMatchByAllureIdOrSelector() {
-        final TestPlanV1_0 plan = new TestPlanV1_0().setTests(List.of(
-                new TestPlanV1_0.TestCase().setId("A-1"),
-                new TestPlanV1_0.TestCase().setSelector("pkg.Test#name")
-        ));
+        final TestPlanV1_0 plan = new TestPlanV1_0().setTests(
+                List.of(
+                        new TestPlanV1_0.TestCase().setId("A-1"),
+                        new TestPlanV1_0.TestCase().setSelector("pkg.Test#name")
+                )
+        );
 
         assertTrue(plan.isSelected("A-1", "other.Test#name"));
         assertTrue(plan.isSelected("other-id", "pkg.Test#name"));
@@ -45,9 +47,9 @@ void shouldMatchByAllureIdOrSelector() {
     void shouldDeserializeVersionedPlans() throws Exception {
         final TestPlan plan = OBJECT_MAPPER.readValue(
                 "{"
-                + "\"version\":\"1.0\","
-                + "\"tests\":[{\"id\":\"A-1\",\"selector\":\"pkg.Test#name\"}]"
-                + "}",
+                        + "\"version\":\"1.0\","
+                        + "\"tests\":[{\"id\":\"A-1\",\"selector\":\"pkg.Test#name\"}]"
+                        + "}",
                 TestPlan.class
         );
 
@@ -57,15 +59,15 @@ void shouldDeserializeVersionedPlans() throws Exception {
 
     @Test
     void shouldFallbackToUnknownPlanForUnknownVersion() throws Exception {
-        final TestPlan plan = Allure.step("Deserialize a plan with an unsupported version", () ->
-                OBJECT_MAPPER.readValue(
+        final TestPlan plan = Allure.step(
+                "Deserialize a plan with an unsupported version", () -> OBJECT_MAPPER.readValue(
                         "{\"version\":\"2.0\"}",
                         TestPlan.class
                 )
         );
 
-        Allure.step("Verify the parser falls back to the unknown plan representation", () ->
-                assertInstanceOf(TestPlanUnknown.class, plan)
+        Allure.step(
+                "Verify the parser falls back to the unknown plan representation", () -> assertInstanceOf(TestPlanUnknown.class, plan)
         );
     }
 }
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
index 2569828ae..b1ad15835 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
@@ -105,17 +105,22 @@
 /**
  * Allure TestNG listener.
  */
-@SuppressWarnings({
-        "ClassDataAbstractionCoupling",
-        "ClassFanOutComplexity",
-})
-public class AllureTestNg implements
-        ISuiteListener,
-        ITestListener,
-        IInvokedMethodListener,
-        IConfigurationListener,
-        IMethodInterceptor,
-        IDataProviderListener {
+@SuppressWarnings(
+    {
+            "ClassDataAbstractionCoupling",
+            "ClassFanOutComplexity",
+            "PMD.GodClass",
+            "PMD.TooManyMethods",
+    }
+)
+public class AllureTestNg
+        implements
+            ISuiteListener,
+            ITestListener,
+            IInvokedMethodListener,
+            IConfigurationListener,
+            IMethodInterceptor,
+            IDataProviderListener {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureTestNg.class);
 
@@ -124,17 +129,13 @@ public class AllureTestNg implements
             ITestContext.class, ITestResult.class, XmlTest.class, Method.class, Object[].class
     );
 
-    private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm");
+    private static final boolean HAS_CUCUMBERJVM7_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm");
 
-    private static final boolean HAS_CUCUMBERJVM6_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.cucumber6jvm.AllureCucumber6Jvm");
+    private static final boolean HAS_CUCUMBERJVM6_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.cucumber6jvm.AllureCucumber6Jvm");
 
-    private static final boolean HAS_CUCUMBERJVM5_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.cucumber5jvm.AllureCucumber5Jvm");
+    private static final boolean HAS_CUCUMBERJVM5_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.cucumber5jvm.AllureCucumber5Jvm");
 
-    private static final boolean HAS_CUCUMBERJVM4_IN_CLASSPATH
-            = isClassAvailableOnClasspath("io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm");
+    private static final boolean HAS_CUCUMBERJVM4_IN_CLASSPATH = isClassAvailableOnClasspath("io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm");
 
     /**
      * Store current testng result uuid to attach before/after methods into.
@@ -340,8 +341,7 @@ protected boolean shouldSkipReportingFor(final ITestResult testResult) {
         return (HAS_CUCUMBERJVM7_IN_CLASSPATH
                 || HAS_CUCUMBERJVM6_IN_CLASSPATH
                 || HAS_CUCUMBERJVM5_IN_CLASSPATH
-                || HAS_CUCUMBERJVM4_IN_CLASSPATH
-               ) && groupsSet.contains("cucumber");
+                || HAS_CUCUMBERJVM4_IN_CLASSPATH) && groupsSet.contains("cucumber");
     }
 
     protected void startTestCase(final ITestResult testResult,
@@ -367,24 +367,26 @@ protected void startTestCase(final ITestContext context,
         final ITestClass testClass = method.getTestClass();
         final List<Label> labels = new ArrayList<>();
         labels.addAll(getProvidedLabels());
-        labels.addAll(Arrays.asList(
-                //Packages grouping
-                createPackageLabel(testClass.getName()),
-                createTestClassLabel(testClass.getName()),
-                createTestMethodLabel(method.getMethodName()),
-
-                //xUnit grouping
-                createParentSuiteLabel(safeExtractSuiteName(testClass)),
-                createSuiteLabel(safeExtractTestTag(testClass)),
-                createSubSuiteLabel(safeExtractTestClassName(testClass)),
-
-                //Timeline grouping
-                createHostLabel(),
-                createThreadLabel(),
-
-                createFrameworkLabel("testng"),
-                createLanguageLabel("java")
-        ));
+        labels.addAll(
+                Arrays.asList(
+                        //Packages grouping
+                        createPackageLabel(testClass.getName()),
+                        createTestClassLabel(testClass.getName()),
+                        createTestMethodLabel(method.getMethodName()),
+
+                        //xUnit grouping
+                        createParentSuiteLabel(safeExtractSuiteName(testClass)),
+                        createSuiteLabel(safeExtractTestTag(testClass)),
+                        createSubSuiteLabel(safeExtractTestClassName(testClass)),
+
+                        //Timeline grouping
+                        createHostLabel(),
+                        createThreadLabel(),
+
+                        createFrameworkLabel("testng"),
+                        createLanguageLabel("java")
+                )
+        );
         labels.addAll(getLabels(method, iClass));
         final List<Parameter> parameters = getParameters(context, method, params);
         final TestResult result = new TestResult()
@@ -393,9 +395,11 @@ protected void startTestCase(final ITestContext context,
                 .setName(getMethodName(method))
                 .setFullName(getQualifiedName(method))
                 .setTitlePath(getTitlePath(testClass))
-                .setStatusDetails(new StatusDetails()
-                        .setFlaky(isFlaky(method, iClass))
-                        .setMuted(isMuted(method, iClass)))
+                .setStatusDetails(
+                        new StatusDetails()
+                                .setFlaky(isFlaky(method, iClass))
+                                .setMuted(isMuted(method, iClass))
+                )
                 .setParameters(parameters)
                 .setLinks(getLinks(method, iClass))
                 .setLabels(labels);
@@ -412,10 +416,12 @@ protected void startTestCase(final ITestContext context,
     }
 
     private List<String> getTitlePath(final ITestClass testClass) {
-        final List<String> result = new ArrayList<>(createTitlePath(
-                safeExtractSuiteName(testClass),
-                safeExtractTestTag(testClass)
-        ));
+        final List<String> result = new ArrayList<>(
+                createTitlePath(
+                        safeExtractSuiteName(testClass),
+                        safeExtractTestTag(testClass)
+                )
+        );
         result.addAll(createTitlePathFromQualifiedClassName(testClass.getName()));
         return result;
     }
@@ -606,9 +612,11 @@ public void afterInvocation(final IInvokedMethod method, final ITestResult testR
             if (testResult.isSuccess()) {
                 getLifecycle().updateFixture(executableUuid, result -> result.setStatus(Status.PASSED));
             } else {
-                getLifecycle().updateFixture(executableUuid, result -> result
-                        .setStatus(getStatus(testResult.getThrowable()))
-                        .setStatusDetails(getStatusDetails(testResult.getThrowable()).orElse(null)));
+                getLifecycle().updateFixture(
+                        executableUuid, result -> result
+                                .setStatus(getStatus(testResult.getThrowable()))
+                                .setStatusDetails(getStatusDetails(testResult.getThrowable()).orElse(null))
+                );
             }
             getLifecycle().stopFixture(executableUuid);
 
@@ -709,9 +717,11 @@ public void onDataProviderFailure(final ITestNGMethod method,
                                       final ITestContext ctx,
                                       final RuntimeException t) {
         final String uuid = currentExecutable.get();
-        getLifecycle().updateFixture(uuid, result -> result
-                .setStatus(getStatus(t))
-                .setStatusDetails(getStatusDetails(t).orElse(null)));
+        getLifecycle().updateFixture(
+                uuid, result -> result
+                        .setStatus(getStatus(t))
+                        .setStatusDetails(getStatusDetails(t).orElse(null))
+        );
         getLifecycle().stopFixture(uuid);
         currentExecutable.remove();
     }
@@ -739,9 +749,9 @@ protected Status getStatus(final Throwable throwable) {
     @SuppressWarnings("BooleanExpressionComplexity")
     private boolean isSupportedConfigurationFixture(final ITestNGMethod testMethod) {
         return testMethod.isBeforeMethodConfiguration() || testMethod.isAfterMethodConfiguration()
-               || testMethod.isBeforeTestConfiguration() || testMethod.isAfterTestConfiguration()
-               || testMethod.isBeforeClassConfiguration() || testMethod.isAfterClassConfiguration()
-               || testMethod.isBeforeSuiteConfiguration() || testMethod.isAfterSuiteConfiguration();
+                || testMethod.isBeforeTestConfiguration() || testMethod.isAfterTestConfiguration()
+                || testMethod.isBeforeClassConfiguration() || testMethod.isAfterClassConfiguration()
+                || testMethod.isBeforeSuiteConfiguration() || testMethod.isAfterSuiteConfiguration();
     }
 
     private void validateContainerExists(final String fixtureName, final String containerUuid) {
@@ -828,7 +838,7 @@ private String getUniqueUuid(final IAttributes suite) {
         return Objects.toString(suite.getAttribute(ALLURE_UUID));
     }
 
-    @SuppressWarnings("PMD.AvoidAccessibilityAlteration")
+    @SuppressWarnings({"PMD.AvoidAccessibilityAlteration", "PMD.CognitiveComplexity"})
     private List<Parameter> getParameters(final ITestContext context,
                                           final ITestNGMethod method,
                                           final Object... parameters) {
@@ -899,7 +909,8 @@ private String getMethodName(final ITestNGMethod method) {
         return firstNonEmpty(
                 method.getDescription(),
                 method.getMethodName(),
-                getQualifiedName(method)).orElse("Unknown");
+                getQualifiedName(method)
+        ).orElse("Unknown");
     }
 
     @SuppressWarnings("SameParameterValue")
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
index 2c0f6cfe3..49ab5b877 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
@@ -49,11 +49,16 @@ public List<IMethodInstance> intercept(final List<IMethodInstance> methods,
                                            final ITestContext context) {
         return methods.stream()
                 .filter(this::isSelected)
-                .sorted(Comparator.comparing(
-                        IMethodInstance::getMethod,
-                        Comparator.nullsFirst(Comparator.comparingInt(
-                                ITestNGMethod::getPriority
-                        ))))
+                .sorted(
+                        Comparator.comparing(
+                                IMethodInstance::getMethod,
+                                Comparator.nullsFirst(
+                                        Comparator.comparingInt(
+                                                ITestNGMethod::getPriority
+                                        )
+                                )
+                        )
+                )
                 .collect(Collectors.toList());
     }
 
@@ -86,8 +91,10 @@ public boolean isSelected(final ITestNGMethod testNGMethod, final TestPlanV1_0 t
     }
 
     private String getSelector(final Method method) {
-        return String.format("%s.%s",
+        return String.format(
+                "%s.%s",
                 method.getDeclaringClass().getCanonicalName(),
-                method.getName());
+                method.getName()
+        );
     }
 }
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java b/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
index 7fc1738a6..898e8955b 100644
--- a/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
@@ -31,7 +31,7 @@ public class AllureTestNgConfig {
     public AllureTestNgConfig(final Properties properties) {
         this.hideDisabledTests = parseBoolean(properties.getProperty(ALLURE_TESTNG_HIDE_DISABLED_TESTS));
         this.hideConfigurationFailures = parseBoolean(
-            properties.getProperty(ALLURE_TESTNG_HIDE_CONFIGURATION_FAILURES)
+                properties.getProperty(ALLURE_TESTNG_HIDE_CONFIGURATION_FAILURES)
         );
     }
 
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
index 606eaf369..cd348b33d 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -73,14 +73,15 @@
 @SuppressWarnings("deprecation")
 public class AllureTestNgTest {
 
+    private static final Condition<List<? extends FixtureResult>> ALL_FINISHED = new Condition<>(
+            items -> items.stream().allMatch(item -> item.getStage() == Stage.FINISHED),
+            "All items should have be in a finished stage"
+    );
 
-    private static final Condition<List<? extends FixtureResult>> ALL_FINISHED = new Condition<>(items ->
-            items.stream().allMatch(item -> item.getStage() == Stage.FINISHED),
-            "All items should have be in a finished stage");
-
-    private static final Condition<List<? extends WithSteps>> WITH_STEPS = new Condition<>(items ->
-            items.stream().allMatch(item -> item.getSteps().size() == 1),
-            "All items should have a step attached");
+    private static final Condition<List<? extends WithSteps>> WITH_STEPS = new Condition<>(
+            items -> items.stream().allMatch(item -> item.getSteps().size() == 1),
+            "All items should have a step attached"
+    );
 
     @SuppressWarnings("unused")
     private static Stream<Arguments> parallelConfiguration() {
@@ -188,22 +189,28 @@ public void testWithTimeout(final XmlSuite.ParallelMode mode, final int threadCo
                 .as("Test case results have not been written")
                 .hasSize(2)
                 .as("Unexpectedly passed status or stage of tests")
-                .allMatch(testResult -> testResult.getStatus().equals(Status.PASSED) &&
-                                        testResult.getStage().equals(Stage.FINISHED))
+                .allMatch(
+                        testResult -> testResult.getStatus().equals(Status.PASSED) &&
+                                testResult.getStage().equals(Stage.FINISHED)
+                )
                 .extracting(TestResult::getName)
                 .as("Unexpectedly passed name of tests")
-                .containsOnlyElementsOf(asList(
-                        testNameWithoutTimeout,
-                        testNameWithTimeout)
+                .containsOnlyElementsOf(
+                        asList(
+                                testNameWithoutTimeout,
+                                testNameWithTimeout
+                        )
                 );
         assertThat(testResults)
                 .flatExtracting(TestResult::getSteps)
                 .as("No steps present for test with timeout")
                 .hasSize(2)
                 .extracting(StepResult::getName)
-                .containsOnlyElementsOf(asList(
-                        "Step of the test with timeout",
-                        "Step of the test with no timeout")
+                .containsOnlyElementsOf(
+                        asList(
+                                "Step of the test with timeout",
+                                "Step of the test with no timeout"
+                        )
                 );
     }
 
@@ -284,7 +291,9 @@ public void javadocDescriptionsOfBeforesWithTheSameNames() {
         checkBeforeJavadocDescriptions(testContainers, "io.qameta.allure.testng.samples.DescriptionsTest.setUpMethod", "Before method description");
         checkBeforeJavadocDescriptions(testContainers, "io.qameta.allure.testng.samples.DescriptionsTest", "Before class description");
 
-        checkBeforeJavadocDescriptions(testContainers, "io.qameta.allure.testng.samples.DescriptionsAnotherTest.setUpMethod", "Before method description from DescriptionsAnotherTest");
+        checkBeforeJavadocDescriptions(
+                testContainers, "io.qameta.allure.testng.samples.DescriptionsAnotherTest.setUpMethod", "Before method description from DescriptionsAnotherTest"
+        );
         checkBeforeJavadocDescriptions(testContainers, "io.qameta.allure.testng.samples.DescriptionsAnotherTest", "Before class description from DescriptionsAnotherTest");
     }
 
@@ -491,9 +500,10 @@ public void perTestTagFixtures(final XmlSuite.ParallelMode mode, final int threa
     @Test
     @DisplayName("Skipped suite")
     public void skippedSuiteTest() {
-        final Condition<StepResult> skipReason = new Condition<>(step ->
-                step.getStatusDetails().getTrace().startsWith("java.lang.RuntimeException: Skip all"),
-                "Suite should be skipped because of an exception in before suite");
+        final Condition<StepResult> skipReason = new Condition<>(
+                step -> step.getStatusDetails().getTrace().startsWith("java.lang.RuntimeException: Skip all"),
+                "Suite should be skipped because of an exception in before suite"
+        );
 
         final AllureResults results = runTestNgSuites("suites/skipped-suite.xml");
         List<TestResult> testResults = results.getTestResults();
@@ -545,8 +555,10 @@ public void multipleSuites() {
         List<String> uids = testResults.stream().map(TestResult::getUuid).collect(Collectors.toList());
         assertThat(testContainers).as("Unexpected quantity of testng containers has been written")
                 .hasSize(9).extracting(TestResultContainer::getName)
-                .contains(beforeMethodName, beforeMethodName, firstTagName, firstSuiteName, secondTagName,
-                        secondSuiteName);
+                .contains(
+                        beforeMethodName, beforeMethodName, firstTagName, firstSuiteName, secondTagName,
+                        secondSuiteName
+                );
 
         final List<String> firstSuite = uids.subList(0, 2);
         assertContainersChildren(beforeMethodName, testContainers, firstSuite);
@@ -608,9 +620,10 @@ public void nestedSteps() {
         String nestedStep = "nestedStep";
         String stepInBefore = "stepTwo";
         String stepInTest = "stepThree";
-        final Condition<StepResult> substep = new Condition<>(step ->
-                step.getSteps().get(0).getName().equals(nestedStep),
-                "Given step should have a substep with name " + nestedStep);
+        final Condition<StepResult> substep = new Condition<>(
+                step -> step.getSteps().get(0).getName().equals(nestedStep),
+                "Given step should have a substep with name " + nestedStep
+        );
 
         final AllureResults results = runTestNgSuites("suites/nested-steps.xml");
         List<TestResult> testResults = results.getTestResults();
@@ -693,7 +706,8 @@ public void linksTest() {
                 .hasSize(4)
                 .flatExtracting(TestResult::getLinks)
                 .extracting(Link::getName)
-                .contains("testClass", "a", "b", "c", "testClassIssue", "testClassTmsLink",
+                .contains(
+                        "testClass", "a", "b", "c", "testClassIssue", "testClassTmsLink",
                         "testClass", "nested1", "nested2", "nested3", "testClassIssue", "issue1", "issue2", "issue3",
                         "testClassTmsLink", "tms1", "tms2", "tms3", "testClass", "a", "b", "c", "testClassIssue",
                         "testClassTmsLink", "testClass", "inheritedLink1", "inheritedLink2", "testClassIssue",
@@ -759,12 +773,13 @@ public void ownerTest() {
         final AllureResults results = runTestNgSuites("suites/owner.xml");
         List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getFullName, tr -> tr.getLabels()
-                        .stream()
-                        .filter(label -> "owner".equals(label.getName()))
-                        .map(Label::getValue)
-                        .sorted()
-                        .collect(Collectors.joining(",", "[", "]"))
+                .extracting(
+                        TestResult::getFullName, tr -> tr.getLabels()
+                                .stream()
+                                .filter(label -> "owner".equals(label.getName()))
+                                .map(Label::getValue)
+                                .sorted()
+                                .collect(Collectors.joining(",", "[", "]"))
                 )
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithOwner", "[charlie]"),
@@ -785,12 +800,13 @@ public void tagTest() {
         final AllureResults results = runTestNgSuites("suites/tags.xml");
         List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .extracting(TestResult::getFullName, tr -> tr.getLabels()
-                        .stream()
-                        .filter(label -> "tag".equals(label.getName()))
-                        .map(Label::getValue)
-                        .sorted()
-                        .collect(Collectors.joining(",", "[", "]"))
+                .extracting(
+                        TestResult::getFullName, tr -> tr.getLabels()
+                                .stream()
+                                .filter(label -> "tag".equals(label.getName()))
+                                .map(Label::getValue)
+                                .sorted()
+                                .collect(Collectors.joining(",", "[", "]"))
                 )
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.testng.samples.TagMethodTest.testWithTag", "[regress]"),
@@ -996,7 +1012,6 @@ public void shouldAttachClassFixturesCorrectly() {
                         "io.qameta.allure.testng.samples.ClassFixturesInParent"
                 );
 
-
         final TestResult classFixtures1 = findTestResultByName(results, "classFixtures1");
         final TestResultContainer c1 = findTestContainerByName(results, "io.qameta.allure.testng.samples.ClassFixtures1");
 
@@ -1022,7 +1037,6 @@ public void shouldAttachClassFixturesCorrectly() {
         assertThat(c4.getChildren())
                 .containsExactlyInAnyOrder(classFixturesInParent.getUuid());
 
-
     }
 
     @AllureFeatures.History
@@ -1068,7 +1082,7 @@ public void shouldProcessCyrillicDescriptions() {
     @MethodSource("parallelConfiguration")
     @DisplayName("Should not mix up fixtures during parallel run")
     public void shouldAddCorrectBeforeMethodFixturesInCaseOfParallelRun(
-            final XmlSuite.ParallelMode mode, final int threadCount) {
+                                                                        final XmlSuite.ParallelMode mode, final int threadCount) {
         final AllureResults results = runTestNgSuites(
                 parallel(mode, threadCount),
                 "suites/gh-219.xml"
@@ -1099,7 +1113,6 @@ public void shouldAddCorrectBeforeMethodFixturesInCaseOfParallelRun(
                             "beforeMethod2"
                     );
 
-
             assertThat(firstAfter)
                     .extracting(FixtureResult::getName)
                     .contains(
@@ -1331,9 +1344,11 @@ private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
                 .hasSameSizeAs(suiteFiles);
 
         return RunUtils.runTests(lifecycle -> {
-            final AllureTestNg adapter = new AllureTestNg(lifecycle,
+            final AllureTestNg adapter = new AllureTestNg(
+                    lifecycle,
                     new AllureTestNgTestFilter(),
-                    config);
+                    config
+            );
             final TestNG testNg = new TestNG(false);
             testNg.addListener(adapter);
             testNg.setTestSuites(suiteFiles);
@@ -1375,13 +1390,13 @@ private Predicate<TestResult> hasLinks() {
     @Step("Find flaky")
     private Predicate<TestResult> flakyPredicate() {
         return testResult -> Objects.nonNull(testResult.getStatusDetails())
-                             && testResult.getStatusDetails().isFlaky();
+                && testResult.getStatusDetails().isFlaky();
     }
 
     @Step("Find muted")
     private Predicate<TestResult> mutedPredicate() {
         return testResult -> Objects.nonNull(testResult.getStatusDetails())
-                             && testResult.getStatusDetails().isMuted();
+                && testResult.getStatusDetails().isMuted();
     }
 
     @Step("Get uuids by container name")
@@ -1402,9 +1417,10 @@ private static void assertContainersChildren(String name, List<TestResultContain
     @Step("Check containers per method")
     private static void assertContainersPerMethod(String name, List<TestResultContainer> containersList,
                                                   List<String> uids) {
-        final Condition<List<? extends TestResultContainer>> singlyMapped = new Condition<>(containers ->
-                containers.stream().allMatch(c -> c.getChildren().size() == 1),
-                format("All containers for per-method fixture %s should be linked to only one testng result", name));
+        final Condition<List<? extends TestResultContainer>> singlyMapped = new Condition<>(
+                containers -> containers.stream().allMatch(c -> c.getChildren().size() == 1),
+                format("All containers for per-method fixture %s should be linked to only one testng result", name)
+        );
 
         assertThat(containersList)
                 .filteredOn("name", name)
@@ -1488,7 +1504,6 @@ private static void checkTestJavadocDescriptions(List<TestResult> results, Strin
             .setId("6")
             .setSelector("allure.junit4.samples.TestsWithIdForFilter.test3");
 
-
     @Test
     @AllureFeatures.Filtration
     public void simpleFiltration() {
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java
index e91a9f759..72788a493 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AfterFixturesCombination.java
@@ -25,7 +25,7 @@
  * @author Egor Borisov ehborisov@gmail.com
  */
 public class AfterFixturesCombination {
-    
+
     @AfterSuite
     public void afterSuiteTwo() {
         afterSuiteTwoStep();
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java
index aca5ade90..4d84f1445 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/AllFeatures.java
@@ -176,7 +176,10 @@ public byte[] addImgAttachment() throws IOException {
         return Files.readAllBytes(img.toPath());
     }
 
-    @Attachment(value = "String attachment", type = "text/plain")
+    @Attachment(
+            value = "String attachment",
+            type = "text/plain"
+    )
     public String addStringAttachment() {
         return Arrays.toString(new Throwable().getStackTrace());
     }
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java
index 6077f8648..956b17574 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/BaseTest.java
@@ -27,7 +27,6 @@ public void baseTest() throws Exception {
         check();
     }
 
-
     abstract void check();
 
 }
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithAttachment.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithAttachment.java
index 20b5a7f61..a7ed8b728 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithAttachment.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/DataProviderWithAttachment.java
@@ -25,7 +25,7 @@ public class DataProviderWithAttachment {
     public Object[][] dataProvider() {
         Allure.addAttachment("attachment", "attachment content");
         return new Object[][]{
-            {"a"}
+                {"a"}
         };
     }
 
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java
index fdaf6a4c4..f79ea4cd5 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/LinksOnTests.java
@@ -40,21 +40,27 @@ public void shouldHasLinks() throws Exception {
     }
 
     @Test
-    @Links({
-            @Link("nested1"),
-            @Link("nested2"),
-    })
+    @Links(
+        {
+                @Link("nested1"),
+                @Link("nested2"),
+        }
+    )
     @Link("nested3")
     @Issue("issue1")
-    @Issues({
-            @Issue("issue2"),
-            @Issue("issue3")
-    })
+    @Issues(
+        {
+                @Issue("issue2"),
+                @Issue("issue3")
+        }
+    )
     @TmsLink("tms1")
-    @TmsLinks({
-            @TmsLink("tms2"),
-            @TmsLink("tms3")
-    })
+    @TmsLinks(
+        {
+                @TmsLink("tms2"),
+                @TmsLink("tms3")
+        }
+    )
     public void shouldHasLinksAsWell() throws Exception {
 
     }
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java
index 30b5dd41a..bd9a64650 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelDataProviderSample.java
@@ -28,17 +28,21 @@
  */
 public class ParallelDataProviderSample {
 
-  @DataProvider(parallel = true)
-  Iterator<Integer[]> provide() {
-    List<Integer[]> ret = new ArrayList<>();
-    for (int i = 0; i < 1000; i++) {
-      ret.add(new Integer[]{i});
+    @DataProvider(parallel = true)
+    Iterator<Integer[]> provide() {
+        List<Integer[]> ret = new ArrayList<>();
+        for (int i = 0; i < 1000; i++) {
+            ret.add(new Integer[]{i});
+        }
+        return ret.iterator();
     }
-    return ret.iterator();
-  }
 
-  @Test(dataProvider = "provide", invocationCount = 2, threadPoolSize = 2)
-  public void checkCME(Integer i) {
-    Assert.assertNotNull(i);
-  }
+    @Test(
+            dataProvider = "provide",
+            invocationCount = 2,
+            threadPoolSize = 2
+    )
+    public void checkCME(Integer i) {
+        Assert.assertNotNull(i);
+    }
 }
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java
index 82180ccb2..6be3a8847 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/ParallelMethods.java
@@ -33,7 +33,6 @@
  */
 public class ParallelMethods {
 
-
     @BeforeSuite
     public void beforeSuite() {
         stepOne();
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java
index 050655a45..aef897d80 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerSuiteFixtures.java
@@ -51,7 +51,7 @@ public void afterSuite2() {
     }
 
     @Step
-    public void step(){
+    public void step() {
 
     }
 }
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java
index cc6e6d87c..8e4cbc65c 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java
@@ -36,7 +36,10 @@ public static Object[][] someProvider() {
         };
     }
 
-    @Test(dataProvider = "someProvider", priority = 4)
+    @Test(
+            dataProvider = "someProvider",
+            priority = 4
+    )
     public void vTest(int parameter) {
         parameter(ORDER_PARAMETER, cnt.incrementAndGet());
     }
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java
index 764267787..ee4c25981 100644
--- a/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java
@@ -16,9 +16,10 @@
 package io.qameta.allure.testng.samples;
 
 import io.qameta.allure.AllureId;
-import static org.assertj.core.api.Assertions.assertThat;
 import org.testng.annotations.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestsWithIdForFilter {
 
     @Test
diff --git a/build.gradle.kts b/build.gradle.kts
index 962913572..8ac9619bf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -275,7 +275,13 @@ configure(libs) {
     }
 
     val enableQuality = true
-    fun excludeGeneratedSources(source: FileTree): FileTree = (source - fileTree("build/generated-sources")).asFileTree
+    fun mainJavaSources(): FileTree = fileTree("src/main/java") {
+        include("**/*.java")
+    }
+
+    fun checkstyleMainJavaSources(): FileTree = mainJavaSources().matching {
+        exclude("cucumber/runtime/formatter/**")
+    }
 
     checkstyle {
         toolVersion = dependencyManagement.managedVersions["com.puppycrawl.tools:checkstyle"]!!
@@ -303,17 +309,21 @@ configure(libs) {
         }
     }
 
-    tasks.withType(Checkstyle::class) {
-        source = excludeGeneratedSources(source)
+    tasks.checkstyleMain {
+        source = checkstyleMainJavaSources()
+        classpath = files()
         enabled = enableQuality
     }
 
-    tasks.withType(Pmd::class) {
-        source = excludeGeneratedSources(source)
+    tasks.pmdMain {
+        source = mainJavaSources()
+        classpath = files()
         enabled = enableQuality
     }
 
-    tasks.withType(SpotBugsTask::class) {
+    tasks.withType<SpotBugsTask>().configureEach {
+        auxClassPaths.from(configurations.named("runtimeClasspath"))
+        dependsOn(tasks.named("jar"))
         enabled = enableQuality
     }
 
@@ -333,7 +343,9 @@ configure(libs) {
         java {
             target("src/**/*.java")
             removeUnusedImports()
+            importOrder("", "jakarta", "javax", "java", "\\#")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|import|open|module|//startfile)")
+            eclipse().configFile("$spotlessDtr/eclipse-jdt.prefs")
             endWithNewline()
             replaceRegex("one blank line after package line", "(package .+;)\n+import", "$1\n\nimport")
             replaceRegex("one blank line after import lists", "(import .+;\n\n)\n+", "$1")
@@ -341,6 +353,7 @@ configure(libs) {
         scala {
             target("src/**/*.scala")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|//startfile)")
+            scalafmt("3.7.3").scalaMajorVersion("2.13").configFile("$spotlessDtr/scalafmt.conf")
             endWithNewline()
             replaceRegex("one blank line after package line", "(package .+;)\n+import", "$1\n\nimport")
             replaceRegex("one blank line after import lists", "(import .+;\n\n)\n+", "$1")
@@ -348,6 +361,7 @@ configure(libs) {
         groovy {
             target("src/**/*.groovy")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|//startfile) ")
+            greclipse("4.29").configFile("$spotlessDtr/eclipse-jdt.prefs")
             endWithNewline()
             replaceRegex("one blank line after package line", "(package .+;)\n+import", "$1\n\nimport")
             replaceRegex("one blank line after import lists", "(import .+;\n\n)\n+", "$1")
diff --git a/gradle/quality-configs/checkstyle/checkstyle.xml b/gradle/quality-configs/checkstyle/checkstyle.xml
index 8e3f80a29..d431282ab 100644
--- a/gradle/quality-configs/checkstyle/checkstyle.xml
+++ b/gradle/quality-configs/checkstyle/checkstyle.xml
@@ -1,247 +1,81 @@
-<?xml version="1.0" ?>
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-<module name="Checker">
-    <!-- Properties (http://checkstyle.sourceforge.net/config.html#Properties#Checker) -->
-    <property name="fileExtensions" value="java, properties, xml"/>
-
-    <!-- Filters (http://checkstyle.sourceforge.net/config_filters.html) -->
-    <module name="SuppressWarningsFilter"/>
-
-    <module name="NewlineAtEndOfFile">
-        <property name="lineSeparator" value="lf"/>
-    </module>
-    <!-- disabled in favour of PMD ExcessiveClassLength check, which correctly checks class length not file length -->
-    <!--<module name="FileLength">-->
-    <!--<property name="max" value="500"/>-->
-    <!--</module>-->
-    <module name="FileTabCharacter"/>
-    <module name="Translation"/>
-    <module name="UniqueProperties"/>
-
-    <module name="LineLength">
-        <property name="max" value="120"/>
-    </module>
-
-    <module name="TreeWalker">
-        <!-- http://checkstyle.sourceforge.net/config_filters.html#SuppressionCommentFilter -->
-        <module name="SuppressionCommentFilter"/>
-
-        <!-- Annotations (http://checkstyle.sourceforge.net/config_annotation.html) -->
-        <!--<module name="AnnotationLocation"/>-->
-        <!--<module name="AnnotationOnSameLine">-->
-        <!--<module name="AnnotationUseStyle"/>-->
-        <module name="MissingDeprecated"/>
-        <module name="MissingOverride"/>
-        <module name="PackageAnnotation"/>
-        <module name="SuppressWarningsHolder"/>
-        <module name="SuppressWarnings"/>
-
-
-        <!-- Block Checks (http://checkstyle.sourceforge.net/config_blocks.html) -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
-        <module name="EmptyCatchBlock"/>
-        <module name="LeftCurly"/>
-        <!--        <module name="NeedBraces"/>-->
-        <module name="RightCurly"/>
-
-
-        <!-- Class Design (http://checkstyle.sourceforge.net/config_design.html) -->
-        <!--<module name="DesignForExtension">-->
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <module name="InnerTypeLast"/>
-        <module name="InterfaceIsType"/>
-        <module name="MutableException"/>
-        <module name="OneTopLevelClass"/>
-        <module name="ThrowsCount"/>
-        <module name="VisibilityModifier">
-            <property name="protectedAllowed" value="true"/>
-        </module>
-
-
-        <!-- Coding (http://checkstyle.sourceforge.net/config_coding.html) -->
-        <module name="ArrayTrailingComma"/>
-        <!--<module name="AvoidInlineConditionals"/>-->
-        <module name="CovariantEquals"/>
-        <!--<module name="DeclarationOrder"/>-->
-        <module name="DefaultComesLast"/>
-        <module name="EmptyStatement"/>
-        <module name="EqualsAvoidNull"/>
-        <module name="EqualsHashCode"/>
-        <module name="ExplicitInitialization"/>
-        <module name="FallThrough"/>
-        <module name="FinalLocalVariable"/>
-        <!--<module name="HiddenField"/>-->
-        <!--<module name="IllegalCatch"/>-->
-        <module name="IllegalInstantiation"/>
-        <!--<module name="IllegalThrows"/>-->
-        <!--<module name="IllegalToken"/>-->
-        <module name="IllegalTokenText"/>
-        <!--<module name="IllegalType"/>-->
-        <module name="InnerAssignment"/>
-        <!--<module name="MagicNumber"/>-->
-        <!--<module name="MissingCtor"/>-->
-        <module name="MissingSwitchDefault"/>
-        <module name="ModifiedControlVariable"/>
-        <module name="MultipleStringLiterals">
-            <property name="ignoreStringsRegexp" value='^(("")|(", ")|("\\n")|("\\t")|(" "))$'/>
-        </module>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="NestedForDepth">
-            <property name="max" value="2"/>
-        </module>
-        <module name="NestedIfDepth">
-            <property name="max" value="3"/>
-        </module>
-        <module name="NestedTryDepth">
-            <property name="max" value="2"/>
-        </module>
-        <module name="NoClone"/>
-        <module name="NoFinalizer"/>
-        <module name="OneStatementPerLine"/>
-        <module name="OverloadMethodsDeclarationOrder"/>
-        <module name="PackageDeclaration"/>
-        <module name="ParameterAssignment"/>  <!-- more strict version is FinalParameters -->
-        <!--<module name="RequireThis"/>-->
-        <module name="ReturnCount">
-            <property name="max" value="5"/>
-            <property name="maxForVoid" value="3"/>
-        </module>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-        <module name="StringLiteralEquality"/>
-        <!--<module name="SuperClone"/>-->
-        <!--<module name="SuperFinalize"/>-->
-        <module name="UnnecessaryParentheses"/>
-        <module name="VariableDeclarationUsageDistance">
-            <property name="allowedDistance" value="5"/>
-        </module>
-
-
-        <!-- Headers (http://checkstyle.sourceforge.net/config_header.html) -->
-        <!--<module name="Header"/>-->
-        <!--<module name="RegexpHeader"/>-->
-
-
-        <!-- Imports (http://checkstyle.sourceforge.net/config_imports.html) -->
-        <module name="AvoidStarImport"/>
-        <!--<module name="AvoidStaticImport"/>-->
-        <!--<module name="CustomImportOrder"/>-->
-        <module name="IllegalImport"/>
-        <!--<module name="ImportControl"/>-->
-        <!--<module name="ImportOrder"/>-->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-
-        <!-- Javadoc Comments (http://checkstyle.sourceforge.net/config_javadoc.html) -->
-        <!--<module name="AtclauseOrder"/>-->
-        <!--<module name="JavadocMethod"/>-->
-        <!--<module name="JavadocPackage"/>-->
-        <!--<module name="JavadocParagraph"/>-->
-        <module name="JavadocStyle"/>
-        <!--<module name="JavadocTagContinuationIndentation"/>-->
-        <module name="JavadocType"/>
-        <!--<module name="JavadocVariable"/>-->
-        <module name="NonEmptyAtclauseDescription"/>
-        <!--<module name="SingleLineJavadoc"/>-->
-        <!--<module name="SummaryJavadoc"/>-->
-        <!--<module name="WriteTag"/>-->
-
-
-        <!-- Metrics (http://checkstyle.sourceforge.net/config_metrics.html) -->
-        <module name="BooleanExpressionComplexity"/>
-        <!--        <module name="ClassDataAbstractionCoupling"/>-->
-        <!--        <module name="ClassFanOutComplexity"/>-->
-        <module name="CyclomaticComplexity"/>
-        <!--        <module name="JavaNCSS"/>-->
-        <module name="NPathComplexity"/>
-
-
-        <!--  Miscellaneous (http://checkstyle.sourceforge.net/config_misc.html) -->
-        <module name="ArrayTypeStyle"/>
-        <!--<module name="AvoidEscapedUnicodeCharacters"/>-->
-        <!--<module name="CommentsIndentation"/>-->
-        <module name="DescendantToken"/>
-        <!--<module name="FinalParameters"/>-->  <!-- DISABLED in favor of less restricted ParameterAssignment -->
-        <!--<module name="Indentation"/>-->
-        <module name="OuterTypeFilename"/>
-        <!--<module name="TodoComment"/>-->
-        <!--<module name="TrailingComment"/>-->
-        <!--<module name="UncommentedMain"/>-->
-        <module name="UpperEll"/>
-
-
-        <!-- Modifiers (http://checkstyle.sourceforge.net/config_modifier.html) -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-
-        <!-- Naming Conventions (http://checkstyle.sourceforge.net/config_naming.html) -->
-        <module name="AbbreviationAsWordInName"/>
-        <!--<module name="AbstractClassName"/>-->
-        <!--<module name="CatchParameterName"/>-->
-        <module name="ClassTypeParameterName">
-            <property name="format" value="^[A-Z]*$"/>
-        </module>
-        <module name="ConstantName"/>
-        <module name="InterfaceTypeParameterName">
-            <property name="format" value="^[A-Z]*$"/>
-        </module>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="MethodTypeParameterName">
-            <property name="format" value="^[A-Z]*$"/>
-        </module>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-
-        <!-- Regexp (http://checkstyle.sourceforge.net/config_regexp.html) -->
-        <!--<module name="Regexp"/>-->
-        <!--<module name="RegexpMultiline"/>-->
-        <!--<module name="RegexpSingleline"/>-->
-        <!--<module name="RegexpSinglelineJava"/>-->
-
-
-        <!-- Size Violations (http://checkstyle.sourceforge.net/config_sizes.html) -->
-        <module name="AnonInnerLength"/>
-        <!--        <module name="ExecutableStatementCount"/>-->
-        <module name="MethodCount"/>
-        <module name="MethodLength"/>
-        <module name="OuterTypeNumber"/>
-        <module name="ParameterNumber"/>
-
-
-        <!-- Whitespace (http://checkstyle.sourceforge.net/config_whitespace.html) -->
-        <module name="EmptyForInitializerPad"/>
-        <module name="EmptyForIteratorPad"/>
-        <!--<module name="EmptyLineSeparator"/>-->
-        <module name="GenericWhitespace"/>
-        <module name="MethodParamPad"/>
-        <module name="NoLineWrap"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="SeparatorWrap">
-            <property name="tokens" value="COMMA"/>
-            <property name="option" value="eol"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="tokens" value="DOT"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="SingleSpaceSeparator"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround"/>
-    </module>
-</module>
+<?xml version="1.0" ?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="Checker">
+    <property name="fileExtensions" value="java"/>
+
+    <module name="SuppressWarningsFilter"/>
+
+    <module name="TreeWalker">
+        <module name="SuppressWarningsHolder"/>
+
+        <!-- Imports -->
+        <module name="AvoidStarImport"/>
+        <module name="ImportControl">
+            <property name="file" value="${config_loc}/import-control.xml"/>
+        </module>
+
+        <!-- Annotations -->
+        <module name="MissingDeprecated"/>
+        <module name="MissingOverride"/>
+
+        <!-- Blocks -->
+        <module name="EmptyBlock"/>
+        <module name="EmptyCatchBlock"/>
+        <module name="NeedBraces"/>
+
+        <!-- Class design -->
+        <module name="HideUtilityClassConstructor"/>
+        <module name="VisibilityModifier">
+            <property name="protectedAllowed" value="true"/>
+        </module>
+
+        <!-- Coding -->
+        <module name="CovariantEquals"/>
+        <module name="DefaultComesLast"/>
+        <module name="EqualsAvoidNull"/>
+        <module name="EqualsHashCode"/>
+        <module name="FallThrough"/>
+        <module name="IllegalInstantiation"/>
+        <module name="IllegalTokenText"/>
+        <module name="InnerAssignment"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="ModifiedControlVariable"/>
+        <module name="MultipleStringLiterals"/>
+        <module name="NoClone"/>
+        <module name="NoFinalizer"/>
+        <module name="OverloadMethodsDeclarationOrder"/>
+        <module name="ParameterAssignment"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <module name="StringLiteralEquality"/>
+        <module name="UnnecessaryParentheses"/>
+
+        <!-- Naming -->
+        <module name="ClassTypeParameterName">
+            <property name="format" value="^[A-Z]*$"/>
+        </module>
+        <module name="ConstantName"/>
+        <module name="InterfaceTypeParameterName">
+            <property name="format" value="^[A-Z]*$"/>
+        </module>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="^[A-Z]*$"/>
+        </module>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+
+        <!-- Modifiers and source structure -->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+        <module name="OuterTypeFilename"/>
+        <module name="UpperEll"/>
+    </module>
+</module>
diff --git a/gradle/quality-configs/checkstyle/import-control.xml b/gradle/quality-configs/checkstyle/import-control.xml
new file mode 100644
index 000000000..70e35d101
--- /dev/null
+++ b/gradle/quality-configs/checkstyle/import-control.xml
@@ -0,0 +1,15 @@
+<!DOCTYPE import-control PUBLIC
+        "-//Checkstyle//DTD ImportControl Configuration 1.4//EN"
+        "https://checkstyle.org/dtds/import_control_1_4.dtd">
+<import-control pkg="io.qameta.allure" strategyOnMismatch="allowed">
+    <disallow pkg="sun"/>
+    <disallow pkg="org.codehaus.jackson"/>
+    <disallow pkg="org.apache.commons.collections"/>
+    <disallow pkg="org.springframework.util"/>
+    <disallow pkg="org.springframework.data.util"/>
+
+    <subpackage name="springweb">
+        <allow pkg="org.springframework.util"/>
+    </subpackage>
+
+</import-control>
diff --git a/gradle/quality-configs/pmd/pmd.xml b/gradle/quality-configs/pmd/pmd.xml
index a3c7ca8bf..8ca8ea307 100644
--- a/gradle/quality-configs/pmd/pmd.xml
+++ b/gradle/quality-configs/pmd/pmd.xml
@@ -1,128 +1,131 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset name="Base ruleset" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
-
-    <description>
-        General Java quality rules.
-    </description>
-
-    <!-- Best practices (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_bestpractices.html) -->
-    <rule ref="category/java/bestpractices.xml">
-        <exclude name="AbstractClassWithoutAbstractMethod"/>
-        <!-- disabled as it's important for android and doesn't matter for general java (also fixes will
-             conflict with checkstyle's VisibilityModifier check -->
-        <exclude name="AccessorMethodGeneration"/>
-        <exclude name="ArrayIsStoredDirectly"/>
-        <exclude name="GuardLogStatement"/>
-        <!--  Doesn't work with Java 8 switch clause  -->
-        <exclude name="ExhaustiveSwitchHasDefault"/>
-    </rule>
-
-
-    <!-- Code style (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_codestyle.html) -->
-    <rule ref="category/java/codestyle.xml">
-        <exclude name="AtLeastOneConstructor"/>
-        <exclude name="CallSuperInConstructor"/>
-        <exclude name="CommentDefaultAccessModifier"/>
-        <exclude name="ConfusingTernary"/>
-        <exclude name="GenericsNaming"/>
-        <exclude name="LinguisticNaming"/>
-        <exclude name="LocalHomeNamingConvention"/> <!-- earlier j2ee group-->
-        <exclude name="LocalInterfaceSessionNamingConvention"/> <!-- earlier j2ee group-->
-        <exclude name="LocalVariableCouldBeFinal"/>
-        <exclude name="LongVariable"/>
-        <exclude name="MDBAndSessionBeanNamingConvention"/> <!-- earlier j2ee group-->
-        <exclude name="OnlyOneReturn"/> <!-- disabled in favour of checkstyle ReturnCount check -->
-        <exclude name="RemoteInterfaceNamingConvention"/> <!-- earlier j2ee group-->
-        <exclude name="RemoteSessionInterfaceNamingConvention"/> <!-- earlier j2ee group-->
-        <exclude name="ShortClassName"/>
-        <exclude name="ShortMethodName"/>
-        <exclude name="ShortVariable"/>
-        <exclude name="TooManyStaticImports"/>
-        <exclude name="UnnecessaryAnnotationValueElement"/>
-        <exclude name="UseDiamondOperator"/>
-        <exclude name="UselessParentheses"/>
-        <exclude name="BooleanGetMethodName"/>
-        <exclude name="ClassNamingConventions"/>
-    </rule>
-
-    <!-- Design (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_design.html) -->
-    <rule ref="category/java/design.xml">
-        <exclude name="AvoidCatchingGenericException"/>
-        <exclude name="CouplingBetweenObjects"/>
-        <exclude name="DataClass"/>
-        <exclude name="ExcessiveImports"/>
-        <exclude name="LawOfDemeter"/>
-        <exclude name="CyclomaticComplexity"/> <!-- disabled in favour of checkstyle's CyclomaticComplexity check -->
-        <exclude name="LoosePackageCoupling"/>
-        <exclude name="SignatureDeclareThrowsException"/>
-        <exclude name="TooManyFields"/>
-        <exclude name="GodClass"/>
-        <exclude name="CognitiveComplexity"/>
-        <exclude name="NcssCount"/>
-        <exclude name="ExcessivePublicCount"/>
-        <exclude name="TooManyMethods"/>
-        <exclude name="ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
-    </rule>
-    <rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts">
-        <properties>
-            <property name="problemDepth" value="4"/>
-        </properties>
-    </rule>
-    <rule ref="category/java/design.xml/NPathComplexity">
-        <properties>
-            <property name="reportLevel" value="201"/>
-        </properties>
-    </rule>
-
-    <!-- Documentation (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_documentation.html) -->
-    <rule ref="category/java/documentation.xml">
-        <exclude name="CommentRequired"/>
-        <exclude name="CommentSize"/>
-    </rule>
-
-
-    <!-- Error prone (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_errorprone.html) -->
-    <rule ref="category/java/errorprone.xml">
-        <exclude name="AvoidCatchingThrowable"/>
-        <exclude name="AvoidFieldNameMatchingMethodName"/>
-        <exclude name="AssignmentInOperand"/>  <!-- duplicate of checkstyle check AssignmentInOperand -->
-        <exclude name="AvoidLiteralsInIfCondition"/>
-        <exclude name="EmptyFinalizer"/>
-        <exclude name="FinalizeDoesNotCallSuperFinalize"/>
-        <exclude name="FinalizeOnlyCallsSuperFinalize"/>
-        <exclude name="JUnitSpelling"/>
-        <exclude name="JUnitStaticSuite"/>
-        <exclude name="MissingSerialVersionUID"/>
-        <exclude
-                name="NullAssignment"/> <!-- disabled due to false positive for initialization with ternary operator -->
-        <exclude name="StaticEJBFieldShouldBeFinal"/> <!-- earlier j2ee group-->
-        <exclude name="TestClassWithoutTestCases"/>
-        <exclude name="UseCorrectExceptionLogging"/>
-        <exclude name="UseLocaleWithCaseConversions"/>
-        <exclude name="UseProperClassLoader"/> <!-- earlier j2ee group-->
-    </rule>
-    <rule ref="category/java/errorprone.xml/AvoidDuplicateLiterals">
-        <properties>
-            <property name="skipAnnotations" value="true"/>
-        </properties>
-    </rule>
-
-
-    <!-- Error prone (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_multithreading.html) -->
-    <rule ref="category/java/multithreading.xml">
-        <exclude name="DoNotUseThreads"/> <!-- earlier j2ee group-->
-        <exclude name="UseConcurrentHashMap"/>
-    </rule>
-
-
-    <!-- Performance (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_performance.html) -->
-    <rule ref="category/java/performance.xml">
-        <exclude name="AvoidInstantiatingObjectsInLoops"/>
-    </rule>
-
-    <!-- Security (no rules) -->
-    <rule ref="category/java/security.xml"/>
-
-</ruleset>
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="Base ruleset" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+
+  <description>
+    General Java quality rules.
+  </description>
+
+  <!-- Best practices -->
+  <rule ref="category/java/bestpractices.xml">
+    <exclude name="AbstractClassWithoutAbstractMethod"/>
+    <!-- disabled as it's important for android and doesn't matter for general java (also fixes will
+         conflict with checkstyle's VisibilityModifier check -->
+    <exclude name="AccessorMethodGeneration"/>
+    <exclude name="ArrayIsStoredDirectly"/>
+    <!--  Doesn't work with Java 8 switch clause  -->
+    <exclude name="ExhaustiveSwitchHasDefault"/>
+    <exclude name="GuardLogStatement"/>
+    <exclude name="ImplicitFunctionalInterface"/>
+    <exclude name="UnnecessaryVarargsArrayCreation"/>
+    <exclude name="UseTryWithResources"/>
+    <exclude name="UseVarargs"/>
+  </rule>
+
+
+  <!-- Code style -->
+  <rule ref="category/java/codestyle.xml">
+    <exclude name="AtLeastOneConstructor"/>
+    <exclude name="BooleanGetMethodName"/>
+    <exclude name="CallSuperInConstructor"/>
+    <exclude name="CommentDefaultAccessModifier"/>
+    <exclude name="ConfusingTernary"/>
+    <exclude name="GenericsNaming"/>
+    <exclude name="LinguisticNaming"/>
+    <exclude name="LocalHomeNamingConvention"/> <!-- earlier j2ee group-->
+    <exclude name="LocalInterfaceSessionNamingConvention"/> <!-- earlier j2ee group-->
+    <exclude name="LocalVariableCouldBeFinal"/>
+    <exclude name="LongVariable"/>
+    <exclude name="MDBAndSessionBeanNamingConvention"/> <!-- earlier j2ee group-->
+    <exclude name="OnlyOneReturn"/> <!-- single-return preference is too noisy for this codebase -->
+    <exclude name="RemoteInterfaceNamingConvention"/> <!-- earlier j2ee group-->
+    <exclude name="RemoteSessionInterfaceNamingConvention"/> <!-- earlier j2ee group-->
+    <exclude name="ShortClassName"/>
+    <exclude name="ShortMethodName"/>
+    <exclude name="ShortVariable"/>
+    <exclude name="TooManyStaticImports"/>
+    <exclude name="UnnecessaryAnnotationValueElement"/>
+    <exclude name="UseDiamondOperator"/>
+    <exclude name="UseShortArrayInitializer"/>
+    <exclude name="UselessParentheses"/>
+  </rule>
+
+  <rule ref="category/java/codestyle.xml/ClassNamingConventions">
+    <properties>
+      <property name="utilityClassPattern" value="[A-Z][a-zA-Z0-9]+"/>
+    </properties>
+  </rule>
+
+  <!-- Design -->
+  <rule ref="category/java/design.xml">
+    <exclude name="AvoidCatchingGenericException"/>
+    <exclude name="CouplingBetweenObjects"/>
+    <exclude name="DataClass"/>
+    <exclude name="CyclomaticComplexity"/>
+    <exclude name="ExcessiveImports"/>
+    <exclude name="ExcessivePublicCount"/>
+    <exclude name="LawOfDemeter"/>
+    <exclude name="LoosePackageCoupling"/>
+    <exclude name="NcssCount"/>
+    <exclude name="NPathComplexity"/>
+    <exclude name="SignatureDeclareThrowsException"/>
+    <exclude name="TooManyFields"/>
+  </rule>
+  <rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts">
+    <properties>
+      <property name="problemDepth" value="4"/>
+    </properties>
+  </rule>
+  <rule ref="category/java/design.xml/TooManyMethods" message="Avoid classes longer than 20 methods">
+    <properties>
+      <property name="maxmethods" value="20"/>
+    </properties>
+  </rule>
+
+
+  <!-- Documentation -->
+  <rule ref="category/java/documentation.xml">
+    <exclude name="CommentRequired"/>
+    <exclude name="CommentSize"/>
+  </rule>
+
+
+  <!-- Error prone -->
+  <rule ref="category/java/errorprone.xml">
+    <exclude name="AvoidCatchingThrowable"/>
+    <exclude name="AvoidDuplicateLiterals"/>  <!-- duplicate of checkstyle check MultipleStringLiterals -->
+    <exclude name="AvoidFieldNameMatchingMethodName"/>
+    <exclude name="AssignmentInOperand"/>  <!-- duplicate of checkstyle check InnerAssignment -->
+    <exclude name="AvoidLiteralsInIfCondition"/>
+    <exclude name="EmptyFinalizer"/>
+    <exclude name="FinalizeDoesNotCallSuperFinalize"/>
+    <exclude name="FinalizeOnlyCallsSuperFinalize"/>
+    <exclude name="InvalidLogMessageFormat"/>
+    <exclude name="JUnitSpelling"/>
+    <exclude name="JUnitStaticSuite"/>
+    <exclude name="MissingStaticMethodInNonInstantiatableClass"/>
+    <exclude name="MissingSerialVersionUID"/>
+    <exclude name="NullAssignment"/> <!-- disabled due to false positive for initialization with ternary operator -->
+    <exclude name="StaticEJBFieldShouldBeFinal"/> <!-- earlier j2ee group-->
+    <exclude name="TestClassWithoutTestCases"/>
+    <exclude name="UseCorrectExceptionLogging"/>
+    <exclude name="UseLocaleWithCaseConversions"/>
+    <exclude name="UseProperClassLoader"/> <!-- earlier j2ee group-->
+  </rule>
+
+  <!-- Multithreading -->
+  <rule ref="category/java/multithreading.xml">
+    <exclude name="DoNotUseThreads"/> <!-- earlier j2ee group-->
+    <exclude name="UseConcurrentHashMap"/>
+  </rule>
+
+
+  <!-- Performance -->
+  <rule ref="category/java/performance.xml"/>
+
+
+  <!-- Security (no rules) -->
+  <rule ref="category/java/security.xml"/>
+
+</ruleset>
diff --git a/gradle/quality-configs/spotbugs/exclude.xml b/gradle/quality-configs/spotbugs/exclude.xml
index f942c310b..58ec6c46e 100644
--- a/gradle/quality-configs/spotbugs/exclude.xml
+++ b/gradle/quality-configs/spotbugs/exclude.xml
@@ -9,6 +9,12 @@
     <Match>
         <Source name="~.*\.scala"/>
     </Match>
+    <Match>
+        <Source name="~.*[/\\]generated-sources[/\\].*"/>
+    </Match>
+    <Match>
+        <Source name="~.*[/\\]generated[/\\].*"/>
+    </Match>
 
     <!-- Disable check -->
     <Match>
diff --git a/gradle/quality-configs/spotless/eclipse-jdt.prefs b/gradle/quality-configs/spotless/eclipse-jdt.prefs
new file mode 100644
index 000000000..02f0d0576
--- /dev/null
+++ b/gradle/quality-configs/spotless/eclipse-jdt.prefs
@@ -0,0 +1,19 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=49
+org.eclipse.jdt.core.formatter.comment.format_block_comments=false
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.lineSplit=180
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=separate_lines_if_wrapped
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=separate_lines_if_wrapped
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
diff --git a/gradle/quality-configs/spotless/scalafmt.conf b/gradle/quality-configs/spotless/scalafmt.conf
new file mode 100644
index 000000000..e5465adc9
--- /dev/null
+++ b/gradle/quality-configs/spotless/scalafmt.conf
@@ -0,0 +1,7 @@
+version = "3.7.3"
+runner.dialect = scala213
+maxColumn = 180
+docstrings.style = SpaceAsterisk
+docstrings.oneline = unfold
+docstrings.blankFirstLine = yes
+docstrings.wrap = no