From 979fdbce6612a60caca1b7dcd0542a7c51695f4e Mon Sep 17 00:00:00 2001
From: Bartek Florczak <bflorczak@outlook.com>
Date: Wed, 24 Jun 2020 16:41:51 +0200
Subject: [PATCH 001/486] fix npe in http client integration (via #454)

---
 .../httpclient/AllureHttpClientRequest.java   | 18 +++++-----
 .../httpclient/AllureHttpClientTest.java      | 33 +++++++++++++++++++
 2 files changed, 42 insertions(+), 9 deletions(-)

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 51b7be410..ea4be2ee6 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
@@ -23,7 +23,6 @@
 import io.qameta.allure.attachment.http.HttpRequestAttachment;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.protocol.HttpContext;
@@ -45,7 +44,7 @@ public class AllureHttpClientRequest implements HttpRequestInterceptor {
 
     public AllureHttpClientRequest() {
         this(new FreemarkerAttachmentRenderer("http-request.ftl"),
-                new DefaultAttachmentProcessor()
+             new DefaultAttachmentProcessor()
         );
     }
 
@@ -57,23 +56,24 @@ public AllureHttpClientRequest(final AttachmentRenderer<AttachmentData> renderer
 
     @Override
     public void process(final HttpRequest request,
-                        final HttpContext context) throws HttpException, IOException {
+                        final HttpContext context) throws IOException {
         final HttpRequestAttachment.Builder builder = create("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();
 
-            final ByteArrayOutputStream os = new ByteArrayOutputStream();
-            entity.writeTo(os);
+            if (entity != null) {
+                final ByteArrayOutputStream os = new ByteArrayOutputStream();
+                entity.writeTo(os);
 
-            final String body = new String(os.toByteArray(), StandardCharsets.UTF_8);
-            builder.setBody(body);
+                final String body = new String(os.toByteArray(), StandardCharsets.UTF_8);
+                builder.setBody(body);
+            }
         }
-
         final HttpRequestAttachment requestAttachment = builder.build();
         processor.addAttachment(requestAttachment, renderer);
     }
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 fbbf67ba8..c974fbc7d 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
@@ -20,6 +20,7 @@
 import io.qameta.allure.attachment.AttachmentProcessor;
 import io.qameta.allure.attachment.AttachmentRenderer;
 import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
@@ -33,7 +34,9 @@
 
 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.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.noContent;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
@@ -65,6 +68,9 @@ void setUp() {
         stubFor(get(urlEqualTo("/empty"))
                 .willReturn(aResponse()
                         .withStatus(304)));
+
+        stubFor(delete(urlEqualTo("/hello"))
+                .willReturn(noContent()));
     }
 
     @AfterEach
@@ -155,4 +161,31 @@ void shouldCreateResponseAttachmentWithEmptyBody() throws Exception {
                 .extracting("body")
                 .containsExactly("No body present");
     }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    void shouldCreateRequestAttachmentWithEmptyBodyWhenNoContentIsReturned() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                                                           .addInterceptorLast(new AllureHttpClientRequest(renderer, processor));
+
+        try (CloseableHttpClient httpClient = builder.build()) {
+            final HttpDelete httpDelete = new HttpDelete(String.format("http://localhost:%d/hello", server.port()));
+            try (CloseableHttpResponse response = httpClient.execute(httpDelete)) {
+                assertThat(response.getEntity())
+                        .isEqualTo(null);
+            }
+        }
+
+        final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
+        verify(processor, times(1))
+                .addAttachment(captor.capture(), eq(renderer));
+
+        assertThat(captor.getAllValues())
+                .hasSize(1)
+                .extracting("body")
+                .containsNull();
+    }
 }

From e24a40c2ec01be9050541d61fc6ac2be0f79013c Mon Sep 17 00:00:00 2001
From: Bartek Florczak <bflorczak@outlook.com>
Date: Wed, 24 Jun 2020 19:18:08 +0200
Subject: [PATCH 002/486] add method name and request url to the attachment
 name for http client integration (via #455)

---
 .../allure/httpclient/AllureHttpClientRequest.java       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 ea4be2ee6..5dc0fdd9e 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
@@ -54,10 +54,17 @@ public AllureHttpClientRequest(final AttachmentRenderer<AttachmentData> renderer
         this.processor = processor;
     }
 
+    private static String getAttachmentName(final HttpRequest request) {
+        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 HttpRequestAttachment.Builder builder = create("Request", request.getRequestLine().getUri())
+
+        final HttpRequestAttachment.Builder builder = create(getAttachmentName(request),
+                                                             request.getRequestLine().getUri())
                 .setMethod(request.getRequestLine().getMethod());
 
         Stream.of(request.getAllHeaders())

From b7e516a0a1a9a178de97e8f943c50b26fa38bbfa Mon Sep 17 00:00:00 2001
From: 10koteyka01 <tihonenkovk@mail.ru>
Date: Tue, 30 Jun 2020 16:25:24 +0700
Subject: [PATCH 003/486] bump selenide version (via #451)

---
 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 6473dcf2d..1cbf9732f 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.11.0"
+val selenideVersion = "5.12.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 1b1f8e1b19034f0dfbde19d40eb0d0a067639475 Mon Sep 17 00:00:00 2001
From: QametaCI <ci@qameta.io>
Date: Tue, 7 Jul 2020 10:36:17 +0000
Subject: [PATCH 004/486] [Gradle Release Plugin] - pre tag commit:  '2.13.5'.

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

diff --git a/gradle.properties b/gradle.properties
index fe032911a..802ad6a3b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-version=2.13.4-SNAPSHOT
+version=2.13.5
 org.gradle.daemon=true
 org.gradle.parallel=true
\ No newline at end of file

From b600f7b1d9fbbf81a8efa1f072d0af218530eb46 Mon Sep 17 00:00:00 2001
From: QametaCI <ci@qameta.io>
Date: Tue, 7 Jul 2020 10:36:26 +0000
Subject: [PATCH 005/486] [Gradle Release Plugin] - new version commit: 
 '2.14-SNAPSHOT'.

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

diff --git a/gradle.properties b/gradle.properties
index 802ad6a3b..1491bba12 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-version=2.13.5
+version=2.14-SNAPSHOT
 org.gradle.daemon=true
 org.gradle.parallel=true
\ No newline at end of file

From 39b8ca078bfc1f52dac8786d6c2111ab4887887b Mon Sep 17 00:00:00 2001
From: Andrey K <legionivo@gmail.com>
Date: Tue, 18 Aug 2020 16:15:22 +0200
Subject: [PATCH 006/486] add readme for junit5 assert module (via #459)

---
 allure-junit5-assert/README.MD | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 allure-junit5-assert/README.MD

diff --git a/allure-junit5-assert/README.MD b/allure-junit5-assert/README.MD
new file mode 100644
index 000000000..5124d63c9
--- /dev/null
+++ b/allure-junit5-assert/README.MD
@@ -0,0 +1,21 @@
+Adding JUnit5-assert may lead to java.lang.OutOfMemoryError: Java heap space
+
+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) 
+
+You can configure AspectJ to only process required classes
+* a) package io.qameta.allure -> to process Allure classes
+* b) package org.junit -> to process JUnit classes
+* c) package com.company -> to process your test classes
+
+Link to documentation https://www.eclipse.org/aspectj/doc/released/devguide/ltw-configuration.html#configuring-load-time-weaving-with-aopxml-files
+
+In order to avoid this issue add aop.xml into `resources/META-INF/` folder. 
+
+```<?xml version="1.0" encoding="utf-8"?>
+<aspectj>
+    <weaver>
+        <include within="io.qameta..*" />
+        <include within="org.junit..*" />
+        <include within="com.company..*" />
+    </weaver>
+</aspectj>```

From ea4ab0fc711bf010df440f128c0b81234b850334 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 14 Sep 2020 18:42:55 +0300
Subject: [PATCH 007/486] bump deps (via #471)

---
 .../allure/assertj/AllureAspectJTest.java     |   2 +-
 .../src/main/resources/META-INF/aop-ajc.xml   |   3 +-
 .../src/main/resources/META-INF/aop-ajc.xml   |   3 +-
 .../src/main/resources/META-INF/aop-ajc.xml   |   3 +-
 .../cucumber5jvm/AllureCucumber5Jvm.java      |  52 ++++++--
 .../testsourcemodel/TestSourcesModel.java     |  15 +++
 .../TestSourcesModelProxy.java                |   1 -
 .../httpclient/AllureHttpClientTest.java      |   1 -
 allure-java-commons-test/build.gradle.kts     |   2 +
 .../java/io/qameta/allure/test/TestData.java  |  41 +++++++
 .../test/ThreadLocalEnhancedRandom.java       |  37 ++++++
 allure-java-commons/build.gradle.kts          |   1 +
 .../io/qameta/allure/AllureLifecycleTest.java |  66 ++++++-----
 .../java/io/qameta/allure/AllureTest.java     |  25 ++--
 .../allure/FileSystemResultsWriterTest.java   |   6 +-
 .../src/test/resources/META-INF/aop-ajc.xml   |   3 +-
 .../src/main/resources/META-INF/aop-ajc.xml   |   2 +-
 allure-junit-platform/build.gradle.kts        |   1 +
 .../src/main/resources/META-INF/aop-ajc.xml   |   3 +-
 .../AllureJunitPlatformTest.java              |   8 +-
 .../src/main/resources/META-INF/aop.xml       |   1 +
 .../src/main/resources/META-INF/aop-ajc.xml   |   1 +
 .../junit5assert/AllureJunit5AssertTest.java  |   1 -
 .../io/qameta/allure/junit5/AllureJunit5.java |  15 +++
 .../allure/junit5/AllureJunit5Test.java       |  17 ++-
 .../AfterEachFixtureFailureSupport.java       |  15 +++
 .../junit5/features/AllFixtureSupport.java    |  15 +++
 .../BeforeEachFixtureFailureSupport.java      |  16 ++-
 .../junit5/features/EachFixtureSupport.java   |  15 +++
 .../src/main/resources/META-INF/aop-ajc.xml   |   3 +-
 .../src/main/resources/META-INF/aop-ajc.xml   |   1 +
 allure-testng/build.gradle.kts                |   1 +
 .../src/main/resources/META-INF/aop-ajc.xml   |   3 +-
 .../allure/testng/AllureTestNgTest.java       |   9 +-
 .../test/resources/suites/all-features.xml    |   2 +-
 .../src/test/resources/suites/attachments.xml |   2 +-
 .../test/resources/suites/bdd-annotations.xml |   2 +-
 .../src/test/resources/suites/broken.xml      |   2 +-
 .../resources/suites/brokenWithoutMessage.xml |   2 +-
 .../suites/descriptions-test-two-classes.xml  |   2 +-
 .../resources/suites/descriptions-test.xml    |   2 +-
 .../suites/failed-after-method-fixture.xml    |   2 +-
 .../suites/failed-after-suite-fixture.xml     |   2 +-
 .../suites/failed-after-test-fixture.xml      |   2 +-
 .../suites/failed-before-method-fixture.xml   |   2 +-
 .../suites/failed-before-suite-fixture.xml    |   2 +-
 .../suites/failed-before-test-fixture.xml     |   2 +-
 .../suites/failed-test-passed-fixture.xml     |   2 +-
 .../resources/suites/failing-by-assertion.xml |   2 +-
 .../src/test/resources/suites/flaky.xml       |   2 +-
 .../src/test/resources/suites/gh-101.xml      |   2 +-
 .../src/test/resources/suites/gh-102.xml      |   2 +-
 .../src/test/resources/suites/gh-106.xml      |   2 +-
 .../src/test/resources/suites/gh-128.xml      |   2 +-
 .../src/test/resources/suites/gh-129.xml      |   2 +-
 .../src/test/resources/suites/gh-135.xml      |   2 +-
 .../src/test/resources/suites/gh-141.xml      |   2 +-
 .../src/test/resources/suites/gh-219.xml      |   2 +-
 .../src/test/resources/suites/gh-304.xml      |   2 +-
 .../src/test/resources/suites/gh-42.xml       |   2 +-
 .../src/test/resources/suites/gh-49.xml       |   2 +-
 .../src/test/resources/suites/gh-97.xml       |   2 +-
 .../src/test/resources/suites/gh-99.xml       |   2 +-
 .../suites/history-id-parameters.xml          |   2 +-
 .../resources/suites/history-id-the-same.xml  |   2 +-
 .../src/test/resources/suites/links.xml       |   2 +-
 .../src/test/resources/suites/muted.xml       |   2 +-
 .../test/resources/suites/nested-steps.xml    |   2 +-
 .../src/test/resources/suites/owner.xml       |   2 +-
 .../suites/parallel-data-provider.xml         |   2 +-
 .../resources/suites/parallel-methods.xml     |   2 +-
 .../resources/suites/parameterized-suite1.xml |   2 +-
 .../resources/suites/parameterized-suite2.xml |   2 +-
 .../resources/suites/parameterized-test.xml   |   2 +-
 .../suites/per-class-fixtures-combination.xml |   2 +-
 .../per-method-fixtures-combination.xml       |   2 +-
 .../suites/per-suite-fixtures-combination.xml |   2 +-
 .../per-test-tag-fixtures-combination.xml     |   2 +-
 .../src/test/resources/suites/retry.xml       |   2 +-
 .../src/test/resources/suites/severity.xml    |   2 +-
 .../src/test/resources/suites/single-test.xml |   2 +-
 .../test/resources/suites/skipped-suite.xml   |   2 +-
 .../resources/suites/tests-with-timeout.xml   |   2 +-
 allure-testng/src/test/resources/testng.xml   |   2 +-
 build.gradle.kts                              | 112 +++++++++---------
 gradle.properties                             |   6 +-
 .../quality-configs/checkstyle/checkstyle.xml |   7 +-
 gradle/quality-configs/pmd/pmd.xml            |   4 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin 55616 -> 58694 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       |  51 ++++----
 gradlew.bat                                   |  21 +++-
 92 files changed, 481 insertions(+), 210 deletions(-)
 create mode 100644 allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java
 create mode 100644 allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java

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 7a48210c8..a4c311e29 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
@@ -82,7 +82,7 @@ void shouldHandleByteArrayObject() {
                 .extracting(StepResult::getName)
                 .containsExactly(
                         "assertThat '<BINARY>'",
-                        "as 'Byte array object []'",
+                        "describedAs 'Byte array object'",
                         "isEqualTo '<BINARY>'"
                 );
     }
diff --git a/allure-cucumber-jvm/src/main/resources/META-INF/aop-ajc.xml b/allure-cucumber-jvm/src/main/resources/META-INF/aop-ajc.xml
index a980b7a2d..09e38300c 100644
--- a/allure-cucumber-jvm/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-cucumber-jvm/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +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>
\ No newline at end of file
+</aspectj>
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
index a980b7a2d..09e38300c 100644
--- a/allure-cucumber2-jvm/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-cucumber2-jvm/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +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>
\ No newline at end of file
+</aspectj>
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
index a980b7a2d..09e38300c 100644
--- a/allure-cucumber3-jvm/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-cucumber3-jvm/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +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>
\ No newline at end of file
+</aspectj>
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 932e0df7a..724e058db 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
@@ -15,33 +15,67 @@
  */
 package io.qameta.allure.cucumber5jvm;
 
-
-import gherkin.ast.*;
-import io.qameta.allure.cucumber5jvm.testsourcemodel.TestSourcesModelProxy;
+import gherkin.ast.Examples;
+import gherkin.ast.Feature;
+import gherkin.ast.ScenarioDefinition;
+import gherkin.ast.ScenarioOutline;
+import gherkin.ast.TableRow;
 import io.cucumber.plugin.ConcurrentEventListener;
-import io.cucumber.plugin.event.*;
+import io.cucumber.plugin.event.DataTableArgument;
+import io.cucumber.plugin.event.EmbedEvent;
+import io.cucumber.plugin.event.EventHandler;
+import io.cucumber.plugin.event.EventPublisher;
+import io.cucumber.plugin.event.HookTestStep;
+import io.cucumber.plugin.event.HookType;
+import io.cucumber.plugin.event.PickleStepTestStep;
+import io.cucumber.plugin.event.Result;
+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.TestStepFinished;
+import io.cucumber.plugin.event.TestStepStarted;
+import io.cucumber.plugin.event.WriteEvent;
 import io.qameta.allure.Allure;
 import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.*;
+import io.qameta.allure.cucumber5jvm.testsourcemodel.TestSourcesModelProxy;
+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.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import static io.qameta.allure.util.ResultsUtils.*;
+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 5.0.
  */
 @SuppressWarnings({
+        "ClassDataAbstractionCoupling",
+        "ClassFanOutComplexity",
         "PMD.ExcessiveImports",
-        "ClassFanOutComplexity", "ClassDataAbstractionCoupling"
+        "PMD.GodClass",
 })
 public class AllureCucumber5Jvm implements ConcurrentEventListener {
 
@@ -291,7 +325,7 @@ private List<Parameter> getExamplesAsParameters(
     private void createDataTableAttachment(final DataTableArgument dataTableArgument) {
         final List<List<String>> rowsInTable = dataTableArgument.cells();
         final StringBuilder dataTableCsv = new StringBuilder();
-        for (List<String> columns:rowsInTable) {
+        for (List<String> columns : rowsInTable) {
             if (!columns.isEmpty()) {
                 for (int i = 0; i < columns.size(); i++) {
                     if (i == columns.size() - 1) {
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 94057e3a6..6ffda30d3 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,3 +1,18 @@
+/*
+ *  Copyright 2020 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.cucumber5jvm.testsourcemodel;
 
 import gherkin.AstBuilder;
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 084b7bd4b..46937911c 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
@@ -25,7 +25,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-
 public class TestSourcesModelProxy {
 
     private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();
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 c974fbc7d..366458e4a 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
@@ -162,7 +162,6 @@ void shouldCreateResponseAttachmentWithEmptyBody() throws Exception {
                 .containsExactly("No body present");
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     void shouldCreateRequestAttachmentWithEmptyBodyWhenNoContentIsReturned() throws Exception {
         final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
diff --git a/allure-java-commons-test/build.gradle.kts b/allure-java-commons-test/build.gradle.kts
index 3141a7a13..ea06623dc 100644
--- a/allure-java-commons-test/build.gradle.kts
+++ b/allure-java-commons-test/build.gradle.kts
@@ -2,6 +2,8 @@ description = "Allure Java Commons Test Utils"
 
 dependencies {
     api("commons-io:commons-io")
+    api("io.github.benas:random-beans")
+    api("org.apache.commons:commons-lang3")
     api(project(":allure-java-commons"))
 }
 
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
new file mode 100644
index 000000000..3748458f8
--- /dev/null
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java
@@ -0,0 +1,41 @@
+/*
+ *  Copyright 2020 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 org.apache.commons.lang3.RandomStringUtils;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public final class TestData {
+
+    private TestData() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    public static String randomName() {
+        return RandomStringUtils.randomAlphabetic(10);
+    }
+
+    public static String randomId() {
+        return randomString(10);
+    }
+
+    public static String randomString(final int count) {
+        return RandomStringUtils.randomAlphanumeric(count);
+    }
+
+}
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
new file mode 100644
index 000000000..d0be47326
--- /dev/null
+++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/ThreadLocalEnhancedRandom.java
@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2020 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 io.github.benas.randombeans.EnhancedRandomBuilder;
+import io.github.benas.randombeans.api.EnhancedRandom;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public final class ThreadLocalEnhancedRandom {
+
+    private static final ThreadLocal<EnhancedRandom> INSTANCE = ThreadLocal
+            .withInitial(EnhancedRandomBuilder::aNewEnhancedRandom);
+
+    private ThreadLocalEnhancedRandom() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    public static EnhancedRandom current() {
+        return INSTANCE.get();
+    }
+
+}
diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts
index 6886a31f5..3d2000b20 100644
--- a/allure-java-commons/build.gradle.kts
+++ b/allure-java-commons/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     implementation("org.jooq:joor-java-8")
     testImplementation("io.github.benas:random-beans")
     testImplementation("io.github.glytching:junit-extensions")
+    testImplementation("org.apache.commons:commons-lang3")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
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 4d86ddc06..35ea19d86 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
@@ -45,9 +45,11 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static io.github.benas.randombeans.api.EnhancedRandom.random;
 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;
 import static java.util.concurrent.CompletableFuture.allOf;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
@@ -71,8 +73,8 @@ public void setUp() {
 
     @Test
     void shouldCreateTest() {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
         final TestResult result = new TestResult().setUuid(uuid).setName(name);
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestCase(uuid);
@@ -90,8 +92,8 @@ void shouldCreateTest() {
 
     @Test
     void shouldCreateTestContainer() {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
         final TestResultContainer container = new TestResultContainer()
                 .setUuid(uuid)
                 .setName(name);
@@ -111,15 +113,15 @@ void shouldCreateTestContainer() {
 
     @Test
     void shouldCreateChildTestContainer() {
-        final String parentUuid = random(String.class);
-        final String parentName = random(String.class);
+        final String parentUuid = randomId();
+        final String parentName = randomName();
         final TestResultContainer parent = new TestResultContainer()
                 .setUuid(parentUuid)
                 .setName(parentName);
         lifecycle.startTestContainer(parent);
 
-        final String childUuid = random(String.class);
-        final String childName = random(String.class);
+        final String childUuid = randomId();
+        final String childName = randomName();
         final TestResultContainer container = new TestResultContainer()
                 .setUuid(childUuid)
                 .setName(childName);
@@ -155,8 +157,8 @@ void shouldCreateChildTestContainer() {
 
     @Test
     void shouldAddStepsToTests() {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
         final TestResult result = new TestResult().setUuid(uuid).setName(name);
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestCase(uuid);
@@ -183,21 +185,21 @@ void shouldAddStepsToTests() {
 
     @Test
     void shouldUpdateTest() {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        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 = random(String.class);
-        final String stepName = random(String.class);
+        final String stepUuid = randomId();
+        final String stepName = randomName();
 
         final StepResult step = new StepResult().setName(stepName);
         lifecycle.startStep(uuid, stepUuid, step);
 
-        final String description = random(String.class);
-        final String fullName = random(String.class);
+        final String description = randomName();
+        final String fullName = randomName();
 
         lifecycle.updateTestCase(uuid, testResult -> testResult.setDescription(description));
         lifecycle.updateTestCase(testResult -> testResult.setFullName(fullName));
@@ -225,9 +227,9 @@ void shouldUpdateTest() {
 
     @Test
     void shouldUpdateContainer() {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
-        final String newName = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
+        final String newName = randomName();
 
         final TestResultContainer container = new TestResultContainer()
                 .setUuid(uuid)
@@ -249,16 +251,16 @@ void shouldUpdateContainer() {
 
     @Test
     void shouldCreateTestFixture() {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
 
         TestResultContainer container = new TestResultContainer()
                 .setUuid(uuid)
                 .setName(name);
         lifecycle.startTestContainer(container);
 
-        final String firstUuid = random(String.class);
-        final String firstName = random(String.class);
+        final String firstUuid = randomId();
+        final String firstName = randomName();
         final FixtureResult first = new FixtureResult().setName(firstName);
 
         lifecycle.startPrepareFixture(uuid, firstUuid, first);
@@ -309,11 +311,11 @@ void shouldAttachAsync() {
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestCase(uuid);
 
-        final String attachment1Content = random(String.class);
-        final String attachment2Content = random(String.class);
+        final String attachment1Content = randomString(100);
+        final String attachment2Content = randomString(100);
 
-        final String attachment1Name = random(String.class);
-        final String attachment2Name = random(String.class);
+        final String attachment1Name = randomName();
+        final String attachment2Name = randomName();
 
         features.add(addStreamAttachmentAsync(
                 attachment1Name, "video/mp4", getStreamWithTimeout(2, attachment1Content)));
@@ -381,8 +383,8 @@ private Supplier<InputStream> getStreamWithTimeout(final long delay, final Strin
 
     @Test
     void supportForConcurrentUseOfChildThreads() throws Exception {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
 
         final int threads = 20;
         final int stepsCount = 1000;
@@ -446,8 +448,8 @@ void supportForConcurrentUseOfChildThreads() throws Exception {
     }
 
     private String randomStep(String parentUuid) {
-        final String uuid = random(String.class);
-        final String name = random(String.class);
+        final String uuid = randomId();
+        final String name = randomName();
         final StepResult step = new StepResult().setName(name);
         lifecycle.startStep(parentUuid, uuid, step);
         lifecycle.stopStep(uuid);
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 53c2f81bd..ac7dbccc9 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
@@ -29,7 +29,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import static io.github.benas.randombeans.api.EnhancedRandom.random;
 import static io.qameta.allure.Allure.attachment;
 import static io.qameta.allure.Allure.description;
 import static io.qameta.allure.Allure.descriptionHtml;
@@ -43,6 +42,8 @@
 import static io.qameta.allure.Allure.step;
 import static io.qameta.allure.Allure.tms;
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static io.qameta.allure.test.TestData.randomName;
+import static io.qameta.allure.test.ThreadLocalEnhancedRandom.current;
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -140,9 +141,9 @@ void shouldHideCheckedExceptions() {
 
     @Test
     void shouldAddLabels() {
-        final Label first = random(Label.class);
-        final Label second = random(Label.class);
-        final Label third = random(Label.class);
+        final Label first = current().nextObject(Label.class);
+        final Label second = current().nextObject(Label.class);
+        final Label third = current().nextObject(Label.class);
 
         final AllureResults results = runWithinTestContext(
                 () -> getLifecycle().updateTestCase(testResult -> testResult.getLabels().addAll(asList(first, second, third))),
@@ -156,9 +157,9 @@ void shouldAddLabels() {
 
     @Test
     void shouldAddParameter() {
-        final Parameter first = random(Parameter.class);
-        final Parameter second = random(Parameter.class);
-        final Parameter third = random(Parameter.class);
+        final Parameter first = current().nextObject(Parameter.class);
+        final Parameter second = current().nextObject(Parameter.class);
+        final Parameter third = current().nextObject(Parameter.class);
 
         final AllureResults results = runWithinTestContext(
                 () -> {
@@ -181,9 +182,9 @@ void shouldAddParameter() {
 
     @Test
     void shouldAddLinks() {
-        final io.qameta.allure.model.Link first = random(Link.class);
-        final io.qameta.allure.model.Link second = random(Link.class);
-        final io.qameta.allure.model.Link third = random(Link.class);
+        final io.qameta.allure.model.Link first = current().nextObject(Link.class);
+        final io.qameta.allure.model.Link second = current().nextObject(Link.class);
+        final io.qameta.allure.model.Link third = current().nextObject(Link.class);
 
         final AllureResults results = runWithinTestContext(
                 () -> {
@@ -206,7 +207,7 @@ void shouldAddLinks() {
 
     @Test
     void shouldAddDescription() {
-        final String description = random(String.class);
+        final String description = randomName();
 
         final AllureResults results = runWithinTestContext(
                 () -> description(description),
@@ -220,7 +221,7 @@ void shouldAddDescription() {
 
     @Test
     void shouldAddDescriptionHtml() {
-        final String descriptionHtml = random(String.class);
+        final String descriptionHtml = randomName();
 
         final AllureResults results = runWithinTestContext(
                 () -> descriptionHtml(descriptionHtml),
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 667f17285..9c0b103c6 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,8 +22,8 @@
 import java.nio.file.Path;
 import java.util.UUID;
 
-import static io.github.benas.randombeans.api.EnhancedRandom.random;
 import static io.qameta.allure.FileSystemResultsWriter.generateTestResultName;
+import static io.qameta.allure.test.ThreadLocalEnhancedRandom.current;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -35,7 +35,7 @@ public class FileSystemResultsWriterTest {
     void shouldNotFailIfNoResultsDirectory(@TempDir final Path folder) {
         Path resolve = folder.resolve("some-directory");
         FileSystemResultsWriter writer = new FileSystemResultsWriter(resolve);
-        final TestResult testResult = random(TestResult.class, "steps");
+        final TestResult testResult = current().nextObject(TestResult.class, "steps");
         writer.write(testResult);
     }
 
@@ -43,7 +43,7 @@ void shouldNotFailIfNoResultsDirectory(@TempDir final Path folder) {
     void shouldWriteTestResult(@TempDir final Path folder) {
         FileSystemResultsWriter writer = new FileSystemResultsWriter(folder);
         final String uuid = UUID.randomUUID().toString();
-        final TestResult testResult = random(TestResult.class, "steps").setUuid(uuid);
+        final TestResult testResult = current().nextObject(TestResult.class, "steps").setUuid(uuid);
         writer.write(testResult);
 
         final String fileName = generateTestResultName(uuid);
diff --git a/allure-java-commons/src/test/resources/META-INF/aop-ajc.xml b/allure-java-commons/src/test/resources/META-INF/aop-ajc.xml
index a980b7a2d..09e38300c 100644
--- a/allure-java-commons/src/test/resources/META-INF/aop-ajc.xml
+++ b/allure-java-commons/src/test/resources/META-INF/aop-ajc.xml
@@ -1,6 +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>
\ No newline at end of file
+</aspectj>
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
index 6c013660f..cd3df04f5 100644
--- a/allure-java-migration/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-java-migration/src/main/resources/META-INF/aop-ajc.xml
@@ -1,9 +1,9 @@
 <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>
-    <weaver options="-warn:none -Xlint:ignore"/>
 </aspectj>
diff --git a/allure-junit-platform/build.gradle.kts b/allure-junit-platform/build.gradle.kts
index 2cf696e6f..82528cfc2 100644
--- a/allure-junit-platform/build.gradle.kts
+++ b/allure-junit-platform/build.gradle.kts
@@ -7,6 +7,7 @@ dependencies {
     api(project(":allure-java-commons"))
     implementation("org.junit.jupiter:junit-jupiter-api")
     implementation("org.junit.platform:junit-platform-launcher")
+    testAnnotationProcessor("org.slf4j:slf4j-simple")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
diff --git a/allure-junit-platform/src/main/resources/META-INF/aop-ajc.xml b/allure-junit-platform/src/main/resources/META-INF/aop-ajc.xml
index a980b7a2d..09e38300c 100644
--- a/allure-junit-platform/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-junit-platform/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +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>
\ No newline at end of file
+</aspectj>
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 f81c299e0..e9f010f9a 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
@@ -220,9 +220,9 @@ void shouldProcessBrokenInAfterAllTests() {
                         tr -> Optional.of(tr).map(TestResult::getStatusDetails).map(StatusDetails::getMessage).orElse(null))
                 .containsExactlyInAnyOrder(
                         tuple("BrokenInAfterAllTests", Status.BROKEN, "Exception in @AfterAll"),
-                        tuple("[1] a", Status.PASSED, null),
-                        tuple("[2] b", Status.PASSED, null),
-                        tuple("[3] c", Status.PASSED, null),
+                        tuple("[1] value=a", Status.PASSED, null),
+                        tuple("[2] value=b", Status.PASSED, null),
+                        tuple("[3] value=c", Status.PASSED, null),
                         tuple("test1()", Status.PASSED, null),
                         tuple("test2()", Status.PASSED, null)
                 );
@@ -334,7 +334,7 @@ void shouldProcessParametrisedTests() {
                 .hasSize(2)
                 .filteredOn(hasStatus(Status.PASSED))
                 .flatExtracting(TestResult::getName)
-                .containsExactlyInAnyOrder("[1] Hello", "[2] World");
+                .containsExactlyInAnyOrder("[1] argument=Hello", "[2] argument=World");
     }
 
     @Test
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 fa1632bca..95f3e6a10 100644
--- a/allure-junit4-aspect/src/main/resources/META-INF/aop.xml
+++ b/allure-junit4-aspect/src/main/resources/META-INF/aop.xml
@@ -1,4 +1,5 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.junit4.aspect.AllureJunit4ListenerAspect"/>
     </aspects>
diff --git a/allure-junit4/src/main/resources/META-INF/aop-ajc.xml b/allure-junit4/src/main/resources/META-INF/aop-ajc.xml
index 1f439cb73..09e38300c 100644
--- a/allure-junit4/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-junit4/src/main/resources/META-INF/aop-ajc.xml
@@ -1,4 +1,5 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.aspects.StepsAspects"/>
         <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
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 63d88429e..44d187e5e 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
@@ -233,4 +233,3 @@ void setLastName(String lastName) {
         }
     }
 }
-
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 501558459..9f2e2b04f 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,3 +1,18 @@
+/*
+ *  Copyright 2020 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.junit5;
 
 import io.qameta.allure.model.Status;
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 3a2a488eb..db61285fe 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,3 +1,18 @@
+/*
+ *  Copyright 2020 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.junit5;
 
 import io.qameta.allure.Allure;
@@ -277,4 +292,4 @@ private AllureResults runClasses(final Class<?>... classes) {
             AttachmentsAspects.setLifecycle(defaultLifecycle);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureFailureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureFailureSupport.java
index d5fd76364..b70b1f919 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureFailureSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureFailureSupport.java
@@ -1,3 +1,18 @@
+/*
+ *  Copyright 2020 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.junit5.features;
 
 import io.qameta.allure.Allure;
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 f19bc65e6..2ef2e0550 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,3 +1,18 @@
+/*
+ *  Copyright 2020 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.junit5.features;
 
 import io.qameta.allure.Allure;
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureFailureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureFailureSupport.java
index f2f77d695..6d7e960cb 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureFailureSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureFailureSupport.java
@@ -1,7 +1,21 @@
+/*
+ *  Copyright 2020 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.junit5.features;
 
 import io.qameta.allure.Allure;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
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 5e723f39b..ac6005395 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,3 +1,18 @@
+/*
+ *  Copyright 2020 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.junit5.features;
 
 import io.qameta.allure.Allure;
diff --git a/allure-scalatest/src/main/resources/META-INF/aop-ajc.xml b/allure-scalatest/src/main/resources/META-INF/aop-ajc.xml
index a980b7a2d..09e38300c 100644
--- a/allure-scalatest/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-scalatest/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +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>
\ No newline at end of file
+</aspectj>
diff --git a/allure-spock/src/main/resources/META-INF/aop-ajc.xml b/allure-spock/src/main/resources/META-INF/aop-ajc.xml
index 1f439cb73..09e38300c 100644
--- a/allure-spock/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-spock/src/main/resources/META-INF/aop-ajc.xml
@@ -1,4 +1,5 @@
 <aspectj>
+    <weaver options="-warn:none -Xlint:ignore"/>
     <aspects>
         <aspect name="io.qameta.allure.aspects.StepsAspects"/>
         <aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
diff --git a/allure-testng/build.gradle.kts b/allure-testng/build.gradle.kts
index dd43d7ecf..36565c519 100644
--- a/allure-testng/build.gradle.kts
+++ b/allure-testng/build.gradle.kts
@@ -8,6 +8,7 @@ dependencies {
     agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("org.testng:testng:$testNgVersion")
+    testAnnotationProcessor("org.slf4j:slf4j-simple")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("com.google.inject:guice")
     testImplementation("org.assertj:assertj-core")
diff --git a/allure-testng/src/main/resources/META-INF/aop-ajc.xml b/allure-testng/src/main/resources/META-INF/aop-ajc.xml
index a980b7a2d..09e38300c 100644
--- a/allure-testng/src/main/resources/META-INF/aop-ajc.xml
+++ b/allure-testng/src/main/resources/META-INF/aop-ajc.xml
@@ -1,6 +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>
\ No newline at end of file
+</aspectj>
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 c8ff94225..564a6a35f 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
@@ -22,7 +22,6 @@
 import io.qameta.allure.aspects.AttachmentsAspects;
 import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.model.Attachment;
-import io.qameta.allure.model.ExecutableItem;
 import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
@@ -33,6 +32,7 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
+import io.qameta.allure.model.WithSteps;
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.AllureResultsWriterStub;
@@ -66,11 +66,11 @@
 @SuppressWarnings("deprecation")
 public class AllureTestNgTest {
 
-    private static final Condition<List<? extends ExecutableItem>> ALL_FINISHED = new Condition<>(items ->
+    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 ExecutableItem>> WITH_STEPS = new Condition<>(items ->
+    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");
 
@@ -199,7 +199,6 @@ public void descriptionsTest() {
                 .contains(testDescription);
     }
 
-    @SuppressWarnings("unchecked")
     @AllureFeatures.Descriptions
     @Test(description = "Javadoc description of befores", dataProvider = "parallelConfiguration")
     public void descriptionsBefores(final XmlSuite.ParallelMode mode, final int threadCount) {
@@ -990,7 +989,7 @@ public void shouldProcessConfigurationFailure() {
 
         assertThat(results.getTestResults())
                 .filteredOn("name", "failed configuration")
-                .extracting(ExecutableItem::getStatusDetails)
+                .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
                 .containsExactly("fail");
     }
diff --git a/allure-testng/src/test/resources/suites/all-features.xml b/allure-testng/src/test/resources/suites/all-features.xml
index ae78bc46a..5a2654f96 100644
--- a/allure-testng/src/test/resources/suites/all-features.xml
+++ b/allure-testng/src/test/resources/suites/all-features.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/attachments.xml b/allure-testng/src/test/resources/suites/attachments.xml
index 42e80252a..2de7fd740 100644
--- a/allure-testng/src/test/resources/suites/attachments.xml
+++ b/allure-testng/src/test/resources/suites/attachments.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/bdd-annotations.xml b/allure-testng/src/test/resources/suites/bdd-annotations.xml
index 263f50759..35bc9b57e 100644
--- a/allure-testng/src/test/resources/suites/bdd-annotations.xml
+++ b/allure-testng/src/test/resources/suites/bdd-annotations.xml
@@ -8,4 +8,4 @@
             <class name="io.qameta.allure.testng.samples.BddAnnotationsTestsInherited"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/broken.xml b/allure-testng/src/test/resources/suites/broken.xml
index 2c06be806..8c5280f29 100644
--- a/allure-testng/src/test/resources/suites/broken.xml
+++ b/allure-testng/src/test/resources/suites/broken.xml
@@ -11,4 +11,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/brokenWithoutMessage.xml b/allure-testng/src/test/resources/suites/brokenWithoutMessage.xml
index e6b58bc2b..cdf35c371 100644
--- a/allure-testng/src/test/resources/suites/brokenWithoutMessage.xml
+++ b/allure-testng/src/test/resources/suites/brokenWithoutMessage.xml
@@ -11,4 +11,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/descriptions-test-two-classes.xml b/allure-testng/src/test/resources/suites/descriptions-test-two-classes.xml
index a4ff104f6..08aa85e7f 100644
--- a/allure-testng/src/test/resources/suites/descriptions-test-two-classes.xml
+++ b/allure-testng/src/test/resources/suites/descriptions-test-two-classes.xml
@@ -11,4 +11,4 @@
     <listeners>
         <listener class-name="io.qameta.allure.testng.AllureTestNg"/>
     </listeners>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/descriptions-test.xml b/allure-testng/src/test/resources/suites/descriptions-test.xml
index d146cbd7d..7bc8ce60e 100644
--- a/allure-testng/src/test/resources/suites/descriptions-test.xml
+++ b/allure-testng/src/test/resources/suites/descriptions-test.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.DescriptionsTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-after-method-fixture.xml b/allure-testng/src/test/resources/suites/failed-after-method-fixture.xml
index 7999d78e6..766cb4b6c 100644
--- a/allure-testng/src/test/resources/suites/failed-after-method-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-after-method-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedAfterMethod"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-after-suite-fixture.xml b/allure-testng/src/test/resources/suites/failed-after-suite-fixture.xml
index c78c1e25d..729a64f21 100644
--- a/allure-testng/src/test/resources/suites/failed-after-suite-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-after-suite-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedAfterSuite"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-after-test-fixture.xml b/allure-testng/src/test/resources/suites/failed-after-test-fixture.xml
index 1ddf24d0c..794f22806 100644
--- a/allure-testng/src/test/resources/suites/failed-after-test-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-after-test-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedAfterTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-before-method-fixture.xml b/allure-testng/src/test/resources/suites/failed-before-method-fixture.xml
index 0249fd3b8..8536b19c5 100644
--- a/allure-testng/src/test/resources/suites/failed-before-method-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-before-method-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedBeforeMethod"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-before-suite-fixture.xml b/allure-testng/src/test/resources/suites/failed-before-suite-fixture.xml
index 8049565e7..8cf017945 100644
--- a/allure-testng/src/test/resources/suites/failed-before-suite-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-before-suite-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedBeforeSuite"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-before-test-fixture.xml b/allure-testng/src/test/resources/suites/failed-before-test-fixture.xml
index 12bb60761..7fa23084c 100644
--- a/allure-testng/src/test/resources/suites/failed-before-test-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-before-test-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedBeforeTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failed-test-passed-fixture.xml b/allure-testng/src/test/resources/suites/failed-test-passed-fixture.xml
index 076988b92..944827b31 100644
--- a/allure-testng/src/test/resources/suites/failed-test-passed-fixture.xml
+++ b/allure-testng/src/test/resources/suites/failed-test-passed-fixture.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedTestPassedBeforeFixture"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/failing-by-assertion.xml b/allure-testng/src/test/resources/suites/failing-by-assertion.xml
index ae8503fc7..fa1f373b6 100644
--- a/allure-testng/src/test/resources/suites/failing-by-assertion.xml
+++ b/allure-testng/src/test/resources/suites/failing-by-assertion.xml
@@ -11,4 +11,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/flaky.xml b/allure-testng/src/test/resources/suites/flaky.xml
index 456e30cff..97bbc749c 100644
--- a/allure-testng/src/test/resources/suites/flaky.xml
+++ b/allure-testng/src/test/resources/suites/flaky.xml
@@ -10,4 +10,4 @@
             <class name="io.qameta.allure.testng.samples.FlakyTestClassInherited"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-101.xml b/allure-testng/src/test/resources/suites/gh-101.xml
index 1457eb828..5afef5fc9 100644
--- a/allure-testng/src/test/resources/suites/gh-101.xml
+++ b/allure-testng/src/test/resources/suites/gh-101.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FixtureWithDescription"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-102.xml b/allure-testng/src/test/resources/suites/gh-102.xml
index be31b547b..bdac2559f 100644
--- a/allure-testng/src/test/resources/suites/gh-102.xml
+++ b/allure-testng/src/test/resources/suites/gh-102.xml
@@ -8,4 +8,4 @@
             <class name="io.qameta.allure.testng.samples.BaseTestB"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-106.xml b/allure-testng/src/test/resources/suites/gh-106.xml
index 04deb1902..4dec26138 100644
--- a/allure-testng/src/test/resources/suites/gh-106.xml
+++ b/allure-testng/src/test/resources/suites/gh-106.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.CyrillicDescriptions"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-128.xml b/allure-testng/src/test/resources/suites/gh-128.xml
index a55b8b93b..cf29f3df1 100644
--- a/allure-testng/src/test/resources/suites/gh-128.xml
+++ b/allure-testng/src/test/resources/suites/gh-128.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.DataProviderWithArray"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-129.xml b/allure-testng/src/test/resources/suites/gh-129.xml
index 587d8c661..955ecc9f6 100644
--- a/allure-testng/src/test/resources/suites/gh-129.xml
+++ b/allure-testng/src/test/resources/suites/gh-129.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.NullParamTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-135.xml b/allure-testng/src/test/resources/suites/gh-135.xml
index ec5c902b0..012b1299d 100644
--- a/allure-testng/src/test/resources/suites/gh-135.xml
+++ b/allure-testng/src/test/resources/suites/gh-135.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.ConfigurationFailure"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-141.xml b/allure-testng/src/test/resources/suites/gh-141.xml
index 3ba451d89..ba38d9d17 100644
--- a/allure-testng/src/test/resources/suites/gh-141.xml
+++ b/allure-testng/src/test/resources/suites/gh-141.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FactoryOnConstructorTests"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-219.xml b/allure-testng/src/test/resources/suites/gh-219.xml
index bceadc7a0..ce8355492 100644
--- a/allure-testng/src/test/resources/suites/gh-219.xml
+++ b/allure-testng/src/test/resources/suites/gh-219.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.BeforeMethods"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-304.xml b/allure-testng/src/test/resources/suites/gh-304.xml
index 7c2c9c6ab..303a2eb1a 100644
--- a/allure-testng/src/test/resources/suites/gh-304.xml
+++ b/allure-testng/src/test/resources/suites/gh-304.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedSetUp"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-42.xml b/allure-testng/src/test/resources/suites/gh-42.xml
index ab6ce4368..450439705 100644
--- a/allure-testng/src/test/resources/suites/gh-42.xml
+++ b/allure-testng/src/test/resources/suites/gh-42.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.FailedFlakyTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-49.xml b/allure-testng/src/test/resources/suites/gh-49.xml
index c70fb6ebc..8c18dc46d 100644
--- a/allure-testng/src/test/resources/suites/gh-49.xml
+++ b/allure-testng/src/test/resources/suites/gh-49.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.DisabledTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-97.xml b/allure-testng/src/test/resources/suites/gh-97.xml
index 3b2865ac8..2799b57e1 100644
--- a/allure-testng/src/test/resources/suites/gh-97.xml
+++ b/allure-testng/src/test/resources/suites/gh-97.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.VarargsParameters"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/gh-99.xml b/allure-testng/src/test/resources/suites/gh-99.xml
index 0a38a78ac..dd18d31ec 100644
--- a/allure-testng/src/test/resources/suites/gh-99.xml
+++ b/allure-testng/src/test/resources/suites/gh-99.xml
@@ -10,4 +10,4 @@
             <class name="io.qameta.allure.testng.samples.ClassFixturesInParent"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/history-id-parameters.xml b/allure-testng/src/test/resources/suites/history-id-parameters.xml
index f77fbef2c..206161756 100644
--- a/allure-testng/src/test/resources/suites/history-id-parameters.xml
+++ b/allure-testng/src/test/resources/suites/history-id-parameters.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.HistoryIdForTestWithDataProvider"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/history-id-the-same.xml b/allure-testng/src/test/resources/suites/history-id-the-same.xml
index 08fd9379d..21d93de9e 100644
--- a/allure-testng/src/test/resources/suites/history-id-the-same.xml
+++ b/allure-testng/src/test/resources/suites/history-id-the-same.xml
@@ -12,4 +12,4 @@
             <class name="io.qameta.allure.testng.samples.JustTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/links.xml b/allure-testng/src/test/resources/suites/links.xml
index 415a5fe1c..3a4070084 100644
--- a/allure-testng/src/test/resources/suites/links.xml
+++ b/allure-testng/src/test/resources/suites/links.xml
@@ -8,4 +8,4 @@
             <class name="io.qameta.allure.testng.samples.LinksOnTestsInherited"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/muted.xml b/allure-testng/src/test/resources/suites/muted.xml
index 13da15e76..4ded62ae1 100644
--- a/allure-testng/src/test/resources/suites/muted.xml
+++ b/allure-testng/src/test/resources/suites/muted.xml
@@ -10,4 +10,4 @@
             <class name="io.qameta.allure.testng.samples.MutedTestClassInherited"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/nested-steps.xml b/allure-testng/src/test/resources/suites/nested-steps.xml
index be9f3652b..56c2368ae 100644
--- a/allure-testng/src/test/resources/suites/nested-steps.xml
+++ b/allure-testng/src/test/resources/suites/nested-steps.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/owner.xml b/allure-testng/src/test/resources/suites/owner.xml
index d4f54561a..831ab32f9 100644
--- a/allure-testng/src/test/resources/suites/owner.xml
+++ b/allure-testng/src/test/resources/suites/owner.xml
@@ -10,4 +10,4 @@
             <class name="io.qameta.allure.testng.samples.OwnerClassTestInherited"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/parallel-data-provider.xml b/allure-testng/src/test/resources/suites/parallel-data-provider.xml
index 41e1b831f..b9f37a2ab 100644
--- a/allure-testng/src/test/resources/suites/parallel-data-provider.xml
+++ b/allure-testng/src/test/resources/suites/parallel-data-provider.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/parallel-methods.xml b/allure-testng/src/test/resources/suites/parallel-methods.xml
index 71fce6997..80d3089e7 100644
--- a/allure-testng/src/test/resources/suites/parallel-methods.xml
+++ b/allure-testng/src/test/resources/suites/parallel-methods.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/parameterized-suite1.xml b/allure-testng/src/test/resources/suites/parameterized-suite1.xml
index 3e78702e4..1867af366 100644
--- a/allure-testng/src/test/resources/suites/parameterized-suite1.xml
+++ b/allure-testng/src/test/resources/suites/parameterized-suite1.xml
@@ -9,4 +9,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/parameterized-suite2.xml b/allure-testng/src/test/resources/suites/parameterized-suite2.xml
index 279cc294d..2faa5f97a 100644
--- a/allure-testng/src/test/resources/suites/parameterized-suite2.xml
+++ b/allure-testng/src/test/resources/suites/parameterized-suite2.xml
@@ -9,4 +9,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/parameterized-test.xml b/allure-testng/src/test/resources/suites/parameterized-test.xml
index f8f5340b4..6911eb613 100644
--- a/allure-testng/src/test/resources/suites/parameterized-test.xml
+++ b/allure-testng/src/test/resources/suites/parameterized-test.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/per-class-fixtures-combination.xml b/allure-testng/src/test/resources/suites/per-class-fixtures-combination.xml
index 467ad6a3c..a54c2e2f4 100644
--- a/allure-testng/src/test/resources/suites/per-class-fixtures-combination.xml
+++ b/allure-testng/src/test/resources/suites/per-class-fixtures-combination.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/per-method-fixtures-combination.xml b/allure-testng/src/test/resources/suites/per-method-fixtures-combination.xml
index c7e2bf9d8..d5834447c 100644
--- a/allure-testng/src/test/resources/suites/per-method-fixtures-combination.xml
+++ b/allure-testng/src/test/resources/suites/per-method-fixtures-combination.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/per-suite-fixtures-combination.xml b/allure-testng/src/test/resources/suites/per-suite-fixtures-combination.xml
index 1cfc65c42..5b569b57d 100644
--- a/allure-testng/src/test/resources/suites/per-suite-fixtures-combination.xml
+++ b/allure-testng/src/test/resources/suites/per-suite-fixtures-combination.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/per-test-tag-fixtures-combination.xml b/allure-testng/src/test/resources/suites/per-test-tag-fixtures-combination.xml
index c625fc43f..390cd0f66 100644
--- a/allure-testng/src/test/resources/suites/per-test-tag-fixtures-combination.xml
+++ b/allure-testng/src/test/resources/suites/per-test-tag-fixtures-combination.xml
@@ -8,4 +8,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/retry.xml b/allure-testng/src/test/resources/suites/retry.xml
index a1447f43b..f19500052 100644
--- a/allure-testng/src/test/resources/suites/retry.xml
+++ b/allure-testng/src/test/resources/suites/retry.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.RetryTest"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/severity.xml b/allure-testng/src/test/resources/suites/severity.xml
index 05f724124..7b53dbc71 100644
--- a/allure-testng/src/test/resources/suites/severity.xml
+++ b/allure-testng/src/test/resources/suites/severity.xml
@@ -10,4 +10,4 @@
             <class name="io.qameta.allure.testng.samples.SeverityClassTestInherited"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/single-test.xml b/allure-testng/src/test/resources/suites/single-test.xml
index efaa27d3d..36c3a07ee 100644
--- a/allure-testng/src/test/resources/suites/single-test.xml
+++ b/allure-testng/src/test/resources/suites/single-test.xml
@@ -11,4 +11,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/skipped-suite.xml b/allure-testng/src/test/resources/suites/skipped-suite.xml
index 24941b5d5..a77424175 100644
--- a/allure-testng/src/test/resources/suites/skipped-suite.xml
+++ b/allure-testng/src/test/resources/suites/skipped-suite.xml
@@ -13,4 +13,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/suites/tests-with-timeout.xml b/allure-testng/src/test/resources/suites/tests-with-timeout.xml
index 2d8cac5a0..a2eb9f525 100644
--- a/allure-testng/src/test/resources/suites/tests-with-timeout.xml
+++ b/allure-testng/src/test/resources/suites/tests-with-timeout.xml
@@ -7,4 +7,4 @@
             <class name="io.qameta.allure.testng.samples.TestWithTimeout"/>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/allure-testng/src/test/resources/testng.xml b/allure-testng/src/test/resources/testng.xml
index aa0e45d43..ae0d72d39 100644
--- a/allure-testng/src/test/resources/testng.xml
+++ b/allure-testng/src/test/resources/testng.xml
@@ -14,4 +14,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/build.gradle.kts b/build.gradle.kts
index 62cf4780c..9fa48023c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,10 +13,10 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:3.27.0")
-        classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4")
-        classpath("io.spring.gradle:dependency-management-plugin:1.0.6.RELEASE")
-        classpath("ru.vyarus:gradle-quality-plugin:4.0.0")
+        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.5.1")
+        classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
+        classpath("io.spring.gradle:dependency-management-plugin:1.0.10.RELEASE")
+        classpath("ru.vyarus:gradle-quality-plugin:4.3.0")
     }
 }
 
@@ -31,14 +31,14 @@ val qualityConfigsDir by extra("$gradleScriptDir/quality-configs")
 val spotlessDtr by extra("$qualityConfigsDir/spotless")
 
 tasks.withType(Wrapper::class) {
-    gradleVersion = "6.3"
+    gradleVersion = "6.6.1"
 }
 
 plugins {
     java
     `java-library`
-    id("net.researchgate.release") version "2.7.0"
-    id("io.qameta.allure") version "2.7.0"
+    id("net.researchgate.release") version "2.8.1"
+    id("io.qameta.allure") version "2.8.1"
 }
 
 java {
@@ -71,36 +71,36 @@ configure(subprojects) {
     apply(plugin = "maven")
     apply(plugin = "io.spring.dependency-management")
     apply(plugin = "ru.vyarus.quality")
-    apply(plugin = "com.diffplug.gradle.spotless")
+    apply(plugin = "com.diffplug.spotless")
     apply(plugin = "io.qameta.allure")
     apply(from = "$gradleScriptDir/bintray.gradle")
     apply(from = "$gradleScriptDir/maven-publish.gradle")
 
     configure<DependencyManagementExtension> {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.9.8")
-            mavenBom("org.junit:junit-bom:5.5.2")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.11.2")
+            mavenBom("org.junit:junit-bom:5.7.0")
         }
         dependencies {
-            dependency("com.github.tomakehurst:wiremock:2.21.0")
-            dependency("com.google.inject:guice:4.2.2")
-            dependency("com.google.testing.compile:compile-testing:0.15")
-            dependency("com.squareup.retrofit2:retrofit:2.5.0")
-            dependency("commons-io:commons-io:2.6")
-            dependency("io.github.benas:random-beans:3.8.0")
-            dependency("io.github.glytching:junit-extensions:2.3.0")
-            dependency("org.apache.commons:commons-lang3:3.8.1")
-            dependency("org.apache.httpcomponents:httpclient:4.5.7")
-            dependency("org.apache.tika:tika-core:1.20")
-            dependency("org.aspectj:aspectjrt:1.9.4")
-            dependency("org.aspectj:aspectjweaver:1.9.4")
-            dependency("org.assertj:assertj-core:3.11.1")
-            dependency("org.codehaus.groovy:groovy-all:2.5.6")
-            dependency("org.freemarker:freemarker:2.3.28")
-            dependency("org.jboss.resteasy:resteasy-client:3.6.2.Final")
-            dependency("org.jooq:joor-java-8:0.9.10")
-            dependency("org.mock-server:mockserver-netty:5.5.1")
-            dependency("org.mockito:mockito-core:2.24.0")
+            dependency("com.github.tomakehurst:wiremock:2.27.2")
+            dependency("com.google.inject:guice:4.2.3")
+            dependency("com.google.testing.compile:compile-testing:0.18")
+            dependency("com.squareup.retrofit2:retrofit:2.9.0")
+            dependency("commons-io:commons-io:2.8.0")
+            dependency("io.github.benas:random-beans:3.9.0")
+            dependency("io.github.glytching:junit-extensions:2.4.0")
+            dependency("org.apache.commons:commons-lang3:3.11")
+            dependency("org.apache.httpcomponents:httpclient:4.5.12")
+            dependency("org.apache.tika:tika-core:1.24.1")
+            dependency("org.aspectj:aspectjrt:1.9.6")
+            dependency("org.aspectj:aspectjweaver:1.9.6")
+            dependency("org.assertj:assertj-core:3.17.2")
+            dependency("org.codehaus.groovy:groovy-all:2.5.13")
+            dependency("org.freemarker:freemarker:2.3.30")
+            dependency("org.jboss.resteasy:resteasy-client:4.5.6.Final")
+            dependency("org.jooq:joor-java-8:0.9.13")
+            dependency("org.mock-server:mockserver-netty:5.11.1")
+            dependency("org.mockito:mockito-core:3.5.10")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")
@@ -130,9 +130,13 @@ configure(subprojects) {
     tasks.test {
         systemProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug")
         systemProperty("allure.model.indentOutput", "true")
+        systemProperty("junit.jupiter.execution.parallel.enabled", true)
+        systemProperty("junit.jupiter.execution.parallel.mode.default", true)
         testLogging {
-            events("passed", "skipped", "failed")
+            listOf(org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED)
         }
+        maxHeapSize = project.property("test.maxHeapSize").toString()
+        maxParallelForks = Integer.parseInt(project.property("test.maxParallelForks") as String)
     }
 
     tasks.processTestResources {
@@ -145,19 +149,25 @@ configure(subprojects) {
 
     configure<QualityExtension> {
         configDir = qualityConfigsDir
-        checkstyleVersion = "8.22"
-        pmdVersion = "6.17.0"
-        spotbugsVersion = "3.1.12"
-        codenarcVersion = "1.4"
+        checkstyleVersion = "8.36.1"
+        pmdVersion = "6.27.0"
+        spotbugsVersion = "4.1.2"
+        codenarcVersion = "1.6"
         enabled = !project.hasProperty("disableQuality")
+        afterEvaluate {
+            val spotbugs = configurations.findByName("spotbugs")
+            if (spotbugs != null) {
+                dependencies {
+                    spotbugs("org.slf4j:slf4j-simple")
+                    spotbugs("com.github.spotbugs:spotbugs:3.1.12")
+                }
+            }
+        }
     }
 
     configure<SpotlessExtension> {
         java {
-            target(fileTree(rootDir) {
-                include("src/**/*.java")
-                exclude("**/generated-sources/**/*.*")
-            })
+            target("src/**/*.java")
             removeUnusedImports()
             @Suppress("INACCESSIBLE_TYPE")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|import|open|module|//startfile)")
@@ -166,9 +176,7 @@ configure(subprojects) {
             replaceRegex("one blank line after import lists", "(import .+;\n\n)\n+", "$1")
         }
         scala {
-            target(fileTree(rootDir) {
-                include("**/src/**/*.scala")
-            })
+            target("src/**/*.scala")
             @Suppress("INACCESSIBLE_TYPE")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|//startfile)")
             endWithNewline()
@@ -176,9 +184,7 @@ configure(subprojects) {
             replaceRegex("one blank line after import lists", "(import .+;\n\n)\n+", "$1")
         }
         groovy {
-            target(fileTree(rootDir) {
-                include("**/src/**/*.groovy")
-            })
+            target("src/**/*.groovy")
             @Suppress("INACCESSIBLE_TYPE")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|//startfile) ")
             endWithNewline()
@@ -186,14 +192,14 @@ configure(subprojects) {
             replaceRegex("one blank line after import lists", "(import .+;\n\n)\n+", "$1")
         }
         format("misc") {
-            target(fileTree(rootDir) {
-                include("**/*.gradle",
-                        "**/*.gitignore",
-                        "README.md",
-                        "CONTRIBUTING.md",
-                        "config/**/*.xml",
-                        "src/**/*.xml")
-            })
+            target(
+                    "*.gradle",
+                    "*.gitignore",
+                    "README.md",
+                    "CONTRIBUTING.md",
+                    "config/**/*.xml",
+                    "src/**/*.xml"
+            )
             trimTrailingWhitespace()
             endWithNewline()
         }
@@ -234,7 +240,7 @@ configure(subprojects) {
 }
 
 allure {
-    version = "2.9.0"
+    version = "2.13.5"
     autoconfigure = false
     aspectjweaver = false
 }
diff --git a/gradle.properties b/gradle.properties
index 1491bba12..1022fe6b1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,7 @@
 version=2.14-SNAPSHOT
+
 org.gradle.daemon=true
-org.gradle.parallel=true
\ No newline at end of file
+org.gradle.parallel=true
+
+test.maxHeapSize=512m
+test.maxParallelForks=4
diff --git a/gradle/quality-configs/checkstyle/checkstyle.xml b/gradle/quality-configs/checkstyle/checkstyle.xml
index 507c4e845..ade530b5b 100644
--- a/gradle/quality-configs/checkstyle/checkstyle.xml
+++ b/gradle/quality-configs/checkstyle/checkstyle.xml
@@ -20,6 +20,10 @@
     <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"/>
@@ -208,9 +212,6 @@
         <!-- Size Violations (http://checkstyle.sourceforge.net/config_sizes.html) -->
         <module name="AnonInnerLength"/>
         <module name="ExecutableStatementCount"/>
-        <module name="LineLength">
-            <property name="max" value="120"/>
-        </module>
         <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 c29cb9780..181a946aa 100644
--- a/gradle/quality-configs/pmd/pmd.xml
+++ b/gradle/quality-configs/pmd/pmd.xml
@@ -30,6 +30,7 @@
         <exclude name="AtLeastOneConstructor"/>
         <exclude name="AvoidFinalLocalVariable"/>
         <exclude name="CallSuperInConstructor"/>
+        <exclude name="ClassNamingConventions"/>
         <exclude name="CommentDefaultAccessModifier"/>
         <exclude name="ConfusingTernary"/>
         <exclude name="LocalHomeNamingConvention"/> <!-- earlier j2ee group-->
@@ -115,7 +116,6 @@
         <exclude name="FinalizeDoesNotCallSuperFinalize"/>
         <exclude name="JUnitSpelling"/>
         <exclude name="JUnitStaticSuite"/>
-        <exclude name="InvalidSlf4jMessageFormat"/>
         <exclude name="LoggerIsNotStaticFinal"/>
         <exclude name="MissingSerialVersionUID"/>
         <exclude name="NullAssignment"/> <!-- disabled due to false positive for initialization with ternary operator -->
@@ -150,4 +150,4 @@
     <!-- Security (no rules) -->
     <rule ref="category/java/security.xml"/>
 
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf016b3885f6930543d57b744ea8c220a1a..490fda8577df6c95960ba7077c43220e5bb2c0d9 100644
GIT binary patch
delta 22806
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
Z!$zsDgoO%|(a?lZ=Qe6kxv{^r{{!uYR<-~D

delta 19980
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
Z5H)%VJiSWIAOn$sbP+#;Q{V4m{s)AkOUM8K

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4b442974..12d38de6a 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-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index af6708ff2..2fe81a7d9 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# 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
+#
+#      https://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.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$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"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# 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"`
@@ -138,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     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" ;;
+        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
 
@@ -159,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # 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"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 6d57edc70..62bd9b9cc 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

From d2e7f6fe1b2299e2a34d02dece93fdd39da000ea Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 14 Sep 2020 18:51:47 +0300
Subject: [PATCH 008/486] deny wildcard imports (via #472)

---
 .../src/main/java/io/qameta/allure/junit4/Tags.java         | 6 +++++-
 .../io/qameta/allure/junit5assert/AllureJunit5Assert.java   | 6 +++++-
 gradle/quality-configs/checkstyle/checkstyle.xml            | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

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 a3646d454..49bacad4b 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
@@ -15,7 +15,11 @@
  */
 package io.qameta.allure.junit4;
 
-import java.lang.annotation.*;
+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;
 
 /**
  * @author jkttt on 05.07.17.
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 669e59799..375a3d19e 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
@@ -21,7 +21,11 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.util.ObjectUtils;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.*;
+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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/gradle/quality-configs/checkstyle/checkstyle.xml b/gradle/quality-configs/checkstyle/checkstyle.xml
index ade530b5b..b4ab1aa17 100644
--- a/gradle/quality-configs/checkstyle/checkstyle.xml
+++ b/gradle/quality-configs/checkstyle/checkstyle.xml
@@ -125,7 +125,7 @@
 
 
         <!-- Imports (http://checkstyle.sourceforge.net/config_imports.html) -->
-        <!--<module name="AvoidStarImport"/>-->
+        <module name="AvoidStarImport"/>
         <!--<module name="AvoidStaticImport"/>-->
         <!--<module name="CustomImportOrder"/>-->
         <module name="IllegalImport"/>

From eecb1b56e14905951af8a3285e5e0218478b7675 Mon Sep 17 00:00:00 2001
From: Artem Eroshenko <eroshenkoam@qameta.io>
Date: Tue, 29 Sep 2020 16:31:18 +0300
Subject: [PATCH 009/486] first draft of cucumber 6 support (via #475)

---
 allure-cucumber6-jvm/build.gradle.kts         |  39 +
 .../cucumber6jvm/AllureCucumber6Jvm.java      | 424 ++++++++++
 .../allure/cucumber6jvm/LabelBuilder.java     | 191 +++++
 .../qameta/allure/cucumber6jvm/TagParser.java |  71 ++
 .../testsourcemodel/TestSourcesModel.java     | 159 ++++
 .../TestSourcesModelProxy.java                |  75 ++
 .../cucumber6jvm/AllureCucumber6JvmTest.java  | 747 ++++++++++++++++++
 .../cucumber6jvm/samples/AmbigiousSteps.java  |  40 +
 .../cucumber6jvm/samples/AttachmentSteps.java |  39 +
 .../samples/BackgroundFeatureSteps.java       |  43 +
 .../samples/BrokenFeatureSteps.java           |  30 +
 .../samples/DatatableFeatureSteps.java        |  31 +
 .../cucumber6jvm/samples/HookSteps.java       |  64 ++
 .../cucumber6jvm/samples/PendingSteps.java    |  32 +
 .../samples/SimpleFeatureSteps.java           |  52 ++
 .../src/test/resources/allure.properties      |   3 +
 .../test/resources/features/ambigious.feature |   5 +
 .../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 |  98 +++
 .../resources/features/multi-examples.feature |  17 +
 .../test/resources/features/parallel.feature  |  17 +
 .../test/resources/features/pending.feature   |   6 +
 .../features/scenario_description.feature     |  19 +
 .../test/resources/features/simple.feature    |   7 +
 .../src/test/resources/features/tags.feature  |  13 +
 .../test/resources/features/undefined.feature |   6 +
 settings.gradle.kts                           |   1 +
 33 files changed, 2293 insertions(+)
 create mode 100644 allure-cucumber6-jvm/build.gradle.kts
 create mode 100644 allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
 create mode 100644 allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
 create mode 100644 allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
 create mode 100644 allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
 create mode 100644 allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java
 create mode 100644 allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
 create mode 100644 allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
 create mode 100644 allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
 create mode 100644 allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java
 create mode 100644 allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java
 create mode 100644 allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java
 create mode 100644 allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
 create mode 100644 allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java
 create mode 100644 allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java
 create mode 100644 allure-cucumber6-jvm/src/test/resources/allure.properties
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/ambigious.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/attachments.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/background.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/broken.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/datatable.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/description.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/examples.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/failed.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/hooks.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/multi-examples.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/parallel.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/pending.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/scenario_description.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/simple.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/tags.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/undefined.feature

diff --git a/allure-cucumber6-jvm/build.gradle.kts b/allure-cucumber6-jvm/build.gradle.kts
new file mode 100644
index 000000000..5bb9fb09f
--- /dev/null
+++ b/allure-cucumber6-jvm/build.gradle.kts
@@ -0,0 +1,39 @@
+description = "Allure CucumberJVM 6.0"
+
+val agent: Configuration by configurations.creating
+
+val cucumberVersion = "6.1.1"
+val cucumberGherkinVersion = "5.1.0"
+
+dependencies {
+    agent("org.aspectj:aspectjweaver")
+    api(project(":allure-java-commons"))
+    compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
+    implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
+    testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
+    testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
+    testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
+    testImplementation("io.cucumber:cucumber-testng:$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"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.cucumber5jvm"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+    doFirst {
+        jvmArgs("-javaagent:${agent.singleFile}")
+    }
+}
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
new file mode 100644
index 000000000..e57514bea
--- /dev/null
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java
@@ -0,0 +1,424 @@
+/*
+ *  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.cucumber6jvm;
+
+import gherkin.ast.Examples;
+import gherkin.ast.Feature;
+import gherkin.ast.ScenarioDefinition;
+import gherkin.ast.ScenarioOutline;
+import gherkin.ast.TableRow;
+import io.cucumber.plugin.ConcurrentEventListener;
+import io.cucumber.plugin.event.DataTableArgument;
+import io.cucumber.plugin.event.EmbedEvent;
+import io.cucumber.plugin.event.EventHandler;
+import io.cucumber.plugin.event.EventPublisher;
+import io.cucumber.plugin.event.HookTestStep;
+import io.cucumber.plugin.event.HookType;
+import io.cucumber.plugin.event.PickleStepTestStep;
+import io.cucumber.plugin.event.Result;
+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.TestStepFinished;
+import io.cucumber.plugin.event.TestStepStarted;
+import io.cucumber.plugin.event.WriteEvent;
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.cucumber6jvm.testsourcemodel.TestSourcesModelProxy;
+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.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+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 5.0.
+ */
+@SuppressWarnings({
+        "ClassDataAbstractionCoupling",
+        "ClassFanOutComplexity",
+        "PMD.ExcessiveImports",
+        "PMD.GodClass",
+})
+public class AllureCucumber6Jvm implements ConcurrentEventListener {
+
+    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;
+    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 AllureCucumber6Jvm() {
+        this(Allure.getLifecycle());
+    }
+
+    public AllureCucumber6Jvm(final AllureLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    /*
+    Event Handlers
+     */
+    @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);
+    }
+
+    private void handleFeatureStartedHandler(final TestSourceRead event) {
+        testSources.addTestSourceReadEvent(event.getUri(), 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 Deque<String> tags = new LinkedList<>(currentTestCase.get().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 TestResult result = new TestResult()
+                .setUuid(getTestCaseUuid(currentTestCase.get()))
+                .setHistoryId(getHistoryId(currentTestCase.get()))
+                .setFullName(featureName + ": " + name)
+                .setName(name)
+                .setLabels(labelBuilder.getScenarioLabels())
+                .setLinks(labelBuilder.getScenarioLinks());
+
+        final ScenarioDefinition scenarioDefinition =
+                testSources.getScenarioDefinition(currentFeatureFile.get(), currentTestCase.get().getLine());
+        if (scenarioDefinition instanceof ScenarioOutline) {
+            result.setParameters(
+                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition, currentTestCase.get())
+            );
+        }
+
+        final String description = Stream.of(feature.getDescription(), scenarioDefinition.getDescription())
+                .filter(Objects::nonNull)
+                .filter(s -> !s.isEmpty())
+                .collect(Collectors.joining("\n"));
+
+        if (!description.isEmpty()) {
+            result.setDescription(description);
+        }
+
+        final TestResultContainer resultContainer = new TestResultContainer()
+                .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
+                .setUuid(getTestContainerUuid())
+                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase.get())));
+
+        lifecycle.scheduleTestCase(result);
+        lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
+        lifecycle.startTestCase(getTestCaseUuid(currentTestCase.get()));
+    }
+
+    private void handleTestCaseFinished(final TestCaseFinished event) {
+
+        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 StepArgument stepArgument = pickleStep.getStep().getArgument();
+            if (stepArgument instanceof DataTableArgument) {
+                final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
+                createDataTableAttachment(dataTableArgument);
+            }
+        } else if (event.getTestStep() instanceof HookTestStep) {
+            initHook((HookTestStep) event.getTestStep());
+        }
+    }
+
+    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.getTestStep() instanceof HookTestStep) {
+            handleHookStep(event);
+        } else {
+            handlePickleStep(event);
+        }
+    }
+
+    private void handleWriteEvent(final WriteEvent event) {
+        lifecycle.addAttachment(
+                "Text output",
+                TEXT_PLAIN,
+                TXT_EXTENSION,
+                Objects.toString(event.getText()).getBytes(StandardCharsets.UTF_8)
+        );
+    }
+
+    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 = testCase.getUri().toString()
+                .substring(testCase.getUri().toString().lastIndexOf('/') + 1)
+                + ":" + 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 TestCase localCurrentTestCase
+    ) {
+        final Optional<Examples> examplesBlock =
+                scenarioOutline.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 {
+            return Collections.emptyList();
+        }
+    }
+
+    private void createDataTableAttachment(final DataTableArgument dataTableArgument) {
+        final List<List<String>> rowsInTable = dataTableArgument.cells();
+        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 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.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);
+        }
+
+        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.getResult());
+        final StatusDetails statusDetails;
+        if (event.getResult().getStatus() == io.cucumber.plugin.event.Status.UNDEFINED) {
+            updateTestCaseStatus(Status.PASSED);
+
+            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);
+        }
+
+        if (!Status.PASSED.equals(stepStatus) && stepStatus != null) {
+            forbidTestCaseStatusChange.set(true);
+        }
+
+        final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
+        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));
+        }
+    }
+}
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
new file mode 100644
index 000000000..5ad4a04e5
--- /dev/null
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java
@@ -0,0 +1,191 @@
+/*
+ *  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.cucumber6jvm;
+
+import io.cucumber.plugin.event.TestCase;
+import gherkin.ast.Feature;
+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.io.File;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+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.createLabel;
+import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
+import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
+import static io.qameta.allure.util.ResultsUtils.createSuiteLabel;
+import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
+import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+
+/**
+ * Scenario labels and links builder.
+ */
+@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount", "MultipleStringLiterals"})
+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<String> tags) {
+        final TagParser tagParser = new TagParser(feature, scenario);
+
+        while (tags.peek() != null) {
+            final String tag = tags.remove();
+
+            if (tag.contains(COMPOSITE_TAG_DELIMITER)) {
+
+                final String[] tagParts = tag.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(tag);
+                    continue;
+                }
+
+                switch (tagKey) {
+                    case SEVERITY:
+                        getScenarioLabels().add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
+                        break;
+                    case TMS_LINK:
+                        getScenarioLinks().add(ResultsUtils.createTmsLink(tagValue));
+                        break;
+                    case ISSUE_LINK:
+                        getScenarioLinks().add(ResultsUtils.createIssueLink(tagValue));
+                        break;
+                    case PLAIN_LINK:
+                        getScenarioLinks().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));
+                        break;
+                }
+            } else if (tagParser.isPureSeverityTag(tag)) {
+                getScenarioLabels().add(ResultsUtils.createSeverityLabel(tag.substring(1)));
+            } else if (!tagParser.isResultTag(tag)) {
+                getScenarioLabels().add(getTagLabel(tag));
+            }
+        }
+
+        final String featureName = feature.getName();
+        final URI uri = scenario.getUri();
+
+        getScenarioLabels().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)
+                .ifPresent(getScenarioLabels()::add);
+    }
+
+    public List<Label> getScenarioLabels() {
+        return scenarioLabels;
+    }
+
+    public List<Link> getScenarioLinks() {
+        return scenarioLinks;
+    }
+
+    private Label getTagLabel(final String tag) {
+        return ResultsUtils.createTagLabel(tag.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(ResultsUtils.createLink(null, name, null, type));
+        } else {
+            LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
+                    namedLinkPatternString);
+        }
+    }
+
+    private Optional<String> featurePackage(final String uriString, final String featureName) {
+        final Optional<URI> maybeUri = safeUri(uriString);
+        if (!maybeUri.isPresent()) {
+            return Optional.empty();
+        }
+        URI uri = maybeUri.get();
+
+        if (!uri.isOpaque()) {
+            final URI work = new File("").toURI();
+            uri = work.relativize(uri);
+        }
+        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(".")));
+    }
+
+    private static Optional<URI> safeUri(final String uri) {
+        try {
+            return Optional.of(URI.create(uri));
+        } catch (Exception e) {
+            LOGGER.debug("could not parse feature uri {}", uri, e);
+        }
+        return Optional.empty();
+    }
+}
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
new file mode 100644
index 000000000..c3b460f5b
--- /dev/null
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/TagParser.java
@@ -0,0 +1,71 @@
+/*
+ *  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.cucumber6jvm;
+
+import gherkin.ast.Feature;
+import io.cucumber.plugin.event.TestCase;
+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;
+    }
+
+    public boolean isFlaky() {
+        return getStatusDetailByTag(FLAKY);
+    }
+
+    public boolean isMuted() {
+        return getStatusDetailByTag(MUTED);
+    }
+
+    public boolean isKnown() {
+        return getStatusDetailByTag(KNOWN);
+    }
+
+    private boolean getStatusDetailByTag(final String tagName) {
+        return scenario.getTags().stream()
+                .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})
+                .contains(tag.toUpperCase());
+    }
+
+    public boolean isPureSeverityTag(final String tag) {
+        return Arrays.stream(SeverityLevel.values())
+                .map(SeverityLevel::value)
+                .map(value -> "@" + value)
+                .anyMatch(value -> value.equalsIgnoreCase(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
new file mode 100644
index 000000000..2afc7c9fa
--- /dev/null
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java
@@ -0,0 +1,159 @@
+/*
+ *  Copyright 2020 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.cucumber6jvm.testsourcemodel;
+
+import gherkin.AstBuilder;
+import gherkin.Parser;
+import gherkin.ParserException;
+import gherkin.TokenMatcher;
+import gherkin.ast.Examples;
+import gherkin.ast.Feature;
+import gherkin.ast.GherkinDocument;
+import gherkin.ast.Node;
+import gherkin.ast.ScenarioDefinition;
+import gherkin.ast.ScenarioOutline;
+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;
+
+public final class TestSourcesModel {
+    private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();
+    private final Map<URI, GherkinDocument> pathToAstMap = new HashMap<>();
+    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
+                : (ScenarioDefinition) astNode.parent.parent.node;
+    }
+
+    public void addTestSourceReadEvent(final URI path, final TestSourceRead event) {
+        pathToReadEventMap.put(path, event);
+    }
+
+    public Feature getFeature(final URI path) {
+        if (!pathToAstMap.containsKey(path)) {
+            parseGherkinSource(path);
+        }
+        if (pathToAstMap.containsKey(path)) {
+            return pathToAstMap.get(path).getFeature();
+        }
+        return null;
+    }
+
+    public AstNode getAstNode(final URI path, final int line) {
+        if (!pathToNodeMap.containsKey(path)) {
+            parseGherkinSource(path);
+        }
+        if (pathToNodeMap.containsKey(path)) {
+            return pathToNodeMap.get(path).get(line);
+        }
+        return null;
+    }
+
+    private void parseGherkinSource(final URI 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).getSource(),
+                    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) {
+            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
+            );
+        }
+    }
+
+    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);
+        for (Step step : child.getSteps()) {
+            nodeMap.put(step.getLocation().getLine(), createAstNode(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) {
+        for (Examples examples : scenarioOutline.getExamples()) {
+            final AstNode examplesNode = createAstNode(examples, childNode);
+            final TableRow headerRow = examples.getTableHeader();
+            final AstNode headerNode = createAstNode(headerRow, examplesNode);
+            nodeMap.put(headerRow.getLocation().getLine(), headerNode);
+            for (int i = 0; i < examples.getTableBody().size(); ++i) {
+                final TableRow examplesRow = examples.getTableBody().get(i);
+                final Node rowNode = createExamplesRowWrapperNode(examplesRow, i);
+                final AstNode expandedScenarioNode = createAstNode(rowNode, examplesNode);
+                nodeMap.put(examplesRow.getLocation().getLine(), expandedScenarioNode);
+            }
+        }
+    }
+
+    private static ExamplesRowWrapperNode createExamplesRowWrapperNode(final Node examplesRow, final int bodyRowIndex) {
+        return new ExamplesRowWrapperNode(examplesRow, bodyRowIndex);
+    }
+
+    private static AstNode createAstNode(final Node node, final AstNode astNode) {
+        return new AstNode(node, astNode);
+    }
+
+    static class ExamplesRowWrapperNode extends Node {
+        private final int bodyRowIndex;
+
+        public int getBodyRowIndex() {
+            return bodyRowIndex;
+        }
+
+        ExamplesRowWrapperNode(final Node examplesRow, final int bodyRowIndex) {
+            super(examplesRow.getLocation());
+            this.bodyRowIndex = bodyRowIndex;
+        }
+    }
+
+    static class AstNode {
+        private final Node node;
+        private final AstNode parent;
+
+        public Node getNode() {
+            return node;
+        }
+
+        public AstNode getParent() {
+            return parent;
+        }
+
+        AstNode(final Node node, final AstNode parent) {
+            this.node = node;
+            this.parent = parent;
+        }
+    }
+}
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
new file mode 100644
index 000000000..ff2b9380b
--- /dev/null
+++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/testsourcemodel/TestSourcesModelProxy.java
@@ -0,0 +1,75 @@
+/*
+ *  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.cucumber6jvm.testsourcemodel;
+
+import gherkin.GherkinDialect;
+import gherkin.GherkinDialectProvider;
+import gherkin.ast.Feature;
+import gherkin.ast.ScenarioDefinition;
+import io.cucumber.plugin.event.TestSourceRead;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+public class TestSourcesModelProxy {
+
+    private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();
+    private final TestSourcesModel testSources;
+
+    public TestSourcesModelProxy() {
+        this.testSources = new TestSourcesModel();
+    }
+
+    public void addTestSourceReadEvent(final URI path, final TestSourceRead event) {
+        this.pathToReadEventMap.put(path, event);
+        testSources.addTestSourceReadEvent(path, event);
+    }
+
+    public Feature getFeature(final URI path) {
+        return testSources.getFeature(path);
+    }
+
+    public ScenarioDefinition getScenarioDefinition(final URI path, final int line) {
+        return testSources.getScenarioDefinition(testSources.getAstNode(path, line));
+    }
+
+    public String getKeywordFromSource(final URI uri, final int stepLine) {
+        return this.getKeywordFromSourceInternal(uri, stepLine);
+    }
+
+    private String getKeywordFromSourceInternal(final URI uri, final int stepLine) {
+        final Feature feature = getFeature(uri);
+        if (feature != null) {
+            final TestSourceRead event = this.getTestSourceReadEvent(uri);
+            final String trimmedSourceLine = event.getSource().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 URI uri) {
+        if (this.pathToReadEventMap.containsKey(uri)) {
+            return pathToReadEventMap.get(uri);
+        }
+        return null;
+    }
+}
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
new file mode 100644
index 000000000..548acaf41
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
@@ -0,0 +1,747 @@
+/*
+ *  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.cucumber6jvm;
+
+import io.cucumber.core.eventbus.EventBus;
+import io.cucumber.core.feature.FeatureParser;
+import io.cucumber.core.feature.FeatureWithLines;
+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.model.Attachment;
+import io.qameta.allure.model.FixtureResult;
+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.AllureResultsWriterStub;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Clock;
+import java.time.Instant;
+import java.util.*;
+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;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@SuppressWarnings("unchecked")
+class AllureCucumber6JvmTest {
+
+    @AllureFeatures.Base
+    @Test
+    void shouldSetName() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName)
+                .containsExactlyInAnyOrder("Add a to b");
+    }
+
+    @AllureFeatures.PassedTests
+    @Test
+    void shouldSetStatus() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.PASSED);
+    }
+
+    @AllureFeatures.FailedTests
+    @Test
+    void shouldSetFailedStatus() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/failed.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.FAILED);
+    }
+
+    @AllureFeatures.FailedTests
+    @Test
+    void shouldSetStatusDetails() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/failed.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatusDetails)
+                .extracting(StatusDetails::getMessage)
+                .containsExactlyInAnyOrder("expected [123] but found [15]");
+    }
+
+    @AllureFeatures.BrokenTests
+    @Test
+    void shouldSetBrokenStatus() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/broken.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.BROKEN);
+    }
+
+    @AllureFeatures.Stages
+    @Test
+    void shouldSetStage() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStage)
+                .containsExactlyInAnyOrder(Stage.FINISHED);
+    }
+
+    @AllureFeatures.Timings
+    @Test
+    void shouldSetStart() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+        final long after = Instant.now().toEpochMilli();
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStart)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @AllureFeatures.Timings
+    @Test
+    void shouldSetStop() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+        final long after = Instant.now().toEpochMilli();
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStop)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @AllureFeatures.FullName
+    @Test
+    void shouldSetFullName() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getFullName)
+                .containsExactlyInAnyOrder("Simple feature: Add a to b");
+    }
+
+    @AllureFeatures.Descriptions
+    @Test
+    void shouldSetDescription() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "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 = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        expected,
+                        expected
+                );
+    }
+
+    @AllureFeatures.Descriptions
+    @Test
+    void shouldSetScenarioDescription() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/scenario_description.feature");
+
+        final String expected = "This is description for current feature.\n"
+                + "It should appear on each scenario in report";
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        expected + "\n    scenario description 1",
+                        expected + "\n    scenario description 2"
+                );
+    }
+
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAddDataTableAttachment() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/datatable.feature");
+
+        final List<Attachment> attachments = writer.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 = writer.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 AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/attachments.feature");
+
+        final List<Attachment> attachments = writer.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("TextAttachment", "text/plain"),
+                        tuple("ImageAttachment", "image/png")
+                );
+
+        final List<String> attachmentContents = writer.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 AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/background.feature");
+
+        final List<TestResult> testResults = writer.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 AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/examples.feature");
+
+        final List<TestResult> testResults = writer.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() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/multi-examples.feature");
+
+        final List<TestResult> testResults = writer.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() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/multi-examples.feature", "--tags", "@ExamplesTag2");
+
+        final List<TestResult> testResults = writer.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 AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/tags.feature");
+
+        final List<TestResult> testResults = writer.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 AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/tags.feature");
+
+        final List<TestResult> testResults = writer.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 AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/tags.feature");
+
+        final List<TestResult> testResults = writer.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 shouldAddThreadHostLabels() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/tags.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName)
+                .contains("host", "thread");
+    }
+
+    @AllureFeatures.MarkerAnnotations
+    @Test
+    void shouldAddCommonLabels() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/tags.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        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")
+                );
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldProcessUndefinedSteps() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/undefined.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.SKIPPED);
+
+        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)
+                );
+    }
+
+    @AllureFeatures.SkippedTests
+    @AllureFeatures.Steps
+    @Test
+    void shouldProcessPendingExceptionsInSteps() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/pending.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.SKIPPED);
+
+        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)
+                );
+    }
+
+    @AllureFeatures.Base
+    @Test
+    void shouldSupportDryRunForSimpleFeatures() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature", "--dry-run");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.SKIPPED)
+                );
+
+        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)
+                );
+    }
+
+    @AllureFeatures.Fixtures
+    @AllureFeatures.Base
+    @Test
+    void shouldSupportDryRunForHooks() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/hooks.feature", "--dry-run", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+
+        final List<TestResult> testResults = writer.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())
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHook()", Status.SKIPPED)
+                );
+
+        assertThat(writer.getTestResultContainers().get(0).getAfters())
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHook()", Status.SKIPPED)
+                );
+
+        assertThat(testResults.get(0).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)
+                );
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldPersistHistoryIdForScenarios() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults.get(0).getHistoryId())
+                .isEqualTo("8eea9ed4458a49d418859d1398580671");
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldPersistHistoryIdForExamples() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/examples.feature", "--threads", "2");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getHistoryId)
+                .containsExactlyInAnyOrder("42a7821e775ec18b112f92e96f0510a5", "afb27d131ed8d41b3f867895a26d2590");
+    }
+
+    private Comparator<TestResult> byHistoryId =
+            Comparator.comparing(TestResult::getHistoryId);
+
+    @AllureFeatures.Parallel
+    @Test
+    void shouldProcessScenariosInParallelMode() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/parallel.feature", "--threads", "3");
+
+        final List<TestResult> testResults = writer.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(3);
+
+        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(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(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")
+                );
+    }
+
+    @AllureFeatures.Fixtures
+    @AllureFeatures.Stages
+    @Test
+    void shouldDisplayHooksAsStages() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/hooks.feature", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+
+        final List<TestResult> testResults = writer.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)
+                );
+
+        assertThat(testResults.get(0).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)
+                );
+
+
+        assertThat(writer.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())
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHook()", Status.PASSED)
+                );
+
+        assertThat(testResults.get(1).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)
+                );
+
+
+        assertThat(writer.getTestResultContainers().get(1).getBefores())
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHookWithException()", Status.FAILED)
+                );
+
+
+        assertThat(testResults.get(2).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)
+                );
+
+        assertThat(writer.getTestResultContainers().get(2).getAfters())
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHookWithException()", Status.FAILED)
+                );
+
+    }
+
+    @AllureFeatures.BrokenTests
+    @Test
+    void shouldHandleAmbigiousStepsExceptions() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/ambigious.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Simple scenario with ambigious steps", Status.SKIPPED)
+                );
+
+        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)
+                );
+    }
+
+    private byte runFeature(final AllureResultsWriterStub writer,
+                            final String featureResource,
+                            final String... moreOptions) {
+
+        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
+        final AllureCucumber6Jvm cucumber6jvm = new AllureCucumber6Jvm(lifecycle);
+        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 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 Runtime runtime = Runtime.builder()
+                .withClassLoader(classLoader)
+                .withRuntimeOptions(options)
+                .withAdditionalPlugins(cucumber6jvm)
+                .withFeatureSupplier(supplier)
+                .build();
+
+        runtime.run();
+        return runtime.exitStatus();
+    }
+}
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
new file mode 100644
index 000000000..434852199
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AmbigiousSteps.java
@@ -0,0 +1,40 @@
+/*
+ *  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.cucumber6jvm.samples;
+
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AmbigiousSteps {
+
+    @When("^ambigious step (.+)$")
+    public void ambigious_1() {
+        // nothing here
+    }
+
+    @When("^ambigious step ([a-z]+)$")
+    public void ambigious_2() {
+        // nothing here
+    }
+
+    @Then("^something bad should happen")
+    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
new file mode 100644
index 000000000..cf896ffe2
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/AttachmentSteps.java
@@ -0,0 +1,39 @@
+/*
+ *  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.cucumber6jvm.samples;
+
+import io.cucumber.java.Scenario;
+import io.cucumber.java.Before;
+import io.cucumber.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.attach("text attachment".getBytes(), "text/plain", "TextAttachment");
+    }
+
+    @Given("step with scenario embed")
+    public void stepWithScenarioEmbed() {
+        scenario.attach("image attachment".getBytes(), "image/png", "ImageAttachment");
+    }
+}
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
new file mode 100644
index 000000000..9eb6f294f
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BackgroundFeatureSteps.java
@@ -0,0 +1,43 @@
+/*
+ *  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.cucumber6jvm.samples;
+
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.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-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
new file mode 100644
index 000000000..9e815c978
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/BrokenFeatureSteps.java
@@ -0,0 +1,30 @@
+/*
+ *  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.cucumber6jvm.samples;
+
+import io.cucumber.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-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
new file mode 100644
index 000000000..bd0cec6f6
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/DatatableFeatureSteps.java
@@ -0,0 +1,31 @@
+/*
+ *  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.cucumber6jvm.samples;
+
+import io.cucumber.datatable.DataTable;
+import io.cucumber.java.en.Given;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@SuppressWarnings("unused")
+public class DatatableFeatureSteps {
+
+    @Given("^users are:$")
+    public void usersAre(DataTable table) {
+    }
+
+}
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
new file mode 100644
index 000000000..917ee04b3
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/HookSteps.java
@@ -0,0 +1,64 @@
+/*
+ *  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.cucumber6jvm.samples;
+
+import io.cucumber.java.After;
+import io.cucumber.java.Before;
+import org.testng.Assert;
+
+/**
+ * @author letsrokk (Dmitry Mayer).
+ */
+public class HookSteps {
+
+    @Before("@WithHooks")
+    public void beforeHook(){
+        // nothing
+    }
+
+    @After("@WithHooks")
+    public void afterHook(){
+        // nothing
+    }
+
+    @Before("@BeforeHookWithException")
+    public void beforeHookWithException(){
+        Assert.fail("Exception in Hook step");
+    }
+
+    @After("@AfterHookWithException")
+    public void afterHookWithException(){
+        Assert.fail("Exception in Hook step");
+    }
+
+    @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-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
new file mode 100644
index 000000000..df67e1a8a
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/PendingSteps.java
@@ -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.cucumber6jvm.samples;
+
+import io.cucumber.java.PendingException;
+import io.cucumber.java.en.Given;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class PendingSteps {
+
+    @Given("^step is yet to be implemented$")
+    public void stepIsYetToBeImplemented() throws Throwable {
+        // Write code here that turns the phrase above into concrete actions
+        throw new PendingException();
+    }
+
+}
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
new file mode 100644
index 000000000..b1d82e29a
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/samples/SimpleFeatureSteps.java
@@ -0,0 +1,52 @@
+/*
+ *  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.cucumber6jvm.samples;
+
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import org.testng.Assert;
+
+/**
+ * @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) {
+        Assert.assertEquals(this.c, arg1);
+    }
+
+}
diff --git a/allure-cucumber6-jvm/src/test/resources/allure.properties b/allure-cucumber6-jvm/src/test/resources/allure.properties
new file mode 100644
index 000000000..dbfefee44
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.model.indentOutput=true
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
diff --git a/allure-cucumber6-jvm/src/test/resources/features/ambigious.feature b/allure-cucumber6-jvm/src/test/resources/features/ambigious.feature
new file mode 100644
index 000000000..921223a39
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/ambigious.feature
@@ -0,0 +1,5 @@
+Feature: Feature with ambigious steps
+
+  Scenario: Simple scenario with ambigious steps
+    When ambigious step present
+    Then something bad should happen
diff --git a/allure-cucumber6-jvm/src/test/resources/features/attachments.feature b/allure-cucumber6-jvm/src/test/resources/features/attachments.feature
new file mode 100644
index 000000000..1585fbe81
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/attachments.feature
@@ -0,0 +1,8 @@
+@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-cucumber6-jvm/src/test/resources/features/background.feature b/allure-cucumber6-jvm/src/test/resources/features/background.feature
new file mode 100644
index 000000000..307f10267
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/background.feature
@@ -0,0 +1,9 @@
+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-cucumber6-jvm/src/test/resources/features/broken.feature b/allure-cucumber6-jvm/src/test/resources/features/broken.feature
new file mode 100644
index 000000000..42bd7ba4f
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/broken.feature
@@ -0,0 +1,4 @@
+Feature: Simple feature
+
+  Scenario: Exception during step
+    Given everything is broken
diff --git a/allure-cucumber6-jvm/src/test/resources/features/datatable.feature b/allure-cucumber6-jvm/src/test/resources/features/datatable.feature
new file mode 100644
index 000000000..ea5e94d3b
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/datatable.feature
@@ -0,0 +1,8 @@
+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-cucumber6-jvm/src/test/resources/features/description.feature b/allure-cucumber6-jvm/src/test/resources/features/description.feature
new file mode 100644
index 000000000..935b6731a
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/description.feature
@@ -0,0 +1,17 @@
+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-cucumber6-jvm/src/test/resources/features/examples.feature b/allure-cucumber6-jvm/src/test/resources/features/examples.feature
new file mode 100644
index 000000000..ecba7b79e
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/examples.feature
@@ -0,0 +1,11 @@
+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-cucumber6-jvm/src/test/resources/features/failed.feature b/allure-cucumber6-jvm/src/test/resources/features/failed.feature
new file mode 100644
index 000000000..a70f8ec79
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/failed.feature
@@ -0,0 +1,7 @@
+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-cucumber6-jvm/src/test/resources/features/hooks.feature b/allure-cucumber6-jvm/src/test/resources/features/hooks.feature
new file mode 100644
index 000000000..aca3f5b1b
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/hooks.feature
@@ -0,0 +1,98 @@
+Feature: Scenarios with hooks
+
+  @WithHooks
+  Scenario: Simple scenario with Before and After hooks
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
+
+  @BeforeHookWithException
+  Scenario: Simple scenario with Before hook with Exception
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
+
+  @AfterHookWithException
+  Scenario: Simple scenario with After hook with Exception
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
+
+  @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-cucumber6-jvm/src/test/resources/features/multi-examples.feature b/allure-cucumber6-jvm/src/test/resources/features/multi-examples.feature
new file mode 100644
index 000000000..04fb2cfef
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/multi-examples.feature
@@ -0,0 +1,17 @@
+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-cucumber6-jvm/src/test/resources/features/parallel.feature b/allure-cucumber6-jvm/src/test/resources/features/parallel.feature
new file mode 100644
index 000000000..a99d46839
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/parallel.feature
@@ -0,0 +1,17 @@
+Feature: Parallel execution of pickles
+
+  Scenario Outline: Simple scenario outline with 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      |
+
+  Scenario: Simple scenario
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
diff --git a/allure-cucumber6-jvm/src/test/resources/features/pending.feature b/allure-cucumber6-jvm/src/test/resources/features/pending.feature
new file mode 100644
index 000000000..5ad9c3438
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/pending.feature
@@ -0,0 +1,6 @@
+Feature: Simple feature with Pending steps
+
+  Scenario: Step is not implemented
+    Given a is 5
+    When step is yet to be implemented
+    Then b is 10
diff --git a/allure-cucumber6-jvm/src/test/resources/features/scenario_description.feature b/allure-cucumber6-jvm/src/test/resources/features/scenario_description.feature
new file mode 100644
index 000000000..fe49efe31
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/scenario_description.feature
@@ -0,0 +1,19 @@
+Feature: Descriptions feature
+
+This is description for current feature.
+It should appear on each scenario in report
+
+  Scenario: Add a to b (1)
+    scenario description 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)
+    scenario description 2
+    Given a is 1
+    And b is 2
+    When I add a to b
+    Then result is 3
+
diff --git a/allure-cucumber6-jvm/src/test/resources/features/simple.feature b/allure-cucumber6-jvm/src/test/resources/features/simple.feature
new file mode 100644
index 000000000..c5b5f2b5f
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/simple.feature
@@ -0,0 +1,7 @@
+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-cucumber6-jvm/src/test/resources/features/tags.feature b/allure-cucumber6-jvm/src/test/resources/features/tags.feature
new file mode 100644
index 000000000..2632623ee
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/tags.feature
@@ -0,0 +1,13 @@
+@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-cucumber6-jvm/src/test/resources/features/undefined.feature b/allure-cucumber6-jvm/src/test/resources/features/undefined.feature
new file mode 100644
index 000000000..39475ff7d
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/undefined.feature
@@ -0,0 +1,6 @@
+Feature: Simple feature with undefined steps
+
+  Scenario: Step is not defined
+    Given  a is 5
+    When step is undefined
+    Then b is 10
diff --git a/settings.gradle.kts b/settings.gradle.kts
index aca806286..011c4a85c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,6 +8,7 @@ include("allure-cucumber2-jvm")
 include("allure-cucumber3-jvm")
 include("allure-cucumber4-jvm")
 include("allure-cucumber5-jvm")
+include("allure-cucumber6-jvm")
 include("allure-descriptions-javadoc")
 include("allure-httpclient")
 include("allure-java-commons")

From 0b8278ccb6329cf122f86fc3a6dbc90a4e68361e Mon Sep 17 00:00:00 2001
From: QametaCI <ci@qameta.io>
Date: Wed, 30 Sep 2020 14:04:54 +0000
Subject: [PATCH 010/486] [Gradle Release Plugin] - pre tag commit:  '2.13.6'.

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

diff --git a/gradle.properties b/gradle.properties
index 1022fe6b1..89100c006 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.14-SNAPSHOT
+version=2.13.6
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 3be1269871260b50150ced1c589eff4ee81d7178 Mon Sep 17 00:00:00 2001
From: QametaCI <ci@qameta.io>
Date: Wed, 30 Sep 2020 14:05:02 +0000
Subject: [PATCH 011/486] [Gradle Release Plugin] - new version commit: 
 '2.14-SNAPSHOT'.

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

diff --git a/gradle.properties b/gradle.properties
index 89100c006..1022fe6b1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.13.6
+version=2.14-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 5365fddefb684ca4d4abd6b43c5ec7b10f2215d3 Mon Sep 17 00:00:00 2001
From: Valery Yatsynovich <valfirst@yandex.ru>
Date: Thu, 1 Oct 2020 14:32:30 +0300
Subject: [PATCH 012/486] fix allure-cucumber6-jvm module name (via #477)

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

diff --git a/allure-cucumber6-jvm/build.gradle.kts b/allure-cucumber6-jvm/build.gradle.kts
index 5bb9fb09f..7f2c6bda5 100644
--- a/allure-cucumber6-jvm/build.gradle.kts
+++ b/allure-cucumber6-jvm/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
 tasks.jar {
     manifest {
         attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.cucumber5jvm"
+                "Automatic-Module-Name" to "io.qameta.allure.cucumber6jvm"
         ))
     }
 }

From eeed043904ba8dd0a4deaca5fcacbc06f259f2cf Mon Sep 17 00:00:00 2001
From: Andrei Solntsev <andrei.solntsev@gmail.com>
Date: Mon, 26 Oct 2020 17:45:56 +0200
Subject: [PATCH 013/486] bump dependencies (via #482)

---
 allure-cucumber-jvm/build.gradle.kts   |  2 +-
 allure-cucumber4-jvm/build.gradle.kts  |  2 +-
 allure-java-migration/build.gradle.kts |  2 +-
 allure-jbehave/build.gradle.kts        |  2 +-
 allure-jsonunit/build.gradle.kts       |  2 +-
 allure-junit4-aspect/build.gradle.kts  |  2 +-
 allure-junit4/build.gradle.kts         |  2 +-
 allure-okhttp3/build.gradle.kts        |  2 +-
 allure-rest-assured/build.gradle.kts   |  2 +-
 allure-selenide/build.gradle.kts       |  2 +-
 allure-spock/build.gradle.kts          |  2 +-
 allure-spring-web/build.gradle.kts     |  2 +-
 build.gradle.kts                       | 10 +++++-----
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/allure-cucumber-jvm/build.gradle.kts b/allure-cucumber-jvm/build.gradle.kts
index 172806f45..20d2608ac 100644
--- a/allure-cucumber-jvm/build.gradle.kts
+++ b/allure-cucumber-jvm/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure CucumberJVM Integration"
 
 val agent: Configuration by configurations.creating
 
-val cucumberVersion = "1.2.5"
+val cucumberVersion = "1.2.6"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-cucumber4-jvm/build.gradle.kts b/allure-cucumber4-jvm/build.gradle.kts
index cb87fff60..e445dcec8 100644
--- a/allure-cucumber4-jvm/build.gradle.kts
+++ b/allure-cucumber4-jvm/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure CucumberJVM 4.0"
 
 val agent: Configuration by configurations.creating
 
-val cucumberVersion = "4.7.2"
+val cucumberVersion = "4.8.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-java-migration/build.gradle.kts b/allure-java-migration/build.gradle.kts
index fa8b72725..ca9c66c0a 100644
--- a/allure-java-migration/build.gradle.kts
+++ b/allure-java-migration/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Java Migration Utils"
 
 val agent: Configuration by configurations.creating
 
-val junitVersion = "4.12"
+val junitVersion = "4.13.1"
 val testNgVersion = "6.14.3"
 
 dependencies {
diff --git a/allure-jbehave/build.gradle.kts b/allure-jbehave/build.gradle.kts
index a584086e4..a31bb7b3e 100644
--- a/allure-jbehave/build.gradle.kts
+++ b/allure-jbehave/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure JBehave Integration"
 
 val agent: Configuration by configurations.creating
 
-val jbehaveVersion = "4.5"
+val jbehaveVersion = "4.7"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts
index 1d46c094b..e5837bae6 100644
--- a/allure-jsonunit/build.gradle.kts
+++ b/allure-jsonunit/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure JsonUnit Integration"
 
 val agent: Configuration by configurations.creating
 
-val jsonUnitVersion = "2.11.1"
+val jsonUnitVersion = "2.19.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-junit4-aspect/build.gradle.kts b/allure-junit4-aspect/build.gradle.kts
index 95d007017..00abb578b 100644
--- a/allure-junit4-aspect/build.gradle.kts
+++ b/allure-junit4-aspect/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure JUnit 4 Aspect HACK"
 
 val agent: Configuration by configurations.creating
 
-val junitVersion = "4.12"
+val junitVersion = "4.13.1"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-junit4/build.gradle.kts b/allure-junit4/build.gradle.kts
index fd9bcfd10..4d9620674 100644
--- a/allure-junit4/build.gradle.kts
+++ b/allure-junit4/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure JUnit 4 Integration"
 
 val agent: Configuration by configurations.creating
 
-val junitVersion = "4.12"
+val junitVersion = "4.13.1"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-okhttp3/build.gradle.kts b/allure-okhttp3/build.gradle.kts
index fcc64fe82..249b74867 100644
--- a/allure-okhttp3/build.gradle.kts
+++ b/allure-okhttp3/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure OkHttp3 Integration"
 
 val agent: Configuration by configurations.creating
 
-val okhttpVersion = "3.13.1"
+val okhttpVersion = "3.14.9"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-rest-assured/build.gradle.kts b/allure-rest-assured/build.gradle.kts
index 486282572..c82fa8dc6 100644
--- a/allure-rest-assured/build.gradle.kts
+++ b/allure-rest-assured/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Rest-Assured Integration"
 
 val agent: Configuration by configurations.creating
 
-val restAssuredVersion = "4.0.0"
+val restAssuredVersion = "4.3.1"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts
index 1cbf9732f..0887f9e8a 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.12.2"
+val selenideVersion = "5.15.1"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-spock/build.gradle.kts b/allure-spock/build.gradle.kts
index a6c58b49e..60bea8f12 100644
--- a/allure-spock/build.gradle.kts
+++ b/allure-spock/build.gradle.kts
@@ -4,7 +4,7 @@ apply(plugin = "groovy")
 
 val agent: Configuration by configurations.creating
 
-val spockFrameworkVersion = "1.2-groovy-2.5"
+val spockFrameworkVersion = "1.3-groovy-2.5"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-spring-web/build.gradle.kts b/allure-spring-web/build.gradle.kts
index 2ddeedc08..ff8a800ec 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Spring Web Integration"
 
 val agent: Configuration by configurations.creating
 
-val springWebVersion = "5.1.4.RELEASE"
+val springWebVersion = "5.2.9.RELEASE"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/build.gradle.kts b/build.gradle.kts
index 9fa48023c..9c69c77ff 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -78,29 +78,29 @@ configure(subprojects) {
 
     configure<DependencyManagementExtension> {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.11.2")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.11.3")
             mavenBom("org.junit:junit-bom:5.7.0")
         }
         dependencies {
             dependency("com.github.tomakehurst:wiremock:2.27.2")
             dependency("com.google.inject:guice:4.2.3")
-            dependency("com.google.testing.compile:compile-testing:0.18")
+            dependency("com.google.testing.compile:compile-testing:0.19")
             dependency("com.squareup.retrofit2:retrofit:2.9.0")
             dependency("commons-io:commons-io:2.8.0")
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.4.0")
             dependency("org.apache.commons:commons-lang3:3.11")
-            dependency("org.apache.httpcomponents:httpclient:4.5.12")
+            dependency("org.apache.httpcomponents:httpclient:4.5.13")
             dependency("org.apache.tika:tika-core:1.24.1")
             dependency("org.aspectj:aspectjrt:1.9.6")
             dependency("org.aspectj:aspectjweaver:1.9.6")
             dependency("org.assertj:assertj-core:3.17.2")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.30")
-            dependency("org.jboss.resteasy:resteasy-client:4.5.6.Final")
+            dependency("org.jboss.resteasy:resteasy-client:4.5.8.Final")
             dependency("org.jooq:joor-java-8:0.9.13")
             dependency("org.mock-server:mockserver-netty:5.11.1")
-            dependency("org.mockito:mockito-core:3.5.10")
+            dependency("org.mockito:mockito-core:3.5.15")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From 30dc5ec16915bf30ce06e071151a3213104a794f Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Sun, 8 Nov 2020 16:24:44 +0300
Subject: [PATCH 014/486] disable test case creation for configuration failure
 results (via #489)

---
 .../java/io/qameta/allure/testng/AllureTestNg.java     | 10 ++++++++++
 .../java/io/qameta/allure/testng/AllureTestNgTest.java |  9 +++++++++
 2 files changed, 19 insertions(+)

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 f296ad9ca..92fb3cfd9 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
@@ -71,6 +71,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static io.qameta.allure.util.ResultsUtils.ALLURE_ID_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.bytesToHex;
 import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
 import static io.qameta.allure.util.ResultsUtils.createHostLabel;
@@ -498,6 +499,15 @@ public void onConfigurationFailure(final ITestResult itr) {
         final String parentUuid = UUID.randomUUID().toString();
 
         startTestCase(itr, parentUuid, uuid);
+
+        // results created for configuration failure should not be considered as test cases.
+        getLifecycle().updateTestCase(
+                uuid,
+                tr -> tr.getLabels().add(
+                        new Label().setName(ALLURE_ID_LABEL_NAME).setValue("-1")
+                )
+        );
+
         stopTestCase(uuid, itr.getThrowable(), getStatus(itr.getThrowable()));
         //do nothing
     }
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 564a6a35f..326189c89 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
@@ -974,6 +974,7 @@ public void shouldAddCorrectBeforeMethodFixturesInCaseOfParallelRun(
         });
     }
 
+    @SuppressWarnings("unchecked")
     @AllureFeatures.Fixtures
     @Issue("135")
     @Test
@@ -992,6 +993,14 @@ public void shouldProcessConfigurationFailure() {
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
                 .containsExactly("fail");
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "failed configuration")
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("AS_ID", "-1")
+                );
     }
 
     @AllureFeatures.IgnoredTests

From cd135f4021d1dcd98085d8832462d8099faaabc0 Mon Sep 17 00:00:00 2001
From: lasnamae <73279289+lasnamae@users.noreply.github.com>
Date: Wed, 11 Nov 2020 16:01:51 +0200
Subject: [PATCH 015/486] bump gradle to 6.7 (via #481)

---
 build.gradle.kts                         |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 58694 -> 59203 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 ++
 gradlew.bat                              |  22 ++++------------------
 5 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9c69c77ff..ba0db2c95 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -31,7 +31,7 @@ val qualityConfigsDir by extra("$gradleScriptDir/quality-configs")
 val spotlessDtr by extra("$qualityConfigsDir/spotless")
 
 tasks.withType(Wrapper::class) {
-    gradleVersion = "6.6.1"
+    gradleVersion = "6.7"
 }
 
 plugins {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 490fda8577df6c95960ba7077c43220e5bb2c0d9..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644
GIT binary patch
delta 6763
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

delta 6251
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 12d38de6a..be52383ef 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-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7d9..4f906e0c8 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 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
diff --git a/gradlew.bat b/gradlew.bat
index 62bd9b9cc..107acd32c 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -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 init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

From 41c9d518f8d2fd84d51348268eef57c115d1e18b Mon Sep 17 00:00:00 2001
From: Artem Eroshenko <eroshenkoam@qameta.io>
Date: Tue, 24 Nov 2020 23:47:04 +0300
Subject: [PATCH 016/486] migrate to gh actions (via #495)

---
 .github/release-drafter.yml         | 20 ++++++++++++++++++++
 .github/workflows/build.yaml        | 21 +++++++++++++++++++++
 .github/workflows/labels-verify.yml | 13 +++++++++++++
 .github/workflows/release-draft.yml | 14 ++++++++++++++
 .github/workflows/release.yaml      | 22 ++++++++++++++++++++++
 5 files changed, 90 insertions(+)
 create mode 100644 .github/release-drafter.yml
 create mode 100644 .github/workflows/build.yaml
 create mode 100644 .github/workflows/labels-verify.yml
 create mode 100644 .github/workflows/release-draft.yml
 create mode 100644 .github/workflows/release.yaml

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
new file mode 100644
index 000000000..a2939dd11
--- /dev/null
+++ b/.github/release-drafter.yml
@@ -0,0 +1,20 @@
+name-template: '$NEXT_MINOR_VERSION'
+tag-template: '$NEXT_MINOR_VERSION'
+categories:
+  - title: '🚀 New Features'
+    labels:
+      - 'type:new feature'
+  - title: '🔬 Improvements'
+    labels:
+      - 'type:enhancement'
+  - title: '🐞 Bug Fixes'
+    labels:
+      - 'type:bug'
+
+change-template: '* $TITLE (via #$NUMBER) - @$AUTHOR'
+template: |
+  $CHANGES
+
+  ## 👀 Links
+
+  [Commits since $PREVIOUS_TAG](https://github.com/allure-framework/allure2/compare/$PREVIOUS_TAG...master)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
new file mode 100644
index 000000000..797525b6d
--- /dev/null
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,21 @@
+name: Build
+
+on:
+  pull_request:
+    branches:
+      - '*'
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Gradle
+        run: ./gradlew build
diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml
new file mode 100644
index 000000000..faf8586e1
--- /dev/null
+++ b/.github/workflows/labels-verify.yml
@@ -0,0 +1,13 @@
+name: "Verify type labels"
+
+on:
+  pull_request:
+    types: [opened, labeled, unlabeled, synchronize]
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: zwaldowski/match-label-action@v2
+        with:
+          allowed: 'type:bug, type:enhancement, type:new feature'
\ No newline at end of file
diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml
new file mode 100644
index 000000000..363a31018
--- /dev/null
+++ b/.github/workflows/release-draft.yml
@@ -0,0 +1,14 @@
+name: Release Draft
+
+on:
+  push:
+    branches:
+    - master
+
+jobs:
+  update_draft_release:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: toolmantim/release-drafter@v5.2.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
new file mode 100644
index 000000000..074cd577c
--- /dev/null
+++ b/.github/workflows/release.yaml
@@ -0,0 +1,22 @@
+name: Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: "Gradle Build"
+        run: ./gradlew build -Pversion=${GITHUB_REF:10}
+      - name: "Gradle Publish to Bintray"
+        env:
+          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
+          BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }}
+        run: ./gradlew bintrayUpload -Pversion=${GITHUB_REF:10}

From 067cd8962d9607a470b62b131cbac093f36450a4 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Tue, 1 Dec 2020 15:54:17 +0300
Subject: [PATCH 017/486] update gh build action

---
 .github/workflows/build.yaml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 797525b6d..10b3c0bb3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,6 +1,7 @@
 name: Build
 
 on:
+  workflow_dispatch:
   pull_request:
     branches:
       - '*'
@@ -9,7 +10,8 @@ on:
       - 'master'
 
 jobs:
-  build:
+  build_8:
+    name: "Build JDK 1.8"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -19,3 +21,14 @@ jobs:
           java-version: 1.8
       - name: Build with Gradle
         run: ./gradlew build
+  build_11:
+    name: "Build JDK 11"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11.0.x
+      - name: Build with Gradle
+        run: ./gradlew build

From f046ca49b8a95bf3690a85bbbe56675b78a92072 Mon Sep 17 00:00:00 2001
From: MetallFoX <fox_rul@mail.ru>
Date: Tue, 8 Dec 2020 15:46:36 +0300
Subject: [PATCH 018/486] add support for cucumber jvm 6.9.0 (via #493)

---
 allure-cucumber6-jvm/build.gradle.kts         |   4 +-
 .../cucumber6jvm/AllureCucumber6Jvm.java      |  30 +--
 .../allure/cucumber6jvm/LabelBuilder.java     |   2 +-
 .../qameta/allure/cucumber6jvm/TagParser.java |   4 +-
 .../testsourcemodel/TestSourcesModel.java     | 195 ++++++++++--------
 .../TestSourcesModelProxy.java                |  12 +-
 .../cucumber6jvm/AllureCucumber6JvmTest.java  |  24 +--
 7 files changed, 149 insertions(+), 122 deletions(-)

diff --git a/allure-cucumber6-jvm/build.gradle.kts b/allure-cucumber6-jvm/build.gradle.kts
index 7f2c6bda5..d355fdf04 100644
--- a/allure-cucumber6-jvm/build.gradle.kts
+++ b/allure-cucumber6-jvm/build.gradle.kts
@@ -2,8 +2,8 @@ description = "Allure CucumberJVM 6.0"
 
 val agent: Configuration by configurations.creating
 
-val cucumberVersion = "6.1.1"
-val cucumberGherkinVersion = "5.1.0"
+val cucumberVersion = "6.9.0"
+val cucumberGherkinVersion = "15.0.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
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 e57514bea..83679ffb5 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
@@ -15,11 +15,10 @@
  */
 package io.qameta.allure.cucumber6jvm;
 
-import gherkin.ast.Examples;
-import gherkin.ast.Feature;
-import gherkin.ast.ScenarioDefinition;
-import gherkin.ast.ScenarioOutline;
-import gherkin.ast.TableRow;
+import io.cucumber.messages.Messages.GherkinDocument.Feature;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Scenario;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Scenario.Examples;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.TableRow;
 import io.cucumber.plugin.ConcurrentEventListener;
 import io.cucumber.plugin.event.DataTableArgument;
 import io.cucumber.plugin.event.EmbedEvent;
@@ -154,11 +153,12 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
                 .setLabels(labelBuilder.getScenarioLabels())
                 .setLinks(labelBuilder.getScenarioLinks());
 
-        final ScenarioDefinition scenarioDefinition =
+        final Scenario scenarioDefinition =
                 testSources.getScenarioDefinition(currentFeatureFile.get(), currentTestCase.get().getLine());
-        if (scenarioDefinition instanceof ScenarioOutline) {
+
+        if (scenarioDefinition.getExamplesCount() > 0) {
             result.setParameters(
-                    getExamplesAsParameters((ScenarioOutline) scenarioDefinition, currentTestCase.get())
+                    getExamplesAsParameters(scenarioDefinition, currentTestCase.get())
             );
         }
 
@@ -300,21 +300,21 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(
-            final ScenarioOutline scenarioOutline, final TestCase localCurrentTestCase
+            final Scenario scenario, final TestCase localCurrentTestCase
     ) {
         final Optional<Examples> examplesBlock =
-                scenarioOutline.getExamples().stream()
-                        .filter(example -> example.getTableBody().stream()
+                scenario.getExamplesList().stream()
+                        .filter(example -> example.getTableBodyList().stream()
                                 .anyMatch(row -> row.getLocation().getLine() == localCurrentTestCase.getLine())
                         ).findFirst();
 
         if (examplesBlock.isPresent()) {
-            final TableRow row = examplesBlock.get().getTableBody().stream()
+            final TableRow row = examplesBlock.get().getTableBodyList().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 IntStream.range(0, examplesBlock.get().getTableHeader().getCellsList().size()).mapToObj(index -> {
+                final String name = examplesBlock.get().getTableHeader().getCellsList().get(index).getValue();
+                final String value = row.getCellsList().get(index).getValue();
                 return createParameter(name, value);
             }).collect(Collectors.toList());
         } else {
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 5ad4a04e5..3a51a15dc 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
@@ -15,8 +15,8 @@
  */
 package io.qameta.allure.cucumber6jvm;
 
+import io.cucumber.messages.Messages.GherkinDocument.Feature;
 import io.cucumber.plugin.event.TestCase;
-import gherkin.ast.Feature;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import io.qameta.allure.util.ResultsUtils;
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 c3b460f5b..f1e5940bf 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
@@ -15,7 +15,7 @@
  */
 package io.qameta.allure.cucumber6jvm;
 
-import gherkin.ast.Feature;
+import io.cucumber.messages.Messages.GherkinDocument.Feature;
 import io.cucumber.plugin.event.TestCase;
 import io.qameta.allure.SeverityLevel;
 
@@ -52,7 +52,7 @@ public boolean isKnown() {
     private boolean getStatusDetailByTag(final String tagName) {
         return scenario.getTags().stream()
                 .anyMatch(tag -> tag.equalsIgnoreCase(tagName))
-                || feature.getTags().stream()
+                || feature.getTagsList().stream()
                 .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
     }
 
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 2afc7c9fa..00575c7b6 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
@@ -15,31 +15,41 @@
  */
 package io.qameta.allure.cucumber6jvm.testsourcemodel;
 
-import gherkin.AstBuilder;
-import gherkin.Parser;
-import gherkin.ParserException;
-import gherkin.TokenMatcher;
-import gherkin.ast.Examples;
-import gherkin.ast.Feature;
-import gherkin.ast.GherkinDocument;
-import gherkin.ast.Node;
-import gherkin.ast.ScenarioDefinition;
-import gherkin.ast.ScenarioOutline;
-import gherkin.ast.Step;
-import gherkin.ast.TableRow;
+import io.cucumber.gherkin.Gherkin;
+import io.cucumber.messages.Messages;
+import io.cucumber.messages.Messages.GherkinDocument;
+import io.cucumber.messages.Messages.GherkinDocument.Feature;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Background;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.FeatureChild;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.FeatureChild.RuleChild;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Scenario;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Scenario.Examples;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Step;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.TableRow;
+import io.cucumber.messages.internal.com.google.protobuf.GeneratedMessageV3;
 import io.cucumber.plugin.event.TestSourceRead;
+
 import java.net.URI;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.UUID;
+
+import static io.cucumber.gherkin.Gherkin.makeSourceEnvelope;
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
 
-public final class TestSourcesModel {
+final class TestSourcesModel {
     private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();
     private final Map<URI, GherkinDocument> pathToAstMap = new HashMap<>();
     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
-                : (ScenarioDefinition) astNode.parent.parent.node;
+    public static Scenario getScenarioDefinition(final AstNode astNode) {
+        AstNode candidate = astNode;
+        while (candidate != null && !(candidate.node instanceof Scenario)) {
+            candidate = candidate.parent;
+        }
+        return candidate == null ? null : (Scenario) candidate.node;
     }
 
     public void addTestSourceReadEvent(final URI path, final TestSourceRead event) {
@@ -56,102 +66,119 @@ public Feature getFeature(final URI path) {
         return null;
     }
 
-    public AstNode getAstNode(final URI path, final int line) {
-        if (!pathToNodeMap.containsKey(path)) {
-            parseGherkinSource(path);
-        }
-        if (pathToNodeMap.containsKey(path)) {
-            return pathToNodeMap.get(path).get(line);
-        }
-        return null;
-    }
-
     private void parseGherkinSource(final URI 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).getSource(),
-                    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);
+        final String source = pathToReadEventMap.get(path).getSource();
+
+        final List<Messages.Envelope> sources = singletonList(
+                makeSourceEnvelope(source, path.toString()));
+
+        final List<Messages.Envelope> envelopes = Gherkin.fromSources(
+                sources,
+                true,
+                true,
+                true,
+                () -> String.valueOf(UUID.randomUUID())).collect(toList());
+
+        final GherkinDocument gherkinDocument = envelopes.stream()
+                .filter(Messages.Envelope::hasGherkinDocument)
+                .map(Messages.Envelope::getGherkinDocument)
+                .findFirst()
+                .orElse(null);
+
+        pathToAstMap.put(path, gherkinDocument);
+        final Map<Integer, AstNode> nodeMap = new HashMap<>();
+        final AstNode currentParent = createAstNode(gherkinDocument.getFeature(), null);
+        for (FeatureChild child : gherkinDocument.getFeature().getChildrenList()) {
+            processFeatureDefinition(nodeMap, child, currentParent);
+        }
+        pathToNodeMap.put(path, nodeMap);
+
+    }
+
+    private void processFeatureDefinition(
+            final Map<Integer, AstNode> nodeMap, final FeatureChild child, final AstNode currentParent) {
+        if (child.hasBackground()) {
+            processBackgroundDefinition(nodeMap, child.getBackground(), currentParent);
+        } else if (child.hasScenario()) {
+            processScenarioDefinition(nodeMap, child.getScenario(), currentParent);
+        } else if (child.hasRule()) {
+            final AstNode childNode = createAstNode(child.getRule(), currentParent);
+            nodeMap.put(child.getRule().getLocation().getLine(), childNode);
+            for (RuleChild ruleChild : child.getRule().getChildrenList()) {
+                processRuleDefinition(nodeMap, ruleChild, childNode);
             }
-            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
-            );
         }
     }
 
-    private void processScenarioDefinition(final Map<Integer, AstNode> nodeMap, final ScenarioDefinition child,
-                                           final AstNode currentParent) {
-        final AstNode childNode = new AstNode(child, currentParent);
+    private void processBackgroundDefinition(
+            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()) {
+            nodeMap.put(step.getLocation().getLine(), createAstNode(step, childNode));
+        }
+    }
+
+    private void processScenarioDefinition(
+            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.getSteps()) {
+        for (Step step : child.getStepsList()) {
             nodeMap.put(step.getLocation().getLine(), createAstNode(step, childNode));
         }
-        if (child instanceof ScenarioOutline) {
-            processScenarioOutlineExamples(nodeMap, (ScenarioOutline) child, childNode);
+        if (child.getExamplesCount() > 0) {
+            processScenarioOutlineExamples(nodeMap, child, childNode);
         }
     }
 
-    private void processScenarioOutlineExamples(final Map<Integer, AstNode> nodeMap,
-                                                final ScenarioOutline scenarioOutline,
-                                                final AstNode childNode) {
-        for (Examples examples : scenarioOutline.getExamples()) {
-            final AstNode examplesNode = createAstNode(examples, childNode);
+    private void processRuleDefinition(
+            final Map<Integer, AstNode> nodeMap, final RuleChild child, final AstNode currentParent) {
+        if (child.hasBackground()) {
+            processBackgroundDefinition(nodeMap, child.getBackground(), currentParent);
+        } else if (child.hasScenario()) {
+            processScenarioDefinition(nodeMap, child.getScenario(), currentParent);
+        }
+    }
+
+    private void processScenarioOutlineExamples(
+            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();
             final AstNode headerNode = createAstNode(headerRow, examplesNode);
             nodeMap.put(headerRow.getLocation().getLine(), headerNode);
-            for (int i = 0; i < examples.getTableBody().size(); ++i) {
-                final TableRow examplesRow = examples.getTableBody().get(i);
-                final Node rowNode = createExamplesRowWrapperNode(examplesRow, i);
-                final AstNode expandedScenarioNode = createAstNode(rowNode, examplesNode);
+            for (int i = 0; i < examples.getTableBodyCount(); ++i) {
+                final TableRow examplesRow = examples.getTableBody(i);
+                final AstNode expandedScenarioNode = createAstNode(examplesRow, examplesNode);
                 nodeMap.put(examplesRow.getLocation().getLine(), expandedScenarioNode);
             }
         }
     }
 
-    private static ExamplesRowWrapperNode createExamplesRowWrapperNode(final Node examplesRow, final int bodyRowIndex) {
-        return new ExamplesRowWrapperNode(examplesRow, bodyRowIndex);
-    }
-
-    private static AstNode createAstNode(final Node node, final AstNode astNode) {
-        return new AstNode(node, astNode);
-    }
-
-    static class ExamplesRowWrapperNode extends Node {
-        private final int bodyRowIndex;
-
-        public int getBodyRowIndex() {
-            return bodyRowIndex;
+    public AstNode getAstNode(final URI path, final int line) {
+        if (!pathToNodeMap.containsKey(path)) {
+            parseGherkinSource(path);
         }
-
-        ExamplesRowWrapperNode(final Node examplesRow, final int bodyRowIndex) {
-            super(examplesRow.getLocation());
-            this.bodyRowIndex = bodyRowIndex;
+        if (pathToNodeMap.containsKey(path)) {
+            return pathToNodeMap.get(path).get(line);
         }
+        return null;
     }
 
-    static class AstNode {
-        private final Node node;
-        private final AstNode parent;
-
-        public Node getNode() {
-            return node;
-        }
+    private AstNode createAstNode(final GeneratedMessageV3 node, final AstNode astNode) {
+        return createAstNode(node, astNode);
+    }
 
-        public AstNode getParent() {
-            return parent;
-        }
+    private static class AstNode {
+        private final GeneratedMessageV3 node;
+        private final AstNode parent;
 
-        AstNode(final Node node, final AstNode parent) {
+        AstNode(final GeneratedMessageV3 node, final AstNode parent) {
             this.node = node;
             this.parent = parent;
         }
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 ff2b9380b..84f757ff0 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
@@ -15,10 +15,10 @@
  */
 package io.qameta.allure.cucumber6jvm.testsourcemodel;
 
-import gherkin.GherkinDialect;
-import gherkin.GherkinDialectProvider;
-import gherkin.ast.Feature;
-import gherkin.ast.ScenarioDefinition;
+import io.cucumber.gherkin.GherkinDialect;
+import io.cucumber.gherkin.GherkinDialectProvider;
+import io.cucumber.messages.Messages.GherkinDocument.Feature;
+import io.cucumber.messages.Messages.GherkinDocument.Feature.Scenario;
 import io.cucumber.plugin.event.TestSourceRead;
 
 import java.net.URI;
@@ -43,8 +43,8 @@ public Feature getFeature(final URI path) {
         return testSources.getFeature(path);
     }
 
-    public ScenarioDefinition getScenarioDefinition(final URI path, final int line) {
-        return testSources.getScenarioDefinition(testSources.getAstNode(path, line));
+    public Scenario getScenarioDefinition(final URI path, final int line) {
+        return TestSourcesModel.getScenarioDefinition(testSources.getAstNode(path, line));
     }
 
     public String getKeywordFromSource(final URI uri, final int stepLine) {
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 548acaf41..06922634e 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
@@ -504,16 +504,16 @@ void shouldSupportDryRunForSimpleFeatures() {
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("Add a to b", Status.SKIPPED)
+                        tuple("Add a to b", Status.PASSED)
                 );
 
         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.PASSED),
+                        tuple("And  b is 10", Status.PASSED),
+                        tuple("When  I add a to b", Status.PASSED),
+                        tuple("Then  result is 15", Status.PASSED)
                 );
     }
 
@@ -529,28 +529,28 @@ void shouldSupportDryRunForHooks() {
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
                 .startsWith(
-                        tuple("Simple scenario with Before and After hooks", Status.SKIPPED)
+                        tuple("Simple scenario with Before and After hooks", Status.PASSED)
                 );
 
         assertThat(writer.getTestResultContainers().get(0).getBefores())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHook()", Status.SKIPPED)
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.beforeHook()", Status.PASSED)
                 );
 
         assertThat(writer.getTestResultContainers().get(0).getAfters())
                 .extracting(FixtureResult::getName, FixtureResult::getStatus)
                 .containsExactlyInAnyOrder(
-                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHook()", Status.SKIPPED)
+                        tuple("io.qameta.allure.cucumber6jvm.samples.HookSteps.afterHook()", Status.PASSED)
                 );
 
         assertThat(testResults.get(0).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.PASSED),
+                        tuple("And  b is 8", Status.PASSED),
+                        tuple("When  I add a to b", Status.PASSED),
+                        tuple("Then  result is 15", Status.PASSED)
                 );
     }
 

From df221706c84c337d3e8bd3bf26aa2f04514d6ede Mon Sep 17 00:00:00 2001
From: MetallFoX <fox_rul@mail.ru>
Date: Wed, 16 Dec 2020 18:23:21 +0300
Subject: [PATCH 019/486] fix infinite recursive call in cucumber6jvm (via
 #498)

---
 .../allure/cucumber6jvm/testsourcemodel/TestSourcesModel.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 00575c7b6..8545fd102 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
@@ -171,7 +171,7 @@ public AstNode getAstNode(final URI path, final int line) {
     }
 
     private AstNode createAstNode(final GeneratedMessageV3 node, final AstNode astNode) {
-        return createAstNode(node, astNode);
+        return new AstNode(node, astNode);
     }
 
     private static class AstNode {

From 43a89b54aae73eab1e2852225a1a9c3329084542 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 17 Dec 2020 13:13:50 +0300
Subject: [PATCH 020/486] add idea metadata (via #486)

---
 .gitignore     |   6 ++++--
 .idea/icon.png | Bin 0 -> 8689 bytes
 .idea/vcs.xml  |  16 ++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 .idea/icon.png
 create mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index fe90411d6..b85107a90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,9 @@ out
 .gradletasknamecache
 
 #IDEA Files
-.idea
+.idea/*
+!.idea/vcs.xml
+!.idea/icon.png
 *.iml
 *.ipr
 
@@ -21,4 +23,4 @@ out
 .DS_Store
 
 #Netbeans files
-/.nb-gradle/
\ No newline at end of file
+/.nb-gradle/
diff --git a/.idea/icon.png b/.idea/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..621c0930b2d6455a9e6822a898d5d586c2accb90
GIT binary patch
literal 8689
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
P00000NkvXXu0mjf-tvaF

literal 0
HcmV?d00001

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..aeaa9e459
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="#(\d+)" />
+          <option name="linkRegexp" value="https://github.com/allure-framework/allure-java/issues/$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

From db150fc54e145bcd8e010e13de7f85e8f5038b77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fulcan=20Arabac=C4=B1?= <ogulcan.a81@hotmail.com>
Date: Mon, 18 Jan 2021 15:37:20 +0300
Subject: [PATCH 021/486] add possibility to configure attachments names for
 rest assured integration (fixes #492, via #491)

---
 .../allure/restassured/AllureRestAssured.java | 22 ++++--
 .../restassured/AllureRestAssuredTest.java    | 70 ++++++++++++-------
 2 files changed, 62 insertions(+), 30 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 717b64ecd..c08d960ba 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
@@ -41,6 +41,8 @@ public class AllureRestAssured implements OrderedFilter {
 
     private String requestTemplatePath = "http-request.ftl";
     private String responseTemplatePath = "http-response.ftl";
+    private String requestAttachmentName = "Request";
+    private String responseAttachmentName;
 
     public AllureRestAssured setRequestTemplate(final String templatePath) {
         this.requestTemplatePath = templatePath;
@@ -52,6 +54,16 @@ public AllureRestAssured setResponseTemplate(final String templatePath) {
         return this;
     }
 
+    public AllureRestAssured setRequestAttachmentName(final String requestAttachmentName) {
+        this.requestAttachmentName = requestAttachmentName;
+        return this;
+    }
+
+    public AllureRestAssured setResponseAttachmentName(final String responseAttachmentName) {
+        this.responseAttachmentName = responseAttachmentName;
+        return this;
+    }
+
     /**
      * @deprecated use {@link #setRequestTemplate(String)} instead.
      * Scheduled for removal in 3.0 release.
@@ -75,9 +87,8 @@ public Response filter(final FilterableRequestSpecification requestSpec,
                            final FilterableResponseSpecification responseSpec,
                            final FilterContext filterContext) {
         final Prettifier prettifier = new Prettifier();
-
-
-        final HttpRequestAttachment.Builder requestAttachmentBuilder = create("Request", requestSpec.getURI())
+        final String url = requestSpec.getURI();
+        final HttpRequestAttachment.Builder requestAttachmentBuilder = create(requestAttachmentName, url)
                 .setMethod(requestSpec.getMethod())
                 .setHeaders(toMapConverter(requestSpec.getHeaders()))
                 .setCookies(toMapConverter(requestSpec.getCookies()));
@@ -94,7 +105,10 @@ public Response filter(final FilterableRequestSpecification requestSpec,
         );
 
         final Response response = filterContext.next(requestSpec, responseSpec);
-        final HttpResponseAttachment responseAttachment = create(response.getStatusLine())
+        if (Objects.isNull(responseAttachmentName)) {
+            responseAttachmentName = response.getStatusLine();
+        }
+        final HttpResponseAttachment responseAttachment = create(responseAttachmentName)
                 .setResponseCode(response.getStatusCode())
                 .setHeaders(toMapConverter(response.getHeaders()))
                 .setBody(prettifier.getPrettifiedBodyIfPossible(response, response.getBody()))
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 ff7e38cf4..e92d5d866 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
@@ -23,15 +23,30 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResults;
 import io.restassured.RestAssured;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.util.Collection;
-import java.util.Objects;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+import org.junit.jupiter.params.provider.ArgumentsSource;
+import java.util.*;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+class AttachmentArgumentProvider implements ArgumentsProvider {
+    @Override
+    public Stream<? extends Arguments> provideArguments(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"))
+        );
+    }
+}
 
 /**
  * @author charlie (Dmitry Baev).
@@ -39,39 +54,43 @@
 @SuppressWarnings("unchecked")
 class AllureRestAssuredTest {
 
-    static Stream<String> attachmentNameProvider() {
-        return Stream.of("Request", "HTTP/1.1 200 OK");
-    }
-
     @ParameterizedTest
-    @MethodSource(value = "attachmentNameProvider")
-    void shouldCreateAttachment(final String attachmentName) {
+    @ArgumentsSource(AttachmentArgumentProvider.class)
+    void shouldCreateAttachment(final List<String> attachmentNames, final AllureRestAssured filter) {
+        RestAssured.replaceFiltersWith(filter);
         final AllureResults results = execute();
 
-        assertThat(results.getTestResults())
-                .flatExtracting(TestResult::getAttachments)
-                .flatExtracting(Attachment::getName)
-                .contains(attachmentName);
+        assertThat(results.getTestResults()
+                .stream()
+                .map(TestResult::getAttachments)
+                .flatMap(Collection::stream)
+                .map(Attachment::getName))
+                .isEqualTo(attachmentNames);
     }
 
     @ParameterizedTest
-    @MethodSource(value = "attachmentNameProvider")
-    void shouldCatchAttachmentBody(final String attachmentName) {
+    @ArgumentsSource(AttachmentArgumentProvider.class)
+    void shouldCatchAttachmentBody(final List<String> attachmentNames, final AllureRestAssured filter) {
+        RestAssured.replaceFiltersWith(filter);
         final AllureResults results = execute();
 
-        final Attachment found = results.getTestResults().stream()
+        List<Attachment> actualAttachments = results.getTestResults().stream()
                 .map(TestResult::getAttachments)
-                .flatMap(Collection::stream)
-                .filter(attachment -> Objects.equals(attachmentName, attachment.getName()))
-                .findAny()
-                .orElseThrow(() -> new RuntimeException("attachment not found"));
+                .flatMap(List::stream)
+                .collect(Collectors.toList());
 
-        assertThat(results.getAttachments())
-                .containsKeys(found.getSource());
+        assertThat(actualAttachments)
+                .flatExtracting(Attachment::getName)
+                .isEqualTo(attachmentNames)
+                .doesNotContainNull();
+
+        assertThat(actualAttachments)
+                .flatExtracting(Attachment::getSource)
+                .containsExactlyInAnyOrderElementsOf(new ArrayList<>(results.getAttachments().keySet()))
+                .doesNotContainNull();
     }
 
     protected final AllureResults execute() {
-        RestAssured.replaceFiltersWith(new AllureRestAssured());
         final WireMockServer server = new WireMockServer(WireMockConfiguration.options().dynamicPort());
 
         return runWithinTestContext(() -> {
@@ -87,5 +106,4 @@ protected final AllureResults execute() {
             }
         });
     }
-
 }

From 54db835d1a309862dd25492c7ce448ea1abc1e91 Mon Sep 17 00:00:00 2001
From: Artem Eroshenko <eroshenkoam@qameta.io>
Date: Mon, 15 Feb 2021 14:04:01 +0300
Subject: [PATCH 022/486] fix face test case creation in Allure TestOps (via
 #509)

---
 .../allure/junitplatform/AllureJunitPlatform.java    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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 74b5def2c..60dc36185 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
@@ -64,6 +64,7 @@
 import static io.qameta.allure.model.Status.FAILED;
 import static io.qameta.allure.model.Status.PASSED;
 import static io.qameta.allure.model.Status.SKIPPED;
+import static io.qameta.allure.util.ResultsUtils.ALLURE_ID_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
 import static io.qameta.allure.util.ResultsUtils.createHostLabel;
 import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
@@ -79,7 +80,13 @@
 /**
  * @author ehborisov
  */
-@SuppressWarnings({"deprecation", "ClassFanOutComplexity", "MultipleStringLiterals", "PMD.GodClass"})
+@SuppressWarnings({
+        "deprecation",
+        "ClassFanOutComplexity",
+        "MultipleStringLiterals",
+        "ClassDataAbstractionCoupling",
+        "PMD.GodClass"
+})
 public class AllureJunitPlatform implements TestExecutionListener {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureJunitPlatform.class);
@@ -419,6 +426,9 @@ private void stopTestCase(final TestIdentifier testIdentifier,
         }
         final String uuid = maybeUuid.get();
         getLifecycle().updateTestCase(uuid, result -> {
+            if (!testIdentifier.isTest()) {
+                result.getLabels().add(new Label().setName(ALLURE_ID_LABEL_NAME).setValue("-1"));
+            }
             result.setStage(Stage.FINISHED);
             result.setStatus(status);
             result.setStatusDetails(statusDetails);

From 6b9cad28cdf14d52eae419c8cad3f712b41b729d Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 17 Mar 2021 14:11:41 +0300
Subject: [PATCH 023/486] improve build workflow (via #511)

---
 .github/dependabot.yml              | 15 ++++++
 .github/labeler.yml                 | 82 +++++++++++++++++++++++++++++
 .github/release-drafter.yml         |  7 ++-
 .github/workflows/build.yaml        |  1 +
 .github/workflows/labeler.yml       | 12 +++++
 .github/workflows/labels-verify.yml |  2 +-
 6 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/labeler.yml
 create mode 100644 .github/workflows/labeler.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..240d09840
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "type:dependencies"
+
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "type:dependencies"
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000..6c0d01bed
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,82 @@
+theme:workflow:
+  - ".github/**"
+
+theme:build:
+  - "gradle/**"
+  - "build.gradle.kts"
+  - "**/build.gradle.kts"
+  - "gradle.properties"
+  - ".gitignore"
+
+theme:assertj:
+  - "allure-assertj/**"
+
+theme:attachments:
+  - "allure-attachments/**"
+
+theme:citrus:
+  - "allure-citrus/**"
+
+theme:cucumber-jvm:
+  - "allure-cucumber*-jvm/**"
+
+theme:descriptions-javadoc:
+  - "allure-descriptions-javadoc/**"
+
+theme:httpclient:
+  - "allure-httpclient/**"
+
+theme:model:
+  - "allure-model/**"
+
+theme:core:
+  - "allure-java-commons/**"
+  - "allure-java-commons-test/**"
+  - "allure-test-filter/**"
+
+theme:jax-rs:
+  - "allure-jax-rs/**"
+
+theme:jbehave:
+  - "allure-jbehave/**"
+
+theme:jsonunit:
+  - "allure-jsonunit/**"
+
+theme:junit4:
+  - "allure-junit4/**"
+  - "allure-junit4-aspect/**"
+
+theme:junit-platform:
+  - "allure-junit5/**"
+  - "allure-junit5-assert/**"
+  - "allure-junit-platform/**"
+
+theme:karate:
+  - "allure-karate/**"
+
+theme:okhttp:
+  - "allure-okhttp/**"
+  - "allure-okhttp3/**"
+
+theme:rest-assured:
+  - "allure-rest-assured/**"
+
+theme:scalatest:
+  - "allure-scalatest/**"
+
+theme:selenide:
+  - "allure-selenide/**"
+
+theme:servlet-api:
+  - "allure-servlet-api/**"
+
+theme:spock:
+  - "allure-spock/**"
+
+theme:spring:
+  - "allure-spring-web/**"
+
+theme:testng:
+  - "allure-testng/**"
+
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index a2939dd11..890e47a94 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -6,12 +6,17 @@ categories:
       - 'type:new feature'
   - title: '🔬 Improvements'
     labels:
-      - 'type:enhancement'
+      - 'type:improvement'
   - title: '🐞 Bug Fixes'
     labels:
       - 'type:bug'
+  - title: '⬆️ Dependency Updates'
+    labels:
+      - 'type:dependencies'
 
 change-template: '* $TITLE (via #$NUMBER) - @$AUTHOR'
+exclude-labels:
+  - 'type:internal'
 template: |
   $CHANGES
 
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 10b3c0bb3..125e0aa58 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -8,6 +8,7 @@ on:
   push:
     branches:
       - 'master'
+      - 'hotfix-*'
 
 jobs:
   build_8:
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 000000000..163862b73
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,12 @@
+name: "Set theme labels"
+
+on:
+  - pull_request
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml
index faf8586e1..d3067e48a 100644
--- a/.github/workflows/labels-verify.yml
+++ b/.github/workflows/labels-verify.yml
@@ -10,4 +10,4 @@ jobs:
     steps:
       - uses: zwaldowski/match-label-action@v2
         with:
-          allowed: 'type:bug, type:enhancement, type:new feature'
\ No newline at end of file
+          allowed: 'type:bug, type:enhancement, type:improvement, type:dependencies, type:internal, type:invalid'

From 6c612e9548daebd9e16325a5e9b6848eeccb4528 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 23:12:03 +0300
Subject: [PATCH 024/486] bump json-unit from 2.19.0 to 2.25.0 (via #519)

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

diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts
index e5837bae6..21dfc7f5b 100644
--- a/allure-jsonunit/build.gradle.kts
+++ b/allure-jsonunit/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure JsonUnit Integration"
 
 val agent: Configuration by configurations.creating
 
-val jsonUnitVersion = "2.19.0"
+val jsonUnitVersion = "2.25.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 2f87bc7daa225029d39aaef5b10ca69552e0a87f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 23:29:50 +0300
Subject: [PATCH 025/486] bump toolmantim/release-drafter from v5.2.0 to
 v5.15.0 (via #512)

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

diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml
index 363a31018..caef7cf56 100644
--- a/.github/workflows/release-draft.yml
+++ b/.github/workflows/release-draft.yml
@@ -9,6 +9,6 @@ jobs:
   update_draft_release:
     runs-on: ubuntu-latest
     steps:
-    - uses: toolmantim/release-drafter@v5.2.0
+    - uses: toolmantim/release-drafter@v5.15.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From 1c917d829ab7eb6b501253514ea402c0e464238e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 23:32:09 +0300
Subject: [PATCH 026/486] bump actions/labeler from v2 to v3 (via #513)

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

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 163862b73..2f232578e 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -7,6 +7,6 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v2
+      - uses: actions/labeler@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From fea3a31a50c835dbf455dad1775a28974bebb5df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 23:37:12 +0300
Subject: [PATCH 027/486] bump actions/checkout from v1 to v2.3.4 (via #516)

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

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 125e0aa58..f1870eb9f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -15,7 +15,7 @@ jobs:
     name: "Build JDK 1.8"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2.3.4
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
@@ -26,7 +26,7 @@ jobs:
     name: "Build JDK 11"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2.3.4
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 074cd577c..1df69505c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2.3.4
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:

From 28dd342fc66bdf7dedbb3ad7bd08c6181e37b22b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 23:37:38 +0300
Subject: [PATCH 028/486] bump rest-assured from 4.3.1 to 4.3.3 (via #517)

---
 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 c82fa8dc6..6634616ac 100644
--- a/allure-rest-assured/build.gradle.kts
+++ b/allure-rest-assured/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Rest-Assured Integration"
 
 val agent: Configuration by configurations.creating
 
-val restAssuredVersion = "4.3.1"
+val restAssuredVersion = "4.3.3"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 027d3c52bbbff2c1b01f16a469eb6a431def197e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 23:41:08 +0300
Subject: [PATCH 029/486] bump spotless-plugin-gradle from 5.5.1 to 5.11.0 (via
 #515)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index ba0db2c95..d01ce3ebc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.5.1")
+        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.11.0")
         classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
         classpath("io.spring.gradle:dependency-management-plugin:1.0.10.RELEASE")
         classpath("ru.vyarus:gradle-quality-plugin:4.3.0")

From 885a57a1575336d92b36eeb4d9110078b424fe2e Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 22 Mar 2021 16:17:11 +0300
Subject: [PATCH 030/486] update labeler configuration (via #524)

---
 .github/labeler.yml | 48 ++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 6c0d01bed..ca8c814d0 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,82 +1,82 @@
-theme:workflow:
+"theme:workflow":
   - ".github/**"
 
-theme:build:
+"theme:build":
   - "gradle/**"
   - "build.gradle.kts"
   - "**/build.gradle.kts"
   - "gradle.properties"
   - ".gitignore"
 
-theme:assertj:
+"theme:assertj":
   - "allure-assertj/**"
 
-theme:attachments:
+"theme:attachments":
   - "allure-attachments/**"
 
-theme:citrus:
+"theme:citrus":
   - "allure-citrus/**"
 
-theme:cucumber-jvm:
+"theme:cucumber-jvm":
   - "allure-cucumber*-jvm/**"
 
-theme:descriptions-javadoc:
+"theme:descriptions-javadoc":
   - "allure-descriptions-javadoc/**"
 
-theme:httpclient:
+"theme:httpclient":
   - "allure-httpclient/**"
 
-theme:model:
+"theme:model":
   - "allure-model/**"
 
-theme:core:
+"theme:core":
   - "allure-java-commons/**"
   - "allure-java-commons-test/**"
   - "allure-test-filter/**"
 
-theme:jax-rs:
+"theme:jax-rs":
   - "allure-jax-rs/**"
 
-theme:jbehave:
+"theme:jbehave":
   - "allure-jbehave/**"
 
-theme:jsonunit:
+"theme:jsonunit":
   - "allure-jsonunit/**"
 
-theme:junit4:
+"theme:junit4":
   - "allure-junit4/**"
   - "allure-junit4-aspect/**"
 
-theme:junit-platform:
+"theme:junit-platform":
   - "allure-junit5/**"
   - "allure-junit5-assert/**"
   - "allure-junit-platform/**"
 
-theme:karate:
+"theme:karate":
   - "allure-karate/**"
 
-theme:okhttp:
+"theme:okhttp":
   - "allure-okhttp/**"
   - "allure-okhttp3/**"
 
-theme:rest-assured:
+"theme:rest-assured":
   - "allure-rest-assured/**"
 
-theme:scalatest:
+"theme:scalatest":
   - "allure-scalatest/**"
 
-theme:selenide:
+"theme:selenide":
   - "allure-selenide/**"
 
-theme:servlet-api:
+"theme:servlet-api":
   - "allure-servlet-api/**"
 
-theme:spock:
+"theme:spock":
   - "allure-spock/**"
 
-theme:spring:
+"theme:spring":
   - "allure-spring-web/**"
 
-theme:testng:
+"theme:testng":
   - "allure-testng/**"
 

From 8c0c0bf1a7a02d223ac840263e049056a0d3244c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 16:20:53 +0300
Subject: [PATCH 031/486] bump mockserver-netty from 5.11.1 to 5.11.2 (via
 #523)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index d01ce3ebc..be89f5ccb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -99,7 +99,7 @@ configure(subprojects) {
             dependency("org.freemarker:freemarker:2.3.30")
             dependency("org.jboss.resteasy:resteasy-client:4.5.8.Final")
             dependency("org.jooq:joor-java-8:0.9.13")
-            dependency("org.mock-server:mockserver-netty:5.11.1")
+            dependency("org.mock-server:mockserver-netty:5.11.2")
             dependency("org.mockito:mockito-core:3.5.15")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")

From f17e00dde6aab6f75a85279f725a4782aa8e7005 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Mar 2021 15:55:23 +0300
Subject: [PATCH 032/486] bump tika-core from 1.24.1 to 1.25 (via #525)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index be89f5ccb..9373a52ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -91,7 +91,7 @@ configure(subprojects) {
             dependency("io.github.glytching:junit-extensions:2.4.0")
             dependency("org.apache.commons:commons-lang3:3.11")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
-            dependency("org.apache.tika:tika-core:1.24.1")
+            dependency("org.apache.tika:tika-core:1.25")
             dependency("org.aspectj:aspectjrt:1.9.6")
             dependency("org.aspectj:aspectjweaver:1.9.6")
             dependency("org.assertj:assertj-core:3.17.2")

From b2a8d8f7a73821b3eeae5b05adf3b4e0575c21d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Mar 2021 16:08:04 +0300
Subject: [PATCH 033/486] bump freemarker from 2.3.30 to 2.3.31 (via #522)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 9373a52ee..438857b65 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -96,7 +96,7 @@ configure(subprojects) {
             dependency("org.aspectj:aspectjweaver:1.9.6")
             dependency("org.assertj:assertj-core:3.17.2")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
-            dependency("org.freemarker:freemarker:2.3.30")
+            dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.5.8.Final")
             dependency("org.jooq:joor-java-8:0.9.13")
             dependency("org.mock-server:mockserver-netty:5.11.2")

From dd16e83442e031affc86d3d36a15d291bf3cbaa8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Mar 2021 16:12:48 +0300
Subject: [PATCH 034/486] bump gradle-quality-plugin from 4.3.0 to 4.5.0 (via
 #514)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 438857b65..5305634cd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ buildscript {
         classpath("com.diffplug.spotless:spotless-plugin-gradle:5.11.0")
         classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
         classpath("io.spring.gradle:dependency-management-plugin:1.0.10.RELEASE")
-        classpath("ru.vyarus:gradle-quality-plugin:4.3.0")
+        classpath("ru.vyarus:gradle-quality-plugin:4.5.0")
     }
 }
 

From 8f433e6986e9b159791f38557499b1749ce54fca Mon Sep 17 00:00:00 2001
From: Artem Eroshenko <eroshenkoam@qameta.io>
Date: Wed, 24 Mar 2021 16:30:00 +0300
Subject: [PATCH 035/486] add test filter module (via #474)

---
 .github/workflows/labels-verify.yml           |   2 +-
 .../io/qameta/allure/test/AllureFeatures.java |   8 ++
 allure-junit-platform/build.gradle.kts        |   1 +
 .../junitplatform/AllureJunitPlatform.java    |  58 +-------
 .../AllureJunitPlatformUtils.java             |  88 ++++++++++++
 .../AllurePostDiscoveryFilter.java            | 129 ++++++++++++++++++
 ...unit.platform.launcher.PostDiscoveryFilter |   1 +
 .../AllureJunitPlatformTest.java              |  47 +------
 .../AllureJunitPlatformTestUtils.java         |  99 ++++++++++++++
 .../AllurePostDiscoveryFilterTest.java        | 112 +++++++++++++++
 .../features/TestsWithAllureId.java           |  52 +++++++
 .../allure/junit4/AllureJunit4Test.java       |   1 +
 allure-test-filter/build.gradle.kts           |  39 ++++++
 .../testfilter/FileTestPlanSupplier.java      |  91 ++++++++++++
 .../io/qameta/allure/testfilter/TestPlan.java |  35 +++++
 .../allure/testfilter/TestPlanSupplier.java   |  35 +++++
 .../allure/testfilter/TestPlanUnknown.java    |  27 ++++
 .../allure/testfilter/TestPlanV1_0.java       | 127 +++++++++++++++++
 allure-testng/build.gradle.kts                |   1 +
 .../io/qameta/allure/testng/AllureTestNg.java |  23 +++-
 .../allure/testng/AllureTestNgTestFilter.java |  87 ++++++++++++
 .../allure/testng/AllureTestNgTest.java       | 127 +++++++++++++++++
 .../testng/samples/TestsWithIdForFilter.java  |  53 +++++++
 settings.gradle.kts                           |   4 +-
 24 files changed, 1142 insertions(+), 105 deletions(-)
 create mode 100644 allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
 create mode 100644 allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
 create mode 100644 allure-junit-platform/src/main/services/org.junit.platform.launcher.PostDiscoveryFilter
 create mode 100644 allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
 create mode 100644 allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
 create mode 100644 allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
 create mode 100644 allure-test-filter/build.gradle.kts
 create mode 100644 allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java
 create mode 100644 allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
 create mode 100644 allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java
 create mode 100644 allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java
 create mode 100644 allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
 create mode 100644 allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java

diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml
index d3067e48a..3f14112bd 100644
--- a/.github/workflows/labels-verify.yml
+++ b/.github/workflows/labels-verify.yml
@@ -10,4 +10,4 @@ jobs:
     steps:
       - uses: zwaldowski/match-label-action@v2
         with:
-          allowed: 'type:bug, type:enhancement, type:improvement, type:dependencies, type:internal, type:invalid'
+          allowed: 'type:bug, type:new feature, type:improvement, type:dependencies, type:internal, type:invalid'
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 53a040a09..6ae21bc43 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
@@ -222,4 +222,12 @@
     @Feature("Timeline")
     @interface Severity {
     }
+
+    @Documented
+    @Inherited
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ElementType.METHOD, ElementType.TYPE})
+    @Feature("Filtration")
+    @interface Filtration {
+    }
 }
diff --git a/allure-junit-platform/build.gradle.kts b/allure-junit-platform/build.gradle.kts
index 82528cfc2..a4b970826 100644
--- a/allure-junit-platform/build.gradle.kts
+++ b/allure-junit-platform/build.gradle.kts
@@ -7,6 +7,7 @@ dependencies {
     api(project(":allure-java-commons"))
     implementation("org.junit.jupiter:junit-jupiter-api")
     implementation("org.junit.platform:junit-platform-launcher")
+    implementation(project(":allure-test-filter"))
     testAnnotationProcessor("org.slf4j:slf4j-simple")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("io.github.glytching:junit-extensions")
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 60dc36185..10ff7c5e8 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
@@ -359,8 +359,10 @@ private void startTestCase(final TestIdentifier testIdentifier) {
         final String uuid = tests.getOrCreate(testIdentifier);
 
         final Optional<TestSource> testSource = testIdentifier.getSource();
-        final Optional<Method> testMethod = testSource.flatMap(this::getTestMethod);
-        final Optional<Class<?>> testClass = testSource.flatMap(this::getTestClass);
+        final Optional<Method> testMethod = testSource
+                .flatMap(AllureJunitPlatformUtils::getTestMethod);
+        final Optional<Class<?>> testClass = testSource
+                .flatMap(AllureJunitPlatformUtils::getTestClass);
 
         final TestResult result = new TestResult()
                 .setUuid(uuid)
@@ -384,7 +386,7 @@ private void startTestCase(final TestIdentifier testIdentifier) {
                 createLanguageLabel("java")
         ));
 
-        testSource.flatMap(this::getFullName).ifPresent(result::setFullName);
+        testSource.flatMap(AllureJunitPlatformUtils::getFullName).ifPresent(result::setFullName);
         testSource.map(this::getSourceLabels).ifPresent(result.getLabels()::addAll);
         testClass.ifPresent(aClass -> {
             final String suiteName = getDisplayName(aClass).orElse(aClass.getCanonicalName());
@@ -508,56 +510,6 @@ private List<Label> getSourceLabels(final TestSource source) {
         return Collections.emptyList();
     }
 
-    private Optional<String> getFullName(final TestSource source) {
-        if (source instanceof MethodSource) {
-            final MethodSource ms = (MethodSource) source;
-            return Optional.of(String.format("%s.%s", ms.getClassName(), ms.getMethodName()));
-        }
-        if (source instanceof ClassSource) {
-            final ClassSource cs = (ClassSource) source;
-            return Optional.ofNullable(cs.getClassName());
-        }
-        return Optional.empty();
-    }
-
-    private Optional<Class<?>> getTestClass(final TestSource source) {
-        if (source instanceof MethodSource) {
-            return getTestClass(((MethodSource) source).getClassName());
-        }
-        if (source instanceof ClassSource) {
-            return Optional.of(((ClassSource) source).getJavaClass());
-        }
-        return Optional.empty();
-    }
-
-    private Optional<Class<?>> getTestClass(final String className) {
-        try {
-            return Optional.of(Class.forName(className));
-        } catch (ClassNotFoundException e) {
-            LOGGER.trace("Could not get test class from test source {}", className, e);
-        }
-        return Optional.empty();
-    }
-
-    private Optional<Method> getTestMethod(final TestSource source) {
-        if (source instanceof MethodSource) {
-            return getTestMethod((MethodSource) source);
-        }
-        return Optional.empty();
-    }
-
-    private Optional<Method> getTestMethod(final MethodSource source) {
-        try {
-            final Class<?> aClass = Class.forName(source.getClassName());
-            return Stream.of(aClass.getDeclaredMethods())
-                    .filter(method -> MethodSource.from(method).equals(source))
-                    .findAny();
-        } catch (ClassNotFoundException e) {
-            LOGGER.trace("Could not get test method from method source {}", source, e);
-        }
-        return Optional.empty();
-    }
-
     private static class Uuids {
 
         private final Map<TestIdentifier, String> storage = new ConcurrentHashMap<>();
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
new file mode 100644
index 000000000..4230cee0e
--- /dev/null
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
@@ -0,0 +1,88 @@
+/*
+ *  Copyright 2020 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.junitplatform;
+
+import org.junit.platform.engine.TestSource;
+import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.engine.support.descriptor.MethodSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Method;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+/* package-private */ final class AllureJunitPlatformUtils {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AllureJunitPlatformUtils.class);
+
+    private AllureJunitPlatformUtils() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    public static Optional<String> getFullName(final TestSource source) {
+        if (source instanceof MethodSource) {
+            final MethodSource ms = (MethodSource) source;
+            return Optional.of(String.format("%s.%s", ms.getClassName(), ms.getMethodName()));
+        }
+        if (source instanceof ClassSource) {
+            final ClassSource cs = (ClassSource) source;
+            return Optional.ofNullable(cs.getClassName());
+        }
+        return Optional.empty();
+    }
+
+    public static Optional<Class<?>> getTestClass(final TestSource source) {
+        if (source instanceof MethodSource) {
+            return getTestClass(((MethodSource) source).getClassName());
+        }
+        if (source instanceof ClassSource) {
+            return Optional.of(((ClassSource) source).getJavaClass());
+        }
+        return Optional.empty();
+    }
+
+    public static Optional<Class<?>> getTestClass(final String className) {
+        try {
+            return Optional.of(Class.forName(className));
+        } catch (ClassNotFoundException e) {
+            LOGGER.trace("Could not get test class from test source {}", className, e);
+        }
+        return Optional.empty();
+    }
+
+    public static Optional<Method> getTestMethod(final TestSource source) {
+        if (source instanceof MethodSource) {
+            return getTestMethod((MethodSource) source);
+        }
+        return Optional.empty();
+    }
+
+    public static Optional<Method> getTestMethod(final MethodSource source) {
+        try {
+            final Class<?> aClass = Class.forName(source.getClassName());
+            return Stream.of(aClass.getDeclaredMethods())
+                    .filter(method -> MethodSource.from(method).equals(source))
+                    .findAny();
+        } catch (ClassNotFoundException e) {
+            LOGGER.trace("Could not get test method from method source {}", source, e);
+        }
+        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
new file mode 100644
index 000000000..e43a76230
--- /dev/null
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilter.java
@@ -0,0 +1,129 @@
+/*
+ *  Copyright 2020 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.junitplatform;
+
+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.platform.engine.FilterResult;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestTag;
+import org.junit.platform.launcher.PostDiscoveryFilter;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static io.qameta.allure.util.ResultsUtils.ALLURE_ID_LABEL_NAME;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AllurePostDiscoveryFilter implements PostDiscoveryFilter {
+
+    private static final Pattern ID_TAG = Pattern.compile("^@?allure\\.id[:=](?<id>.+)$");
+
+    private final TestPlan testPlan;
+
+    public AllurePostDiscoveryFilter() {
+        this(new FileTestPlanSupplier().supply().orElse(null));
+    }
+
+    public AllurePostDiscoveryFilter(final TestPlan testPlan) {
+        this.testPlan = testPlan;
+    }
+
+    @Override
+    public FilterResult apply(final TestDescriptor object) {
+        if (Objects.isNull(testPlan)) {
+            return FilterResult.included("test plan is empty");
+        }
+        if (!object.isTest()) {
+            return FilterResult.included("filter only applied for tests");
+        }
+
+        final String allureId = findAllureId(object);
+        final String uniqueId = object.getUniqueId().toString();
+        final String fullName = object.getSource()
+                .flatMap(AllureJunitPlatformUtils::getFullName)
+                .orElse(null);
+
+        return FilterResult.includedIf(
+                isIncluded(testPlan, allureId, uniqueId, fullName)
+        );
+    }
+
+    private boolean isIncluded(final TestPlan testPlan,
+                               final String allureId,
+                               final String uniqueId,
+                               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, uniqueId, fullName));
+        }
+        return true;
+    }
+
+    @SuppressWarnings("BooleanExpressionComplexity")
+    private boolean match(final TestPlanV1_0.TestCase tc,
+                          final String allureId,
+                          final String uniqueId,
+                          final String fullName) {
+        return Objects.nonNull(tc.getId()) && tc.getId().equals(allureId)
+                || Objects.nonNull(tc.getSelector()) && tc.getSelector().equals(uniqueId)
+                || Objects.nonNull(tc.getSelector()) && tc.getSelector().equals(fullName);
+    }
+
+    private String findAllureId(final TestDescriptor object) {
+        return object.getSource()
+                .flatMap(AllureJunitPlatformUtils::getTestMethod)
+                .flatMap(this::findAllureId)
+                .orElseGet(() -> findAllureId(object.getTags()));
+    }
+
+    private String findAllureId(final Collection<TestTag> tags) {
+        return tags.stream()
+                .map(TestTag::getName)
+                .map(t -> {
+                    final Matcher matcher = ID_TAG.matcher(t);
+                    return matcher.matches()
+                            ? Optional.ofNullable(matcher.group("id"))
+                            : Optional.<String>empty();
+                })
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .filter(Objects::nonNull)
+                .findAny()
+                .orElse(null);
+    }
+
+    private Optional<String> findAllureId(final Method value) {
+        return AnnotationUtils.getLabels(value)
+                .stream()
+                .filter(l -> ALLURE_ID_LABEL_NAME.equals(l.getName()))
+                .map(Label::getValue)
+                .findAny();
+    }
+
+}
diff --git a/allure-junit-platform/src/main/services/org.junit.platform.launcher.PostDiscoveryFilter b/allure-junit-platform/src/main/services/org.junit.platform.launcher.PostDiscoveryFilter
new file mode 100644
index 000000000..94f98f34e
--- /dev/null
+++ b/allure-junit-platform/src/main/services/org.junit.platform.launcher.PostDiscoveryFilter
@@ -0,0 +1 @@
+io.qameta.allure.junitplatform.AllurePostDiscoveryFilter
\ No newline at end of file
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 e9f010f9a..d0233f581 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,12 +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.Step;
-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;
@@ -64,17 +59,9 @@
 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.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.ResourceLock;
-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.nio.charset.StandardCharsets;
 import java.util.Collection;
@@ -82,8 +69,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
+import static io.qameta.allure.junitplatform.AllureJunitPlatformTestUtils.runClasses;
 import static io.qameta.allure.junitplatform.features.TaggedTests.CLASS_TAG;
 import static io.qameta.allure.junitplatform.features.TaggedTests.METHOD_TAG;
 import static io.qameta.allure.test.AllurePredicates.hasLabel;
@@ -772,36 +759,4 @@ void shouldSupportAllureIdAnnotations() {
 
     }
 
-    @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()
-                .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);
-            launcher.execute(request);
-            return writerStub;
-        } finally {
-            Allure.setLifecycle(defaultLifecycle);
-            StepsAspects.setLifecycle(defaultLifecycle);
-            AttachmentsAspects.setLifecycle(defaultLifecycle);
-        }
-    }
 }
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
new file mode 100644
index 000000000..b8d76cd08
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTestUtils.java
@@ -0,0 +1,99 @@
+/*
+ *  Copyright 2020 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.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 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.TestPlan;
+import org.junit.platform.launcher.core.LauncherConfig;
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
+import org.junit.platform.launcher.core.LauncherFactory;
+
+import java.util.stream.Stream;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public final class AllureJunitPlatformTestUtils {
+
+    private AllureJunitPlatformTestUtils() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    @Step("Run classes {classes}")
+    public static 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()
+                .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);
+            launcher.execute(request);
+            return writerStub;
+        } finally {
+            Allure.setLifecycle(defaultLifecycle);
+            StepsAspects.setLifecycle(defaultLifecycle);
+            AttachmentsAspects.setLifecycle(defaultLifecycle);
+        }
+    }
+
+    @Step("Build test plan for {classes}")
+    public static 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-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
new file mode 100644
index 000000000..e03a1ec0b
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllurePostDiscoveryFilterTest.java
@@ -0,0 +1,112 @@
+/*
+ *  Copyright 2020 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.junitplatform;
+
+import io.qameta.allure.junitplatform.features.PassedTests;
+import io.qameta.allure.junitplatform.features.TestsWithAllureId;
+import io.qameta.allure.testfilter.TestPlanV1_0;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
+
+import java.util.Arrays;
+
+import static io.qameta.allure.junitplatform.AllureJunitPlatformTestUtils.buildPlan;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AllurePostDiscoveryFilterTest {
+
+    @Test
+    void shouldRunAllTestsIfNoTestPlanProvided() {
+        final TestPlan testPlan = buildPlan(null, PassedTests.class);
+
+        final long testsCount = testPlan.countTestIdentifiers(TestIdentifier::isTest);
+
+        assertThat(testsCount)
+                .isEqualTo(3);
+    }
+
+    @Test
+    void shouldRunAllTestsIfEmptyTestPlanProvided() {
+        final TestPlan testPlan = buildPlan(new TestPlanV1_0(), PassedTests.class);
+
+        final long testsCount = testPlan.countTestIdentifiers(TestIdentifier::isTest);
+
+        assertThat(testsCount)
+                .isEqualTo(3);
+    }
+
+    @Test
+    void shouldFilterTestCasesByFullName() {
+        final TestPlan testPlan = buildPlan(
+                new TestPlanV1_0().setTests(Arrays.asList(
+                        new TestPlanV1_0.TestCase()
+                                .setSelector("io.qameta.allure.junitplatform.features.PassedTests.second"),
+                        new TestPlanV1_0.TestCase()
+                                .setSelector("io.qameta.allure.junitplatform.features.PassedTests.first")
+                )),
+                PassedTests.class
+        );
+
+        final long testsCount = testPlan.countTestIdentifiers(TestIdentifier::isTest);
+
+        assertThat(testsCount)
+                .isEqualTo(2);
+    }
+
+    @Test
+    void shouldFilterTestCasesByUniqueId() {
+        final TestPlan testPlan = buildPlan(
+                new TestPlanV1_0().setTests(Arrays.asList(
+                        new TestPlanV1_0.TestCase()
+                                .setSelector("[engine:junit-jupiter]/[class:io.qameta.allure.junitplatform.features.PassedTests]/[method:second()]"),
+                        new TestPlanV1_0.TestCase()
+                                .setSelector("[engine:junit-jupiter]/[class:io.qameta.allure.junitplatform.features.PassedTests]/[method:third()]")
+                )),
+                PassedTests.class
+        );
+
+        final long testsCount = testPlan.countTestIdentifiers(TestIdentifier::isTest);
+
+        assertThat(testsCount)
+                .isEqualTo(2);
+    }
+
+    @Test
+    void shouldFilterTestCasesByAllureId() {
+        final TestPlan testPlan = buildPlan(
+                new TestPlanV1_0().setTests(Arrays.asList(
+                        new TestPlanV1_0.TestCase()
+                                .setId("32"),
+                        new TestPlanV1_0.TestCase()
+                                .setId("34"),
+                        new TestPlanV1_0.TestCase()
+                                .setId("41"),
+                        new TestPlanV1_0.TestCase()
+                                .setId("48")
+                )),
+                TestsWithAllureId.class
+        );
+
+        final long testsCount = testPlan.countTestIdentifiers(TestIdentifier::isTest);
+
+        assertThat(testsCount)
+                .isEqualTo(3);
+    }
+}
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
new file mode 100644
index 000000000..26c8380d8
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/TestsWithAllureId.java
@@ -0,0 +1,52 @@
+/*
+ *  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.junitplatform.features;
+
+import io.qameta.allure.AllureId;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class TestsWithAllureId {
+
+    @BeforeAll
+    static void doNothing(){
+
+    }
+
+    @Test
+    void first() {
+    }
+
+    @AllureId("32")
+    @Test
+    void second() {
+    }
+
+    @AllureId("48")
+    @Test
+    void third() {
+    }
+
+    @Tag("allure.id=34")
+    @Test
+    void oneMoreTest() {
+    }
+
+}
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 1ddf6ebae..cb63aae33 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
@@ -42,6 +42,7 @@
 import io.qameta.allure.test.AllureFeatures;
 import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.AllureResultsWriterStub;
+
 import org.junit.jupiter.api.Test;
 import org.junit.runner.JUnitCore;
 
diff --git a/allure-test-filter/build.gradle.kts b/allure-test-filter/build.gradle.kts
new file mode 100644
index 000000000..7b2972876
--- /dev/null
+++ b/allure-test-filter/build.gradle.kts
@@ -0,0 +1,39 @@
+description = "Allure Test Filter"
+
+val agent: Configuration by configurations.creating
+
+dependencies {
+    agent("org.aspectj:aspectjweaver")
+    implementation("com.fasterxml.jackson.core:jackson-databind")
+    implementation(project(":allure-java-commons"))
+    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-assertj"))
+    testImplementation(project(":allure-java-commons-test"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.testfilter"
+        ))
+    }
+    from("src/main/services") {
+        into("META-INF/services")
+    }
+}
+
+tasks.test {
+    systemProperty("junit.jupiter.execution.parallel.enabled", "false")
+    useJUnitPlatform()
+    exclude("**/features/*")
+    doFirst {
+        jvmArgs("-javaagent:${agent.singleFile}")
+    }
+}
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
new file mode 100644
index 000000000..204805b51
--- /dev/null
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/FileTestPlanSupplier.java
@@ -0,0 +1,91 @@
+/*
+ *  Copyright 2020 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.testfilter;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.ObjectMapper;
+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.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * The {@link TestPlanSupplier} that reads test plan from file, specified
+ * in {@code ALLURE_TESTPLAN_PATH} environment variable.
+ *
+ * @author charlie (Dmitry Baev).
+ */
+public class FileTestPlanSupplier implements TestPlanSupplier {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileTestPlanSupplier.class);
+
+    /**
+     * The possible environment variable names.
+     */
+    private static final String[] ENV_TESTPLAN_PATH = {"ALLURE_TESTPLAN_PATH", "AS_TESTPLAN_PATH"};
+
+    /**
+     * {@link ObjectMapper} to read test plan file.
+     */
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+            .enable(JsonGenerator.Feature.IGNORE_UNKNOWN);
+
+    /**
+     * Supply test plan.
+     *
+     * @return the test plan.
+     */
+    @Override
+    public Optional<TestPlan> supply() {
+        final Optional<String> testPlanPath = Arrays.stream(ENV_TESTPLAN_PATH)
+                .map(System::getenv)
+                .filter(Objects::nonNull)
+                .filter(s -> !s.isEmpty())
+                .findFirst();
+
+        return testPlanPath
+                .flatMap(this::tryGetPath)
+                .filter(Files::exists)
+                .filter(Files::isRegularFile)
+                .flatMap(this::readTestPlan);
+    }
+
+    private Optional<TestPlan> readTestPlan(final Path path) {
+        try (InputStream stream = Files.newInputStream(path)) {
+            return Optional.of(OBJECT_MAPPER.readValue(stream, TestPlan.class));
+        } catch (IOException e) {
+            LOGGER.warn("could not read test plan file {}", path, e);
+            return Optional.empty();
+        }
+    }
+
+    private Optional<Path> tryGetPath(final String path) {
+        try {
+            return Optional.of(Paths.get(path));
+        } catch (Exception e) {
+            LOGGER.warn("could not read test plan file {}: invalid path", path);
+            return Optional.empty();
+        }
+    }
+
+}
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
new file mode 100644
index 000000000..a0c5b7c21
--- /dev/null
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlan.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2020 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.testfilter;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+/**
+ * Common interface for all test plan implementations.
+ *
+ * @author charlie (Dmitry Baev).
+ */
+@JsonTypeInfo(
+        use = JsonTypeInfo.Id.NAME,
+        property = "version",
+        defaultImpl = TestPlanUnknown.class
+)
+@JsonSubTypes({
+        @JsonSubTypes.Type(TestPlanV1_0.class)
+})
+public interface TestPlan {
+}
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
new file mode 100644
index 000000000..b3a2c27a7
--- /dev/null
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanSupplier.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2020 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.testfilter;
+
+import java.util.Optional;
+
+/**
+ * Marker interface for all test plan suppliers.
+ *
+ * @author charlie (Dmitry Baev).
+ */
+@FunctionalInterface
+public interface TestPlanSupplier {
+
+    /**
+     * Supply test plan.
+     *
+     * @return the test plan.
+     */
+    Optional<TestPlan> supply();
+
+}
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
new file mode 100644
index 000000000..937a7c74a
--- /dev/null
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanUnknown.java
@@ -0,0 +1,27 @@
+/*
+ *  Copyright 2020 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.testfilter;
+
+import java.io.Serializable;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class TestPlanUnknown implements TestPlan, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+}
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
new file mode 100644
index 000000000..a74ccef9a
--- /dev/null
+++ b/allure-test-filter/src/main/java/io/qameta/allure/testfilter/TestPlanV1_0.java
@@ -0,0 +1,127 @@
+/*
+ *  Copyright 2020 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.testfilter;
+
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@JsonTypeName("1.0")
+@SuppressWarnings({"TypeName", "PMD.CyclomaticComplexity"})
+public class TestPlanV1_0 implements TestPlan, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * List of tests to run.
+     */
+    private List<TestCase> tests;
+
+    /**
+     * Gets the value of the tests property.
+     *
+     * @return tests.
+     */
+    public List<TestCase> getTests() {
+        return tests;
+    }
+
+    /**
+     * Sets the value of the tests property.
+     *
+     * @param tests the value to set.
+     * @return current instance.
+     */
+    public TestPlanV1_0 setTests(final List<TestCase> tests) {
+        this.tests = tests;
+        return this;
+    }
+
+    /**
+     * @param allureId value of @AllureId annotation, if not set pass null value
+     * @param selector selector of test method
+     * @return
+     */
+    public boolean isSelected(final String allureId, final String selector) {
+        return getTests().stream().map(test -> new String[]{test.getId(), test.getSelector()})
+                .flatMap(array -> Arrays.stream(array).filter(Objects::nonNull))
+                .anyMatch(item -> item.equals(selector) || item.equals(allureId));
+    }
+
+    /**
+     * Test plan test case. At least one of {@link #id} and {@link #selector} should be specified.
+     */
+    public static class TestCase implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * Test case id. Can be specified by providing {@code AS_ID} label.
+         */
+        private String id;
+
+        /**
+         * Selector that can be used to run test case. Some sort of unique id or full name of test.
+         */
+        private String selector;
+
+        /**
+         * Gets the value of the id property.
+         *
+         * @return id
+         */
+        public String getId() {
+            return id;
+        }
+
+        /**
+         * Sets the value of the id property.
+         *
+         * @param id the id to set.
+         * @return current instance.
+         */
+        public TestCase setId(final String id) {
+            this.id = id;
+            return this;
+        }
+
+        /**
+         * Gets the value of the selector property.
+         *
+         * @return id
+         */
+        public String getSelector() {
+            return selector;
+        }
+
+        /**
+         * Sets the value of the selector property.
+         *
+         * @param selector the selector to set.
+         * @return current instance.
+         */
+        public TestCase setSelector(final String selector) {
+            this.selector = selector;
+            return this;
+        }
+    }
+}
diff --git a/allure-testng/build.gradle.kts b/allure-testng/build.gradle.kts
index 36565c519..c48c6d44c 100644
--- a/allure-testng/build.gradle.kts
+++ b/allure-testng/build.gradle.kts
@@ -8,6 +8,7 @@ dependencies {
     agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("org.testng:testng:$testNgVersion")
+    implementation(project(":allure-test-filter"))
     testAnnotationProcessor("org.slf4j:slf4j-simple")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("com.google.inject:guice")
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 92fb3cfd9..d1e453055 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
@@ -40,6 +40,8 @@
 import org.testng.IConfigurationListener;
 import org.testng.IInvokedMethod;
 import org.testng.IInvokedMethodListener;
+import org.testng.IMethodInstance;
+import org.testng.IMethodInterceptor;
 import org.testng.ISuite;
 import org.testng.ISuiteListener;
 import org.testng.ITestClass;
@@ -97,14 +99,15 @@
  * Allure TestNG listener.
  */
 @SuppressWarnings({
-        "PMD.ExcessiveImports", "PMD.TooManyMethods", "PMD.GodClass",
+        "PMD.ExcessiveImports", "PMD.TooManyMethods", "PMD.GodClass", "PMD.CyclomaticComplexity",
         "ClassFanOutComplexity", "ClassDataAbstractionCoupling", "PMD.ExcessiveClassLength"
 })
 public class AllureTestNg implements
         ISuiteListener,
         ITestListener,
         IInvokedMethodListener,
-        IConfigurationListener {
+        IConfigurationListener,
+        IMethodInterceptor {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureTestNg.class);
 
@@ -139,19 +142,30 @@ public class AllureTestNg implements
     );
 
     private final AllureLifecycle lifecycle;
+    private final AllureTestNgTestFilter testFilter;
 
-    public AllureTestNg(final AllureLifecycle lifecycle) {
+    public AllureTestNg(final AllureLifecycle lifecycle, final AllureTestNgTestFilter testFilter) {
         this.lifecycle = lifecycle;
+        this.testFilter = testFilter;
+    }
+
+    public AllureTestNg(final AllureLifecycle lifecycle) {
+        this(lifecycle, new AllureTestNgTestFilter());
     }
 
     public AllureTestNg() {
-        this.lifecycle = Allure.getLifecycle();
+        this(Allure.getLifecycle(), new AllureTestNgTestFilter());
     }
 
     public AllureLifecycle getLifecycle() {
         return lifecycle;
     }
 
+    @Override
+    public List<IMethodInstance> intercept(final List<IMethodInstance> methods, final ITestContext context) {
+        return testFilter.intercept(methods, context);
+    }
+
     @Override
     public void onStart(final ISuite suite) {
         final TestResultContainer result = new TestResultContainer()
@@ -179,6 +193,7 @@ public void onStart(final ITestContext context) {
         context.getExcludedMethods().stream()
                 .filter(ITestNGMethod::isTest)
                 .filter(method -> !method.getEnabled())
+                .filter(testFilter::isSelected)
                 .forEach(method -> createFakeResult(context, method));
     }
 
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
new file mode 100644
index 000000000..b07ace62d
--- /dev/null
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java
@@ -0,0 +1,87 @@
+/*
+ *  Copyright 2020 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.testng;
+
+import io.qameta.allure.AllureId;
+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 java.lang.reflect.Method;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.testng.IMethodInstance;
+import org.testng.IMethodInterceptor;
+import org.testng.ITestContext;
+import org.testng.ITestNGMethod;
+import org.testng.internal.ConstructorOrMethod;
+
+public class AllureTestNgTestFilter implements IMethodInterceptor {
+
+    private final TestPlan testPlan;
+
+    public AllureTestNgTestFilter() {
+        this.testPlan = new FileTestPlanSupplier().supply().orElse(new TestPlanUnknown());
+    }
+
+    public AllureTestNgTestFilter(final TestPlan testPlan) {
+        this.testPlan = testPlan;
+    }
+
+    @Override
+    public List<IMethodInstance> intercept(final List<IMethodInstance> methods, final ITestContext context) {
+        if (testPlan instanceof TestPlanV1_0) {
+            return methods.stream()
+                    .filter(instance -> isSelected(instance.getMethod()))
+                    .collect(Collectors.toList());
+        } else {
+            return methods;
+        }
+    }
+
+    public boolean isSelected(final ITestNGMethod instance) {
+        if (testPlan instanceof TestPlanV1_0) {
+            return isSelected(instance, (TestPlanV1_0) testPlan);
+        } else {
+            return true;
+        }
+    }
+
+    public boolean isSelected(final ITestNGMethod testNGMethod, final TestPlanV1_0 testPlan) {
+        final Optional<Method> method = Optional.ofNullable(testNGMethod)
+                .map(ITestNGMethod::getConstructorOrMethod)
+                .map(ConstructorOrMethod::getMethod);
+
+        if (method.isPresent()) {
+            final String selector = getSelector(method.get());
+            final String allureId = method
+                    .filter(m -> m.isAnnotationPresent(AllureId.class))
+                    .map(m -> m.getAnnotation(AllureId.class))
+                    .map(AllureId::value).orElse(null);
+            return testPlan.isSelected(allureId, selector);
+        }
+        return false;
+    }
+
+    private String getSelector(final Method method) {
+        return String.format("%s.%s",
+                method.getDeclaringClass().getCanonicalName(),
+                method.getName());
+    }
+}
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 326189c89..a3314a187 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
@@ -36,6 +36,9 @@
 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 io.qameta.allure.testng.samples.TestsWithIdForFilter;
 import org.assertj.core.api.Condition;
 import org.assertj.core.groups.Tuple;
 import org.testng.ITestNGListener;
@@ -1270,4 +1273,128 @@ private static void checkTestJavadocDescriptions(List<TestResult> results, Strin
                 .containsOnly(expectedDescriptionHtml);
     }
 
+    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.testng.samples.TestsWithIdForFilter.test1");
+    private final TestPlanV1_0.TestCase test2 = new TestPlanV1_0.TestCase()
+            .setId("2")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.test2");
+    private final TestPlanV1_0.TestCase test3 = new TestPlanV1_0.TestCase()
+            .setId("3")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.test3");
+    private final TestPlanV1_0.TestCase otherId = new TestPlanV1_0.TestCase().setId("4")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.test1");
+    private final TestPlanV1_0.TestCase skipped = new TestPlanV1_0.TestCase().setId("5")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.skipped");
+    private final TestPlanV1_0.TestCase correctIdIncorrectSelector = new TestPlanV1_0.TestCase()
+            .setId("3")
+            .setSelector("io.qameta.allure.testng.samples.TestsWithIdForFilter.test3");
+    private final TestPlanV1_0.TestCase correctIdIncorrectSelectorFailed = new TestPlanV1_0.TestCase()
+            .setId("6")
+            .setSelector("allure.junit4.samples.TestsWithIdForFilter.test3");
+
+
+    @Test
+    @AllureFeatures.Filtration
+    public void simpleFiltration()  {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(test1, test2, test3));
+        List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(3)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test1", Status.PASSED),
+                        tuple("test2", Status.PASSED),
+                        tuple("test3", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void onlyId()  {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(onlyId2, onlyId4));
+        List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test4", Status.PASSED),
+                        tuple("test2", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void idAssignToOtherTest() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(otherId));
+        List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
+
+        assertThat(testResults)
+                .hasSize(2)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test1", Status.PASSED),
+                        tuple("test4", Status.PASSED)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void skippedTest() {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(skipped));
+        List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
+        assertThat(testResults)
+                .hasSize(1)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("skipped", null)
+                );
+    }
+
+    @Test
+    @AllureFeatures.Filtration
+    public void correctIdIncorrectSelector()  {
+        TestPlanV1_0 plan = new TestPlanV1_0().setTests(
+                Arrays.asList(test1, test2, correctIdIncorrectSelector, correctIdIncorrectSelectorFailed)
+        );
+        List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
+        assertThat(testResults)
+                .hasSize(4)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .contains(
+                        tuple("test1", Status.PASSED),
+                        tuple("test2", Status.PASSED),
+                        tuple("test3", Status.PASSED),
+                        tuple("test6", Status.FAILED)
+                );
+    }
+
+    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);
+            testNG.run();
+            return results;
+        } finally {
+            Allure.setLifecycle(cached);
+            StepsAspects.setLifecycle(cached);
+            AttachmentsAspects.setLifecycle(cached);
+        }
+    }
+
 }
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
new file mode 100644
index 000000000..70bcdcde4
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TestsWithIdForFilter.java
@@ -0,0 +1,53 @@
+/*
+ *  Copyright 2020 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.testng.samples;
+
+import io.qameta.allure.AllureId;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.testng.annotations.Test;
+
+public class TestsWithIdForFilter {
+
+    @Test
+    @AllureId("1")
+    public void test1() {
+    }
+
+    @Test
+    @AllureId("2")
+    public void test2() {
+    }
+
+    @Test
+    public void test3() {
+    }
+
+    @Test
+    @AllureId("4")
+    public void test4() {
+    }
+
+    @Test(enabled = false)
+    @AllureId("5")
+    public void skipped() {
+    }
+
+    @Test
+    @AllureId("6")
+    public void test6() {
+        assertThat(true).isFalse();
+    }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 011c4a85c..d2093d40a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -21,6 +21,7 @@ include("allure-junit-platform")
 include("allure-junit4")
 include("allure-junit4-aspect")
 include("allure-junit5")
+include("allure-junit5-assert")
 include("allure-model")
 include("allure-okhttp")
 include("allure-okhttp3")
@@ -30,5 +31,6 @@ include("allure-selenide")
 include("allure-servlet-api")
 include("allure-spock")
 include("allure-spring-web")
+include("allure-test-filter")
 include("allure-testng")
-include("allure-junit5-assert")
+

From 7a5818dd35c7ffb406c8cc79e193b0288c9e9932 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Mar 2021 17:10:09 +0300
Subject: [PATCH 036/486] Bump junit from 4.13.1 to 4.13.2 (via #529)

Bumps [junit](https://github.com/junit-team/junit4) from 4.13.1 to 4.13.2.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.13.1...r4.13.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 allure-java-migration/build.gradle.kts | 2 +-
 allure-junit4-aspect/build.gradle.kts  | 2 +-
 allure-junit4/build.gradle.kts         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/allure-java-migration/build.gradle.kts b/allure-java-migration/build.gradle.kts
index ca9c66c0a..c31df1fa6 100644
--- a/allure-java-migration/build.gradle.kts
+++ b/allure-java-migration/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Java Migration Utils"
 
 val agent: Configuration by configurations.creating
 
-val junitVersion = "4.13.1"
+val junitVersion = "4.13.2"
 val testNgVersion = "6.14.3"
 
 dependencies {
diff --git a/allure-junit4-aspect/build.gradle.kts b/allure-junit4-aspect/build.gradle.kts
index 00abb578b..9b002dbd4 100644
--- a/allure-junit4-aspect/build.gradle.kts
+++ b/allure-junit4-aspect/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure JUnit 4 Aspect HACK"
 
 val agent: Configuration by configurations.creating
 
-val junitVersion = "4.13.1"
+val junitVersion = "4.13.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-junit4/build.gradle.kts b/allure-junit4/build.gradle.kts
index 4d9620674..08eddfe47 100644
--- a/allure-junit4/build.gradle.kts
+++ b/allure-junit4/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure JUnit 4 Integration"
 
 val agent: Configuration by configurations.creating
 
-val junitVersion = "4.13.1"
+val junitVersion = "4.13.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 458799758b9797fbc764b5fb884da515a650ba82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 12:07:28 +0300
Subject: [PATCH 037/486] bump mockito-core from 3.5.15 to 3.8.0 (via #530)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 5305634cd..67e969a8e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -100,7 +100,7 @@ configure(subprojects) {
             dependency("org.jboss.resteasy:resteasy-client:4.5.8.Final")
             dependency("org.jooq:joor-java-8:0.9.13")
             dependency("org.mock-server:mockserver-netty:5.11.2")
-            dependency("org.mockito:mockito-core:3.5.15")
+            dependency("org.mockito:mockito-core:3.8.0")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From f8683615e538277659e506b60fc6d3059e9360e3 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 26 Mar 2021 12:44:28 +0300
Subject: [PATCH 038/486] update labels-verify.yml

---
 .github/workflows/labels-verify.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml
index 3f14112bd..80acd10ab 100644
--- a/.github/workflows/labels-verify.yml
+++ b/.github/workflows/labels-verify.yml
@@ -10,4 +10,10 @@ jobs:
     steps:
       - uses: zwaldowski/match-label-action@v2
         with:
-          allowed: 'type:bug, type:new feature, type:improvement, type:dependencies, type:internal, type:invalid'
+          allowed: >
+            type:bug
+            type:new feature
+            type:improvement
+            type:dependencies
+            type:internal
+            type:invalid

From 404ac3097e54916d4e52daf6bcfa0ad8b51276e8 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 26 Mar 2021 13:24:21 +0300
Subject: [PATCH 039/486] switch label-verify to baev/match-label-action

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

diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml
index 80acd10ab..477a3ff8a 100644
--- a/.github/workflows/labels-verify.yml
+++ b/.github/workflows/labels-verify.yml
@@ -8,7 +8,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: zwaldowski/match-label-action@v2
+      - uses: baev/match-label-action@master
         with:
           allowed: >
             type:bug

From fc4f2bcd7e5bc596a8ff8a011f3918614595b51e Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 26 Mar 2021 13:46:00 +0300
Subject: [PATCH 040/486] revert allowed setting for label-verify

---
 .github/workflows/labels-verify.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml
index 477a3ff8a..2c3bd2a1f 100644
--- a/.github/workflows/labels-verify.yml
+++ b/.github/workflows/labels-verify.yml
@@ -10,10 +10,4 @@ jobs:
     steps:
       - uses: baev/match-label-action@master
         with:
-          allowed: >
-            type:bug
-            type:new feature
-            type:improvement
-            type:dependencies
-            type:internal
-            type:invalid
+          allowed: 'type:bug,type:new feature,type:improvement,type:dependencies,type:internal,type:invalid'

From 6b28fcd2522b0dbbb2c9b1c9baa918e8e01971be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 13:58:06 +0300
Subject: [PATCH 041/486] bump commons-lang3 from 3.11 to 3.12.0 (via #532)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 67e969a8e..d563af1c7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -89,7 +89,7 @@ configure(subprojects) {
             dependency("commons-io:commons-io:2.8.0")
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.4.0")
-            dependency("org.apache.commons:commons-lang3:3.11")
+            dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
             dependency("org.apache.tika:tika-core:1.25")
             dependency("org.aspectj:aspectjrt:1.9.6")

From c930f56f2686ac7b287de5ffef49ecda4f662942 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 26 Mar 2021 14:12:35 +0300
Subject: [PATCH 042/486] fix labeler action

---
 .github/workflows/labeler.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 2f232578e..956bf2f95 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,7 +1,7 @@
 name: "Set theme labels"
 
 on:
-  - pull_request
+  - pull_request_target
 
 jobs:
   triage:
@@ -9,4 +9,4 @@ jobs:
     steps:
       - uses: actions/labeler@v3
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

From 7b4d510b3a4c42d4835d7755c1e6daea68e3d91b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 14:18:52 +0300
Subject: [PATCH 043/486] bump jackson-bom from 2.11.3 to 2.12.2 (via #533)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index d563af1c7..4186e1650 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -78,7 +78,7 @@ configure(subprojects) {
 
     configure<DependencyManagementExtension> {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.11.3")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.12.2")
             mavenBom("org.junit:junit-bom:5.7.0")
         }
         dependencies {

From 3bbdcda43b28937994fe714b8d5750ad467293de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 14:20:04 +0300
Subject: [PATCH 044/486] bump resteasy-client from 4.5.8.Final to 4.6.0.Final
 (via #528)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 4186e1650..31cedf2c7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -97,7 +97,7 @@ configure(subprojects) {
             dependency("org.assertj:assertj-core:3.17.2")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
-            dependency("org.jboss.resteasy:resteasy-client:4.5.8.Final")
+            dependency("org.jboss.resteasy:resteasy-client:4.6.0.Final")
             dependency("org.jooq:joor-java-8:0.9.13")
             dependency("org.mock-server:mockserver-netty:5.11.2")
             dependency("org.mockito:mockito-core:3.8.0")

From 532c0306002cd0125f964f175f7bcf7c318220a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 14:27:42 +0300
Subject: [PATCH 045/486] bump selenide from 5.15.1 to 5.20.1 (via #534)

---
 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 0887f9e8a..2d4890884 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.15.1"
+val selenideVersion = "5.20.1"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 16a2c8095d4a5c4d936473fd22c1d1ea96ce9f3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 14:38:20 +0300
Subject: [PATCH 046/486] bump junit-bom from 5.7.0 to 5.7.1 (via #535)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 31cedf2c7..d320c7ccc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -79,7 +79,7 @@ configure(subprojects) {
     configure<DependencyManagementExtension> {
         imports {
             mavenBom("com.fasterxml.jackson:jackson-bom:2.12.2")
-            mavenBom("org.junit:junit-bom:5.7.0")
+            mavenBom("org.junit:junit-bom:5.7.1")
         }
         dependencies {
             dependency("com.github.tomakehurst:wiremock:2.27.2")

From 03bc59f5fc738d3c6f5ae4533615c1d649db2f00 Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Fri, 26 Mar 2021 12:56:05 +0100
Subject: [PATCH 047/486] don't consume http responses (via #502)

---
 .../httpclient/AllureHttpClientResponse.java  | 36 ++++---------------
 .../httpclient/AllureHttpClientTest.java      | 20 +++++++++++
 2 files changed, 26 insertions(+), 30 deletions(-)

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 0507beb86..f75891181 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
@@ -21,17 +21,13 @@
 import io.qameta.allure.attachment.DefaultAttachmentProcessor;
 import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
 import io.qameta.allure.attachment.http.HttpResponseAttachment;
-import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;
-import org.apache.http.entity.HttpEntityWrapper;
+import org.apache.http.entity.BufferedHttpEntity;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.EntityUtils;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.stream.Stream;
 
 import static io.qameta.allure.attachment.http.HttpResponseAttachment.Builder.create;
@@ -67,10 +63,12 @@ public void process(final HttpResponse response,
                 .forEach(header -> builder.setHeader(header.getName(), header.getValue()));
 
         if (response.getEntity() != null) {
-            final LoggableEntity loggableEntity = new LoggableEntity(response.getEntity());
-            response.setEntity(loggableEntity);
+            if (!response.getEntity().isRepeatable()) {
+                final BufferedHttpEntity bufferedEntity = new BufferedHttpEntity(response.getEntity());
+                response.setEntity(bufferedEntity);
+            }
 
-            builder.setBody(loggableEntity.getBody());
+            builder.setBody(EntityUtils.toString(response.getEntity()));
         } else {
             builder.setBody("No body present");
         }
@@ -78,26 +76,4 @@ public void process(final HttpResponse response,
         final HttpResponseAttachment responseAttachment = builder.build();
         processor.addAttachment(responseAttachment, renderer);
     }
-
-    /**
-     * Required to allow consume httpEntity twice.
-     */
-    private static class LoggableEntity extends HttpEntityWrapper {
-
-        private final byte[] rawContent;
-
-        LoggableEntity(final HttpEntity wrappedEntity) throws IOException {
-            super(wrappedEntity);
-            rawContent = EntityUtils.toByteArray(wrappedEntity);
-        }
-
-        public String getBody() {
-            return new String(rawContent, StandardCharsets.UTF_8);
-        }
-
-        @Override
-        public InputStream getContent() {
-            return new ByteArrayInputStream(rawContent);
-        }
-    }
 }
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 366458e4a..d7e56ea95 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
@@ -22,6 +22,7 @@
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.entity.BufferedHttpEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
@@ -187,4 +188,23 @@ void shouldCreateRequestAttachmentWithEmptyBodyWhenNoContentIsReturned() throws
                 .extracting("body")
                 .containsNull();
     }
+
+    @Test
+    void shouldNotConsumeBody() throws Exception {
+        final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
+        final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);
+
+        final HttpClientBuilder builder = HttpClientBuilder.create()
+                                                           .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);
+          }
+        }
+    }
 }

From 33ceec87353662cfd30d1e365e9b507f9cd9aa9a Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 26 Mar 2021 16:03:37 +0300
Subject: [PATCH 048/486] add support for inherited annotations (via #537)

---
 .../qameta/allure/util/AnnotationUtils.java   |  4 +--
 .../allure/util/AnnotationUtilsTest.java      | 35 +++++++++++++++++++
 .../allure/testng/AllureTestNgTest.java       | 22 +++++++++---
 3 files changed, 54 insertions(+), 7 deletions(-)

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 906c505a5..6fd4cee07 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
@@ -62,7 +62,7 @@ private AnnotationUtils() {
      * @return discovered links.
      */
     public static Set<Link> getLinks(final AnnotatedElement annotatedElement) {
-        return getLinks(annotatedElement.getDeclaredAnnotations());
+        return getLinks(annotatedElement.getAnnotations());
     }
 
     /**
@@ -94,7 +94,7 @@ public static Set<Link> getLinks(final Collection<Annotation> annotations) {
      * @return discovered labels.
      */
     public static Set<Label> getLabels(final AnnotatedElement annotatedElement) {
-        return getLabels(annotatedElement.getDeclaredAnnotations());
+        return getLabels(annotatedElement.getAnnotations());
     }
 
     /**
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 5c346ddd2..b7eaa4b04 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
@@ -416,4 +416,39 @@ void complexCase() {
                         tuple("owner", "tester2")
                 );
     }
+
+    @Issue("i-1")
+    @Link("example")
+    @Feature("a")
+    static class InheritedParentTest1 {
+    }
+
+    @Issue("i-2")
+    @Story("b")
+    static class InheritedChildTest1 extends InheritedParentTest1 {
+    }
+
+    @Test
+    void inheritedLabelAnnotationsTest() {
+        final Set<Label> labels1 = getLabels(InheritedChildTest1.class);
+
+        assertThat(labels1)
+                .extracting(Label::getName, Label::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("feature", "a"),
+                        tuple("story", "b")
+                );
+    }
+
+    @Test
+    void inheritedLinkAnnotationsTest() {
+        final Set<io.qameta.allure.model.Link> links = getLinks(InheritedChildTest1.class);
+
+        assertThat(links)
+                .extracting(io.qameta.allure.model.Link::getName, io.qameta.allure.model.Link::getType)
+                .containsExactlyInAnyOrder(
+                        tuple("i-2", "issue"),
+                        tuple("example", "custom")
+                );
+    }
 }
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 a3314a187..0d4d1f4c9 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
@@ -671,11 +671,23 @@ public void ownerTest() {
         final AllureResults results = runTestNgSuites("suites/owner.xml");
         List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .hasSize(8)
-                .flatExtracting(TestResult::getLabels)
-                .filteredOn(label -> "owner".equals(label.getName()))
-                .extracting(Label::getValue)
-                .containsExactly("charlie", "charlie", "other-guy", "eroshenkoam", "eroshenkoam", "other-guy");
+                .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]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithOwner", "[charlie]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithoutOwner", "[]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithoutOwner", "[]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerClassTest.testWithOwner", "[eroshenkoam,other-guy]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerClassTest.testWithOwner", "[eroshenkoam,other-guy]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerClassTest.testWithoutOwner", "[eroshenkoam]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerClassTest.testWithoutOwner", "[eroshenkoam]")
+                );
     }
 
     @AllureFeatures.Attachments

From 1c36d3a4450a94ff8295a2fe7d87c368927d3aab Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 26 Mar 2021 16:58:58 +0300
Subject: [PATCH 049/486] bump gradle (via #538)

---
 build.gradle.kts                         | 6 +++---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d320c7ccc..230b13e28 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
     repositories {
         maven("https://plugins.gradle.org/m2/")
         mavenLocal()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -31,7 +31,7 @@ val qualityConfigsDir by extra("$gradleScriptDir/quality-configs")
 val spotlessDtr by extra("$qualityConfigsDir/spotless")
 
 tasks.withType(Wrapper::class) {
-    gradleVersion = "6.7"
+    gradleVersion = "6.8.3"
 }
 
 plugins {
@@ -234,8 +234,8 @@ configure(subprojects) {
     }
 
     repositories {
-        jcenter()
         mavenLocal()
+        mavenCentral()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index be52383ef..442d9132e 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-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 64084cdbab28a71dd34e0ab2141f42677f700f16 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 26 Mar 2021 18:05:38 +0300
Subject: [PATCH 050/486] fix release drafter commits since link

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

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 890e47a94..c17d77dbe 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -22,4 +22,4 @@ template: |
 
   ## 👀 Links
 
-  [Commits since $PREVIOUS_TAG](https://github.com/allure-framework/allure2/compare/$PREVIOUS_TAG...master)
+  [Commits since $PREVIOUS_TAG](https://github.com/allure-framework/allure-java/compare/$PREVIOUS_TAG...master)

From 6e1a62fd694d6ec00ccd3ea83f9ea9052314d3b0 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 26 Mar 2021 18:22:42 +0300
Subject: [PATCH 051/486] add issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 38 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..dd84ea782
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+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/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..bbcbbe7d6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+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 ef835d0f2e034f339f786ae5a2f76ab0c786d29e Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 26 Mar 2021 19:16:16 +0300
Subject: [PATCH 052/486] happy new 2021

---
 LICENSE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index a5ff24fc6..e078585bf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2019 Qameta Software OÜ
+   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.
@@ -198,4 +198,4 @@
    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.
\ No newline at end of file
+   limitations under the License.

From 6998376418a3bd34543bba82f1a26a0eef38e070 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 26 Mar 2021 19:17:06 +0300
Subject: [PATCH 053/486] add build badge

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e96e77409..fa8419abf 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,9 @@
 [CONTRIBUTING.md]: .github/CONTRIBUTING.md
 [docs]: https://docs.qameta.io/allure/2.0/
 
-# Allure Java Integrations [![bintray-badge][]][bintray]
+# Allure Java Integrations 
+
+[![Build](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml/badge.svg)](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml) [![bintray-badge][]][bintray]
 
 The repository contains new versions of adaptors for JVM-based test frameworks.
 

From 7e63f35340c06b33c314b8df5adec9d56accab05 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 26 Mar 2021 22:23:41 +0300
Subject: [PATCH 054/486] bump cucumber-jvm deps (via #539)

---
 allure-cucumber-jvm/build.gradle.kts          |  1 -
 .../cucumberjvm/AllureCucumberJvmTest.java    | 12 ++---
 allure-cucumber4-jvm/build.gradle.kts         |  1 -
 .../cucumber4jvm/AllureCucumber4JvmTest.java  |  7 ++-
 .../cucumber4jvm/samples/HookSteps.java       |  6 +--
 .../samples/SimpleFeatureSteps.java           |  5 +-
 allure-cucumber5-jvm/build.gradle.kts         |  1 -
 .../cucumber5jvm/AllureCucumber5JvmTest.java  |  7 ++-
 .../cucumber5jvm/samples/HookSteps.java       |  6 +--
 .../samples/SimpleFeatureSteps.java           |  5 +-
 allure-cucumber6-jvm/build.gradle.kts         |  5 +-
 .../cucumber6jvm/AllureCucumber6Jvm.java      | 48 ++++++++++++-------
 .../cucumber6jvm/AllureCucumber6JvmTest.java  |  7 ++-
 .../cucumber6jvm/samples/HookSteps.java       |  6 +--
 .../samples/SimpleFeatureSteps.java           |  5 +-
 15 files changed, 73 insertions(+), 49 deletions(-)

diff --git a/allure-cucumber-jvm/build.gradle.kts b/allure-cucumber-jvm/build.gradle.kts
index 20d2608ac..3bde4ddfc 100644
--- a/allure-cucumber-jvm/build.gradle.kts
+++ b/allure-cucumber-jvm/build.gradle.kts
@@ -11,7 +11,6 @@ dependencies {
     implementation("info.cukes:cucumber-java:$cucumberVersion")
     implementation("info.cukes:gherkin:2.12.2")
     testImplementation("commons-io:commons-io")
-    testImplementation("info.cukes:cucumber-testng:$cucumberVersion")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
diff --git a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java
index 5b63d63ba..ea5db2632 100644
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java
+++ b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java
@@ -15,7 +15,6 @@
  */
 package io.qameta.allure.cucumberjvm;
 
-import cucumber.api.testng.FeatureResultListener;
 import cucumber.runtime.ClassFinder;
 import cucumber.runtime.Runtime;
 import cucumber.runtime.RuntimeOptions;
@@ -423,17 +422,12 @@ private AllureResults runFeature(final String featureResource,
         final Runtime runtime = new Runtime(resourceLoader, classFinder, classLoader, options);
 
         options.addPlugin(cucumberJvm);
-
-        final FeatureResultListener resultListener = new FeatureResultListener(
-                options.reporter(classLoader),
-                options.isStrict()
-        );
         final List<CucumberFeature> features = options.cucumberFeatures(resourceLoader);
         features.forEach(cucumberFeature -> cucumberFeature.run(
                 options.formatter(classLoader),
-                resultListener,
-                runtime)
-        );
+                options.reporter(classLoader),
+                runtime
+        ));
         return writer;
     }
 }
diff --git a/allure-cucumber4-jvm/build.gradle.kts b/allure-cucumber4-jvm/build.gradle.kts
index e445dcec8..897696ba3 100644
--- a/allure-cucumber4-jvm/build.gradle.kts
+++ b/allure-cucumber4-jvm/build.gradle.kts
@@ -10,7 +10,6 @@ dependencies {
     implementation("io.cucumber:cucumber-core:$cucumberVersion")
     implementation("io.cucumber:cucumber-java:$cucumberVersion")
     testImplementation("commons-io:commons-io")
-    testImplementation("io.cucumber:cucumber-testng:$cucumberVersion")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
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 a24160f02..47cf825a1 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
@@ -123,7 +123,12 @@ void shouldSetStatusDetails() {
         assertThat(testResults)
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("expected [123] but found [15]");
+                .containsExactlyInAnyOrder("\n"
+                        + "Expecting:\n"
+                        + " <15>\n"
+                        + "to be equal to:\n"
+                        + " <123>\n"
+                        + "but was not.");
     }
 
     @AllureFeatures.BrokenTests
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 3a2f55c93..ee2d6a5b6 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
@@ -17,7 +17,7 @@
 
 import io.cucumber.java.After;
 import io.cucumber.java.Before;
-import org.testng.Assert;
+import org.assertj.core.api.Assertions;
 
 /**
  * @author letsrokk (Dmitry Mayer).
@@ -36,12 +36,12 @@ public void afterHook(){
 
     @Before("@BeforeHookWithException")
     public void beforeHookWithException(){
-        Assert.fail("Exception in Hook step");
+        Assertions.fail("Exception in Hook step");
     }
 
     @After("@AfterHookWithException")
     public void afterHookWithException(){
-        Assert.fail("Exception in Hook step");
+        Assertions.fail("Exception in Hook step");
     }
 
     @Before("@bp")
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 7325cc855..d4dc96521 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
@@ -18,7 +18,7 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import org.testng.Assert;
+import org.assertj.core.api.Assertions;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -46,7 +46,8 @@ public void i_add_a_to_b() {
 
     @Then("^result is (\\d+)$")
     public void result_is(int arg1) {
-        Assert.assertEquals(this.c, arg1);
+        Assertions.assertThat(this.c)
+                .isEqualTo(arg1);
     }
 
 }
diff --git a/allure-cucumber5-jvm/build.gradle.kts b/allure-cucumber5-jvm/build.gradle.kts
index c74c9a200..3899bbf31 100644
--- a/allure-cucumber5-jvm/build.gradle.kts
+++ b/allure-cucumber5-jvm/build.gradle.kts
@@ -13,7 +13,6 @@ dependencies {
     testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
     testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
     testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
-    testImplementation("io.cucumber:cucumber-testng:$cucumberVersion")
     testImplementation("commons-io:commons-io")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
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 15509de7e..f75c8835e 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
@@ -108,7 +108,12 @@ void shouldSetStatusDetails() {
         assertThat(testResults)
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("expected [123] but found [15]");
+                .containsExactlyInAnyOrder("\n"
+                        + "Expecting:\n"
+                        + " <15>\n"
+                        + "to be equal to:\n"
+                        + " <123>\n"
+                        + "but was not.");
     }
 
     @AllureFeatures.BrokenTests
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 ece9f875b..00f96ebc3 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
@@ -17,7 +17,7 @@
 
 import io.cucumber.java.After;
 import io.cucumber.java.Before;
-import org.testng.Assert;
+import org.assertj.core.api.Assertions;
 
 /**
  * @author letsrokk (Dmitry Mayer).
@@ -36,12 +36,12 @@ public void afterHook(){
 
     @Before("@BeforeHookWithException")
     public void beforeHookWithException(){
-        Assert.fail("Exception in Hook step");
+        Assertions.fail("Exception in Hook step");
     }
 
     @After("@AfterHookWithException")
     public void afterHookWithException(){
-        Assert.fail("Exception in Hook step");
+        Assertions.fail("Exception in Hook step");
     }
 
     @Before("@bp")
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 a81c7a212..0cdbaf491 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
@@ -18,7 +18,7 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import org.testng.Assert;
+import org.assertj.core.api.Assertions;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -46,7 +46,8 @@ public void i_add_a_to_b() {
 
     @Then("^result is (\\d+)$")
     public void result_is(int arg1) {
-        Assert.assertEquals(this.c, arg1);
+        Assertions.assertThat(this.c)
+                .isEqualTo(arg1);
     }
 
 }
diff --git a/allure-cucumber6-jvm/build.gradle.kts b/allure-cucumber6-jvm/build.gradle.kts
index d355fdf04..c2553e5c7 100644
--- a/allure-cucumber6-jvm/build.gradle.kts
+++ b/allure-cucumber6-jvm/build.gradle.kts
@@ -2,8 +2,8 @@ description = "Allure CucumberJVM 6.0"
 
 val agent: Configuration by configurations.creating
 
-val cucumberVersion = "6.9.0"
-val cucumberGherkinVersion = "15.0.2"
+val cucumberVersion = "6.10.2"
+val cucumberGherkinVersion = "18.0.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
@@ -13,7 +13,6 @@ dependencies {
     testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
     testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
     testImplementation("io.cucumber:cucumber-java:$cucumberVersion")
-    testImplementation("io.cucumber:cucumber-testng:$cucumberVersion")
     testImplementation("commons-io:commons-io")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
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 83679ffb5..88ed7caea 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
@@ -154,7 +154,10 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
                 .setLinks(labelBuilder.getScenarioLinks());
 
         final Scenario scenarioDefinition =
-                testSources.getScenarioDefinition(currentFeatureFile.get(), currentTestCase.get().getLine());
+                testSources.getScenarioDefinition(
+                        currentFeatureFile.get(),
+                        currentTestCase.get().getLocation().getLine()
+                );
 
         if (scenarioDefinition.getExamplesCount() > 0) {
             result.setParameters(
@@ -278,7 +281,7 @@ private String getHookStepUuid(final HookTestStep step) {
     private String getHistoryId(final TestCase testCase) {
         final String testCaseLocation = testCase.getUri().toString()
                 .substring(testCase.getUri().toString().lastIndexOf('/') + 1)
-                + ":" + testCase.getLine();
+                + ":" + testCase.getLocation().getLine();
         return md5(testCaseLocation);
     }
 
@@ -302,24 +305,37 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     private List<Parameter> getExamplesAsParameters(
             final Scenario scenario, final TestCase localCurrentTestCase
     ) {
-        final Optional<Examples> examplesBlock =
+        final Optional<Examples> maybeExample =
                 scenario.getExamplesList().stream()
                         .filter(example -> example.getTableBodyList().stream()
-                                .anyMatch(row -> row.getLocation().getLine() == localCurrentTestCase.getLine())
-                        ).findFirst();
-
-        if (examplesBlock.isPresent()) {
-            final TableRow row = examplesBlock.get().getTableBodyList().stream()
-                    .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLine())
-                    .findFirst().get();
-            return IntStream.range(0, examplesBlock.get().getTableHeader().getCellsList().size()).mapToObj(index -> {
-                final String name = examplesBlock.get().getTableHeader().getCellsList().get(index).getValue();
-                final String value = row.getCellsList().get(index).getValue();
-                return createParameter(name, value);
-            }).collect(Collectors.toList());
-        } else {
+                                .anyMatch(row -> row.getLocation().getLine()
+                                        == localCurrentTestCase.getLocation().getLine())
+                        )
+                        .findFirst();
+
+        if (!maybeExample.isPresent()) {
             return Collections.emptyList();
         }
+
+        final Examples examples = maybeExample.get();
+
+        final Optional<TableRow> maybeRow = examples.getTableBodyList().stream()
+                .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLocation().getLine())
+                .findFirst();
+
+        if (!maybeRow.isPresent()) {
+            return Collections.emptyList();
+        }
+
+        final TableRow row = maybeRow.get();
+
+        return IntStream.range(0, examples.getTableHeader().getCellsList().size())
+                .mapToObj(index -> {
+                    final String name = examples.getTableHeader().getCellsList().get(index).getValue();
+                    final String value = row.getCellsList().get(index).getValue();
+                    return createParameter(name, value);
+                })
+                .collect(Collectors.toList());
     }
 
     private void createDataTableAttachment(final DataTableArgument dataTableArgument) {
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 06922634e..2c3b267bb 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
@@ -108,7 +108,12 @@ void shouldSetStatusDetails() {
         assertThat(testResults)
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("expected [123] but found [15]");
+                .containsExactlyInAnyOrder("\n"
+                        + "Expecting:\n"
+                        + " <15>\n"
+                        + "to be equal to:\n"
+                        + " <123>\n"
+                        + "but was not.");
     }
 
     @AllureFeatures.BrokenTests
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 917ee04b3..e0de9fc63 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
@@ -17,7 +17,7 @@
 
 import io.cucumber.java.After;
 import io.cucumber.java.Before;
-import org.testng.Assert;
+import org.assertj.core.api.Assertions;
 
 /**
  * @author letsrokk (Dmitry Mayer).
@@ -36,12 +36,12 @@ public void afterHook(){
 
     @Before("@BeforeHookWithException")
     public void beforeHookWithException(){
-        Assert.fail("Exception in Hook step");
+        Assertions.fail("Exception in Hook step");
     }
 
     @After("@AfterHookWithException")
     public void afterHookWithException(){
-        Assert.fail("Exception in Hook step");
+        Assertions.fail("Exception in Hook step");
     }
 
     @Before("@bp")
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 b1d82e29a..f7b792f00 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
@@ -18,7 +18,7 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import org.testng.Assert;
+import org.assertj.core.api.Assertions;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -46,7 +46,8 @@ public void i_add_a_to_b() {
 
     @Then("^result is (\\d+)$")
     public void result_is(int arg1) {
-        Assert.assertEquals(this.c, arg1);
+        Assertions.assertThat(this.c)
+                .isEqualTo(arg1);
     }
 
 }

From 959a0166efdb7f83ee1316d406bfa05250ffec7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 27 Mar 2021 12:54:14 +0300
Subject: [PATCH 055/486] bump guice from 4.2.3 to 5.0.1 (via #536)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 230b13e28..019086096 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -83,7 +83,7 @@ configure(subprojects) {
         }
         dependencies {
             dependency("com.github.tomakehurst:wiremock:2.27.2")
-            dependency("com.google.inject:guice:4.2.3")
+            dependency("com.google.inject:guice:5.0.1")
             dependency("com.google.testing.compile:compile-testing:0.19")
             dependency("com.squareup.retrofit2:retrofit:2.9.0")
             dependency("commons-io:commons-io:2.8.0")

From 7de0c105f2ebcd06fb186e37c778351c27a2d1b5 Mon Sep 17 00:00:00 2001
From: Artem Eroshenko <eroshenkoam@qameta.io>
Date: Sun, 28 Mar 2021 22:57:10 +0300
Subject: [PATCH 056/486] fixture container (via #541)

---
 .../io/qameta/allure/testng/AllureTestNg.java | 12 ++++--
 .../allure/testng/AllureTestNgTest.java       | 28 ++++++++++++++
 .../testng/samples/FailedBeforeClass.java     | 37 +++++++++++++++++++
 .../testng/samples/FailedBeforeMethod.java    |  3 ++
 .../testng/samples/FailedBeforeSuite.java     |  3 ++
 .../testng/samples/FailedBeforeTest.java      |  3 ++
 .../suites/failed-before-class-fixture.xml    | 10 +++++
 7 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java
 create mode 100644 allure-testng/src/test/resources/suites/failed-before-class-fixture.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 d1e453055..9ac145202 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
@@ -515,6 +515,9 @@ public void onConfigurationFailure(final ITestResult itr) {
 
         startTestCase(itr, parentUuid, uuid);
 
+        addChildToContainer(getUniqueUuid(itr.getTestContext()), uuid);
+        addChildToContainer(getUniqueUuid(itr.getTestContext().getSuite()), uuid);
+        addClassContainerChild(itr.getMethod().getTestClass(), uuid);
         // results created for configuration failure should not be considered as test cases.
         getLifecycle().updateTestCase(
                 uuid,
@@ -747,12 +750,15 @@ private Consumer<TestResult> setStatus(final Status status, final StatusDetails
     }
 
     private void addClassContainerChild(final ITestClass clazz, final String childUuid) {
+        this.addChildToContainer(classContainerUuidStorage.get(clazz), childUuid);
+    }
+
+    private void addChildToContainer(final String containerUuid, final String childUuid) {
         lock.writeLock().lock();
         try {
-            final String parentUuid = classContainerUuidStorage.get(clazz);
-            if (nonNull(parentUuid)) {
+            if (nonNull(containerUuid)) {
                 getLifecycle().updateTestContainer(
-                        parentUuid,
+                        containerUuid,
                         container -> container.getChildren().add(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 0d4d1f4c9..ccbc6b670 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
@@ -52,6 +52,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -1128,6 +1129,33 @@ 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"}
+        };
+    }
+
+    @Test(dataProvider = "failedFixtures")
+    @AllureFeatures.Fixtures
+    public void shouldAddBeforeFixtureToFakeTestResult(final String suite, final String fixture) {
+        System.out.println(suite);
+        System.out.println(fixture);
+        final AllureResults results = runTestNgSuites(suite);
+        final Optional<TestResult> result = results.getTestResults().stream()
+                .filter(r -> r.getName().contains(fixture))
+                .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)
+                .findAny();
+        assertThat(result).as("Before failed configuration container").isNotEmpty();
+        assertThat(befores.get().getChildren())
+                .contains(result.get().getUuid());
+    }
+
     @Step("Run testng suites {suites}")
     private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
                                           final String... suites) {
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
new file mode 100644
index 000000000..f28c7a7d8
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/FailedBeforeClass.java
@@ -0,0 +1,37 @@
+/*
+ *  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.testng.samples;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static io.qameta.allure.Allure.step;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class FailedBeforeClass {
+
+    @BeforeClass
+    public void beforeClass() throws Exception {
+        step("before class step");
+        throw new RuntimeException();
+    }
+
+    @Test
+    public void skipped() throws Exception {
+    }
+}
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 b0b1eaa34..85b1326ae 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
@@ -18,6 +18,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import static io.qameta.allure.Allure.step;
+
 /**
  * @author charlie (Dmitry Baev).
  */
@@ -25,6 +27,7 @@ public class FailedBeforeMethod {
 
     @BeforeMethod
     public void beforeMethod() throws Exception {
+        step("before method step");
         throw new RuntimeException();
     }
 
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 c025d019d..f0f10afef 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
@@ -18,6 +18,8 @@
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
+import static io.qameta.allure.Allure.step;
+
 /**
  * @author charlie (Dmitry Baev).
  */
@@ -25,6 +27,7 @@ public class FailedBeforeSuite {
 
     @BeforeSuite
     public void beforeSuite() throws Exception {
+        step("before suite step");
         throw new RuntimeException();
     }
 
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 e4964f946..0e57ae2d3 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
@@ -18,6 +18,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import static io.qameta.allure.Allure.step;
+
 /**
  * @author charlie (Dmitry Baev).
  */
@@ -25,6 +27,7 @@ public class FailedBeforeTest {
 
     @BeforeTest
     public void beforeTest() throws Exception {
+        step("before test step");
         throw new RuntimeException();
     }
 
diff --git a/allure-testng/src/test/resources/suites/failed-before-class-fixture.xml b/allure-testng/src/test/resources/suites/failed-before-class-fixture.xml
new file mode 100644
index 000000000..74377bcad
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/failed-before-class-fixture.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="Fixtures Support">
+    <test name="Test fixtures">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.FailedBeforeClass"/>
+        </classes>
+    </test>
+</suite>

From 2d875e0e97d7fe5a57268bed102d0cbb5dfdc043 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 14:58:29 +0300
Subject: [PATCH 057/486] bump spotless-plugin-gradle from 5.11.0 to 5.11.1
 (via #546)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 019086096..c9978fe49 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.11.0")
+        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.11.1")
         classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
         classpath("io.spring.gradle:dependency-management-plugin:1.0.10.RELEASE")
         classpath("ru.vyarus:gradle-quality-plugin:4.5.0")

From 9e6ff61e28aaa0e3452f7e861da10f74f2b4b885 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 14:58:54 +0300
Subject: [PATCH 058/486] bump spring-web from 5.2.9.RELEASE to 5.3.5 (via
 #544)

---
 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 ff8a800ec..edd5d70a7 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Spring Web Integration"
 
 val agent: Configuration by configurations.creating
 
-val springWebVersion = "5.2.9.RELEASE"
+val springWebVersion = "5.3.5"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From fc310d0252d2a14b7f65d1499cd6aa786802b279 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 15:09:30 +0300
Subject: [PATCH 059/486] bump jbehave-core from 4.7 to 4.8.2 (via #543)

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

diff --git a/allure-jbehave/build.gradle.kts b/allure-jbehave/build.gradle.kts
index a31bb7b3e..36edee469 100644
--- a/allure-jbehave/build.gradle.kts
+++ b/allure-jbehave/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure JBehave Integration"
 
 val agent: Configuration by configurations.creating
 
-val jbehaveVersion = "4.7"
+val jbehaveVersion = "4.8.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From ab64037592119b9581853d7d294d7fbf990ee747 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 16:37:45 +0300
Subject: [PATCH 060/486] bump dependency-management-plugin from 1.0.10.RELEASE
 to 1.0.11.RELEASE (via #547)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index c9978fe49..104c88544 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
     dependencies {
         classpath("com.diffplug.spotless:spotless-plugin-gradle:5.11.1")
         classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
-        classpath("io.spring.gradle:dependency-management-plugin:1.0.10.RELEASE")
+        classpath("io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE")
         classpath("ru.vyarus:gradle-quality-plugin:4.5.0")
     }
 }

From d1311ab485873fe7b21d35b41cc74a70c03d6702 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 16:57:45 +0300
Subject: [PATCH 061/486] bump assertj-core from 3.17.2 to 3.19.0 (via #545)

---
 .../main/java/io/qameta/allure/assertj/AllureAspectJ.java  | 7 ++++++-
 allure-cucumber4-jvm/build.gradle.kts                      | 1 +
 .../qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java | 7 +------
 .../allure/cucumber4jvm/samples/SimpleFeatureSteps.java    | 6 ++++--
 .../qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java | 7 +------
 .../allure/cucumber5jvm/samples/SimpleFeatureSteps.java    | 6 ++++--
 .../qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java | 7 +------
 .../allure/cucumber6jvm/samples/SimpleFeatureSteps.java    | 6 ++++--
 build.gradle.kts                                           | 2 +-
 9 files changed, 23 insertions(+), 26 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 e54ca815e..4ecea1dd8 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
@@ -60,6 +60,11 @@ public void anyAssertCreation() {
         //pointcut body, should be empty
     }
 
+    @Pointcut("execution(public * org.assertj.core.api.AssertionsForClassTypes.*(..))")
+    public void anyAssertCreation2() {
+        //pointcut body, should be empty
+    }
+
     @Pointcut("execution(* org.assertj.core.api.AssertJProxySetup.*(..))")
     public void proxyMethod() {
         //pointcut body, should be empty
@@ -70,7 +75,7 @@ public void anyAssert() {
         //pointcut body, should be empty
     }
 
-    @After("anyAssertCreation()")
+    @After("anyAssertCreation() || anyAssertCreation2()")
     public void logAssertCreation(final JoinPoint joinPoint) {
         final String actual = joinPoint.getArgs().length > 0
                 ? ObjectUtils.toString(joinPoint.getArgs()[0])
diff --git a/allure-cucumber4-jvm/build.gradle.kts b/allure-cucumber4-jvm/build.gradle.kts
index 897696ba3..28e68c347 100644
--- a/allure-cucumber4-jvm/build.gradle.kts
+++ b/allure-cucumber4-jvm/build.gradle.kts
@@ -15,6 +15,7 @@ dependencies {
     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")
 }
 
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 47cf825a1..4ddbb50eb 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
@@ -123,12 +123,7 @@ void shouldSetStatusDetails() {
         assertThat(testResults)
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("\n"
-                        + "Expecting:\n"
-                        + " <15>\n"
-                        + "to be equal to:\n"
-                        + " <123>\n"
-                        + "but was not.");
+                .containsExactlyInAnyOrder("expecting 15 to be equal to 123");
     }
 
     @AllureFeatures.BrokenTests
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 d4dc96521..44e64a45f 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
@@ -46,8 +46,10 @@ public void i_add_a_to_b() {
 
     @Then("^result is (\\d+)$")
     public void result_is(int arg1) {
-        Assertions.assertThat(this.c)
-                .isEqualTo(arg1);
+        // use manual fail for more stable message format
+        if (this.c != arg1) {
+            Assertions.fail("expecting %d to be equal to %d", this.c, arg1);
+        }
     }
 
 }
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 f75c8835e..afd6c9567 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
@@ -108,12 +108,7 @@ void shouldSetStatusDetails() {
         assertThat(testResults)
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("\n"
-                        + "Expecting:\n"
-                        + " <15>\n"
-                        + "to be equal to:\n"
-                        + " <123>\n"
-                        + "but was not.");
+                .containsExactlyInAnyOrder("expecting 15 to be equal to 123");
     }
 
     @AllureFeatures.BrokenTests
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 0cdbaf491..3c7c2fd0a 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
@@ -46,8 +46,10 @@ public void i_add_a_to_b() {
 
     @Then("^result is (\\d+)$")
     public void result_is(int arg1) {
-        Assertions.assertThat(this.c)
-                .isEqualTo(arg1);
+        // use manual fail for more stable message format
+        if (this.c != arg1) {
+            Assertions.fail("expecting %d to be equal to %d", this.c, arg1);
+        }
     }
 
 }
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 2c3b267bb..fdc541590 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
@@ -108,12 +108,7 @@ void shouldSetStatusDetails() {
         assertThat(testResults)
                 .extracting(TestResult::getStatusDetails)
                 .extracting(StatusDetails::getMessage)
-                .containsExactlyInAnyOrder("\n"
-                        + "Expecting:\n"
-                        + " <15>\n"
-                        + "to be equal to:\n"
-                        + " <123>\n"
-                        + "but was not.");
+                .containsExactlyInAnyOrder("expecting 15 to be equal to 123");
     }
 
     @AllureFeatures.BrokenTests
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 f7b792f00..85d03e315 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
@@ -46,8 +46,10 @@ public void i_add_a_to_b() {
 
     @Then("^result is (\\d+)$")
     public void result_is(int arg1) {
-        Assertions.assertThat(this.c)
-                .isEqualTo(arg1);
+        // use manual fail for more stable message format
+        if (this.c != arg1) {
+            Assertions.fail("expecting %d to be equal to %d", this.c, arg1);
+        }
     }
 
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index 104c88544..c0b0e101b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -94,7 +94,7 @@ configure(subprojects) {
             dependency("org.apache.tika:tika-core:1.25")
             dependency("org.aspectj:aspectjrt:1.9.6")
             dependency("org.aspectj:aspectjweaver:1.9.6")
-            dependency("org.assertj:assertj-core:3.17.2")
+            dependency("org.assertj:assertj-core:3.19.0")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.6.0.Final")

From b782b29f45e1720481f2c853eb9a03cd13bc11cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 13:48:03 +0300
Subject: [PATCH 062/486] bump tika-core from 1.25 to 1.26 (via #549)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index c0b0e101b..b46c3b0a8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -91,7 +91,7 @@ configure(subprojects) {
             dependency("io.github.glytching:junit-extensions:2.4.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
-            dependency("org.apache.tika:tika-core:1.25")
+            dependency("org.apache.tika:tika-core:1.26")
             dependency("org.aspectj:aspectjrt:1.9.6")
             dependency("org.aspectj:aspectjweaver:1.9.6")
             dependency("org.assertj:assertj-core:3.19.0")

From 1b4e832b912edcc2b11666031b3c9833cc609f71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 15:52:08 +0300
Subject: [PATCH 063/486] bump joor-java-8 from 0.9.13 to 0.9.14 (via #558)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index b46c3b0a8..4bb4fe901 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -98,7 +98,7 @@ configure(subprojects) {
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.6.0.Final")
-            dependency("org.jooq:joor-java-8:0.9.13")
+            dependency("org.jooq:joor-java-8:0.9.14")
             dependency("org.mock-server:mockserver-netty:5.11.2")
             dependency("org.mockito:mockito-core:3.8.0")
             dependencySet("org.slf4j:1.7.30") {

From 676679117b9f4baffc4890ea766e0b14fa4af2b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 18:22:20 +0300
Subject: [PATCH 064/486] bump mockito-core from 3.8.0 to 3.9.0 (via #557)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 4bb4fe901..d65ab03ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -100,7 +100,7 @@ configure(subprojects) {
             dependency("org.jboss.resteasy:resteasy-client:4.6.0.Final")
             dependency("org.jooq:joor-java-8:0.9.14")
             dependency("org.mock-server:mockserver-netty:5.11.2")
-            dependency("org.mockito:mockito-core:3.8.0")
+            dependency("org.mockito:mockito-core:3.9.0")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From 142a4bb27bf5c579cc7b0cc1d1381ecf976005ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Apr 2021 12:12:48 +0300
Subject: [PATCH 065/486] bump jackson-bom from 2.12.2 to 2.12.3 (via #561)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index d65ab03ee..2a4a6bd55 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -78,7 +78,7 @@ configure(subprojects) {
 
     configure<DependencyManagementExtension> {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.12.2")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.12.3")
             mavenBom("org.junit:junit-bom:5.7.1")
         }
         dependencies {

From 8bbd2d86cdfb7271af1f37848cbdcb2e447ed89e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Apr 2021 12:13:33 +0300
Subject: [PATCH 066/486] bump spotless-plugin-gradle from 5.11.1 to 5.12.1
 (via #562)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 2a4a6bd55..e2ec9141c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.11.1")
+        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.12.1")
         classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
         classpath("io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE")
         classpath("ru.vyarus:gradle-quality-plugin:4.5.0")

From c8bba0f7afd1f3269ff96300927db023fcd33346 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 15:12:41 +0300
Subject: [PATCH 067/486] bump selenide from 5.20.1 to 5.20.2 (via #564)

---
 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 2d4890884..7a2de87e5 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.20.1"
+val selenideVersion = "5.20.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From a1a870bcb87e3f6559988dd4ac8e30574d7e1a2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 12:55:45 +0300
Subject: [PATCH 068/486] bump selenide from 5.20.2 to 5.20.3 (via #566)

---
 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 7a2de87e5..61aa0de8c 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.20.2"
+val selenideVersion = "5.20.3"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From a0d78609a6ca909d5c32b7156231266d6df06e3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 13:06:22 +0300
Subject: [PATCH 069/486] bump spring-web from 5.3.5 to 5.3.6 (via #563)

---
 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 edd5d70a7..754716507 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Spring Web Integration"
 
 val agent: Configuration by configurations.creating
 
-val springWebVersion = "5.3.5"
+val springWebVersion = "5.3.6"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 2d7c38c17cab5725a83db285d7f0bcf3c09dce17 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 13:09:09 +0300
Subject: [PATCH 070/486] bump spotless-plugin-gradle from 5.12.1 to 5.12.2
 (via #565)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index e2ec9141c..5873ca756 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.12.1")
+        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.12.2")
         classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
         classpath("io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE")
         classpath("ru.vyarus:gradle-quality-plugin:4.5.0")

From 5ed4d7708355ac6acf40967329016d4acb503b6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Apr 2021 17:37:31 +0300
Subject: [PATCH 071/486] bump selenide from 5.20.3 to 5.20.4 (via #569)

---
 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 61aa0de8c..c0b0b4e32 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.20.3"
+val selenideVersion = "5.20.4"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 6cd8d2b6c0b699581ee83d2d4e3ae7f3c5a19a1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Apr 2021 17:41:29 +0300
Subject: [PATCH 072/486] bump spotless-plugin-gradle from 5.12.2 to 5.12.4
 (via #568)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 5873ca756..ed03769e5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.12.2")
+        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.12.4")
         classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
         classpath("io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE")
         classpath("ru.vyarus:gradle-quality-plugin:4.5.0")

From 12b8631010981e33f0ec2e5b6268b5245dffb60b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Apr 2021 17:42:02 +0300
Subject: [PATCH 073/486] bump actions/setup-java from v1 to v2 (via #555)

---
 .github/workflows/build.yaml   | 8 +++++---
 .github/workflows/release.yaml | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f1870eb9f..f3bb57f3f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -17,9 +17,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2.3.4
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: 8.0.x
       - name: Build with Gradle
         run: ./gradlew build
   build_11:
@@ -28,8 +29,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2.3.4
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 11.0.x
       - name: Build with Gradle
         run: ./gradlew build
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 1df69505c..0a72b1b46 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -10,9 +10,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2.3.4
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: 8.0.x
       - name: "Gradle Build"
         run: ./gradlew build -Pversion=${GITHUB_REF:10}
       - name: "Gradle Publish to Bintray"

From 0dc499624459218621e1723cba5f3e1b970d7b23 Mon Sep 17 00:00:00 2001
From: Artem Eroshenko <eroshenkoam@qameta.io>
Date: Thu, 29 Apr 2021 15:00:24 +0300
Subject: [PATCH 074/486] release to central (via #542)

---
 .github/workflows/{build.yaml => build.yml} |  4 +-
 .github/workflows/publish.yml               | 34 ++++++++
 .github/workflows/release.yaml              | 23 -----
 .github/workflows/release.yml               | 18 ++++
 allure-junit-platform/build.gradle.kts      | 15 ++--
 allure-junit5/build.gradle.kts              | 13 +--
 allure-model/build.gradle.kts               |  2 +-
 allure-testng/build.gradle.kts              | 15 ++--
 build.gradle.kts                            | 93 ++++++++++++++-------
 gradle/bintray.gradle                       | 31 -------
 gradle/maven-publish.gradle                 | 55 ------------
 11 files changed, 139 insertions(+), 164 deletions(-)
 rename .github/workflows/{build.yaml => build.yml} (90%)
 create mode 100644 .github/workflows/publish.yml
 delete mode 100644 .github/workflows/release.yaml
 create mode 100644 .github/workflows/release.yml
 delete mode 100644 gradle/bintray.gradle
 delete mode 100644 gradle/maven-publish.gradle

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yml
similarity index 90%
rename from .github/workflows/build.yaml
rename to .github/workflows/build.yml
index f3bb57f3f..7334f99ef 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     name: "Build JDK 1.8"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2
       - name: Set up JDK 1.8
         uses: actions/setup-java@v2
         with:
@@ -27,7 +27,7 @@ jobs:
     name: "Build JDK 11"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 000000000..f1e628065
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,34 @@
+name: Publish
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 8.0.x
+      - name: Set up GPG
+        run: echo -n "${GPG_PRIVATE_KEY}" | base64 --decode > ${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg
+        env:
+          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+      - name: "Gradle Build"
+        run: ./gradlew build -Pversion=${GITHUB_REF:10}
+      - name: "Gradle Publish"
+        run: |
+           ./gradlew publishToSonatype -Pversion=${GITHUB_REF:10} \
+                     -Psigning.keyId=${GPG_KEY_ID} \
+                     -Psigning.password=${GPG_PASSPHRASE} \
+                     -Psigning.secretKeyRingFile=${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg
+        env:
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_PASSWORD }}
+          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
deleted file mode 100644
index 0a72b1b46..000000000
--- a/.github/workflows/release.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Release
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2.3.4
-      - name: Set up JDK
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'zulu'
-          java-version: 8.0.x
-      - name: "Gradle Build"
-        run: ./gradlew build -Pversion=${GITHUB_REF:10}
-      - name: "Gradle Publish to Bintray"
-        env:
-          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-          BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }}
-        run: ./gradlew bintrayUpload -Pversion=${GITHUB_REF:10}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..ed630f050
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,18 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      releaseVersion:
+        description: "The release version in <MAJOR>.<MINOR>.<PATCH> format"
+        required: true
+      nextVersion:
+        description: "The next version in <MAJOR>.<MINOR> format WITHOUT SNAPSHOT SUFFIX"
+        required: true
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.4
+
diff --git a/allure-junit-platform/build.gradle.kts b/allure-junit-platform/build.gradle.kts
index a4b970826..417709e6b 100644
--- a/allure-junit-platform/build.gradle.kts
+++ b/allure-junit-platform/build.gradle.kts
@@ -40,14 +40,15 @@ tasks.test {
     }
 }
 
-val spiOffJar by tasks.creating(Jar::class) {
+val spiOffJar: Jar by tasks.creating(Jar::class) {
     from(sourceSets.getByName("main").output)
-    classifier = "spi-off"
+    archiveClassifier.set("spi-off")
 }
 
-val spiOff by configurations.creating {
-    extendsFrom(configurations.getByName("compile"))
+publishing {
+    publications {
+        named<MavenPublication>("maven") {
+            artifact(spiOffJar)
+        }
+    }
 }
-
-artifacts.add("archives", spiOffJar)
-artifacts.add("spiOff", spiOffJar)
diff --git a/allure-junit5/build.gradle.kts b/allure-junit5/build.gradle.kts
index 91499fd26..0b63accf3 100644
--- a/allure-junit5/build.gradle.kts
+++ b/allure-junit5/build.gradle.kts
@@ -38,15 +38,16 @@ tasks.test {
     }
 }
 
-val spiOffJar by tasks.creating(Jar::class) {
+val spiOffJar: Jar by tasks.creating(Jar::class) {
     from(sourceSets.getByName("main").output)
     archiveClassifier.set("spi-off")
 }
 
-val spiOff by configurations.creating {
-    extendsFrom(configurations.getByName("compile"))
+publishing {
+    publications {
+        named<MavenPublication>("maven") {
+            artifact(spiOffJar)
+        }
+    }
 }
 
-artifacts.add("archives", spiOffJar)
-artifacts.add("spiOff", spiOffJar)
-
diff --git a/allure-model/build.gradle.kts b/allure-model/build.gradle.kts
index 507dfdf45..9b5fb34fd 100644
--- a/allure-model/build.gradle.kts
+++ b/allure-model/build.gradle.kts
@@ -4,7 +4,7 @@ val agent: Configuration by configurations.creating
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
-    implementation("com.fasterxml.jackson.core:jackson-databind")
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.12.2")
     testImplementation("io.github.benas:random-beans")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
diff --git a/allure-testng/build.gradle.kts b/allure-testng/build.gradle.kts
index c48c6d44c..f6b2d0107 100644
--- a/allure-testng/build.gradle.kts
+++ b/allure-testng/build.gradle.kts
@@ -39,14 +39,15 @@ tasks.test {
     }
 }
 
-val spiOffJar by tasks.creating(Jar::class) {
+val spiOffJar: Jar by tasks.creating(Jar::class) {
     from(sourceSets.getByName("main").output)
-    classifier = "spi-off"
+    archiveClassifier.set("spi-off")
 }
 
-val spiOff by configurations.creating {
-    extendsFrom(configurations.getByName("compile"))
+publishing {
+    publications {
+        named<MavenPublication>("maven") {
+            artifact(spiOffJar)
+        }
+    }
 }
-
-artifacts.add("archives", spiOffJar)
-artifacts.add("spiOff", spiOffJar)
diff --git a/build.gradle.kts b/build.gradle.kts
index ed03769e5..b495319c7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,5 @@
 import com.diffplug.gradle.spotless.SpotlessExtension
-import io.qameta.allure.gradle.AllureExtension
 import io.qameta.allure.gradle.task.AllureReport
-import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
-import org.gradle.jvm.tasks.Jar
 import ru.vyarus.gradle.plugin.quality.QualityExtension
 
 buildscript {
@@ -14,8 +11,6 @@ buildscript {
 
     dependencies {
         classpath("com.diffplug.spotless:spotless-plugin-gradle:5.12.4")
-        classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
-        classpath("io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE")
         classpath("ru.vyarus:gradle-quality-plugin:4.5.0")
     }
 }
@@ -37,7 +32,10 @@ tasks.withType(Wrapper::class) {
 plugins {
     java
     `java-library`
-    id("net.researchgate.release") version "2.8.1"
+    `maven-publish`
+    signing
+    id("io.spring.dependency-management") version "1.0.11.RELEASE"
+    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
     id("io.qameta.allure") version "2.8.1"
 }
 
@@ -50,33 +48,32 @@ tasks.withType(JavaCompile::class) {
     options.encoding = "UTF-8"
 }
 
-release {
-    tagTemplate = "\${version}"
-}
-
-val afterReleaseBuild by tasks.existing
-
 configure(listOf(rootProject)) {
     description = "Allure Java"
     group = "io.qameta.allure"
 }
 
+nexusPublishing {
+    repositories {
+        sonatype()
+    }
+}
+
 configure(subprojects) {
     val project = this
     group = "io.qameta.allure"
     version = version
 
     apply(plugin = "java")
+    apply(plugin = "signing")
     apply(plugin = "java-library")
-    apply(plugin = "maven")
-    apply(plugin = "io.spring.dependency-management")
+    apply(plugin = "maven-publish")
+    apply(plugin = "io.qameta.allure")
     apply(plugin = "ru.vyarus.quality")
     apply(plugin = "com.diffplug.spotless")
-    apply(plugin = "io.qameta.allure")
-    apply(from = "$gradleScriptDir/bintray.gradle")
-    apply(from = "$gradleScriptDir/maven-publish.gradle")
+    apply(plugin = "io.spring.dependency-management")
 
-    configure<DependencyManagementExtension> {
+    dependencyManagement {
         imports {
             mavenBom("com.fasterxml.jackson:jackson-bom:2.12.3")
             mavenBom("org.junit:junit-bom:5.7.1")
@@ -206,31 +203,63 @@ configure(subprojects) {
         encoding("UTF-8")
     }
 
-    configure<AllureExtension> {
+    allure {
         autoconfigure = false
         aspectjweaver = false
     }
 
-    val sourceJar by tasks.creating(Jar::class) {
-        from(sourceSets.getByName("main").allSource)
-        archiveClassifier.set("sources")
-    }
-
-    val javadocJar by tasks.creating(Jar::class) {
-        from(tasks.getByName("javadoc"))
-        archiveClassifier.set("javadoc")
+    java {
+        withJavadocJar()
+        withSourcesJar()
     }
 
     tasks.withType(Javadoc::class) {
         (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
     }
 
-    artifacts.add("archives", sourceJar)
-    artifacts.add("archives", javadocJar)
+    publishing {
+        publications {
+            create<MavenPublication>("maven") {
+                from(components["java"])
+                suppressAllPomMetadataWarnings()
+                pom {
+                    name.set(project.name)
+                    description.set("Module ${project.name} of Allure Framework.")
+                    url.set("https://github.com/allure-framework/allure-java")
+                    licenses {
+                        license {
+                            name.set("The Apache License, Version 2.0")
+                            url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                        }
+                    }
+                    developers {
+                        developer {
+                            id.set("baev")
+                            name.set("Dmitry Baev")
+                            email.set("dmitry.baev@qameta.io")
+                        }
+                        developer {
+                            id.set("eroshenkoam")
+                            name.set("Artem Eroshenko")
+                            email.set("artem.eroshenko@qameta.io")
+                        }
+                    }
+                    scm {
+                        developerConnection.set("scm:git:git://github.com/allure-framework/allure-java")
+                        connection.set("scm:git:git://github.com/allure-framework/allure-java")
+                        url.set("https://github.com/allure-framework/allure-java")
+                    }
+                    issueManagement {
+                        system.set("GitHub Issues")
+                        url.set("https://github.com/allure-framework/allure-java/issues")
+                    }
+                }
+            }
+        }
+    }
 
-    val bintrayUpload by tasks.existing
-    afterReleaseBuild {
-        dependsOn(bintrayUpload)
+    signing {
+        sign(publishing.publications["maven"])
     }
 
     repositories {
diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle
deleted file mode 100644
index 60e005f04..000000000
--- a/gradle/bintray.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-apply plugin: 'com.jfrog.bintray'
-
-bintray {
-    user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
-
-    configurations = ['archives']
-
-    publish = true
-    pkg {
-        userOrg = 'qameta'
-        repo = 'maven'
-        name = 'allure-java'
-        desc = 'Allure Java integrations'
-        websiteUrl = 'https://github.com/allure-framework/allure-java'
-        issueTrackerUrl = 'https://github.com/allure-framework/allure-java'
-        vcsUrl = 'https://github.com/allure-framework/allure-java.git'
-        licenses = ['Apache-2.0']
-
-        githubRepo = 'allure-framework/allure-java'
-        githubReleaseNotesFile = 'README.md'
-
-        version {
-            name = project.version
-            released = new Date()
-            gpg {
-                sign = true
-            }
-        }
-    }
-}
diff --git a/gradle/maven-publish.gradle b/gradle/maven-publish.gradle
deleted file mode 100644
index 7543a22be..000000000
--- a/gradle/maven-publish.gradle
+++ /dev/null
@@ -1,55 +0,0 @@
-apply plugin: 'maven'
-
-install {
-    repositories.mavenInstaller {
-        customizePom(pom, project)
-    }
-}
-
-def customizePom(pom, gradleProject) {
-    pom.whenConfigured { generatedPom ->
-        // eliminate testng-scoped dependencies (no need in maven central poms)
-        generatedPom.dependencies.removeAll { dep ->
-            dep.scope == "test"
-        }
-
-        // sort to make pom dependencies order consistent to ease comparison of older poms
-        generatedPom.dependencies = generatedPom.dependencies.sort { dep ->
-            "$dep.scope:$dep.groupId:$dep.artifactId"
-        }
-
-        // add all items necessary for maven central publication
-        generatedPom.project {
-            name = gradleProject.description
-            description = gradleProject.description
-            url = "https://github.com/allure-framework/allure-java"
-            organization {
-                name = "Qameta IO"
-                url = "https://qameta.io"
-            }
-            licenses {
-                license {
-                    name = 'The Apache Software License, Version 2.0'
-                    url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    distribution = 'repo'
-                }
-            }
-            scm {
-                url = 'https://github.com/allure-framework/allure-java'
-                connection = 'scm:git:git://github.com/allure-framework/allure-java'
-                developerConnection = 'scm:git:git://github.com/allure-framework/allure-java'
-            }
-            developers {
-                developer {
-                    id = 'baev'
-                    name = 'Dmitry Baev'
-                    email = 'baev@qameta.io'
-                }
-            }
-            issueManagement {
-                system = 'Github Issues'
-                url = 'https://github.com/allure-framework/allure-java/issues'
-            }
-        }
-    }
-}

From 8f9880f25ad1dec9401c81b6d85291b52e8a83ca Mon Sep 17 00:00:00 2001
From: Artem Eroshenko <eroshenkoam@qameta.io>
Date: Fri, 30 Apr 2021 19:05:59 +0300
Subject: [PATCH 075/486] fix junit5 filter (via #571)

---
 .../AllurePostDiscoveryFilter.java            |   2 +-
 .../AllureJunitPlatformTestUtils.java         |  13 +-
 .../AllurePostDiscoveryFilterTest.java        | 144 +++++++++++-------
 .../features/FilterParameterizedTests.java    |  50 ++++++
 .../features/FilterSimpleTests.java           |  46 ++++++
 5 files changed, 196 insertions(+), 59 deletions(-)
 create mode 100644 allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.java
 create mode 100644 allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.java

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 e43a76230..c66e592de 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
@@ -56,7 +56,7 @@ public FilterResult apply(final TestDescriptor object) {
         if (Objects.isNull(testPlan)) {
             return FilterResult.included("test plan is empty");
         }
-        if (!object.isTest()) {
+        if (!object.getChildren().isEmpty()) {
             return FilterResult.included("filter only applied for tests");
         }
 
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 b8d76cd08..b26897f22 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
@@ -22,11 +22,11 @@
 import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.testfilter.TestPlan;
 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.TestPlan;
 import org.junit.platform.launcher.core.LauncherConfig;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.platform.launcher.core.LauncherFactory;
@@ -44,6 +44,11 @@ private AllureJunitPlatformTestUtils() {
 
     @Step("Run classes {classes}")
     public static AllureResults runClasses(final Class<?>... classes) {
+        return runClasses(null, 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);
 
@@ -52,6 +57,7 @@ public static AllureResults runClasses(final Class<?>... classes) {
                 .toArray(ClassSelector[]::new);
 
         final LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+                .filters(new AllurePostDiscoveryFilter(testPlan))
                 .selectors(classSelectors)
                 .build();
 
@@ -77,8 +83,9 @@ public static AllureResults runClasses(final Class<?>... classes) {
     }
 
     @Step("Build test plan for {classes}")
-    public static TestPlan buildPlan(final io.qameta.allure.testfilter.TestPlan testPlan,
-                                     final Class<?>... 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);
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 e03a1ec0b..2f7dfc144 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
@@ -15,16 +15,16 @@
  */
 package io.qameta.allure.junitplatform;
 
-import io.qameta.allure.junitplatform.features.PassedTests;
-import io.qameta.allure.junitplatform.features.TestsWithAllureId;
+import io.qameta.allure.junitplatform.features.FilterParameterizedTests;
+import io.qameta.allure.junitplatform.features.FilterSimpleTests;
+import io.qameta.allure.test.AllureResults;
+import io.qameta.allure.testfilter.TestPlan;
 import io.qameta.allure.testfilter.TestPlanV1_0;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.launcher.TestIdentifier;
-import org.junit.platform.launcher.TestPlan;
 
 import java.util.Arrays;
 
-import static io.qameta.allure.junitplatform.AllureJunitPlatformTestUtils.buildPlan;
+import static io.qameta.allure.junitplatform.AllureJunitPlatformTestUtils.runClasses;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -34,79 +34,113 @@ public class AllurePostDiscoveryFilterTest {
 
     @Test
     void shouldRunAllTestsIfNoTestPlanProvided() {
-        final TestPlan testPlan = buildPlan(null, PassedTests.class);
+        final AllureResults results = runClasses(FilterSimpleTests.class);
 
-        final long testsCount = testPlan.countTestIdentifiers(TestIdentifier::isTest);
+        assertThat(results.getTestResults())
+                .hasSize(3);
+    }
+
+    @Test
+    void shouldRunAllParameterizedTestsIfNoTestPlanProvided() {
+        final AllureResults results = runClasses(FilterParameterizedTests.class);
 
-        assertThat(testsCount)
-                .isEqualTo(3);
+        assertThat(results.getTestResults())
+                .hasSize(6);
     }
 
     @Test
     void shouldRunAllTestsIfEmptyTestPlanProvided() {
-        final TestPlan testPlan = buildPlan(new TestPlanV1_0(), PassedTests.class);
-
-        final long testsCount = testPlan.countTestIdentifiers(TestIdentifier::isTest);
+        final AllureResults results = runClasses(new TestPlanV1_0(), FilterSimpleTests.class);
+        assertThat(results.getTestResults())
+                .hasSize(3);
+    }
 
-        assertThat(testsCount)
-                .isEqualTo(3);
+    @Test
+    void shouldRunAllParameterizedTestsIfEmptyTestPlanProvided() {
+        final AllureResults results = runClasses(new TestPlanV1_0(), FilterParameterizedTests.class);
+        assertThat(results.getTestResults())
+                .hasSize(6);
     }
 
     @Test
     void shouldFilterTestCasesByFullName() {
-        final TestPlan testPlan = buildPlan(
-                new TestPlanV1_0().setTests(Arrays.asList(
-                        new TestPlanV1_0.TestCase()
-                                .setSelector("io.qameta.allure.junitplatform.features.PassedTests.second"),
-                        new TestPlanV1_0.TestCase()
-                                .setSelector("io.qameta.allure.junitplatform.features.PassedTests.first")
-                )),
-                PassedTests.class
+        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 long testsCount = testPlan.countTestIdentifiers(TestIdentifier::isTest);
+        final AllureResults results = runClasses(testPlan, FilterSimpleTests.class);
+        assertThat(results.getTestResults())
+                .hasSize(2);
+    }
 
-        assertThat(testsCount)
-                .isEqualTo(2);
+    @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 AllureResults results = runClasses(testPlan, FilterParameterizedTests.class);
+        assertThat(results.getTestResults())
+                .hasSize(4);
     }
 
     @Test
     void shouldFilterTestCasesByUniqueId() {
-        final TestPlan testPlan = buildPlan(
-                new TestPlanV1_0().setTests(Arrays.asList(
-                        new TestPlanV1_0.TestCase()
-                                .setSelector("[engine:junit-jupiter]/[class:io.qameta.allure.junitplatform.features.PassedTests]/[method:second()]"),
-                        new TestPlanV1_0.TestCase()
-                                .setSelector("[engine:junit-jupiter]/[class:io.qameta.allure.junitplatform.features.PassedTests]/[method:third()]")
-                )),
-                PassedTests.class
-        );
-
-        final long testsCount = testPlan.countTestIdentifiers(TestIdentifier::isTest);
-
-        assertThat(testsCount)
-                .isEqualTo(2);
+        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())
+                .hasSize(2);
     }
 
     @Test
     void shouldFilterTestCasesByAllureId() {
-        final TestPlan testPlan = buildPlan(
-                new TestPlanV1_0().setTests(Arrays.asList(
-                        new TestPlanV1_0.TestCase()
-                                .setId("32"),
-                        new TestPlanV1_0.TestCase()
-                                .setId("34"),
-                        new TestPlanV1_0.TestCase()
-                                .setId("41"),
-                        new TestPlanV1_0.TestCase()
-                                .setId("48")
-                )),
-                TestsWithAllureId.class
-        );
+        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())
+                .hasSize(2);
+    }
+
+    @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 AllureResults results = runClasses(testPlan, FilterParameterizedTests.class);
+        assertThat(results.getTestResults())
+                .hasSize(4);
+    }
 
-        final long testsCount = testPlan.countTestIdentifiers(TestIdentifier::isTest);
 
-        assertThat(testsCount)
-                .isEqualTo(3);
+    private String testId(final Class<?> testClass, String method) {
+        return String.format("[engine:%s]/[class:%s]/[method:%s()]",
+                "junit-jupiter",
+                testClass.getCanonicalName(),
+                method);
     }
+
+
 }
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
new file mode 100644
index 000000000..f7bf17ad1
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterParameterizedTests.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.junitplatform.features;
+
+import io.qameta.allure.AllureId;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class FilterParameterizedTests {
+
+    @BeforeAll
+    static void doNothing() {
+
+    }
+
+    @AllureId("10")
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void first(String value) {
+    }
+
+    @AllureId("20")
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void second(String value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void third(String value) {
+    }
+
+}
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
new file mode 100644
index 000000000..11ee50512
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/FilterSimpleTests.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.junitplatform.features;
+
+import io.qameta.allure.AllureId;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class FilterSimpleTests {
+
+    @BeforeAll
+    static void doNothing(){
+
+    }
+
+    @Test
+    @AllureId("10")
+    void first() {
+    }
+
+    @Test
+    @AllureId("20")
+    void second() {
+    }
+
+    @Test
+    void third() {
+    }
+
+}

From 150dc2cf545745ae4bbdce61f28b2076d0631c54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Apr 2021 19:06:23 +0300
Subject: [PATCH 076/486] bump spotbugs from 3.1.12 to 4.2.3 (via #573)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index b495319c7..e71783c58 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -156,7 +156,7 @@ configure(subprojects) {
             if (spotbugs != null) {
                 dependencies {
                     spotbugs("org.slf4j:slf4j-simple")
-                    spotbugs("com.github.spotbugs:spotbugs:3.1.12")
+                    spotbugs("com.github.spotbugs:spotbugs:4.2.3")
                 }
             }
         }

From 2d19782c2020c734c1d16ddd5b843af688cb0f28 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Apr 2021 19:06:45 +0300
Subject: [PATCH 077/486] bump jackson-databind from 2.12.2 to 2.12.3 (via
 #572)

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

diff --git a/allure-model/build.gradle.kts b/allure-model/build.gradle.kts
index 9b5fb34fd..5d8287fdf 100644
--- a/allure-model/build.gradle.kts
+++ b/allure-model/build.gradle.kts
@@ -4,7 +4,7 @@ val agent: Configuration by configurations.creating
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.12.2")
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.12.3")
     testImplementation("io.github.benas:random-beans")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")

From a222e0bc6328629f05707ab44965840b9015d50d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 May 2021 14:08:09 +0300
Subject: [PATCH 078/486] bump gradle-quality-plugin from 4.5.0 to 4.6.0 (via
 #575)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index e71783c58..3cf7c43d0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ buildscript {
 
     dependencies {
         classpath("com.diffplug.spotless:spotless-plugin-gradle:5.12.4")
-        classpath("ru.vyarus:gradle-quality-plugin:4.5.0")
+        classpath("ru.vyarus:gradle-quality-plugin:4.6.0")
     }
 }
 

From 97620611a9a6c85fcbdb13bff13dc7285ecff8de Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 10 May 2021 14:31:49 +0300
Subject: [PATCH 079/486] bump release action

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ed630f050..edb26b5d9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,4 +15,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2.3.4
+      - name: "Set release version in gradle.properties file"
+        run: |
+          sed -i -e '/version=/s/.*/version=${{ inputs.releaseVersion }}/g' gradle.properties
+          cat gradle.properties
+      - name: "Set next development version in gradle.properties file"
+        run: |
+          sed -i -e '/version=/s/.*/version=${{ inputs.nextVersion }}-SNAPSHOT/g' gradle.properties
+          cat gradle.properties
+
 

From 854e43af0f10c45689755d7b65f79d9e2550468c Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 10 May 2021 14:35:24 +0300
Subject: [PATCH 080/486] fix inputs variable

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index edb26b5d9..23fe91550 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,11 +17,11 @@ jobs:
       - uses: actions/checkout@v2.3.4
       - name: "Set release version in gradle.properties file"
         run: |
-          sed -i -e '/version=/s/.*/version=${{ inputs.releaseVersion }}/g' gradle.properties
+          sed -i -e '/version=/s/.*/version=${{ github.event.inputs.releaseVersion }}/g' gradle.properties
           cat gradle.properties
       - name: "Set next development version in gradle.properties file"
         run: |
-          sed -i -e '/version=/s/.*/version=${{ inputs.nextVersion }}-SNAPSHOT/g' gradle.properties
+          sed -i -e '/version=/s/.*/version=${{ github.event.inputs.nextVersion }}-SNAPSHOT/g' gradle.properties
           cat gradle.properties
 
 

From 65a8bfba1deab07592a09bb1107e2fd26c6cd8d0 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 10 May 2021 14:48:01 +0300
Subject: [PATCH 081/486] set up release workflow

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 23fe91550..f8ef4416e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,14 +14,40 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
+      - name: "check releaseVersion"
+        run: echo "${{ github.event.inputs.releaseVersion }}" | grep -Eq "^\d+\.\d+\.\d+$"
+
+      - name: "check nextVersion"
+        run: echo "${{ github.event.inputs.nextVersion }}" | grep -Eq "^\d+\.\d+$"
+
       - uses: actions/checkout@v2.3.4
+        with:
+          token: ${{ secrets.QAMETA_CI }}
+
+      - name: Configure CI Git User
+        run: |
+          git config --global user.name qameta-ci
+          git config --global user.email qameta-ci@qameta.io
+
       - name: "Set release version in gradle.properties file"
         run: |
           sed -i -e '/version=/s/.*/version=${{ github.event.inputs.releaseVersion }}/g' gradle.properties
           cat gradle.properties
+
+      - name: "Commit release version and create tag"
+        run: |
+          git commit -am "release ${{ github.event.inputs.releaseVersion }}"
+          git tag ${{ github.event.inputs.releaseVersion }}
+          git push origin ${{ github.event.inputs.releaseVersion }}
+
       - name: "Set next development version in gradle.properties file"
         run: |
           sed -i -e '/version=/s/.*/version=${{ github.event.inputs.nextVersion }}-SNAPSHOT/g' gradle.properties
           cat gradle.properties
 
+      - name: "Commit next development version and push it"
+        run: |
+          git commit -am "set next development version ${{ github.event.inputs.releaseVersion }}"
+          git push origin master
+
 

From d54a8a9aebc9c47b9a607152fd35f68a141004f1 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 10 May 2021 15:11:28 +0300
Subject: [PATCH 082/486] fix validations

---
 .github/workflows/release.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f8ef4416e..fbfb94d1b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,17 +14,19 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - name: "check releaseVersion"
-        run: echo "${{ github.event.inputs.releaseVersion }}" | grep -Eq "^\d+\.\d+\.\d+$"
+      - name: "Check release version"
+        run: |
+          [ "${{ github.event.inputs.releaseVersion }}" '=~' '^[0-9]+\.[0-9]+\.[0-9]+$' ]
 
-      - name: "check nextVersion"
-        run: echo "${{ github.event.inputs.nextVersion }}" | grep -Eq "^\d+\.\d+$"
+      - name: "Check next version"
+        run: |
+          [ "${{ github.event.inputs.nextVersion }}" '=~' '^[0-9]+\.[0-9]+$' ]
 
       - uses: actions/checkout@v2.3.4
         with:
           token: ${{ secrets.QAMETA_CI }}
 
-      - name: Configure CI Git User
+      - name: "Configure CI Git User"
         run: |
           git config --global user.name qameta-ci
           git config --global user.email qameta-ci@qameta.io

From 761039390d54fe72b19eec7644b63b5a6978c902 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 10 May 2021 15:19:21 +0300
Subject: [PATCH 083/486] try to use expr for inputs validation

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fbfb94d1b..47a3ff206 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,11 +16,11 @@ jobs:
     steps:
       - name: "Check release version"
         run: |
-          [ "${{ github.event.inputs.releaseVersion }}" '=~' '^[0-9]+\.[0-9]+\.[0-9]+$' ]
+          expr "${{ github.event.inputs.releaseVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
 
       - name: "Check next version"
         run: |
-          [ "${{ github.event.inputs.nextVersion }}" '=~' '^[0-9]+\.[0-9]+$' ]
+          expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
 
       - uses: actions/checkout@v2.3.4
         with:

From f6e13e4d3e6c3a2c4822054e9493a127813139d4 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 10 May 2021 12:20:02 +0000
Subject: [PATCH 084/486] release 2.13.10

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

diff --git a/gradle.properties b/gradle.properties
index 1022fe6b1..9ebd5e23f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.14-SNAPSHOT
+version=2.13.10
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 8cdc4fb44628f531894d33adc7cc74caa142a738 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 10 May 2021 12:20:04 +0000
Subject: [PATCH 085/486] set next development version 2.13.10

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

diff --git a/gradle.properties b/gradle.properties
index 9ebd5e23f..1022fe6b1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.13.10
+version=2.14-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 156c656a7ef2c740efb71f32ed2dcd7ae9f35412 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 10 May 2021 16:50:32 +0300
Subject: [PATCH 086/486] update wf

---
 .github/workflows/build.yml         | 31 +++++++++++++----------------
 .github/workflows/labels-verify.yml |  2 +-
 .github/workflows/publish.yml       | 14 ++++++++-----
 .github/workflows/release-draft.yml |  8 ++++----
 .github/workflows/release.yml       | 12 +++++++++--
 5 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7334f99ef..35003690a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,27 +11,24 @@ on:
       - 'hotfix-*'
 
 jobs:
-  build_8:
-    name: "Build JDK 1.8"
+  build:
+    name: "Build"
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java-version: [ '8.0.x', '11.0.x' ]
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'zulu'
-          java-version: 8.0.x
-      - name: Build with Gradle
-        run: ./gradlew build
-  build_11:
-    name: "Build JDK 11"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
+
+      - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 11.0.x
+          java-version: ${{ matrix.java-version }}
+
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew build -x test
+
+      - name: Run tests
+        if: always()
+        run: ./gradlew test
diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml
index 2c3bd2a1f..077315bba 100644
--- a/.github/workflows/labels-verify.yml
+++ b/.github/workflows/labels-verify.yml
@@ -2,7 +2,7 @@ name: "Verify type labels"
 
 on:
   pull_request:
-    types: [opened, labeled, unlabeled, synchronize]
+    types: [ opened, labeled, unlabeled, synchronize ]
 
 jobs:
   triage:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f1e628065..d7aacdff3 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -2,31 +2,35 @@ name: Publish
 
 on:
   release:
-    types: [published]
+    types: [ published ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
           java-version: 8.0.x
+
       - name: Set up GPG
         run: echo -n "${GPG_PRIVATE_KEY}" | base64 --decode > ${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg
         env:
           GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+
       - name: "Gradle Build"
         run: ./gradlew build -Pversion=${GITHUB_REF:10}
+
       - name: "Gradle Publish"
         run: |
-           ./gradlew publishToSonatype -Pversion=${GITHUB_REF:10} \
-                     -Psigning.keyId=${GPG_KEY_ID} \
-                     -Psigning.password=${GPG_PASSPHRASE} \
-                     -Psigning.secretKeyRingFile=${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg
+          ./gradlew publishToSonatype -Pversion=${GITHUB_REF:10} \
+                    -Psigning.keyId=${GPG_KEY_ID} \
+                    -Psigning.password=${GPG_PASSPHRASE} \
+                    -Psigning.secretKeyRingFile=${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg
         env:
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }}
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_PASSWORD }}
diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml
index caef7cf56..ea9ee55ca 100644
--- a/.github/workflows/release-draft.yml
+++ b/.github/workflows/release-draft.yml
@@ -3,12 +3,12 @@ name: Release Draft
 on:
   push:
     branches:
-    - master
+      - master
 
 jobs:
   update_draft_release:
     runs-on: ubuntu-latest
     steps:
-    - uses: toolmantim/release-drafter@v5.15.0
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+      - uses: toolmantim/release-drafter@v5.15.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 47a3ff206..5afc8430b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,7 +49,15 @@ jobs:
 
       - name: "Commit next development version and push it"
         run: |
-          git commit -am "set next development version ${{ github.event.inputs.releaseVersion }}"
-          git push origin master
+          git commit -am "set next development version ${{ github.event.inputs.nextVersion }}"
+          git push origin ${GITHUB_REF}
 
+      - name: "Publish Github Release"
+        uses: toolmantim/release-drafter@v5.15.0
+        with:
+          tag: ${{ github.event.inputs.releaseVersion }}
+          publish: "true"
+          version: ${{ github.event.inputs.releaseVersion }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.QAMETA_CI }}
 

From dc2287257bef64fe375a7ac285c7587118af884c Mon Sep 17 00:00:00 2001
From: Artem Eroshenko <eroshenkoam@qameta.io>
Date: Tue, 11 May 2021 15:50:25 +0300
Subject: [PATCH 087/486] fix maven publish (via #579)

---
 build.gradle.kts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3cf7c43d0..f534a6363 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -217,6 +217,10 @@ configure(subprojects) {
         (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
     }
 
+    tasks.withType<GenerateModuleMetadata> {
+        enabled = false
+    }
+
     publishing {
         publications {
             create<MavenPublication>("maven") {

From f1252b9c45493e32fef29a33050336636a160e01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 13:41:33 +0300
Subject: [PATCH 088/486] bump actions/checkout from 2 to 2.3.4 (via #580)

---
 .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 35003690a..86fcb6876 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         java-version: [ '8.0.x', '11.0.x' ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index d7aacdff3..02bf97606 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@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v2

From c5491518561525c93446432f96eb4575094f96a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 May 2021 14:41:51 +0300
Subject: [PATCH 089/486] bump mockito-core from 3.9.0 to 3.10.0 (via #581)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index f534a6363..cb2d62fa6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -97,7 +97,7 @@ configure(subprojects) {
             dependency("org.jboss.resteasy:resteasy-client:4.6.0.Final")
             dependency("org.jooq:joor-java-8:0.9.14")
             dependency("org.mock-server:mockserver-netty:5.11.2")
-            dependency("org.mockito:mockito-core:3.9.0")
+            dependency("org.mockito:mockito-core:3.10.0")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From d5d6530b0c8c48f68d48b6de164fca1ab3aaadb7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 May 2021 14:42:12 +0300
Subject: [PATCH 090/486] bump spring-web from 5.3.6 to 5.3.7 (via #582)

---
 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 754716507..a0a11301e 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Spring Web Integration"
 
 val agent: Configuration by configurations.creating
 
-val springWebVersion = "5.3.6"
+val springWebVersion = "5.3.7"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 9b8aef7878575ccfc67115f5786af232a74135ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 May 2021 16:29:29 +0300
Subject: [PATCH 091/486] bump spotless-plugin-gradle from 5.12.4 to 5.12.5
 (via #583)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index cb2d62fa6..b3acb11f9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.12.4")
+        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.12.5")
         classpath("ru.vyarus:gradle-quality-plugin:4.6.0")
     }
 }

From c6e476dbc0db14833a3346e2d1f559d0e572401b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 May 2021 16:29:49 +0300
Subject: [PATCH 092/486] bump selenide from 5.20.4 to 5.21.0 (via #584)

---
 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 c0b0b4e32..9248d6864 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.20.4"
+val selenideVersion = "5.21.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 69af93b69357c0c429676d44a4dcfd5c61840ccf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 May 2021 16:50:10 +0300
Subject: [PATCH 093/486] bump junit-bom from 5.7.1 to 5.7.2 (via #585)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index b3acb11f9..0b42d4565 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -76,7 +76,7 @@ configure(subprojects) {
     dependencyManagement {
         imports {
             mavenBom("com.fasterxml.jackson:jackson-bom:2.12.3")
-            mavenBom("org.junit:junit-bom:5.7.1")
+            mavenBom("org.junit:junit-bom:5.7.2")
         }
         dependencies {
             dependency("com.github.tomakehurst:wiremock:2.27.2")

From dca807f415deb6604a4c433b15f1a1aee9e6cb6e Mon Sep 17 00:00:00 2001
From: Artem Eroshenko <eroshenkoam@qameta.io>
Date: Mon, 17 May 2021 19:43:19 +0300
Subject: [PATCH 094/486] fix testng tests execution order (via #578)

---
 .github/workflows/build.yml                   |  2 +-
 .../io/qameta/allure/test/AllureFeatures.java |  8 +++
 .../io/qameta/allure/testng/AllureTestNg.java |  8 ++-
 .../allure/testng/AllureTestNgTestFilter.java | 35 +++++-----
 .../allure/testng/AllureTestNgTest.java       | 49 +++++++++++---
 .../allure/testng/samples/PriorityTests.java  | 64 +++++++++++++++++++
 6 files changed, 138 insertions(+), 28 deletions(-)
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 86fcb6876..2d2896536 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,4 +31,4 @@ jobs:
 
       - name: Run tests
         if: always()
-        run: ./gradlew test
+        run: ./gradlew --no-build-cache cleanTest test
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 6ae21bc43..d4641dcc8 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
@@ -230,4 +230,12 @@
     @Feature("Filtration")
     @interface Filtration {
     }
+
+    @Documented
+    @Inherited
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ElementType.METHOD, ElementType.TYPE})
+    @Feature("Ordering")
+    @interface Ordering {
+    }
 }
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 9ac145202..9183a589b 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
@@ -144,7 +144,8 @@ public class AllureTestNg implements
     private final AllureLifecycle lifecycle;
     private final AllureTestNgTestFilter testFilter;
 
-    public AllureTestNg(final AllureLifecycle lifecycle, final AllureTestNgTestFilter testFilter) {
+    public AllureTestNg(final AllureLifecycle lifecycle,
+                        final AllureTestNgTestFilter testFilter) {
         this.lifecycle = lifecycle;
         this.testFilter = testFilter;
     }
@@ -154,7 +155,7 @@ public AllureTestNg(final AllureLifecycle lifecycle) {
     }
 
     public AllureTestNg() {
-        this(Allure.getLifecycle(), new AllureTestNgTestFilter());
+        this(Allure.getLifecycle());
     }
 
     public AllureLifecycle getLifecycle() {
@@ -162,7 +163,8 @@ public AllureLifecycle getLifecycle() {
     }
 
     @Override
-    public List<IMethodInstance> intercept(final List<IMethodInstance> methods, final ITestContext context) {
+    public List<IMethodInstance> intercept(final List<IMethodInstance> methods,
+                                           final ITestContext context) {
         return testFilter.intercept(methods, context);
     }
 
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 b07ace62d..37047a919 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
@@ -20,18 +20,18 @@
 import io.qameta.allure.testfilter.TestPlan;
 import io.qameta.allure.testfilter.TestPlanUnknown;
 import io.qameta.allure.testfilter.TestPlanV1_0;
-
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import org.testng.IMethodInstance;
 import org.testng.IMethodInterceptor;
 import org.testng.ITestContext;
 import org.testng.ITestNGMethod;
 import org.testng.internal.ConstructorOrMethod;
 
+import java.lang.reflect.Method;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class AllureTestNgTestFilter implements IMethodInterceptor {
 
     private final TestPlan testPlan;
@@ -46,18 +46,23 @@ public AllureTestNgTestFilter(final TestPlan testPlan) {
 
     @Override
     public List<IMethodInstance> intercept(final List<IMethodInstance> methods, final ITestContext context) {
-        if (testPlan instanceof TestPlanV1_0) {
-            return methods.stream()
-                    .filter(instance -> isSelected(instance.getMethod()))
-                    .collect(Collectors.toList());
-        } else {
-            return methods;
-        }
+        return methods.stream()
+                .filter(this::isSelected)
+                .sorted(Comparator.comparing(
+                        IMethodInstance::getMethod,
+                        Comparator.nullsFirst(Comparator.comparingInt(
+                                ITestNGMethod::getPriority
+                        ))))
+                .collect(Collectors.toList());
+    }
+
+    public boolean isSelected(final IMethodInstance instance) {
+        return isSelected(instance.getMethod());
     }
 
-    public boolean isSelected(final ITestNGMethod instance) {
+    public boolean isSelected(final ITestNGMethod method) {
         if (testPlan instanceof TestPlanV1_0) {
-            return isSelected(instance, (TestPlanV1_0) testPlan);
+            return isSelected(method, (TestPlanV1_0) testPlan);
         } else {
             return true;
         }
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 ccbc6b670..7a4ebe266 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
@@ -38,6 +38,7 @@
 import io.qameta.allure.test.AllureResultsWriterStub;
 import io.qameta.allure.testfilter.TestPlan;
 import io.qameta.allure.testfilter.TestPlanV1_0;
+import io.qameta.allure.testng.samples.PriorityTests;
 import io.qameta.allure.testng.samples.TestsWithIdForFilter;
 import org.assertj.core.api.Condition;
 import org.assertj.core.groups.Tuple;
@@ -50,6 +51,7 @@
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -434,11 +436,20 @@ public void skippedSuiteTest() {
         List<TestResultContainer> testContainers = results.getTestResultContainers();
         assertThat(testResults)
                 .extracting(TestResult::getName, TestResult::getStatus)
-                .contains(
+                .containsExactlyInAnyOrder(
                         tuple("skippedTest", Status.SKIPPED),
+                        tuple("skipSuite", Status.BROKEN),
                         tuple("testWithOneStep", Status.SKIPPED)
                 );
-        assertThat(testContainers).as("Unexpected quantity of testng containers has been written").hasSize(4);
+        assertThat(testContainers)
+                .as("Unexpected quantity of testng containers has been written")
+                .extracting(TestResultContainer::getName)
+                .containsExactlyInAnyOrder(
+                        "Test tag 8",
+                        "Test suite 8",
+                        "io.qameta.allure.testng.samples.SkippedSuite",
+                        "io.qameta.allure.testng.samples.TestsWithSteps"
+                );
 
         assertThat(findTestContainerByName(results, "Test suite 8").getBefores())
                 .as("Before suite container should have a before method with one step")
@@ -677,7 +688,7 @@ public void ownerTest() {
                         .filter(label -> "owner".equals(label.getName()))
                         .map(Label::getValue)
                         .sorted()
-                        .collect(Collectors.joining(",","[","]"))
+                        .collect(Collectors.joining(",", "[", "]"))
                 )
                 .containsExactlyInAnyOrder(
                         tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithOwner", "[charlie]"),
@@ -1141,8 +1152,6 @@ public Object[][] failedFixtures() {
     @Test(dataProvider = "failedFixtures")
     @AllureFeatures.Fixtures
     public void shouldAddBeforeFixtureToFakeTestResult(final String suite, final String fixture) {
-        System.out.println(suite);
-        System.out.println(fixture);
         final AllureResults results = runTestNgSuites(suite);
         final Optional<TestResult> result = results.getTestResults().stream()
                 .filter(r -> r.getName().contains(fixture))
@@ -1156,6 +1165,19 @@ public void shouldAddBeforeFixtureToFakeTestResult(final String suite, final Str
                 .contains(result.get().getUuid());
     }
 
+    @Test
+    @AllureFeatures.Ordering
+    public void shouldOrderTests() {
+        final AllureResults results = runTestPlan(null, PriorityTests.class);
+        final List<String> ordered = results.getTestResults().stream()
+                .sorted(Comparator.comparing(this::getOrderParameter))
+                .map(TestResult::getName)
+                .collect(Collectors.toList());
+        System.out.println(Arrays.toString(ordered.toArray()));
+        assertThat(ordered)
+                .containsExactly("zTest", "yTest", "xTest", "wTest", "vTest", "vTest");
+    }
+
     @Step("Run testng suites {suites}")
     private AllureResults runTestNgSuites(final Consumer<TestNG> configurer,
                                           final String... suites) {
@@ -1338,7 +1360,7 @@ private static void checkTestJavadocDescriptions(List<TestResult> results, Strin
 
     @Test
     @AllureFeatures.Filtration
-    public void simpleFiltration()  {
+    public void simpleFiltration() {
         TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(test1, test2, test3));
         List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
 
@@ -1354,7 +1376,7 @@ public void simpleFiltration()  {
 
     @Test
     @AllureFeatures.Filtration
-    public void onlyId()  {
+    public void onlyId() {
         TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(onlyId2, onlyId4));
         List<TestResult> testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults();
 
@@ -1397,7 +1419,7 @@ public void skippedTest() {
 
     @Test
     @AllureFeatures.Filtration
-    public void correctIdIncorrectSelector()  {
+    public void correctIdIncorrectSelector() {
         TestPlanV1_0 plan = new TestPlanV1_0().setTests(
                 Arrays.asList(test1, test2, correctIdIncorrectSelector, correctIdIncorrectSelectorFailed)
         );
@@ -1413,7 +1435,7 @@ public void correctIdIncorrectSelector()  {
                 );
     }
 
-    public AllureResultsWriterStub runTestPlan(TestPlan plan, final Class<?> ... testClasses) {
+    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));
@@ -1437,4 +1459,13 @@ public AllureResultsWriterStub runTestPlan(TestPlan plan, final Class<?> ... tes
         }
     }
 
+    private Integer getOrderParameter(final TestResult result) {
+        return result.getParameters().stream()
+                .filter(p -> p.getName().equals("order"))
+                .map(Parameter::getValue)
+                .map(Integer::parseInt)
+                .findAny()
+                .orElse(0);
+    }
+
 }
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
new file mode 100644
index 000000000..43997cbdf
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java
@@ -0,0 +1,64 @@
+/*
+ *  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.testng.samples;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static io.qameta.allure.Allure.parameter;
+
+public class PriorityTests {
+
+    private final static String ORDER_PARAMETER = "order";
+
+    private final AtomicInteger cnt = new AtomicInteger();
+
+    @DataProvider(name = "someProvider")
+    public static Object[][] someProvider() {
+        return new Object[][]{
+                new Object[]{1},
+                new Object[]{2}
+        };
+    }
+
+    @Test(dataProvider = "someProvider", priority = 4)
+    public void vTest(int parameter) {
+        parameter(ORDER_PARAMETER, cnt.incrementAndGet());
+    }
+
+    @Test(priority = 3)
+    public void wTest() {
+        parameter(ORDER_PARAMETER, cnt.incrementAndGet());
+    }
+
+    @Test(priority = 2)
+    public void xTest() {
+        parameter(ORDER_PARAMETER, cnt.incrementAndGet());
+    }
+
+    @Test(priority = 1)
+    public void yTest() {
+        parameter(ORDER_PARAMETER, cnt.incrementAndGet());
+    }
+
+    @Test
+    public void zTest() {
+        parameter(ORDER_PARAMETER, cnt.incrementAndGet());
+    }
+
+}

From 4ac3b92c92227ce3133f4d91bcd8eb08b4ebe136 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Thu, 20 May 2021 17:48:25 +0000
Subject: [PATCH 095/486] release 2.14.0

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

diff --git a/gradle.properties b/gradle.properties
index 1022fe6b1..b7700f216 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.14-SNAPSHOT
+version=2.14.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 6df0556dd8053345bc9988297458aded3324e9af Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Thu, 20 May 2021 17:48:27 +0000
Subject: [PATCH 096/486] set next development version 2.15

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

diff --git a/gradle.properties b/gradle.properties
index b7700f216..6b2b860c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.14.0
+version=2.15-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 33ae6797e2afb682ab61dd502ea6613fcee8f53e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 14:20:55 +0300
Subject: [PATCH 097/486] bump rest-assured from 4.3.3 to 4.4.0 (via #587)

---
 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 6634616ac..70620242a 100644
--- a/allure-rest-assured/build.gradle.kts
+++ b/allure-rest-assured/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Rest-Assured Integration"
 
 val agent: Configuration by configurations.creating
 
-val restAssuredVersion = "4.3.3"
+val restAssuredVersion = "4.4.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 26d53be47aed7ade9f0584b8f6b7a636e1d118bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 May 2021 13:13:50 +0300
Subject: [PATCH 098/486] bump commons-io from 2.8.0 to 2.9.0 (via #590)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 0b42d4565..27ce1490e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -83,7 +83,7 @@ configure(subprojects) {
             dependency("com.google.inject:guice:5.0.1")
             dependency("com.google.testing.compile:compile-testing:0.19")
             dependency("com.squareup.retrofit2:retrofit:2.9.0")
-            dependency("commons-io:commons-io:2.8.0")
+            dependency("commons-io:commons-io:2.9.0")
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.4.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")

From c9de13ad5613436c925cd85dad51d0ea8b91606b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 May 2021 13:14:15 +0300
Subject: [PATCH 099/486] bump json-unit from 2.25.0 to 2.26.0 (via #588)

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

diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts
index 21dfc7f5b..5ac50cad0 100644
--- a/allure-jsonunit/build.gradle.kts
+++ b/allure-jsonunit/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure JsonUnit Integration"
 
 val agent: Configuration by configurations.creating
 
-val jsonUnitVersion = "2.25.0"
+val jsonUnitVersion = "2.26.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 19694a29fc25faf1381abe79e4a17e2d884cb3f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 11:15:51 +0300
Subject: [PATCH 100/486] bump selenide from 5.21.0 to 5.22.0 (via #592)

---
 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 9248d6864..8735085d7 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.21.0"
+val selenideVersion = "5.22.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From e5951cc5128f8ed9f882233bb97cbb20c9fe20f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jun 2021 12:39:05 +0300
Subject: [PATCH 101/486] bump mockito-core from 3.10.0 to 3.11.0 (via #591)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 27ce1490e..bd5bad6d1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -97,7 +97,7 @@ configure(subprojects) {
             dependency("org.jboss.resteasy:resteasy-client:4.6.0.Final")
             dependency("org.jooq:joor-java-8:0.9.14")
             dependency("org.mock-server:mockserver-netty:5.11.2")
-            dependency("org.mockito:mockito-core:3.10.0")
+            dependency("org.mockito:mockito-core:3.11.0")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From 5cb59227c9698f3c024fd4113b72fc7547d1b444 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jun 2021 12:43:36 +0300
Subject: [PATCH 102/486] bump spring-web from 5.3.7 to 5.3.8 (via #596)

---
 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 a0a11301e..402caf966 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Spring Web Integration"
 
 val agent: Configuration by configurations.creating
 
-val springWebVersion = "5.3.7"
+val springWebVersion = "5.3.8"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 87e5e9d2f64eb3e923bbb57d4a121622fc3034da Mon Sep 17 00:00:00 2001
From: naresha <naresha.k@gmail.com>
Date: Thu, 10 Jun 2021 16:48:09 +0530
Subject: [PATCH 103/486] add junit platform test unique id to result metadata
 (fixes ##593, via#594)

---
 .../junitplatform/AllureJunitPlatform.java    | 11 ++++++++
 .../AllureJunitPlatformTest.java              | 14 ++++++++++
 .../features/JupiterUniqueIdTest.java         | 28 +++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.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 10ff7c5e8..64d8d6dee 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
@@ -100,6 +100,8 @@ public class AllureJunitPlatform implements TestExecutionListener {
     public static final String EVENT_STOP = "stop";
     public static final String EVENT_FAILURE = "failure";
 
+    public static final String JUNIT_PLATFORM_UNIQUE_ID = "junit.platform.uniqueid";
+
     private static final String STDOUT = "stdout";
     private static final String STDERR = "stderr";
     private static final String TEXT_PLAIN = "text/plain";
@@ -373,6 +375,8 @@ private void startTestCase(final TestIdentifier testIdentifier) {
 
         result.getLabels().addAll(getProvidedLabels());
 
+        result.getLabels().add(getJUnitPlatformUniqueId(testIdentifier));
+
         testClass.map(AnnotationUtils::getLabels).ifPresent(result.getLabels()::addAll);
         testMethod.map(AnnotationUtils::getLabels).ifPresent(result.getLabels()::addAll);
 
@@ -510,6 +514,13 @@ private List<Label> getSourceLabels(final TestSource source) {
         return Collections.emptyList();
     }
 
+    private Label getJUnitPlatformUniqueId(final TestIdentifier testIdentifier) {
+        final Label label = new Label();
+        label.setName(JUNIT_PLATFORM_UNIQUE_ID);
+        label.setValue(testIdentifier.getUniqueId());
+        return label;
+    }
+
     private static class Uuids {
 
         private final Map<TestIdentifier, String> storage = new ConcurrentHashMap<>();
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 d0233f581..3ee5ed814 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
@@ -26,6 +26,7 @@
 import io.qameta.allure.junitplatform.features.DisabledTests;
 import io.qameta.allure.junitplatform.features.DynamicTests;
 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.OneTest;
 import io.qameta.allure.junitplatform.features.OwnerTest;
@@ -70,6 +71,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.JUNIT_PLATFORM_UNIQUE_ID;
 import static io.qameta.allure.junitplatform.AllureJunitPlatformTestUtils.runClasses;
 import static io.qameta.allure.junitplatform.features.TaggedTests.CLASS_TAG;
 import static io.qameta.allure.junitplatform.features.TaggedTests.METHOD_TAG;
@@ -759,4 +761,16 @@ void shouldSupportAllureIdAnnotations() {
 
     }
 
+    @AllureFeatures.Base
+    @Test
+    void shouldPopulateTestCaseId() {
+        final AllureResults results = runClasses(JupiterUniqueIdTest.class);
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .filteredOn("name", JUNIT_PLATFORM_UNIQUE_ID)
+                .extracting(Label::getValue)
+                .first()
+                .isEqualTo("[engine:junit-jupiter]/[class:io.qameta.allure.junitplatform.features.JupiterUniqueIdTest]/[method:jupiterTest()]");
+    }
 }
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
new file mode 100644
index 000000000..2ff1ecf52
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java
@@ -0,0 +1,28 @@
+/*
+ *  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.junitplatform.features;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author naresha (Naresha K)
+ */
+public class JupiterUniqueIdTest {
+
+    @Test
+    void jupiterTest() {
+    }
+}

From 7f33882a958f366da4376a29eeecc846138198ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jun 2021 10:41:49 +0300
Subject: [PATCH 104/486] bump spotless-plugin-gradle from 5.12.5 to 5.13.0
 (via #598)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index bd5bad6d1..b446e37bb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.12.5")
+        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.13.0")
         classpath("ru.vyarus:gradle-quality-plugin:4.6.0")
     }
 }

From 49e374a3ca0b060ad07ea2436c197f4fb71a0cd1 Mon Sep 17 00:00:00 2001
From: Michael Werle <mkw-github@coruscations.com>
Date: Mon, 14 Jun 2021 06:34:22 -0500
Subject: [PATCH 105/486] remove unnecessary dependencies (fixes #595, via
 #597)

---
 allure-java-commons/build.gradle.kts          |  2 -
 .../io/qameta/allure/util/NamingUtils.java    | 44 +++++++++++++++++--
 .../io/qameta/allure/util/ResultsUtils.java   | 18 +++++++-
 build.gradle.kts                              |  2 -
 4 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts
index 3d2000b20..5c7d7d2bb 100644
--- a/allure-java-commons/build.gradle.kts
+++ b/allure-java-commons/build.gradle.kts
@@ -8,8 +8,6 @@ dependencies {
     api(project(":allure-model"))
     compileOnly("org.aspectj:aspectjrt")
     implementation("com.fasterxml.jackson.core:jackson-databind")
-    implementation("org.apache.tika:tika-core")
-    implementation("org.jooq:joor-java-8")
     testImplementation("io.github.benas:random-beans")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.apache.commons:commons-lang3")
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 716d6595f..f52209b51 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,6 +18,7 @@
 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;
@@ -29,8 +30,6 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import static org.joor.Reflect.on;
-
 /**
  * @author charlie (Dmitry Baev).
  */
@@ -88,9 +87,48 @@ private static String extractProperties(final Object object, final String[] part
                         .map(child -> extractProperties(child, parts, index))
                         .collect(JOINER);
             }
-            final Object child = on(object).get(parts[index]);
+            final Object child = extractChild(object, parts[index]);
             return extractProperties(child, parts, index + 1);
         }
         return ObjectUtils.toString(object);
     }
+
+    private static Object extractChild(final Object object, final String part) {
+        final Class<?> type = object == null ? Object.class : object.getClass();
+        try {
+            return extractField(object, part, type);
+        } 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;
+        }
+    }
+
+    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/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index b3a4beb88..4f6e01a45 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
@@ -27,10 +27,10 @@
 import io.qameta.allure.model.Parameter;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StatusDetails;
-import org.apache.tika.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -60,6 +60,7 @@
  */
 @SuppressWarnings({
         "ClassFanOutComplexity",
+        "ClassDataAbstractionCoupling",
         "PMD.ExcessiveImports",
         "PMD.TooManyMethods",
         "PMD.GodClass",
@@ -394,7 +395,7 @@ private static Optional<String> readResource(final ClassLoader classLoader, fina
             if (Objects.isNull(is)) {
                 return Optional.empty();
             }
-            final byte[] bytes = IOUtils.toByteArray(is);
+            final byte[] bytes = toBytes(is);
             return Optional.of(new String(bytes, StandardCharsets.UTF_8));
         } catch (IOException e) {
             LOGGER.warn("Unable to process description resource file", e);
@@ -402,6 +403,19 @@ private static Optional<String> readResource(final ClassLoader classLoader, fina
         return Optional.empty();
     }
 
+    private static byte[] toBytes(final InputStream is) throws IOException {
+        final ByteArrayOutputStream output = new ByteArrayOutputStream();
+        final byte[] buffer = new byte[4096];
+        int n;
+        do {
+            n = is.read(buffer);
+            if (n > 0) {
+                output.write(buffer, 0, n);
+            }
+        } while (-1 != n);
+        return output.toByteArray();
+    }
+
     private static boolean separateLines() {
         return parseBoolean(loadAllureProperties().getProperty(ALLURE_SEPARATE_LINES_SYSPROP));
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index b446e37bb..305f9334a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -88,14 +88,12 @@ configure(subprojects) {
             dependency("io.github.glytching:junit-extensions:2.4.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
-            dependency("org.apache.tika:tika-core:1.26")
             dependency("org.aspectj:aspectjrt:1.9.6")
             dependency("org.aspectj:aspectjweaver:1.9.6")
             dependency("org.assertj:assertj-core:3.19.0")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.6.0.Final")
-            dependency("org.jooq:joor-java-8:0.9.14")
             dependency("org.mock-server:mockserver-netty:5.11.2")
             dependency("org.mockito:mockito-core:3.11.0")
             dependencySet("org.slf4j:1.7.30") {

From 275d32bb48f83e823df740a161d2ef3724bf89bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jun 2021 15:03:47 +0300
Subject: [PATCH 106/486] bump mockito-core from 3.11.0 to 3.11.1 (via #599)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 305f9334a..b8ac5a5ff 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -95,7 +95,7 @@ configure(subprojects) {
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.6.0.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
-            dependency("org.mockito:mockito-core:3.11.0")
+            dependency("org.mockito:mockito-core:3.11.1")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From 46fd6c57f829eb92cbd85d98a070f6d4ee5d2f9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jun 2021 15:04:10 +0300
Subject: [PATCH 107/486] bump commons-io from 2.9.0 to 2.10.0 (via #600)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index b8ac5a5ff..687291e1a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -83,7 +83,7 @@ configure(subprojects) {
             dependency("com.google.inject:guice:5.0.1")
             dependency("com.google.testing.compile:compile-testing:0.19")
             dependency("com.squareup.retrofit2:retrofit:2.9.0")
-            dependency("commons-io:commons-io:2.9.0")
+            dependency("commons-io:commons-io:2.10.0")
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.4.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")

From 2762164edd9f39dbd14f16a2efe90df9e1bedac9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jun 2021 17:57:50 +0300
Subject: [PATCH 108/486] bump assertj-core from 3.19.0 to 3.20.0 (via #602)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 687291e1a..678bec046 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -90,7 +90,7 @@ configure(subprojects) {
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
             dependency("org.aspectj:aspectjrt:1.9.6")
             dependency("org.aspectj:aspectjweaver:1.9.6")
-            dependency("org.assertj:assertj-core:3.19.0")
+            dependency("org.assertj:assertj-core:3.20.0")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.6.0.Final")

From 2f5e6d9102a6bfce53d96a6aaa8d783580976f3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 4 Jul 2021 14:03:23 +0300
Subject: [PATCH 109/486] bump assertj-core from 3.20.0 to 3.20.2 (via #607)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 678bec046..6c19fb718 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -90,7 +90,7 @@ configure(subprojects) {
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
             dependency("org.aspectj:aspectjrt:1.9.6")
             dependency("org.aspectj:aspectjweaver:1.9.6")
-            dependency("org.assertj:assertj-core:3.20.0")
+            dependency("org.assertj:assertj-core:3.20.2")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.6.0.Final")

From 09b959dde9ab876a8dc9fcab6ba701bd2ffb0c35 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 4 Jul 2021 14:03:43 +0300
Subject: [PATCH 110/486] bump resteasy-client from 4.6.0.Final to 4.6.1.Final
 (via #606)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 6c19fb718..5f44c0812 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -93,7 +93,7 @@ configure(subprojects) {
             dependency("org.assertj:assertj-core:3.20.2")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
-            dependency("org.jboss.resteasy:resteasy-client:4.6.0.Final")
+            dependency("org.jboss.resteasy:resteasy-client:4.6.1.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
             dependency("org.mockito:mockito-core:3.11.1")
             dependencySet("org.slf4j:1.7.30") {

From 0cd601aeec85246010fa7962aa980247b46161df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 4 Jul 2021 14:23:31 +0300
Subject: [PATCH 111/486] bump selenide from 5.22.0 to 5.22.2 (via #611)

---
 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 8735085d7..90f42559d 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.22.0"
+val selenideVersion = "5.22.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 8c34f58374c3e24347be1df10d321b2177fb4454 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 4 Jul 2021 15:47:28 +0300
Subject: [PATCH 112/486] bump mockito-core from 3.11.1 to 3.11.2 (via #612)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 5f44c0812..42e2cad8f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -95,7 +95,7 @@ configure(subprojects) {
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.6.1.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
-            dependency("org.mockito:mockito-core:3.11.1")
+            dependency("org.mockito:mockito-core:3.11.2")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From 4c6200ec4227ad5e911295eeb1b25b90ef71b396 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 4 Jul 2021 15:47:47 +0300
Subject: [PATCH 113/486] bump aspectjweaver from 1.9.6 to 1.9.7 (via #610)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 42e2cad8f..6e974787b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -89,7 +89,7 @@ configure(subprojects) {
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
             dependency("org.aspectj:aspectjrt:1.9.6")
-            dependency("org.aspectj:aspectjweaver:1.9.6")
+            dependency("org.aspectj:aspectjweaver:1.9.7")
             dependency("org.assertj:assertj-core:3.20.2")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")

From ae7a1726a4d0ef764442a4f9cac35b08083bdda7 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 5 Jul 2021 19:27:56 +0300
Subject: [PATCH 114/486] shadow jackson deps and remove deprecations (via
 #615)

---
 .github/workflows/build.yml                   |   2 +-
 allure-bom/build.gradle.kts                   |  33 +
 allure-java-commons/build.gradle.kts          |  58 +-
 .../io/qameta/allure/AllureConstants.java     |  12 -
 .../java/io/qameta/allure/AllureUtils.java    |  46 --
 .../allure/FileSystemResultsReader.java       | 120 ----
 .../allure/FileSystemResultsWriter.java       |   2 +-
 .../allure/internal/Allure2ModelJackson.java  | 107 +++
 .../io/qameta/allure/util/ResultsUtils.java   |  12 +-
 .../junitplatform/AllureJunitPlatform.java    |  17 +-
 allure-model/build.gradle.kts                 |   1 -
 .../io/qameta/allure/model/Attachment.java    |  95 +--
 .../qameta/allure/model/ExecutableItem.java   | 435 +------------
 .../io/qameta/allure/model/FixtureResult.java | 357 +++++-----
 .../java/io/qameta/allure/model/Label.java    |  58 +-
 .../java/io/qameta/allure/model/Link.java     |  82 +--
 .../io/qameta/allure/model/Parameter.java     | 135 +++-
 .../java/io/qameta/allure/model/Stage.java    |  40 +-
 .../allure/model/StageDeserializer.java       |  41 --
 .../java/io/qameta/allure/model/Status.java   |  38 +-
 .../io/qameta/allure/model/StatusDetails.java | 118 ++--
 .../io/qameta/allure/model/StepResult.java    | 359 +++++------
 .../io/qameta/allure/model/TestResult.java    | 607 +++++++-----------
 .../allure/model/TestResultContainer.java     | 429 +++----------
 .../io/qameta/allure/model/TestRunResult.java |  98 ---
 .../qameta/allure/model/WithAttachments.java  |  15 +-
 .../io/qameta/allure/model/WithLinks.java     |  14 +-
 .../qameta/allure/model/WithParameters.java   |  15 +-
 .../io/qameta/allure/model/WithStatus.java    |  14 +-
 .../allure/model/WithStatusDetails.java       |  15 +-
 .../io/qameta/allure/model/WithSteps.java     |  15 +-
 allure-reader/build.gradle.kts                |  29 +
 .../allure/reader/AllureEnumDeserializer.java |  32 +-
 .../reader/AllureObjectMapperFactory.java     |  29 +-
 .../reader/ParameterModeDeserializer.java     |  26 +-
 .../allure/reader/StageDeserializer.java      |  29 +-
 .../allure/reader/StatusDeserializer.java     |  27 +
 allure-test-filter/build.gradle.kts           |  68 +-
 .../testfilter/FileTestPlanSupplier.java      |   7 +-
 .../allure/testfilter/TestPlanV1_0.java       |   2 +-
 .../io/qameta/allure/testng/AllureTestNg.java |  85 +--
 .../allure/testng/AllureTestNgTest.java       |   3 +-
 build.gradle.kts                              | 228 ++++---
 gradle.properties                             |   4 +
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew.bat                                   | 178 ++---
 settings.gradle.kts                           |  33 +
 47 files changed, 1745 insertions(+), 2427 deletions(-)
 create mode 100644 allure-bom/build.gradle.kts
 delete mode 100644 allure-java-commons/src/main/java/io/qameta/allure/AllureUtils.java
 delete mode 100644 allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsReader.java
 create mode 100644 allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
 delete mode 100644 allure-model/src/main/java/io/qameta/allure/model/StageDeserializer.java
 delete mode 100644 allure-model/src/main/java/io/qameta/allure/model/TestRunResult.java
 create mode 100644 allure-reader/build.gradle.kts
 rename allure-model/src/main/java/io/qameta/allure/model/StatusDeserializer.java => allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java (56%)
 rename allure-model/src/main/java/io/qameta/allure/model/Allure2ModelJackson.java => allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java (55%)
 rename allure-java-commons/src/main/java/io/qameta/allure/ReadError.java => allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java (54%)
 rename allure-java-commons/src/main/java/io/qameta/allure/AllureResultsReader.java => allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java (53%)
 create mode 100644 allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.java

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2d2896536..6009acaf8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
           java-version: ${{ matrix.java-version }}
 
       - name: Build with Gradle
-        run: ./gradlew build -x test
+        run: ./gradlew build -x test --scan
 
       - name: Run tests
         if: always()
diff --git a/allure-bom/build.gradle.kts b/allure-bom/build.gradle.kts
new file mode 100644
index 000000000..9593300aa
--- /dev/null
+++ b/allure-bom/build.gradle.kts
@@ -0,0 +1,33 @@
+plugins {
+    `java-platform`
+}
+
+description = "Allure Java (Bill of Materials)"
+
+dependencies {
+    constraints {
+        rootProject.subprojects.sorted()
+                .forEach { api("${it.group}:${it.name}:${it.version}") }
+    }
+}
+
+tasks.withType(Jar::class) {
+    enabled = false
+}
+
+configurations.archives {
+    artifacts.removeAll{ it.extension == "jar" }
+}
+
+publishing.publications.named<MavenPublication>("maven") {
+    pom {
+        from(components["javaPlatform"])
+        description.set("This Bill of Materials POM can be used to ease dependency management " +
+                "when referencing multiple Allure artifacts using Gradle or Maven.")
+        packaging = "pom"
+        withXml {
+            val filteredContent = asString().replace("\\s*<scope>compile</scope>".toRegex(), "")
+            asString().clear().append(filteredContent)
+        }
+    }
+}
diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts
index 5c7d7d2bb..0c4f06028 100644
--- a/allure-java-commons/build.gradle.kts
+++ b/allure-java-commons/build.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("com.github.johnrengelman.shadow")
+}
+
 description = "Allure Java Commons"
 
 val agent: Configuration by configurations.creating
@@ -7,7 +11,7 @@ dependencies {
     api("org.slf4j:slf4j-api")
     api(project(":allure-model"))
     compileOnly("org.aspectj:aspectjrt")
-    implementation("com.fasterxml.jackson.core:jackson-databind")
+    internal("com.fasterxml.jackson.core:jackson-databind")
     testImplementation("io.github.benas:random-beans")
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.apache.commons:commons-lang3")
@@ -21,17 +25,51 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.jar {
-    manifest {
-        attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.commons"
-        ))
+configurations.forEach { configuration ->
+    configuration.outgoing.apply {
+        val removed = artifacts.removeAll { it.classifier.isNullOrEmpty() }
+        if (removed) {
+            artifact(tasks.shadowJar) {
+                classifier = ""
+            }
+        }
     }
 }
 
-tasks.test {
-    useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
+tasks {
+    jar {
+        dependsOn(shadowJar)
+        enabled = false
+    }
+
+    shadowJar {
+        archiveClassifier.set("")
+        relocate("com.fasterxml.jackson", "io.qameta.allure.internal.shadowed.jackson")
+        dependencies {
+            include(dependency("com.fasterxml.jackson.core::"))
+        }
+        exclude("**/module-info.class")
+        exclude("META-INF/LICENSE*.md")
+        mergeServiceFiles()
+        manifest {
+            attributes(mapOf(
+                    "Specification-Title" to project.name,
+                    "Implementation-Title" to project.name,
+                    "Implementation-Version" to project.version,
+                    "Automatic-Module-Name" to "io.qameta.allure.commons"
+            ))
+        }
+    }
+
+    assemble {
+        dependsOn(shadowJar)
+    }
+
+    test {
+        dependsOn(shadowJar)
+        useJUnitPlatform()
+        doFirst {
+            jvmArgs("-javaagent:${agent.singleFile}")
+        }
     }
 }
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 481e6ae6a..7e432af99 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
@@ -30,18 +30,6 @@ public final class AllureConstants {
 
     public static final String TEST_RESULT_CONTAINER_FILE_GLOB = "*-container.json";
 
-    /**
-     * @deprecated scheduled to remove in 3.0
-     */
-    @Deprecated
-    public static final String TEST_RUN_FILE_SUFFIX = "-testrun.json";
-
-    /**
-     * @deprecated scheduled to remove in 3.0
-     */
-    @Deprecated
-    public static final String TEST_RUN_FILE_GLOB = "*-testrun.json";
-
     public static final String ATTACHMENT_FILE_SUFFIX = "-attachment";
 
     public static final String ATTACHMENT_FILE_GLOB = "*-attachment*";
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/AllureUtils.java
deleted file mode 100644
index a48951f2c..000000000
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureUtils.java
+++ /dev/null
@@ -1,46 +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;
-
-import java.util.UUID;
-
-/**
- * @author charlie (Dmitry Baev).
- * @deprecated scheduled to remove in 3.0.
- */
-@Deprecated
-public final class AllureUtils {
-
-    private AllureUtils() {
-        throw new IllegalStateException("Do not instance");
-    }
-
-    public static String generateTestResultName() {
-        return generateTestResultName(UUID.randomUUID().toString());
-    }
-
-    public static String generateTestResultName(final String uuid) {
-        return uuid + AllureConstants.TEST_RESULT_FILE_SUFFIX;
-    }
-
-    public static String generateTestResultContainerName() {
-        return generateTestResultContainerName(UUID.randomUUID().toString());
-    }
-
-    public static String generateTestResultContainerName(final String uuid) {
-        return uuid + AllureConstants.TEST_RESULT_CONTAINER_FILE_SUFFIX;
-    }
-}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsReader.java b/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsReader.java
deleted file mode 100644
index a504eb158..000000000
--- a/allure-java-commons/src/main/java/io/qameta/allure/FileSystemResultsReader.java
+++ /dev/null
@@ -1,120 +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;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.qameta.allure.model.Allure2ModelJackson;
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.model.TestResultContainer;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import static io.qameta.allure.AllureConstants.ATTACHMENT_FILE_GLOB;
-import static io.qameta.allure.AllureConstants.TEST_RESULT_CONTAINER_FILE_GLOB;
-import static io.qameta.allure.AllureConstants.TEST_RESULT_FILE_GLOB;
-import static java.nio.file.Files.newDirectoryStream;
-
-/**
- * @author charlie (Dmitry Baev).
- * @deprecated scheduled to remove in 3.0
- */
-@Deprecated
-public class FileSystemResultsReader implements AllureResultsReader {
-
-    private final Path resultsDirectory;
-
-    private final ObjectMapper mapper;
-
-    private final List<ReadError> errors = new ArrayList<>();
-
-    public FileSystemResultsReader(final Path resultsDirectory) {
-        this.resultsDirectory = resultsDirectory;
-        this.mapper = Allure2ModelJackson.createMapper();
-    }
-
-    @Override
-    public Stream<TestResult> readTestResults() {
-        return listFiles(resultsDirectory, TEST_RESULT_FILE_GLOB)
-                .map(this::readTestResult)
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-    @Override
-    public Stream<TestResultContainer> readTestResultsContainers() {
-        return listFiles(resultsDirectory, TEST_RESULT_CONTAINER_FILE_GLOB)
-                .map(this::readTestResultContainer)
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-    @Override
-    public Stream<String> findAllAttachments() {
-        return listFiles(resultsDirectory, ATTACHMENT_FILE_GLOB)
-                .map(Path::getFileName)
-                .map(Path::toString);
-    }
-
-    @Override
-    public InputStream readAttachment(final String source) throws IOException {
-        return Files.newInputStream(resultsDirectory.resolve(source));
-    }
-
-    @Override
-    public List<ReadError> getErrors() {
-        return errors;
-    }
-
-    private Optional<TestResult> readTestResult(final Path file) {
-        try (InputStream is = Files.newInputStream(file)) {
-            return Optional.ofNullable(mapper.readValue(is, TestResult.class));
-        } catch (IOException e) {
-            errors.add(new ReadError(e, "Could not read result file {}", file));
-            return Optional.empty();
-        }
-    }
-
-    private Optional<TestResultContainer> readTestResultContainer(final Path file) {
-        try (InputStream is = Files.newInputStream(file)) {
-            return Optional.ofNullable(mapper.readValue(is, TestResultContainer.class));
-        } catch (IOException e) {
-            errors.add(new ReadError(e, "Could not read result container file {}", file));
-            return Optional.empty();
-        }
-    }
-
-    private Stream<Path> listFiles(final Path directory, final String glob) {
-        try (DirectoryStream<Path> directoryStream = newDirectoryStream(directory, glob)) {
-            return StreamSupport.stream(directoryStream.spliterator(), false)
-                    .filter(Files::isRegularFile)
-                    .collect(Collectors.toList())
-                    .stream();
-        } catch (IOException e) {
-            errors.add(new ReadError(e, "Could not list files in directory {}", directory));
-            return Stream.empty();
-        }
-    }
-}
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 3e318ed7e..3e361b07b 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
@@ -16,7 +16,7 @@
 package io.qameta.allure;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.qameta.allure.model.Allure2ModelJackson;
+import io.qameta.allure.internal.Allure2ModelJackson;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
 
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
new file mode 100644
index 000000000..db9e137c5
--- /dev/null
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/Allure2ModelJackson.java
@@ -0,0 +1,107 @@
+/*
+ *  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.internal;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
+
+import java.io.IOException;
+import java.util.Locale;
+
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+import static com.fasterxml.jackson.databind.MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME;
+import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT;
+
+/**
+ * The type Allure 2 model jackson.
+ *
+ * @author baev (Dmitry Baev).
+ */
+@SuppressWarnings("PMD.ClassNamingConventions")
+public final class Allure2ModelJackson {
+
+    public static final String INDENT_OUTPUT_PROPERTY_NAME = "allure.results.indentOutput";
+
+    private Allure2ModelJackson() {
+        throw new IllegalStateException("Do not instance Allure2ModelJackson");
+    }
+
+    public static ObjectMapper createMapper() {
+        return new ObjectMapper()
+                .configure(USE_WRAPPER_NAME_AS_PROPERTY_NAME, true)
+                .setSerializationInclusion(NON_NULL)
+                .configure(INDENT_OUTPUT, Boolean.getBoolean(INDENT_OUTPUT_PROPERTY_NAME))
+                .registerModule(new SimpleModule()
+                        .addSerializer(Status.class, new StatusSerializer())
+                        .addSerializer(Stage.class, new StageSerializer())
+                        .addSerializer(Parameter.Mode.class, new ParameterModeSerializer())
+                );
+    }
+
+    /**
+     * 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/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index 4f6e01a45..c49cba794 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
@@ -48,6 +48,7 @@
 import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -372,20 +373,17 @@ private static String getStackTraceAsString(final Throwable throwable) {
         return stringWriter.toString();
     }
 
-    /**
-     * @deprecated use {@link #getJavadocDescription(ClassLoader, Method)} instead.
-     */
-    @Deprecated
     public static void processDescription(final ClassLoader classLoader,
                                           final Method method,
-                                          final io.qameta.allure.model.ExecutableItem item) {
+                                          final Consumer<String> setDescription,
+                                          final Consumer<String> setDescriptionHtml) {
         if (method.isAnnotationPresent(Description.class)) {
             if (method.getAnnotation(Description.class).useJavaDoc()) {
                 getJavadocDescription(classLoader, method)
-                        .ifPresent(item::setDescriptionHtml);
+                        .ifPresent(setDescriptionHtml);
             } else {
                 final String description = method.getAnnotation(Description.class).value();
-                item.setDescription(description);
+                setDescription.accept(description);
             }
         }
     }
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 64d8d6dee..a4164acdd 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
@@ -46,6 +46,7 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -81,7 +82,6 @@
  * @author ehborisov
  */
 @SuppressWarnings({
-        "deprecation",
         "ClassFanOutComplexity",
         "MultipleStringLiterals",
         "ClassDataAbstractionCoupling",
@@ -89,19 +89,14 @@
 })
 public class AllureJunitPlatform implements TestExecutionListener {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AllureJunitPlatform.class);
-
     public static final String ALLURE_FIXTURE = "allure.fixture";
-
     public static final String PREPARE = "prepare";
     public static final String TEAR_DOWN = "tear_down";
-
     public static final String EVENT_START = "start";
     public static final String EVENT_STOP = "stop";
     public static final String EVENT_FAILURE = "failure";
-
     public static final String JUNIT_PLATFORM_UNIQUE_ID = "junit.platform.uniqueid";
-
+    private static final Logger LOGGER = LoggerFactory.getLogger(AllureJunitPlatform.class);
     private static final String STDOUT = "stdout";
     private static final String STDERR = "stderr";
     private static final String TEXT_PLAIN = "text/plain";
@@ -286,7 +281,7 @@ private void stopTestContainer(final TestIdentifier testIdentifier) {
         }
         final String uuid = maybeUuid.get();
         final TestPlan context = testPlanStorage.get();
-        final Set<String> children = Optional.ofNullable(context)
+        final List<String> children = Optional.ofNullable(context)
                 .map(tp -> tp.getDescendants(testIdentifier))
                 .orElseGet(Collections::emptySet)
                 .stream()
@@ -294,7 +289,8 @@ private void stopTestContainer(final TestIdentifier testIdentifier) {
                 .map(tests::get)
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .collect(Collectors.toCollection(HashSet::new));
+                .distinct()
+                .collect(Collectors.toCollection(ArrayList::new));
 
         if (testIdentifier.isTest()) {
             tests.get(testIdentifier).ifPresent(children::add);
@@ -416,7 +412,8 @@ private void startTestCase(final TestIdentifier testIdentifier) {
         testMethod.ifPresent(method -> ResultsUtils.processDescription(
                 method.getDeclaringClass().getClassLoader(),
                 method,
-                result
+                result::setDescription,
+                result::setDescriptionHtml
         ));
 
         getLifecycle().scheduleTestCase(result);
diff --git a/allure-model/build.gradle.kts b/allure-model/build.gradle.kts
index 5d8287fdf..dcc2389fc 100644
--- a/allure-model/build.gradle.kts
+++ b/allure-model/build.gradle.kts
@@ -4,7 +4,6 @@ val agent: Configuration by configurations.creating
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.12.3")
     testImplementation("io.github.benas:random-beans")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
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 fcf57ab6d..750bc7239 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
@@ -18,37 +18,35 @@
 import java.io.Serializable;
 
 /**
- * POJO that stores attachment information.
+ * The model object that used to link attachment files, stored in results directory,
+ * to test results.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.WithAttachments
+ * @since 2.0
  */
 public class Attachment implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    protected String name;
-
-    protected String source;
-
-    protected String type;
+    private String name;
+    private String source;
+    private String type;
 
     /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
+     * Gets name.
+     *
+     * @return the name
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     * Sets name.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
     public Attachment setName(final String value) {
         this.name = value;
@@ -56,24 +54,19 @@ public Attachment setName(final String value) {
     }
 
     /**
-     * Gets the value of the source property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
+     * Gets source.
+     *
+     * @return the source
      */
     public String getSource() {
         return source;
     }
 
     /**
-     * Sets the value of the source property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     * Sets source.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
     public Attachment setSource(final String value) {
         this.source = value;
@@ -81,51 +74,23 @@ public Attachment setSource(final String value) {
     }
 
     /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
+     * Gets type.
+     *
+     * @return the type
      */
     public String getType() {
         return type;
     }
 
     /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     * Sets type.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
     public Attachment setType(final String value) {
         this.type = value;
         return this;
     }
 
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public Attachment withName(final String value) {
-        return setName(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public Attachment withSource(final String value) {
-        return setSource(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public Attachment withType(final String value) {
-        return setType(value);
-    }
 }
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 e6de82585..b73cfee17 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 2019 Qameta Software OÜ
+ *  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.
@@ -15,435 +15,16 @@
  */
 package io.qameta.allure.model;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 /**
- * POJO that stores common information about executable items.
+ * Marker interface for model objects that holds information about
+ * executable items, like test results, fixture results or steps.
  *
- * @deprecated scheduled to removal in 3.0 release.
+ * @author charlie (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
  */
-@Deprecated
-@SuppressWarnings("PMD.ExcessivePublicCount")
-public abstract class ExecutableItem implements Serializable, WithAttachments,
+public interface ExecutableItem extends WithAttachments,
         WithParameters, WithStatusDetails, WithSteps {
 
-    private static final long serialVersionUID = 1L;
-
-    protected String name;
-
-    protected Status status;
-
-    protected StatusDetails statusDetails;
-
-    protected Stage stage;
-
-    protected String description;
-
-    protected String descriptionHtml;
-
-    protected List<StepResult> steps;
-
-    protected List<Attachment> attachments;
-
-    protected List<Parameter> parameters;
-
-    protected Long start;
-
-    protected Long stop;
-
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public ExecutableItem setName(final String value) {
-        this.name = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the status property.
-     *
-     * @return possible object is
-     * {@link Status }
-     */
-    @Override
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     *
-     * @param value allowed object is
-     *              {@link Status }
-     */
-    public ExecutableItem setStatus(final Status value) {
-        this.status = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the statusDetails property.
-     *
-     * @return possible object is
-     * {@link StatusDetails }
-     */
-    @Override
-    public StatusDetails getStatusDetails() {
-        return statusDetails;
-    }
-
-    /**
-     * Sets the value of the statusDetails property.
-     *
-     * @param value allowed object is
-     *              {@link StatusDetails }
-     */
-    public ExecutableItem setStatusDetails(final StatusDetails value) {
-        this.statusDetails = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the stage property.
-     *
-     * @return possible object is
-     * {@link Stage }
-     */
-    public Stage getStage() {
-        return stage;
-    }
-
-    /**
-     * Sets the value of the stage property.
-     *
-     * @param value allowed object is
-     *              {@link Stage }
-     */
-    public ExecutableItem setStage(final Stage value) {
-        this.stage = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public ExecutableItem setDescription(final String value) {
-        this.description = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the descriptionHtml property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getDescriptionHtml() {
-        return descriptionHtml;
-    }
-
-    /**
-     * Sets the value of the descriptionHtml property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public ExecutableItem setDescriptionHtml(final String value) {
-        this.descriptionHtml = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the start property.
-     *
-     * @return possible object is
-     * {@link Long }
-     */
-    public Long getStart() {
-        return start;
-    }
-
-    /**
-     * Sets the value of the start property.
-     *
-     * @param value allowed object is
-     *              {@link Long }
-     */
-    public ExecutableItem setStart(final Long value) {
-        this.start = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the stop property.
-     *
-     * @return possible object is
-     * {@link Long }
-     */
-    public Long getStop() {
-        return stop;
-    }
-
-    /**
-     * Sets the value of the stop property.
-     *
-     * @param value allowed object is
-     *              {@link Long }
-     */
-    public ExecutableItem setStop(final Long value) {
-        this.stop = value;
-        return this;
-    }
-
-    @Override
-    public List<StepResult> getSteps() {
-        if (steps == null) {
-            steps = new ArrayList<>();
-        }
-        return steps;
-    }
-
-    public ExecutableItem setSteps(final List<StepResult> steps) {
-        this.steps = steps;
-        return this;
-    }
-
-    public ExecutableItem setSteps(final StepResult... values) {
-        if (values != null) {
-            for (StepResult value : values) {
-                getSteps().add(value);
-            }
-        }
-        return this;
-    }
-
-    public ExecutableItem setSteps(final Collection<StepResult> values) {
-        if (values != null) {
-            getSteps().addAll(values);
-        }
-        return this;
-    }
-
-    @Override
-    public List<Attachment> getAttachments() {
-        if (attachments == null) {
-            attachments = new ArrayList<>();
-        }
-        return attachments;
-    }
-
-    public ExecutableItem setAttachments(final List<Attachment> attachments) {
-        this.attachments = attachments;
-        return this;
-    }
-
-    public ExecutableItem setAttachments(final Attachment... values) {
-        if (values != null) {
-            for (Attachment value : values) {
-                getAttachments().add(value);
-            }
-        }
-        return this;
-    }
-
-    public ExecutableItem setAttachments(final Collection<Attachment> values) {
-        if (values != null) {
-            getAttachments().addAll(values);
-        }
-        return this;
-    }
-
-    @Override
-    public List<Parameter> getParameters() {
-        if (parameters == null) {
-            parameters = new ArrayList<>();
-        }
-        return parameters;
-    }
-
-    public ExecutableItem setParameters(final List<Parameter> parameters) {
-        this.parameters = parameters;
-        return this;
-    }
-
-    public ExecutableItem setParameters(final Parameter... values) {
-        if (values != null) {
-            for (Parameter value : values) {
-                getParameters().add(value);
-            }
-        }
-        return this;
-    }
-
-    public ExecutableItem setParameters(final Collection<Parameter> values) {
-        if (values != null) {
-            getParameters().addAll(values);
-        }
-        return this;
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withName(final String value) {
-        return setName(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withStatus(final Status value) {
-        return setStatus(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withStatusDetails(final StatusDetails value) {
-        return setStatusDetails(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withStage(final Stage value) {
-        return setStage(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withDescription(final String value) {
-        return setDescription(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withDescriptionHtml(final String value) {
-        return setDescriptionHtml(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withStart(final Long value) {
-        return setStart(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withStop(final Long value) {
-        return setStop(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withSteps(final StepResult... values) {
-        return setSteps(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withSteps(final Collection<StepResult> values) {
-        return setSteps(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withSteps(final List<StepResult> steps) {
-        return setSteps(steps);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withAttachments(final Attachment... values) {
-        return setAttachments(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withAttachments(final Collection<Attachment> values) {
-        return setAttachments(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withAttachments(final List<Attachment> attachments) {
-        return setAttachments(attachments);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withParameters(final Parameter... values) {
-        return setParameters(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withParameters(final Collection<Parameter> values) {
-        return setParameters(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public ExecutableItem withParameters(final List<Parameter> parameters) {
-        return setParameters(parameters);
-    }
 }
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 ff1eb229e..7c2e12427 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
@@ -16,306 +16,281 @@
 package io.qameta.allure.model;
 
 import java.io.Serializable;
-import java.util.Collection;
+import java.util.ArrayList;
 import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
 
 /**
- * POJO that stores fixture result information.
+ * The model object that stores information about executed test fixtures (set up and tear down methods).
+ * In order to link test fixture to test result {@link TestResultContainer} is used.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.TestResult
+ * @see io.qameta.allure.model.TestResultContainer
+ * @since 2.0
  */
-@SuppressWarnings("deprecation")
-public class FixtureResult extends ExecutableItem implements Serializable {
+public class FixtureResult implements Serializable, ExecutableItem {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
-    public FixtureResult setName(final String value) {
-        super.setName(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setStatus(final Status value) {
-        super.setStatus(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setStatusDetails(final StatusDetails value) {
-        super.setStatusDetails(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setStage(final Stage value) {
-        super.setStage(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setDescription(final String value) {
-        super.setDescription(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setDescriptionHtml(final String value) {
-        super.setDescriptionHtml(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setStart(final Long value) {
-        super.setStart(value);
-        return this;
-    }
-
-    @Override
-    public FixtureResult setStop(final Long value) {
-        super.setStop(value);
-        return this;
-    }
-
-    @Override
-    @JsonProperty
-    public FixtureResult setSteps(final List<StepResult> steps) {
-        super.setSteps(steps);
-        return this;
-    }
+    private String name;
+    private Status status;
+    private StatusDetails statusDetails;
+    private Stage stage;
+    private String description;
+    private String descriptionHtml;
+    private List<StepResult> steps = new ArrayList<>();
+    private List<Attachment> attachments = new ArrayList<>();
+    private List<Parameter> parameters = new ArrayList<>();
+    private Long start;
+    private Long stop;
 
     /**
-     * @deprecated use {@link #setSteps(List)} instead.
+     * Gets name.
+     *
+     * @return the name
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public FixtureResult setSteps(final StepResult... values) {
-        super.setSteps(values);
-        return this;
+    public String getName() {
+        return name;
     }
 
     /**
-     * @deprecated use {@link #setSteps(List)} instead.
+     * Sets name.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public FixtureResult setSteps(final Collection<StepResult> values) {
-        super.setSteps(values);
-        return this;
-    }
-
-    @Override
-    @JsonProperty
-    public FixtureResult setAttachments(final List<Attachment> attachments) {
-        super.setAttachments(attachments);
+    public FixtureResult setName(final String value) {
+        this.name = value;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setAttachments(List)} instead.
+     * Gets status.
+     *
+     * @return the status
      */
-    @Deprecated
     @Override
-    @JsonIgnore
-    public FixtureResult setAttachments(final Attachment... values) {
-        super.setAttachments(values);
-        return this;
+    public Status getStatus() {
+        return status;
     }
 
     /**
-     * @deprecated use {@link #setAttachments(List)} instead.
+     * Sets status.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public FixtureResult setAttachments(final Collection<Attachment> values) {
-        super.setAttachments(values);
+    public FixtureResult setStatus(final Status value) {
+        this.status = value;
         return this;
     }
 
+    /**
+     * Gets status details.
+     *
+     * @return the status details
+     */
     @Override
-    @JsonProperty
-    public FixtureResult setParameters(final List<Parameter> parameters) {
-        super.setParameters(parameters);
-        return this;
+    public StatusDetails getStatusDetails() {
+        return statusDetails;
     }
 
     /**
-     * @deprecated use {@link #setParameters(List)} instead.
+     * Sets status details.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public FixtureResult setParameters(final Parameter... values) {
-        super.setParameters(values);
+    public FixtureResult setStatusDetails(final StatusDetails value) {
+        this.statusDetails = value;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setParameters(List)} instead.
+     * Gets stage.
+     *
+     * @return the stage
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public FixtureResult setParameters(final Collection<Parameter> values) {
-        super.setParameters(values);
-        return this;
+    public Stage getStage() {
+        return stage;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets stage.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withName(final String value) {
-        return setName(value);
+    public FixtureResult setStage(final Stage value) {
+        this.stage = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets description.
+     *
+     * @return the description
      */
-    @Deprecated
-    @Override
-    public FixtureResult withStatus(final Status value) {
-        return setStatus(value);
+    public String getDescription() {
+        return description;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets description.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withStatusDetails(final StatusDetails value) {
-        return setStatusDetails(value);
+    public FixtureResult setDescription(final String value) {
+        this.description = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets description html.
+     *
+     * @return the description html
      */
-    @Deprecated
-    @Override
-    public FixtureResult withStage(final Stage value) {
-        return setStage(value);
+    public String getDescriptionHtml() {
+        return descriptionHtml;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets description html.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withDescription(final String value) {
-        return setDescription(value);
+    public FixtureResult setDescriptionHtml(final String value) {
+        this.descriptionHtml = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets steps.
+     *
+     * @return the steps
      */
-    @Deprecated
     @Override
-    public FixtureResult withDescriptionHtml(final String value) {
-        return setDescriptionHtml(value);
+    public List<StepResult> getSteps() {
+        return steps;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets steps.
+     *
+     * @param steps the steps
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withStart(final Long value) {
-        return setStart(value);
+    public FixtureResult setSteps(final List<StepResult> steps) {
+        this.steps = steps;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets attachments.
+     *
+     * @return the attachments
      */
-    @Deprecated
     @Override
-    public FixtureResult withStop(final Long value) {
-        return setStop(value);
+    public List<Attachment> getAttachments() {
+        return attachments;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets attachments.
+     *
+     * @param attachments the attachments
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withSteps(final StepResult... values) {
-        return setSteps(values);
+    public FixtureResult setAttachments(final List<Attachment> attachments) {
+        this.attachments = attachments;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets parameters.
+     *
+     * @return the parameters
      */
-    @Deprecated
     @Override
-    public FixtureResult withSteps(final Collection<StepResult> values) {
-        return setSteps(values);
+    public List<Parameter> getParameters() {
+        return parameters;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets parameters.
+     *
+     * @param parameters the parameters
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withSteps(final List<StepResult> steps) {
-        return setSteps(steps);
+    public FixtureResult setParameters(final List<Parameter> parameters) {
+        this.parameters = parameters;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets start.
+     *
+     * @return the start
      */
-    @Deprecated
-    @Override
-    public FixtureResult withAttachments(final Attachment... values) {
-        return setAttachments(values);
+    public Long getStart() {
+        return start;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets start.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withAttachments(final Collection<Attachment> values) {
-        return setAttachments(values);
+    public FixtureResult setStart(final Long value) {
+        this.start = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets stop.
+     *
+     * @return the stop
      */
-    @Deprecated
-    @Override
-    public FixtureResult withAttachments(final List<Attachment> attachments) {
-        return setAttachments(attachments);
+    public Long getStop() {
+        return stop;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets stop.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public FixtureResult withParameters(final Parameter... values) {
-        return setParameters(values);
+    public FixtureResult setStop(final Long value) {
+        this.stop = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * {@inheritDoc}
      */
-    @Deprecated
     @Override
-    public FixtureResult withParameters(final Collection<Parameter> values) {
-        return setParameters(values);
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final FixtureResult that = (FixtureResult) o;
+        return Objects.equals(name, that.name)
+                && status == that.status;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * {@inheritDoc}
      */
-    @Deprecated
     @Override
-    public FixtureResult withParameters(final List<Parameter> parameters) {
-        return setParameters(parameters);
+    public int hashCode() {
+        return Objects.hash(name, status);
     }
-
 }
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 f9f5d19dc..d8b400379 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
@@ -16,33 +16,37 @@
 package io.qameta.allure.model;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
- * POJO that stores label information.
+ * The model object that could be used to pass additional metadata to test results.
+ * Note that labels with empty (blank) name will be omitted during report generation.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.TestResult
+ * @since 2.0
  */
 public class Label implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    protected String name;
-
-    protected String value;
+    private String name;
+    private String value;
 
     /**
-     * Gets the value of the name property.
+     * Gets name.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the name
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Sets the value of the name property.
+     * Sets name.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public Label setName(final String value) {
         this.name = value;
@@ -50,20 +54,19 @@ public Label setName(final String value) {
     }
 
     /**
-     * Gets the value of the value property.
+     * Gets value.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the value
      */
     public String getValue() {
         return value;
     }
 
     /**
-     * Sets the value of the value property.
+     * Sets value.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public Label setValue(final String value) {
         this.value = value;
@@ -71,18 +74,25 @@ public Label setValue(final String value) {
     }
 
     /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    public Label withName(final String value) {
-        return setName(value);
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final Label label = (Label) o;
+        return Objects.equals(name, label.name) && Objects.equals(value, label.value);
     }
 
     /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    public Label withValue(final String value) {
-        return setValue(value);
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, value);
     }
 }
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 57d241e5c..a5de7c71d 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
@@ -16,35 +16,38 @@
 package io.qameta.allure.model;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
- * POJO that stores link information.
+ * Model object that could be used to pass links to external resources to test results.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.WithLinks
+ * @see io.qameta.allure.model.TestResult
+ * @since 2.0
  */
 public class Link implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    protected String name;
-
-    protected String url;
-
-    protected String type;
+    private String name;
+    private String url;
+    private String type;
 
     /**
-     * Gets the value of the name property.
+     * Gets name.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the name
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Sets the value of the name property.
+     * Sets name.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public Link setName(final String value) {
         this.name = value;
@@ -52,20 +55,19 @@ public Link setName(final String value) {
     }
 
     /**
-     * Gets the value of the url property.
+     * Gets url.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the url
      */
     public String getUrl() {
         return url;
     }
 
     /**
-     * Sets the value of the url property.
+     * Sets url.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public Link setUrl(final String value) {
         this.url = value;
@@ -73,20 +75,19 @@ public Link setUrl(final String value) {
     }
 
     /**
-     * Gets the value of the type property.
+     * Gets type.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the type
      */
     public String getType() {
         return type;
     }
 
     /**
-     * Sets the value of the type property.
+     * Sets type.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public Link setType(final String value) {
         this.type = value;
@@ -94,26 +95,27 @@ public Link setType(final String value) {
     }
 
     /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public Link withName(final String value) {
-        return setName(value);
-    }
-
-    /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    public Link withUrl(final String value) {
-        return setUrl(value);
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final Link link = (Link) o;
+        return Objects.equals(name, link.name)
+                && Objects.equals(url, link.url)
+                && Objects.equals(type, link.type);
     }
 
     /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    public Link withType(final String value) {
-        return setType(value);
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, url, type);
     }
 }
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 e89a395ca..b41727380 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
@@ -16,33 +16,48 @@
 package io.qameta.allure.model;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
- * POJO that stores parameter information.
+ * The model object that could be used to pass information about test parameters to test results.
+ * Note that parameters with empty (blank) name will be omitted during report generation.
+ * <p>
+ * Parameters are used in history key generation for test results. In general words,
+ * if test's results have the same parameters they will be considered as retries. But if
+ * at least one parameter is differ (or, for example, missed) results will be considered
+ * as separate results.
+ * <p>
+ * You can exclude parameters from history key calculation by setting {@link #excluded} property
+ * to <code>true</code>.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.TestResult
+ * @see io.qameta.allure.model.WithParameters
+ * @since 2.0
  */
 public class Parameter implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    protected String name;
-
-    protected String value;
+    private String name;
+    private String value;
+    private Boolean excluded;
+    private Mode mode;
 
     /**
-     * Gets the value of the name property.
+     * Gets name.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the name
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Sets the value of the name property.
+     * Sets name.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
     public Parameter setName(final String value) {
         this.name = value;
@@ -50,20 +65,19 @@ public Parameter setName(final String value) {
     }
 
     /**
-     * Gets the value of the value property.
+     * Gets value.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the value
      */
     public String getValue() {
         return value;
     }
 
     /**
-     * Sets the value of the value property.
+     * Sets value.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
     public Parameter setValue(final String value) {
         this.value = value;
@@ -71,18 +85,91 @@ public Parameter setValue(final String value) {
     }
 
     /**
-     * @deprecated use set method
+     * Gets excluded.
+     *
+     * @return the excluded
      */
-    @Deprecated
-    public Parameter withName(final String value) {
-        return setName(value);
+    public Boolean getExcluded() {
+        return excluded;
     }
 
     /**
-     * @deprecated use set method
+     * Sets excluded.
+     *
+     * @param excluded the excluded
+     * @return self for method chaining.
      */
-    @Deprecated
-    public Parameter withValue(final String value) {
-        return setValue(value);
+    public Parameter setExcluded(final Boolean excluded) {
+        this.excluded = excluded;
+        return this;
+    }
+
+    /**
+     * Gets mode.
+     *
+     * @return the mode
+     */
+    public Mode getMode() {
+        return mode;
+    }
+
+    /**
+     * Sets mode.
+     *
+     * @param mode the mode
+     * @return self for method chaining.
+     */
+    public Parameter setMode(final Mode mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final Parameter parameter = (Parameter) o;
+        return Objects.equals(name, parameter.name)
+                && Objects.equals(value, parameter.value);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, value);
+    }
+
+    /**
+     * The parameter render mode.
+     *
+     * @author baev (Dmitry Baev)
+     * @since 2.15
+     */
+    public enum Mode {
+
+        /**
+         * Completely hide parameter from report.
+         */
+        HIDDEN,
+
+        /**
+         * Display parameter, but mask it's value.
+         */
+        MASKED,
+
+        /**
+         * Default mode. Displays both parameter name and value.
+         */
+        DEFAULT
+
     }
 }
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 34a22513f..14b0b199b 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
@@ -15,17 +15,33 @@
  */
 package io.qameta.allure.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
-
 /**
  * Test stages.
+ *
+ * @author baev (Dmitry Baev)
+ * @since 2.0
  */
 public enum Stage {
 
+    /**
+     * Scheduled stage.
+     */
     SCHEDULED("scheduled"),
+    /**
+     * Running stage.
+     */
     RUNNING("running"),
+    /**
+     * Finished stage.
+     */
     FINISHED("finished"),
+    /**
+     * Pending stage.
+     */
     PENDING("pending"),
+    /**
+     * Interrupted stage.
+     */
     INTERRUPTED("interrupted");
 
     private final String value;
@@ -34,11 +50,12 @@ public enum Stage {
         value = v;
     }
 
-    @JsonValue
-    public String value() {
-        return value;
-    }
-
+    /**
+     * From value stage.
+     *
+     * @param v the v
+     * @return the stage
+     */
     public static Stage fromValue(final String v) {
         for (Stage c : Stage.values()) {
             if (c.value.equals(v)) {
@@ -48,4 +65,13 @@ public static Stage fromValue(final String v) {
         throw new IllegalArgumentException(v);
     }
 
+    /**
+     * Value string.
+     *
+     * @return the string
+     */
+    public String value() {
+        return value;
+    }
+
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/StageDeserializer.java b/allure-model/src/main/java/io/qameta/allure/model/StageDeserializer.java
deleted file mode 100644
index 29a9c8b4e..000000000
--- a/allure-model/src/main/java/io/qameta/allure/model/StageDeserializer.java
+++ /dev/null
@@ -1,41 +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.model;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-import java.io.IOException;
-import java.util.stream.Stream;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-public class StageDeserializer extends StdDeserializer<Stage> {
-    protected StageDeserializer() {
-        super(Stage.class);
-    }
-
-    @Override
-    public Stage deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {
-        final String value = p.readValueAs(String.class);
-        return Stream.of(Stage.values())
-                .filter(status -> status.value().equalsIgnoreCase(value))
-                .findAny()
-                .orElse(null);
-    }
-}
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 fd6e31fa0..4f6c73d55 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
@@ -15,16 +15,30 @@
  */
 package io.qameta.allure.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
-
 /**
  * Test statuses.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.WithStatus
+ * @since 2.0
  */
 public enum Status {
 
+    /**
+     * Marks tests that have some failed checks (assertions).
+     */
     FAILED("failed"),
+    /**
+     * Marks tests with unexpected failures during test execution.
+     */
     BROKEN("broken"),
+    /**
+     * Marks passed tests.
+     */
     PASSED("passed"),
+    /**
+     * Marks skipped/interrupted tests.
+     */
     SKIPPED("skipped");
 
     private final String value;
@@ -33,11 +47,12 @@ public enum Status {
         value = v;
     }
 
-    @JsonValue
-    public String value() {
-        return value;
-    }
-
+    /**
+     * From value status.
+     *
+     * @param v the v
+     * @return the status
+     */
     public static Status fromValue(final String v) {
         for (Status c : Status.values()) {
             if (c.value.equals(v)) {
@@ -47,4 +62,13 @@ public static Status fromValue(final String v) {
         throw new IllegalArgumentException(v);
     }
 
+    /**
+     * Value string.
+     *
+     * @return the string
+     */
+    public String value() {
+        return 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 855a639f4..940ffd9d1 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
@@ -16,33 +16,39 @@
 package io.qameta.allure.model;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
- * POJO that stores status details.
+ * The type Status details.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.WithStatusDetails
+ * @since 2.0
  */
 public class StatusDetails implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    protected boolean known;
-
-    protected boolean muted;
-
-    protected boolean flaky;
-
-    protected String message;
-
-    protected String trace;
+    private boolean known;
+    private boolean muted;
+    private boolean flaky;
+    private String message;
+    private String trace;
 
     /**
-     * Gets the value of the known property.
+     * Is known boolean.
+     *
+     * @return the boolean
      */
     public boolean isKnown() {
         return known;
     }
 
     /**
-     * Sets the value of the known property.
+     * Sets known.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
     public StatusDetails setKnown(final boolean value) {
         this.known = value;
@@ -50,14 +56,19 @@ public StatusDetails setKnown(final boolean value) {
     }
 
     /**
-     * Gets the value of the muted property.
+     * Is muted boolean.
+     *
+     * @return the boolean
      */
     public boolean isMuted() {
         return muted;
     }
 
     /**
-     * Sets the value of the muted property.
+     * Sets muted.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
     public StatusDetails setMuted(final boolean value) {
         this.muted = value;
@@ -65,14 +76,19 @@ public StatusDetails setMuted(final boolean value) {
     }
 
     /**
-     * Gets the value of the flaky property.
+     * Is flaky boolean.
+     *
+     * @return the boolean
      */
     public boolean isFlaky() {
         return flaky;
     }
 
     /**
-     * Sets the value of the flaky property.
+     * Sets flaky.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
     public StatusDetails setFlaky(final boolean value) {
         this.flaky = value;
@@ -80,20 +96,19 @@ public StatusDetails setFlaky(final boolean value) {
     }
 
     /**
-     * Gets the value of the message property.
+     * Gets message.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the message
      */
     public String getMessage() {
         return message;
     }
 
     /**
-     * Sets the value of the message property.
+     * Sets message.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public StatusDetails setMessage(final String value) {
         this.message = value;
@@ -101,20 +116,19 @@ public StatusDetails setMessage(final String value) {
     }
 
     /**
-     * Gets the value of the trace property.
+     * Gets trace.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the trace
      */
     public String getTrace() {
         return trace;
     }
 
     /**
-     * Sets the value of the trace property.
+     * Sets trace.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public StatusDetails setTrace(final String value) {
         this.trace = value;
@@ -122,42 +136,26 @@ public StatusDetails setTrace(final String value) {
     }
 
     /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public StatusDetails withKnown(final boolean value) {
-        return setKnown(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public StatusDetails withMuted(final boolean value) {
-        return setMuted(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public StatusDetails withFlaky(final boolean value) {
-        return setFlaky(value);
-    }
-
-    /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    public StatusDetails withMessage(final String value) {
-        return setMessage(value);
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final StatusDetails that = (StatusDetails) o;
+        return Objects.equals(message, that.message)
+                && Objects.equals(trace, that.trace);
     }
 
     /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    public StatusDetails withTrace(final String value) {
-        return setTrace(value);
+    @Override
+    public int hashCode() {
+        return Objects.hash(message, trace);
     }
 }
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 b114c0bbc..04855631a 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
@@ -16,305 +16,284 @@
 package io.qameta.allure.model;
 
 import java.io.Serializable;
-import java.util.Collection;
+import java.util.ArrayList;
 import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
 
 /**
- * POJO that stores step information.
+ * The model object that stores information about test steps that was run.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.ExecutableItem
+ * @see io.qameta.allure.model.WithAttachments
+ * @see io.qameta.allure.model.WithParameters
+ * @see io.qameta.allure.model.WithStatus
+ * @see io.qameta.allure.model.WithStatusDetails
+ * @see io.qameta.allure.model.WithSteps
+ * @since 2.0
  */
-@SuppressWarnings("deprecation")
-public class StepResult extends ExecutableItem implements Serializable {
+public class StepResult implements Serializable, ExecutableItem {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
-    public StepResult setName(final String value) {
-        super.setName(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setStatus(final Status value) {
-        super.setStatus(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setStatusDetails(final StatusDetails value) {
-        super.setStatusDetails(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setStage(final Stage value) {
-        super.setStage(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setDescription(final String value) {
-        super.setDescription(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setDescriptionHtml(final String value) {
-        super.setDescriptionHtml(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setStart(final Long value) {
-        super.setStart(value);
-        return this;
-    }
-
-    @Override
-    public StepResult setStop(final Long value) {
-        super.setStop(value);
-        return this;
-    }
-
-    @Override
-    @JsonProperty
-    public StepResult setSteps(final List<StepResult> steps) {
-        super.setSteps(steps);
-        return this;
-    }
+    private String name;
+    private Status status;
+    private StatusDetails statusDetails;
+    private Stage stage;
+    private String description;
+    private String descriptionHtml;
+    private List<StepResult> steps = new ArrayList<>();
+    private List<Attachment> attachments = new ArrayList<>();
+    private List<Parameter> parameters = new ArrayList<>();
+    private Long start;
+    private Long stop;
 
     /**
-     * @deprecated use {@link #setSteps(List)} instead.
+     * Gets name.
+     *
+     * @return the name
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public StepResult setSteps(final StepResult... values) {
-        super.setSteps(values);
-        return this;
+    public String getName() {
+        return name;
     }
 
     /**
-     * @deprecated use {@link #setSteps(List)} instead.
+     * Sets name.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public StepResult setSteps(final Collection<StepResult> values) {
-        super.setSteps(values);
-        return this;
-    }
-
-    @Override
-    @JsonProperty
-    public StepResult setAttachments(final List<Attachment> attachments) {
-        super.setAttachments(attachments);
+    public StepResult setName(final String value) {
+        this.name = value;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setAttachments(List)} instead.
+     * Gets status.
+     *
+     * @return the status
      */
-    @Deprecated
     @Override
-    @JsonIgnore
-    public StepResult setAttachments(final Attachment... values) {
-        super.setAttachments(values);
-        return this;
+    public Status getStatus() {
+        return status;
     }
 
     /**
-     * @deprecated use {@link #setAttachments(List)} instead.
+     * Sets status.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public StepResult setAttachments(final Collection<Attachment> values) {
-        super.setAttachments(values);
+    public StepResult setStatus(final Status value) {
+        this.status = value;
         return this;
     }
 
+    /**
+     * Gets status details.
+     *
+     * @return the status details
+     */
     @Override
-    @JsonProperty
-    public StepResult setParameters(final List<Parameter> parameters) {
-        super.setParameters(parameters);
-        return this;
+    public StatusDetails getStatusDetails() {
+        return statusDetails;
     }
 
     /**
-     * @deprecated use {@link #setParameters(List)} instead.
+     * Sets status details.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public StepResult setParameters(final Parameter... values) {
-        super.setParameters(values);
+    public StepResult setStatusDetails(final StatusDetails value) {
+        this.statusDetails = value;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setParameters(List)} instead.
+     * Gets stage.
+     *
+     * @return the stage
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public StepResult setParameters(final Collection<Parameter> values) {
-        super.setParameters(values);
-        return this;
+    public Stage getStage() {
+        return stage;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets stage.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withName(final String value) {
-        return setName(value);
+    public StepResult setStage(final Stage value) {
+        this.stage = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets description.
+     *
+     * @return the description
      */
-    @Deprecated
-    @Override
-    public StepResult withStatus(final Status value) {
-        return setStatus(value);
+    public String getDescription() {
+        return description;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets description.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withStatusDetails(final StatusDetails value) {
-        return setStatusDetails(value);
+    public StepResult setDescription(final String value) {
+        this.description = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets description html.
+     *
+     * @return the description html
      */
-    @Deprecated
-    @Override
-    public StepResult withStage(final Stage value) {
-        return setStage(value);
+    public String getDescriptionHtml() {
+        return descriptionHtml;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets description html.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withDescription(final String value) {
-        return setDescription(value);
+    public StepResult setDescriptionHtml(final String value) {
+        this.descriptionHtml = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets steps.
+     *
+     * @return the steps
      */
-    @Deprecated
     @Override
-    public StepResult withDescriptionHtml(final String value) {
-        return setDescriptionHtml(value);
+    public List<StepResult> getSteps() {
+        return steps;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets steps.
+     *
+     * @param steps the steps
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withStart(final Long value) {
-        return setStart(value);
+    public StepResult setSteps(final List<StepResult> steps) {
+        this.steps = steps;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets attachments.
+     *
+     * @return the attachments
      */
-    @Deprecated
     @Override
-    public StepResult withStop(final Long value) {
-        return setStop(value);
+    public List<Attachment> getAttachments() {
+        return attachments;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets attachments.
+     *
+     * @param attachments the attachments
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withSteps(final StepResult... values) {
-        return setSteps(values);
+    public StepResult setAttachments(final List<Attachment> attachments) {
+        this.attachments = attachments;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets parameters.
+     *
+     * @return the parameters
      */
-    @Deprecated
     @Override
-    public StepResult withSteps(final Collection<StepResult> values) {
-        return setSteps(values);
+    public List<Parameter> getParameters() {
+        return parameters;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets parameters.
+     *
+     * @param parameters the parameters
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withSteps(final List<StepResult> steps) {
-        return setSteps(steps);
+    public StepResult setParameters(final List<Parameter> parameters) {
+        this.parameters = parameters;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets start.
+     *
+     * @return the start
      */
-    @Deprecated
-    @Override
-    public StepResult withAttachments(final Attachment... values) {
-        return setAttachments(values);
+    public Long getStart() {
+        return start;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets start.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withAttachments(final Collection<Attachment> values) {
-        return setAttachments(values);
+    public StepResult setStart(final Long value) {
+        this.start = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets stop.
+     *
+     * @return the stop
      */
-    @Deprecated
-    @Override
-    public StepResult withAttachments(final List<Attachment> attachments) {
-        return setAttachments(attachments);
+    public Long getStop() {
+        return stop;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets stop.
+     *
+     * @param value the value
+     * @return self for method chaining
      */
-    @Deprecated
-    @Override
-    public StepResult withParameters(final Parameter... values) {
-        return setParameters(values);
+    public StepResult setStop(final Long value) {
+        this.stop = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * {@inheritDoc}
      */
-    @Deprecated
     @Override
-    public StepResult withParameters(final Collection<Parameter> values) {
-        return setParameters(values);
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final StepResult that = (StepResult) o;
+        return Objects.equals(name, that.name)
+                && status == that.status;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * {@inheritDoc}
      */
-    @Deprecated
     @Override
-    public StepResult withParameters(final List<Parameter> parameters) {
-        return setParameters(parameters);
+    public int hashCode() {
+        return Objects.hash(name, status);
     }
 }
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 438af01ba..1c9cbb47e 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
@@ -17,49 +17,60 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
 
 /**
- * POJO that stores test result information.
+ * The model object that stores information about test that was run.
+ * Test results are the main entity of Allure.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.ExecutableItem
+ * @see io.qameta.allure.model.WithAttachments
+ * @see io.qameta.allure.model.WithLinks
+ * @see io.qameta.allure.model.WithParameters
+ * @see io.qameta.allure.model.WithStatus
+ * @see io.qameta.allure.model.WithStatusDetails
+ * @see io.qameta.allure.model.WithSteps
+ * @since 2.0
  */
-@SuppressWarnings({"PMD.TooManyMethods", "PMD.ExcessivePublicCount", "deprecation"})
-public class TestResult extends ExecutableItem implements Serializable, WithLinks {
+@SuppressWarnings({"PMD.TooManyMethods", "PMD.ExcessivePublicCount"})
+public class TestResult implements Serializable, ExecutableItem, WithLinks {
 
     private static final long serialVersionUID = 1L;
 
-    protected String uuid;
-
-    protected String historyId;
-
-    protected String testCaseId;
-
-    protected String rerunOf;
-
-    protected String fullName;
-
-    protected List<Label> labels;
-
-    protected List<Link> links;
-
-    /**
-     * Gets the value of the uuid property.
+    private String uuid;
+    private String historyId;
+    private String testCaseId;
+    private String fullName;
+    private List<Label> labels = new ArrayList<>();
+    private List<Link> links = new ArrayList<>();
+    private String name;
+    private Status status;
+    private StatusDetails statusDetails;
+    private Stage stage;
+    private String description;
+    private String descriptionHtml;
+    private List<StepResult> steps = new ArrayList<>();
+    private List<Attachment> attachments = new ArrayList<>();
+    private List<Parameter> parameters = new ArrayList<>();
+    private Long start;
+    private Long stop;
+
+    /**
+     * Gets uuid.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the uuid
      */
     public String getUuid() {
         return uuid;
     }
 
     /**
-     * Sets the value of the uuid property.
+     * Sets uuid.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
     public TestResult setUuid(final String value) {
         this.uuid = value;
@@ -67,20 +78,19 @@ public TestResult setUuid(final String value) {
     }
 
     /**
-     * Gets the value of the historyId property.
+     * Gets history id.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the history id
      */
     public String getHistoryId() {
         return historyId;
     }
 
     /**
-     * Sets the value of the historyId property.
+     * Sets history id.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
     public TestResult setHistoryId(final String value) {
         this.historyId = value;
@@ -88,20 +98,19 @@ public TestResult setHistoryId(final String value) {
     }
 
     /**
-     * Gets the value of the testCaseId property.
+     * Gets test case id.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the test case id
      */
     public String getTestCaseId() {
         return testCaseId;
     }
 
     /**
-     * Sets the value of the testCaseId property.
+     * Sets test case id.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
     public TestResult setTestCaseId(final String value) {
         this.testCaseId = value;
@@ -109,500 +118,320 @@ public TestResult setTestCaseId(final String value) {
     }
 
     /**
-     * Gets the value of the rerunOf property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getRerunOf() {
-        return rerunOf;
-    }
-
-    /**
-     * Sets the value of the rerunOf property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public TestResult setRerunOf(final String value) {
-        this.rerunOf = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the fullName property.
+     * Gets full name.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the full name
      */
     public String getFullName() {
         return fullName;
     }
 
     /**
-     * Sets the value of the fullName property.
+     * Sets full name.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining.
      */
     public TestResult setFullName(final String value) {
         this.fullName = value;
         return this;
     }
 
+    /**
+     * Gets labels.
+     *
+     * @return the labels
+     */
     public List<Label> getLabels() {
-        if (labels == null) {
-            labels = new ArrayList<>();
-        }
         return labels;
     }
 
-    @JsonProperty
+    /**
+     * Sets labels.
+     *
+     * @param labels the labels
+     * @return self for method chaining.
+     */
     public TestResult setLabels(final List<Label> labels) {
         this.labels = labels;
         return this;
     }
 
-    /**
-     * @deprecated use {@link #getLabels()} ()} and {@link Collection#addAll(Collection)} instead.
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResult setLabels(final Label... values) {
-        if (values != null) {
-            for (Label value : values) {
-                getLabels().add(value);
-            }
-        }
-        return this;
-    }
 
     /**
-     * @deprecated use {@link #getLabels()} ()} and {@link Collection#addAll(Collection)} instead.
+     * Gets links.
+     *
+     * @return the links
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResult setLabels(final Collection<Label> values) {
-        if (values != null) {
-            getLabels().addAll(values);
-        }
-        return this;
-    }
-
     @Override
     public List<Link> getLinks() {
-        if (links == null) {
-            links = new ArrayList<>();
-        }
         return links;
     }
 
-    @JsonProperty
+    /**
+     * Sets links.
+     *
+     * @param links the links
+     * @return self for method chaining.
+     */
     public TestResult setLinks(final List<Link> links) {
         this.links = links;
         return this;
     }
 
     /**
-     * @deprecated use {@link #getLinks()} and {@link Collection#addAll(Collection)} instead.
+     * Gets name.
+     *
+     * @return the name
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResult setLinks(final Link... values) {
-        if (values != null) {
-            for (Link value : values) {
-                getLinks().add(value);
-            }
-        }
-        return this;
+    public String getName() {
+        return name;
     }
 
     /**
-     * @deprecated use {@link #getLinks()} and {@link Collection#addAll(Collection)} instead.
+     * Sets name.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResult setLinks(final Collection<Link> values) {
-        if (values != null) {
-            getLinks().addAll(values);
-        }
-        return this;
-    }
-
-    @Override
     public TestResult setName(final String value) {
-        super.setName(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setStatus(final Status value) {
-        super.setStatus(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setStatusDetails(final StatusDetails value) {
-        super.setStatusDetails(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setStage(final Stage value) {
-        super.setStage(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setDescription(final String value) {
-        super.setDescription(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setDescriptionHtml(final String value) {
-        super.setDescriptionHtml(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setStart(final Long value) {
-        super.setStart(value);
-        return this;
-    }
-
-    @Override
-    public TestResult setStop(final Long value) {
-        super.setStop(value);
-        return this;
-    }
-
-    @Override
-    @JsonProperty
-    public TestResult setSteps(final List<StepResult> steps) {
-        super.setSteps(steps);
+        this.name = value;
         return this;
     }
 
     /**
-     * @deprecated use {@link #getSteps()} and {@link Collection#addAll(Collection)} instead.
+     * Gets status.
+     *
+     * @return the status
      */
-    @Deprecated
     @Override
-    @JsonIgnore
-    public TestResult setSteps(final StepResult... values) {
-        super.setSteps(values);
-        return this;
+    public Status getStatus() {
+        return status;
     }
 
     /**
-     * @deprecated use {@link #getSteps()} and {@link Collection#addAll(Collection)} instead.
+     * Sets status.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public TestResult setSteps(final Collection<StepResult> values) {
-        super.setSteps(values);
+    public TestResult setStatus(final Status value) {
+        this.status = value;
         return this;
     }
 
-    @Override
-    @JsonProperty
-    public TestResult setAttachments(final List<Attachment> attachments) {
-        super.setAttachments(attachments);
-        return this;
-    }
 
     /**
-     * @deprecated use {@link #getAttachments()} and {@link Collection#addAll(Collection)} instead.
+     * Gets status details.
+     *
+     * @return the status details
      */
-    @Deprecated
     @Override
-    @JsonIgnore
-    public TestResult setAttachments(final Attachment... values) {
-        super.setAttachments(values);
-        return this;
+    public StatusDetails getStatusDetails() {
+        return statusDetails;
     }
 
     /**
-     * @deprecated use {@link #getAttachments()} and {@link Collection#addAll(Collection)} instead.
+     * Sets status details.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public TestResult setAttachments(final Collection<Attachment> values) {
-        super.setAttachments(values);
-        return this;
-    }
-
-    @Override
-    @JsonProperty
-    public TestResult setParameters(final List<Parameter> parameters) {
-        super.setParameters(parameters);
+    public TestResult setStatusDetails(final StatusDetails value) {
+        this.statusDetails = value;
         return this;
     }
 
     /**
-     * @deprecated use {@link #getParameters()} and {@link Collection#addAll(Collection)} instead.
+     * Gets stage.
+     *
+     * @return the stage
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public TestResult setParameters(final Parameter... values) {
-        super.setParameters(values);
-        return this;
+    public Stage getStage() {
+        return stage;
     }
 
     /**
-     * @deprecated use {@link #getParameters()} and {@link Collection#addAll(Collection)} instead.
+     * Sets stage.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public TestResult setParameters(final Collection<Parameter> values) {
-        super.setParameters(values);
+    public TestResult setStage(final Stage value) {
+        this.stage = value;
         return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withUuid(final String value) {
-        return setUuid(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withHistoryId(final String value) {
-        return setHistoryId(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withTestCaseId(final String value) {
-        return setTestCaseId(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withRerunOf(final String value) {
-        return setRerunOf(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withFullName(final String value) {
-        return setFullName(value);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withLabels(final Label... values) {
-        return setLabels(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withLabels(final Collection<Label> values) {
-        return setLabels(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withLabels(final List<Label> labels) {
-        return setLabels(labels);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    public TestResult withLinks(final Link... values) {
-        return setLinks(values);
-    }
-
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets description.
+     *
+     * @return the description
      */
-    @Deprecated
-    public TestResult withLinks(final Collection<Link> values) {
-        return setLinks(values);
+    public String getDescription() {
+        return description;
     }
 
     /**
-     * @deprecated use set method
+     * Sets description.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    public TestResult withLinks(final List<Link> links) {
-        return setLinks(links);
+    public TestResult setDescription(final String value) {
+        this.description = value;
+        return this;
     }
 
-
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets description html.
+     *
+     * @return the description html
      */
-    @Deprecated
-    @Override
-    public TestResult withName(final String value) {
-        return setName(value);
+    public String getDescriptionHtml() {
+        return descriptionHtml;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets description html.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    public TestResult withStatus(final Status value) {
-        return setStatus(value);
+    public TestResult setDescriptionHtml(final String value) {
+        this.descriptionHtml = value;
+        return this;
     }
 
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    @Override
-    public TestResult withStatusDetails(final StatusDetails value) {
-        return setStatusDetails(value);
-    }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets steps.
+     *
+     * @return the steps
      */
-    @Deprecated
     @Override
-    public TestResult withStage(final Stage value) {
-        return setStage(value);
+    public List<StepResult> getSteps() {
+        return steps;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets steps.
+     *
+     * @param steps the steps
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    public TestResult withDescription(final String value) {
-        return setDescription(value);
+    public TestResult setSteps(final List<StepResult> steps) {
+        this.steps = steps;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets attachments.
+     *
+     * @return the attachments
      */
-    @Deprecated
     @Override
-    public TestResult withDescriptionHtml(final String value) {
-        return setDescriptionHtml(value);
+    public List<Attachment> getAttachments() {
+        return attachments;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets attachments.
+     *
+     * @param attachments the attachments
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    public TestResult withStart(final Long value) {
-        return setStart(value);
+    public TestResult setAttachments(final List<Attachment> attachments) {
+        this.attachments = attachments;
+        return this;
     }
 
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    @Override
-    public TestResult withStop(final Long value) {
-        return setStop(value);
-    }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets parameters.
+     *
+     * @return the parameters
      */
-    @Deprecated
     @Override
-    public TestResult withSteps(final StepResult... values) {
-        return setSteps(values);
+    public List<Parameter> getParameters() {
+        return parameters;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets parameters.
+     *
+     * @param parameters the parameters
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    public TestResult withSteps(final Collection<StepResult> values) {
-        return setSteps(values);
+    public TestResult setParameters(final List<Parameter> parameters) {
+        this.parameters = parameters;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets start.
+     *
+     * @return the start
      */
-    @Deprecated
-    @Override
-    public TestResult withSteps(final List<StepResult> steps) {
-        return setSteps(steps);
+    public Long getStart() {
+        return start;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets start.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    public TestResult withAttachments(final Attachment... values) {
-        return setAttachments(values);
+    public TestResult setStart(final Long value) {
+        this.start = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Gets stop.
+     *
+     * @return the stop
      */
-    @Deprecated
-    @Override
-    public TestResult withAttachments(final Collection<Attachment> values) {
-        return setAttachments(values);
+    public Long getStop() {
+        return stop;
     }
 
-    /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
-     */
-    @Deprecated
-    @Override
-    public TestResult withAttachments(final List<Attachment> attachments) {
-        return setAttachments(attachments);
-    }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * Sets stop.
+     *
+     * @param value the value
+     * @return self for method chaining.
      */
-    @Deprecated
-    @Override
-    public TestResult withParameters(final Parameter... values) {
-        return setParameters(values);
+    public TestResult setStop(final Long value) {
+        this.stop = value;
+        return this;
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * {@inheritDoc}
      */
-    @Deprecated
     @Override
-    public TestResult withParameters(final Collection<Parameter> values) {
-        return setParameters(values);
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final TestResult that = (TestResult) o;
+        return Objects.equals(uuid, that.uuid)
+                && Objects.equals(historyId, that.historyId)
+                && Objects.equals(testCaseId, that.testCaseId)
+                && Objects.equals(fullName, that.fullName)
+                && Objects.equals(name, that.name);
     }
 
     /**
-     * @deprecated use set method. Scheduled to removal in 3.0 release.
+     * {@inheritDoc}
      */
-    @Deprecated
     @Override
-    public TestResult withParameters(final List<Parameter> parameters) {
-        return setParameters(parameters);
+    public int hashCode() {
+        return Objects.hash(uuid, historyId, testCaseId, fullName, name);
     }
 }
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 9546d9c43..db4f430cb 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
@@ -15,57 +15,54 @@
  */
 package io.qameta.allure.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 /**
- * POJO that stores information about test fixtures.
+ * The model object that stores links between test results and test fixtures.
+ * <p>
+ * During report generation all {@link #befores} and {@link #afters} is added to each
+ * test result that {@link TestResult#getUuid()} matches values, specified in {@link #children}.
+ * <p>
+ * Containers that have empty {@link #children} are simply ignored.
+ *
+ * @author baev (Dmitry Baev)
+ * @see io.qameta.allure.model.TestResult
+ * @see io.qameta.allure.model.WithLinks
+ * @since 2.0
  */
 @SuppressWarnings("PMD.ExcessivePublicCount")
 public class TestResultContainer implements Serializable, WithLinks {
 
     private static final long serialVersionUID = 1L;
 
-    protected String uuid;
-
-    protected String name;
-
-    protected List<String> children;
-
-    protected String description;
-
-    protected String descriptionHtml;
-
-    protected List<FixtureResult> befores;
-
-    protected List<FixtureResult> afters;
-
-    protected List<Link> links;
-
-    protected Long start;
-
-    protected Long stop;
+    private String uuid;
+    private String name;
+    private List<String> children = new ArrayList<>();
+    private String description;
+    private String descriptionHtml;
+    private List<FixtureResult> befores = new ArrayList<>();
+    private List<FixtureResult> afters = new ArrayList<>();
+    private List<Link> links;
+    private Long start;
+    private Long stop;
 
     /**
-     * Gets the value of the uuid property.
+     * Gets uuid.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the uuid
      */
     public String getUuid() {
         return uuid;
     }
 
     /**
-     * Sets the value of the uuid property.
+     * Sets uuid.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public TestResultContainer setUuid(final String value) {
         this.uuid = value;
@@ -73,20 +70,19 @@ public TestResultContainer setUuid(final String value) {
     }
 
     /**
-     * Gets the value of the name property.
+     * Gets name.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the name
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Sets the value of the name property.
+     * Sets name.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public TestResultContainer setName(final String value) {
         this.name = value;
@@ -94,20 +90,19 @@ public TestResultContainer setName(final String value) {
     }
 
     /**
-     * Gets the value of the description property.
+     * Gets description.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the description
      */
     public String getDescription() {
         return description;
     }
 
     /**
-     * Sets the value of the description property.
+     * Sets description.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public TestResultContainer setDescription(final String value) {
         this.description = value;
@@ -115,20 +110,19 @@ public TestResultContainer setDescription(final String value) {
     }
 
     /**
-     * Gets the value of the descriptionHtml property.
+     * Gets description html.
      *
-     * @return possible object is
-     * {@link String }
+     * @return the description html
      */
     public String getDescriptionHtml() {
         return descriptionHtml;
     }
 
     /**
-     * Sets the value of the descriptionHtml property.
+     * Sets description html.
      *
-     * @param value allowed object is
-     *              {@link String }
+     * @param value the value
+     * @return self for method chaining
      */
     public TestResultContainer setDescriptionHtml(final String value) {
         this.descriptionHtml = value;
@@ -136,20 +130,19 @@ public TestResultContainer setDescriptionHtml(final String value) {
     }
 
     /**
-     * Gets the value of the start property.
+     * Gets start.
      *
-     * @return possible object is
-     * {@link Long }
+     * @return the start
      */
     public Long getStart() {
         return start;
     }
 
     /**
-     * Sets the value of the start property.
+     * Sets start.
      *
-     * @param value allowed object is
-     *              {@link Long }
+     * @param value the value
+     * @return self for method chaining
      */
     public TestResultContainer setStart(final Long value) {
         this.start = value;
@@ -157,342 +150,126 @@ public TestResultContainer setStart(final Long value) {
     }
 
     /**
-     * Gets the value of the stop property.
+     * Gets stop.
      *
-     * @return possible object is
-     * {@link Long }
+     * @return the stop
      */
     public Long getStop() {
         return stop;
     }
 
     /**
-     * Sets the value of the stop property.
+     * Sets stop.
      *
-     * @param value allowed object is
-     *              {@link Long }
+     * @param value the value
+     * @return self for method chaining
      */
     public TestResultContainer setStop(final Long value) {
         this.stop = value;
         return this;
     }
 
+    /**
+     * Gets children.
+     *
+     * @return the children
+     */
     public List<String> getChildren() {
-        if (children == null) {
-            children = new ArrayList<>();
-        }
         return children;
     }
 
-    @JsonProperty
-    public TestResultContainer setChildren(final List<String> children) {
-        this.children = children;
-        return this;
-    }
-
     /**
-     * @deprecated use {@link #setChildren(List)} instead.
+     * Sets children.
+     *
+     * @param children the children
+     * @return self for method chaining
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setChildren(final String... values) {
-        if (values != null) {
-            for (String value : values) {
-                getChildren().add(value);
-            }
-        }
+    public TestResultContainer setChildren(final List<String> children) {
+        this.children = children;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setChildren(List)} instead.
+     * Gets befores.
+     *
+     * @return the befores
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setChildren(final Collection<String> values) {
-        if (values != null) {
-            getChildren().addAll(values);
-        }
-        return this;
-    }
-
     public List<FixtureResult> getBefores() {
-        if (befores == null) {
-            befores = new ArrayList<>();
-        }
         return befores;
     }
 
-    @JsonProperty
-    public TestResultContainer setBefores(final List<FixtureResult> befores) {
-        this.befores = befores;
-        return this;
-    }
-
     /**
-     * @deprecated use {@link #setBefores(List)} instead.
+     * Sets befores.
+     *
+     * @param befores the befores
+     * @return self for method chaining
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setBefores(final FixtureResult... values) {
-        if (values != null) {
-            for (FixtureResult value : values) {
-                getBefores().add(value);
-            }
-        }
+    public TestResultContainer setBefores(final List<FixtureResult> befores) {
+        this.befores = befores;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setBefores(List)} instead.
+     * Gets afters.
+     *
+     * @return the afters
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setBefores(final Collection<FixtureResult> values) {
-        if (values != null) {
-            getBefores().addAll(values);
-        }
-        return this;
-    }
-
     public List<FixtureResult> getAfters() {
-        if (afters == null) {
-            afters = new ArrayList<>();
-        }
         return afters;
     }
 
-    @JsonProperty
-    public TestResultContainer setAfters(final List<FixtureResult> afters) {
-        this.afters = afters;
-        return this;
-    }
-
     /**
-     * @deprecated use {@link #setAfters(List)} instead.
+     * Sets afters.
+     *
+     * @param afters the afters
+     * @return self for method chaining
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setAfters(final FixtureResult... values) {
-        if (values != null) {
-            for (FixtureResult value : values) {
-                getAfters().add(value);
-            }
-        }
+    public TestResultContainer setAfters(final List<FixtureResult> afters) {
+        this.afters = afters;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setAfters(List)} instead.
+     * Gets links.
+     *
+     * @return the links
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setAfters(final Collection<FixtureResult> values) {
-        if (values != null) {
-            getAfters().addAll(values);
-        }
-        return this;
-    }
-
     @Override
     public List<Link> getLinks() {
-        if (links == null) {
-            links = new ArrayList<>();
-        }
         return links;
     }
 
-    @JsonProperty
+    /**
+     * Sets links.
+     *
+     * @param links the links
+     * @return self for method chaining
+     */
     public TestResultContainer setLinks(final List<Link> links) {
         this.links = links;
         return this;
     }
 
     /**
-     * @deprecated use {@link #setLinks(List)} instead.
+     * {@inheritDoc}
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setLinks(final Link... values) {
-        if (values != null) {
-            for (Link value : values) {
-                getLinks().add(value);
-            }
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
         }
-        return this;
-    }
-
-    /**
-     * @deprecated use {@link #setLinks(List)} instead.
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer setLinks(final Collection<Link> values) {
-        if (values != null) {
-            getLinks().addAll(values);
+        if (o == null || getClass() != o.getClass()) {
+            return false;
         }
-        return this;
+        final TestResultContainer that = (TestResultContainer) o;
+        return Objects.equals(uuid, that.uuid) && Objects.equals(name, that.name);
     }
 
     /**
-     * @deprecated use set method
+     * {@inheritDoc}
      */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withUuid(final String value) {
-        return setUuid(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withName(final String value) {
-        return setName(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withDescription(final String value) {
-        return setDescription(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withDescriptionHtml(final String value) {
-        return setDescriptionHtml(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withStart(final Long value) {
-        return setStart(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withStop(final Long value) {
-        return setStop(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withChildren(final String... values) {
-        return setChildren(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withChildren(final Collection<String> values) {
-        return setChildren(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withChildren(final List<String> children) {
-        return setChildren(children);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withBefores(final FixtureResult... values) {
-        return setBefores(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withBefores(final Collection<FixtureResult> values) {
-        return setBefores(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withBefores(final List<FixtureResult> befores) {
-        return setBefores(befores);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withAfters(final FixtureResult... values) {
-        return setAfters(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withAfters(final Collection<FixtureResult> values) {
-        return setAfters(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withAfters(final List<FixtureResult> afters) {
-        return setAfters(afters);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withLinks(final Link... values) {
-        return setLinks(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withLinks(final Collection<Link> values) {
-        return setLinks(values);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    @JsonIgnore
-    public TestResultContainer withLinks(final List<Link> links) {
-        return setLinks(links);
+    @Override
+    public int hashCode() {
+        return Objects.hash(uuid, name);
     }
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/TestRunResult.java b/allure-model/src/main/java/io/qameta/allure/model/TestRunResult.java
deleted file mode 100644
index 829ed4e74..000000000
--- a/allure-model/src/main/java/io/qameta/allure/model/TestRunResult.java
+++ /dev/null
@@ -1,98 +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.model;
-
-import java.io.Serializable;
-
-/**
- * POJO that stores information about test run.
- * @deprecated scheduled for removal in 3.0 release
- */
-@Deprecated
-public class TestRunResult implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    protected String uuid;
-
-    protected String name;
-
-    /**
-     * Gets the value of the uuid property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Sets the value of the uuid property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public TestRunResult setUuid(final String value) {
-        this.uuid = value;
-        return this;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public TestRunResult setName(final String value) {
-        this.name = value;
-        return this;
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public TestRunResult withUuid(final String value) {
-        return setUuid(value);
-    }
-
-    /**
-     * @deprecated use set method
-     */
-    @Deprecated
-    public TestRunResult withName(final String value) {
-        return setName(value);
-    }
-}
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 ece54c8de..970ba3262 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
@@ -18,11 +18,22 @@
 import java.util.List;
 
 /**
- * @author charlie (Dmitry Baev baev@qameta.io).
- * @since 1.0-BETA1
+ * The marker interface for model objects with attachments.
+ *
+ * @author baev (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
+ * @see ExecutableItem
+ * @since 2.0
  */
 public interface WithAttachments {
 
+    /**
+     * Gets attachments.
+     *
+     * @return the attachments
+     */
     List<Attachment> getAttachments();
 
 }
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 e0169bbd2..35d93ae89 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
@@ -18,10 +18,22 @@
 import java.util.List;
 
 /**
- * @author charlie (Dmitry Baev).
+ * The marker interface for model objects with links.
+ *
+ * @author baev (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
+ * @see ExecutableItem
+ * @since 2.0
  */
 public interface WithLinks {
 
+    /**
+     * Gets links.
+     *
+     * @return the links
+     */
     List<Link> getLinks();
 
 }
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 a89b0bfc3..59634c8fd 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
@@ -18,11 +18,22 @@
 import java.util.List;
 
 /**
- * @author charlie (Dmitry Baev).
- * @since 1.0-BETA2
+ * The marker interface for model objects that could be parameterised.
+ *
+ * @author baev (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
+ * @see ExecutableItem
+ * @since 2.0
  */
 public interface WithParameters {
 
+    /**
+     * Gets parameters.
+     *
+     * @return the parameters
+     */
     List<Parameter> getParameters();
 
 }
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 c2e64e315..14ce4ecd8 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
@@ -16,10 +16,22 @@
 package io.qameta.allure.model;
 
 /**
- * @author charlie (Dmitry Baev).
+ * The marker interface for model objects with status.
+ *
+ * @author baev (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
+ * @see ExecutableItem
+ * @since 2.0
  */
 public interface WithStatus {
 
+    /**
+     * Gets status.
+     *
+     * @return the status
+     */
     Status getStatus();
 
 }
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 bca413090..409886584 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
@@ -16,10 +16,23 @@
 package io.qameta.allure.model;
 
 /**
- * @author charlie (Dmitry Baev).
+ * The marker interface for model objects with status details.
+ *
+ * @author baev (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
+ * @see ExecutableItem
+ * @see WithStatus
+ * @since 2.0
  */
 public interface WithStatusDetails extends WithStatus {
 
+    /**
+     * Gets status details.
+     *
+     * @return the status details
+     */
     StatusDetails getStatusDetails();
 
 }
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 71816082d..11952fa58 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
@@ -18,11 +18,22 @@
 import java.util.List;
 
 /**
- * @author charlie (Dmitry Baev).
- * @since 1.0-BETA1
+ * The marker interface for model objects with steps.
+ *
+ * @author baev (Dmitry Baev).
+ * @see TestResult
+ * @see FixtureResult
+ * @see StepResult
+ * @see ExecutableItem
+ * @since 2.0
  */
 public interface WithSteps {
 
+    /**
+     * Gets steps.
+     *
+     * @return the steps
+     */
     List<StepResult> getSteps();
 
 }
diff --git a/allure-reader/build.gradle.kts b/allure-reader/build.gradle.kts
new file mode 100644
index 000000000..73ca0bf02
--- /dev/null
+++ b/allure-reader/build.gradle.kts
@@ -0,0 +1,29 @@
+description = "Allure Model Reader Module"
+
+val agent: Configuration by configurations.creating
+
+dependencies {
+    agent("org.aspectj:aspectjweaver")
+    api(project(":allure-model"))
+    implementation("com.fasterxml.jackson.core:jackson-databind")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.slf4j:slf4j-simple")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.reader"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+    doFirst {
+        jvmArgs("-javaagent:${agent.singleFile}")
+    }
+}
diff --git a/allure-model/src/main/java/io/qameta/allure/model/StatusDeserializer.java b/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
similarity index 56%
rename from allure-model/src/main/java/io/qameta/allure/model/StatusDeserializer.java
rename to allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
index 5b3508db2..2e0be5da6 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/StatusDeserializer.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/AllureEnumDeserializer.java
@@ -13,29 +13,45 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.model;
+package io.qameta.allure.reader;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
 import java.io.IOException;
+import java.util.Objects;
 import java.util.stream.Stream;
 
 /**
  * @author charlie (Dmitry Baev).
+ * @param <T> the enum's type
  */
-public class StatusDeserializer extends StdDeserializer<Status> {
-    protected StatusDeserializer() {
-        super(Status.class);
+/* package-private */ abstract class AllureEnumDeserializer<T extends Enum<T>> extends StdDeserializer<T> {
+
+    private final Class<T> type;
+
+    protected AllureEnumDeserializer(final Class<T> vc) {
+        super(vc);
+        type = vc;
     }
 
     @Override
-    public Status deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {
+    public T deserialize(final JsonParser p,
+                         final DeserializationContext ctxt) throws IOException {
         final String value = p.readValueAs(String.class);
-        return Stream.of(Status.values())
-                .filter(status -> status.value().equalsIgnoreCase(value))
-                .findAny()
+        if (Objects.isNull(value)) {
+            return null;
+        }
+
+        final String trimmed = value.trim();
+        if (trimmed.isEmpty()) {
+            return null;
+        }
+
+        return Stream.of(type.getEnumConstants())
+                .filter(e -> e.name().equalsIgnoreCase(trimmed))
+                .findFirst()
                 .orElse(null);
     }
 }
diff --git a/allure-model/src/main/java/io/qameta/allure/model/Allure2ModelJackson.java b/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
similarity index 55%
rename from allure-model/src/main/java/io/qameta/allure/model/Allure2ModelJackson.java
rename to allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
index 6832b5b58..acfade3ad 100644
--- a/allure-model/src/main/java/io/qameta/allure/model/Allure2ModelJackson.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/AllureObjectMapperFactory.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 Qameta Software OÜ
+ *  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.
@@ -13,35 +13,34 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure.model;
+package io.qameta.allure.reader;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-
-import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
-import static com.fasterxml.jackson.databind.MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME;
-import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Stage;
+import io.qameta.allure.model.Status;
 
 /**
  * @author charlie (Dmitry Baev).
  */
-@SuppressWarnings("PMD.ClassNamingConventions")
-public final class Allure2ModelJackson {
-
-    public static final String INDENT_OUTPUT_PROPERTY_NAME = "allure.results.indentOutput";
+public final class AllureObjectMapperFactory {
 
-    private Allure2ModelJackson() {
-        throw new IllegalStateException("Do not instance Allure2ModelJackson");
+    private AllureObjectMapperFactory() {
+        throw new IllegalStateException("do not instance");
     }
 
     public static ObjectMapper createMapper() {
         return new ObjectMapper()
-                .configure(USE_WRAPPER_NAME_AS_PROPERTY_NAME, true)
-                .setSerializationInclusion(NON_NULL)
-                .configure(INDENT_OUTPUT, Boolean.getBoolean(INDENT_OUTPUT_PROPERTY_NAME))
+                .enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME)
+                .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
+                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
                 .registerModule(new SimpleModule()
                         .addDeserializer(Status.class, new StatusDeserializer())
                         .addDeserializer(Stage.class, new StageDeserializer())
+                        .addDeserializer(Parameter.Mode.class, new ParameterModeDeserializer())
                 );
     }
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/ReadError.java b/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
similarity index 54%
rename from allure-java-commons/src/main/java/io/qameta/allure/ReadError.java
rename to allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
index 474ea15f6..68a68cd84 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/ReadError.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/ParameterModeDeserializer.java
@@ -13,31 +13,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure;
+package io.qameta.allure.reader;
 
-import java.util.Objects;
+import io.qameta.allure.model.Parameter;
 
 /**
  * @author charlie (Dmitry Baev).
- * @deprecated scheduled to remove in 3.0
  */
-@Deprecated
-public class ReadError {
-
-    private final String message;
-
-    private final Throwable exception;
-
-    public ReadError(final Throwable exception, final String message, final Object... args) {
-        this.message = Objects.nonNull(args) ? String.format(message, args) : message;
-        this.exception = exception;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public Throwable getException() {
-        return exception;
+public class ParameterModeDeserializer extends AllureEnumDeserializer<Parameter.Mode> {
+    public ParameterModeDeserializer() {
+        super(Parameter.Mode.class);
     }
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsReader.java b/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
similarity index 53%
rename from allure-java-commons/src/main/java/io/qameta/allure/AllureResultsReader.java
rename to allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
index a4f22e354..f8de06408 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/AllureResultsReader.java
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/StageDeserializer.java
@@ -13,32 +13,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.qameta.allure;
+package io.qameta.allure.reader;
 
-import io.qameta.allure.model.TestResult;
-import io.qameta.allure.model.TestResultContainer;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.stream.Stream;
+import io.qameta.allure.model.Stage;
 
 /**
  * @author charlie (Dmitry Baev).
- *
- * @deprecated scheduled to remove in 3.0
  */
-@Deprecated
-public interface AllureResultsReader {
-
-    Stream<TestResult> readTestResults();
-
-    Stream<TestResultContainer> readTestResultsContainers();
-
-    Stream<String> findAllAttachments();
-
-    InputStream readAttachment(String source) throws IOException;
-
-    List<ReadError> getErrors();
-
+public class StageDeserializer extends AllureEnumDeserializer<Stage> {
+    public StageDeserializer() {
+        super(Stage.class);
+    }
 }
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
new file mode 100644
index 000000000..5b86f6b35
--- /dev/null
+++ b/allure-reader/src/main/java/io/qameta/allure/reader/StatusDeserializer.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.reader;
+
+import io.qameta.allure.model.Status;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class StatusDeserializer extends AllureEnumDeserializer<Status> {
+    public StatusDeserializer() {
+        super(Status.class);
+    }
+}
diff --git a/allure-test-filter/build.gradle.kts b/allure-test-filter/build.gradle.kts
index 7b2972876..86c73354c 100644
--- a/allure-test-filter/build.gradle.kts
+++ b/allure-test-filter/build.gradle.kts
@@ -1,11 +1,15 @@
+plugins {
+    id("com.github.johnrengelman.shadow")
+}
+
 description = "Allure Test Filter"
 
 val agent: Configuration by configurations.creating
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
-    implementation("com.fasterxml.jackson.core:jackson-databind")
     implementation(project(":allure-java-commons"))
+    internal("com.fasterxml.jackson.core:jackson-databind")
     testAnnotationProcessor("org.slf4j:slf4j-simple")
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("io.github.glytching:junit-extensions")
@@ -18,22 +22,56 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.jar {
-    manifest {
-        attributes(mapOf(
-                "Automatic-Module-Name" to "io.qameta.allure.testfilter"
-        ))
-    }
-    from("src/main/services") {
-        into("META-INF/services")
+configurations.forEach { configuration ->
+    configuration.outgoing.apply {
+        val removed = artifacts.removeAll { it.classifier.isNullOrEmpty() }
+        if (removed) {
+            artifact(tasks.shadowJar) {
+                classifier = ""
+            }
+        }
     }
 }
 
-tasks.test {
-    systemProperty("junit.jupiter.execution.parallel.enabled", "false")
-    useJUnitPlatform()
-    exclude("**/features/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
+tasks {
+    jar {
+        dependsOn(shadowJar)
+        enabled = false
+    }
+
+    shadowJar {
+        archiveClassifier.set("")
+        relocate("com.fasterxml.jackson", "io.qameta.allure.internal.shadowed.jackson")
+        dependencies {
+            // we only need relocate to use jackson, shadowed in allure-java-commons
+            include(dependency("x:x:x"))
+        }
+        mergeServiceFiles()
+        manifest {
+            attributes(mapOf(
+                    "Specification-Title" to project.name,
+                    "Implementation-Title" to project.name,
+                    "Implementation-Version" to project.version,
+                    "Automatic-Module-Name" to "io.qameta.allure.testfilter"
+            ))
+        }
+        from("src/main/services") {
+            into("META-INF/services")
+        }
+    }
+
+    assemble {
+        dependsOn(shadowJar)
+    }
+
+    test {
+        dependsOn(shadowJar)
+        systemProperty("junit.jupiter.execution.parallel.enabled", "false")
+        useJUnitPlatform()
+        exclude("**/features/*")
+        doFirst {
+            jvmArgs("-javaagent:${agent.singleFile}")
+        }
     }
 }
+
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 204805b51..901b685da 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
@@ -15,7 +15,7 @@
  */
 package io.qameta.allure.testfilter;
 
-import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,11 +44,8 @@ public class FileTestPlanSupplier implements TestPlanSupplier {
      */
     private static final String[] ENV_TESTPLAN_PATH = {"ALLURE_TESTPLAN_PATH", "AS_TESTPLAN_PATH"};
 
-    /**
-     * {@link ObjectMapper} to read test plan file.
-     */
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
-            .enable(JsonGenerator.Feature.IGNORE_UNKNOWN);
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
 
     /**
      * Supply test plan.
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 a74ccef9a..72d79e816 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
@@ -59,7 +59,7 @@ public TestPlanV1_0 setTests(final List<TestCase> tests) {
     /**
      * @param allureId value of @AllureId annotation, if not set pass null value
      * @param selector selector of test method
-     * @return
+     * @return true if test case with given allureId or selection is selected, false otherwise.
      */
     public boolean isSelected(final String allureId, final String selector) {
         return getTests().stream().map(test -> new String[]{test.getId(), test.getSelector()})
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 9183a589b..bf0b0ca7d 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
@@ -112,35 +112,29 @@ public class AllureTestNg implements
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureTestNg.class);
 
     private static final String ALLURE_UUID = "ALLURE_UUID";
-
+    private static final List<Class<?>> INJECTED_TYPES = Arrays.asList(
+            ITestContext.class, ITestResult.class, XmlTest.class, Method.class, Object[].class
+    );
     /**
      * Store current testng result uuid to attach before/after methods into.
      */
     private final ThreadLocal<Current> currentTestResult = ThreadLocal
             .withInitial(Current::new);
-
     /**
      * Store current container uuid for fake containers around before/after methods.
      */
     private final ThreadLocal<String> currentTestContainer = ThreadLocal
             .withInitial(() -> UUID.randomUUID().toString());
-
     /**
      * Store uuid for current executable item to catch steps and attachments.
      */
     private final ThreadLocal<String> currentExecutable = ThreadLocal
             .withInitial(() -> UUID.randomUUID().toString());
-
     /**
      * Store uuid for class test containers.
      */
     private final Map<ITestClass, String> classContainerUuidStorage = new ConcurrentHashMap<>();
     private final ReadWriteLock lock = new ReentrantReadWriteLock();
-
-    private static final List<Class<?>> INJECTED_TYPES = Arrays.asList(
-            ITestContext.class, ITestResult.class, XmlTest.class, Method.class, Object[].class
-    );
-
     private final AllureLifecycle lifecycle;
     private final AllureTestNgTestFilter testFilter;
 
@@ -158,6 +152,20 @@ public AllureTestNg() {
         this(Allure.getLifecycle());
     }
 
+    private static String safeExtractSuiteName(final ITestClass testClass) {
+        final Optional<XmlTest> xmlTest = Optional.ofNullable(testClass.getXmlTest());
+        return xmlTest.map(XmlTest::getSuite).map(XmlSuite::getName).orElse("Undefined suite");
+    }
+
+    private static String safeExtractTestTag(final ITestClass testClass) {
+        final Optional<XmlTest> xmlTest = Optional.ofNullable(testClass.getXmlTest());
+        return xmlTest.map(XmlTest::getName).orElse("Undefined testng tag");
+    }
+
+    private static String safeExtractTestClassName(final ITestClass testClass) {
+        return firstNonEmpty(testClass.getTestName(), testClass.getName()).orElse("Undefined class name");
+    }
+
     public AllureLifecycle getLifecycle() {
         return lifecycle;
     }
@@ -314,7 +322,14 @@ protected void startTestCase(final ITestContext context,
                 .setParameters(parameters)
                 .setLinks(getLinks(method, iClass))
                 .setLabels(labels);
-        processDescription(getClass().getClassLoader(), method.getConstructorOrMethod().getMethod(), result);
+
+        processDescription(
+                getClass().getClassLoader(),
+                method.getConstructorOrMethod().getMethod(),
+                result::setDescription,
+                result::setDescriptionHtml
+        );
+
         getLifecycle().scheduleTestCase(parentUuid, result);
         getLifecycle().startTestCase(uuid);
     }
@@ -395,7 +410,6 @@ public void beforeInvocation(final IInvokedMethod method, final ITestResult test
         }
     }
 
-
     private void ifSuiteFixtureStarted(final ISuite suite, final ITestNGMethod testMethod) {
         if (testMethod.isBeforeSuiteConfiguration()) {
             startBefore(getUniqueUuid(suite), testMethod);
@@ -469,14 +483,19 @@ private String getQualifiedName(final ITestNGMethod method) {
         return method.getRealClass().getName() + "." + method.getMethodName();
     }
 
-    @SuppressWarnings("deprecation")
     private FixtureResult getFixtureResult(final ITestNGMethod method) {
         final FixtureResult fixtureResult = new FixtureResult()
-                .withName(getMethodName(method))
-                .withStart(System.currentTimeMillis())
-                .withDescription(method.getDescription())
-                .withStage(Stage.RUNNING);
-        processDescription(getClass().getClassLoader(), method.getConstructorOrMethod().getMethod(), fixtureResult);
+                .setName(getMethodName(method))
+                .setStart(System.currentTimeMillis())
+                .setDescription(method.getDescription())
+                .setStage(Stage.RUNNING);
+
+        processDescription(
+                getClass().getClassLoader(),
+                method.getConstructorOrMethod().getMethod(),
+                fixtureResult::setDescription,
+                fixtureResult::setDescriptionHtml
+        );
         return fixtureResult;
     }
 
@@ -649,20 +668,6 @@ private String getUniqueUuid(final IAttributes suite) {
         return Objects.toString(suite.getAttribute(ALLURE_UUID));
     }
 
-    private static String safeExtractSuiteName(final ITestClass testClass) {
-        final Optional<XmlTest> xmlTest = Optional.ofNullable(testClass.getXmlTest());
-        return xmlTest.map(XmlTest::getSuite).map(XmlSuite::getName).orElse("Undefined suite");
-    }
-
-    private static String safeExtractTestTag(final ITestClass testClass) {
-        final Optional<XmlTest> xmlTest = Optional.ofNullable(testClass.getXmlTest());
-        return xmlTest.map(XmlTest::getName).orElse("Undefined testng tag");
-    }
-
-    private static String safeExtractTestClassName(final ITestClass testClass) {
-        return firstNonEmpty(testClass.getTestName(), testClass.getName()).orElse("Undefined class name");
-    }
-
     private List<Parameter> getParameters(final ITestContext context,
                                           final ITestNGMethod method,
                                           final Object... parameters) {
@@ -792,6 +797,15 @@ private Current refreshContext() {
         return currentTestResult.get();
     }
 
+    /**
+     * The stage of current result context.
+     */
+    private enum CurrentStage {
+        BEFORE,
+        TEST,
+        AFTER
+    }
+
     /**
      * Describes current test result.
      */
@@ -824,13 +838,4 @@ public String getUuid() {
             return uuid;
         }
     }
-
-    /**
-     * The stage of current result context.
-     */
-    private enum CurrentStage {
-        BEFORE,
-        TEST,
-        AFTER
-    }
 }
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 7a4ebe266..03d51515c 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
@@ -200,7 +200,8 @@ public void descriptionsTest() {
         assertThat(testResult).as("Test case result has not been written")
                 .hasSize(2)
                 .filteredOn(result -> result.getName().equals("test"))
-                .extracting(result -> result.getDescriptionHtml().trim())
+                .extracting(TestResult::getDescriptionHtml)
+                .map(String::trim)
                 .as("Javadoc description of test case has not been processed")
                 .contains(testDescription);
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index 6e974787b..f147bf796 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,19 +1,4 @@
-import com.diffplug.gradle.spotless.SpotlessExtension
 import io.qameta.allure.gradle.task.AllureReport
-import ru.vyarus.gradle.plugin.quality.QualityExtension
-
-buildscript {
-    repositories {
-        maven("https://plugins.gradle.org/m2/")
-        mavenLocal()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:5.13.0")
-        classpath("ru.vyarus:gradle-quality-plugin:4.6.0")
-    }
-}
 
 val linkHomepage by extra("https://qameta.io/allure")
 val linkCi by extra("https://ci.qameta.in/job/allure-java_deploy/")
@@ -25,8 +10,10 @@ val gradleScriptDir by extra("${rootProject.projectDir}/gradle")
 val qualityConfigsDir by extra("$gradleScriptDir/quality-configs")
 val spotlessDtr by extra("$qualityConfigsDir/spotless")
 
+val libs = subprojects.filterNot { it.name in "allure-bom" }
+
 tasks.withType(Wrapper::class) {
-    gradleVersion = "6.8.3"
+    gradleVersion = "7.1.1"
 }
 
 plugins {
@@ -34,9 +21,11 @@ plugins {
     `java-library`
     `maven-publish`
     signing
-    id("io.spring.dependency-management") version "1.0.11.RELEASE"
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
-    id("io.qameta.allure") version "2.8.1"
+    id("com.diffplug.spotless")
+    id("io.github.gradle-nexus.publish-plugin")
+    id("io.qameta.allure")
+    id("io.spring.dependency-management")
+    id("ru.vyarus.quality")
 }
 
 java {
@@ -44,6 +33,7 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
+
 tasks.withType(JavaCompile::class) {
     options.encoding = "UTF-8"
 }
@@ -60,14 +50,79 @@ nexusPublishing {
 }
 
 configure(subprojects) {
-    val project = this
     group = "io.qameta.allure"
     version = version
 
-    apply(plugin = "java")
     apply(plugin = "signing")
-    apply(plugin = "java-library")
     apply(plugin = "maven-publish")
+
+    publishing {
+        publications {
+            create<MavenPublication>("maven") {
+                suppressAllPomMetadataWarnings()
+                versionMapping {
+                    allVariants {
+                        fromResolutionResult()
+                    }
+                }
+                pom {
+                    name.set(project.name)
+                    description.set("Module ${project.name} of Allure Framework.")
+                    url.set("https://github.com/allure-framework/allure-java")
+                    licenses {
+                        license {
+                            name.set("The Apache License, Version 2.0")
+                            url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                        }
+                    }
+                    developers {
+                        developer {
+                            id.set("baev")
+                            name.set("Dmitry Baev")
+                            email.set("dmitry.baev@qameta.io")
+                        }
+                        developer {
+                            id.set("eroshenkoam")
+                            name.set("Artem Eroshenko")
+                            email.set("artem.eroshenko@qameta.io")
+                        }
+                    }
+                    scm {
+                        developerConnection.set("scm:git:git://github.com/allure-framework/allure-java")
+                        connection.set("scm:git:git://github.com/allure-framework/allure-java")
+                        url.set("https://github.com/allure-framework/allure-java")
+                    }
+                    issueManagement {
+                        system.set("GitHub Issues")
+                        url.set("https://github.com/allure-framework/allure-java/issues")
+                    }
+                }
+            }
+        }
+    }
+
+    signing {
+        sign(publishing.publications["maven"])
+    }
+
+    tasks.withType<Sign>().configureEach {
+        onlyIf { !project.version.toString().endsWith("-SNAPSHOT") }
+    }
+
+    tasks.withType<GenerateModuleMetadata> {
+        enabled = false
+    }
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+}
+
+configure(libs) {
+    val project = this
+    apply(plugin = "java")
+    apply(plugin = "java-library")
     apply(plugin = "io.qameta.allure")
     apply(plugin = "ru.vyarus.quality")
     apply(plugin = "com.diffplug.spotless")
@@ -102,47 +157,64 @@ configure(subprojects) {
                 entry("slf4j-simple")
             }
         }
+        generatedPomCustomization {
+            enabled(false)
+        }
     }
 
-    tasks.compileJava {
-        options.encoding = "UTF-8"
+    // Excluding shadowed jars from pom.xml https://github.com/gradle/gradle/issues/10861#issuecomment-576562961
+    val internal by configurations.creating {
+        isVisible = false
+        isCanBeConsumed = false
+        isCanBeResolved = false
     }
+    configurations.compileClasspath.get().extendsFrom(internal)
+    configurations.runtimeClasspath.get().extendsFrom(internal)
+    configurations.testCompileClasspath.get().extendsFrom(internal)
+    configurations.testRuntimeClasspath.get().extendsFrom(internal)
 
-    tasks.compileTestJava {
-        options.encoding = "UTF-8"
-        options.compilerArgs.add("-parameters")
-    }
+    tasks {
+        compileJava {
+            options.encoding = "UTF-8"
+        }
 
-    tasks.jar {
-        manifest {
-            attributes(mapOf(
-                    "Implementation-Title" to project.name,
-                    "Implementation-Version" to project.version
-            ))
+        compileTestJava {
+            options.encoding = "UTF-8"
+            options.compilerArgs.add("-parameters")
         }
-    }
 
-    tasks.test {
-        systemProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug")
-        systemProperty("allure.model.indentOutput", "true")
-        systemProperty("junit.jupiter.execution.parallel.enabled", true)
-        systemProperty("junit.jupiter.execution.parallel.mode.default", true)
-        testLogging {
-            listOf(org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED)
+        jar {
+            manifest {
+                attributes(mapOf(
+                        "Specification-Title" to project.name,
+                        "Implementation-Title" to project.name,
+                        "Implementation-Version" to project.version
+                ))
+            }
         }
-        maxHeapSize = project.property("test.maxHeapSize").toString()
-        maxParallelForks = Integer.parseInt(project.property("test.maxParallelForks") as String)
-    }
 
-    tasks.processTestResources {
-        filesMatching("**/allure.properties") {
-            filter {
-                it.replace("#project.description#", project.description ?: project.name)
+        test {
+            systemProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug")
+            systemProperty("allure.model.indentOutput", "true")
+            systemProperty("junit.jupiter.execution.parallel.enabled", true)
+            systemProperty("junit.jupiter.execution.parallel.mode.default", true)
+            testLogging {
+                listOf(org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED)
+            }
+            maxHeapSize = project.property("test.maxHeapSize").toString()
+            maxParallelForks = Integer.parseInt(project.property("test.maxParallelForks") as String)
+        }
+
+        processTestResources {
+            filesMatching("**/allure.properties") {
+                filter {
+                    it.replace("#project.description#", project.description ?: project.name)
+                }
             }
         }
     }
 
-    configure<QualityExtension> {
+    quality {
         configDir = qualityConfigsDir
         checkstyleVersion = "8.36.1"
         pmdVersion = "6.27.0"
@@ -160,7 +232,7 @@ configure(subprojects) {
         }
     }
 
-    configure<SpotlessExtension> {
+    spotless {
         java {
             target("src/**/*.java")
             removeUnusedImports()
@@ -215,59 +287,11 @@ configure(subprojects) {
         (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
     }
 
-    tasks.withType<GenerateModuleMetadata> {
-        enabled = false
-    }
-
-    publishing {
-        publications {
-            create<MavenPublication>("maven") {
-                from(components["java"])
-                suppressAllPomMetadataWarnings()
-                pom {
-                    name.set(project.name)
-                    description.set("Module ${project.name} of Allure Framework.")
-                    url.set("https://github.com/allure-framework/allure-java")
-                    licenses {
-                        license {
-                            name.set("The Apache License, Version 2.0")
-                            url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-                        }
-                    }
-                    developers {
-                        developer {
-                            id.set("baev")
-                            name.set("Dmitry Baev")
-                            email.set("dmitry.baev@qameta.io")
-                        }
-                        developer {
-                            id.set("eroshenkoam")
-                            name.set("Artem Eroshenko")
-                            email.set("artem.eroshenko@qameta.io")
-                        }
-                    }
-                    scm {
-                        developerConnection.set("scm:git:git://github.com/allure-framework/allure-java")
-                        connection.set("scm:git:git://github.com/allure-framework/allure-java")
-                        url.set("https://github.com/allure-framework/allure-java")
-                    }
-                    issueManagement {
-                        system.set("GitHub Issues")
-                        url.set("https://github.com/allure-framework/allure-java/issues")
-                    }
-                }
-            }
+    publishing.publications.named<MavenPublication>("maven") {
+        pom {
+            from(components["java"])
         }
     }
-
-    signing {
-        sign(publishing.publications["maven"])
-    }
-
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
 }
 
 allure {
diff --git a/gradle.properties b/gradle.properties
index 6b2b860c6..8f2c540cd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,6 +2,10 @@ version=2.15-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true
+org.gradle.warning.mode=none
 
 test.maxHeapSize=512m
 test.maxParallelForks=4
+
+# https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
+kotlin.stdlib.default.dependency=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132e..05679dc3c 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-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32c..ac1b06f93 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,89 +1,89 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="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
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="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
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d2093d40a..34c483a40 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,6 +2,7 @@ rootProject.name = "allure-java"
 
 include("allure-assertj")
 include("allure-attachments")
+include("allure-bom")
 include("allure-citrus")
 include("allure-cucumber-jvm")
 include("allure-cucumber2-jvm")
@@ -25,6 +26,7 @@ include("allure-junit5-assert")
 include("allure-model")
 include("allure-okhttp")
 include("allure-okhttp3")
+include("allure-reader")
 include("allure-rest-assured")
 include("allure-scalatest")
 include("allure-selenide")
@@ -34,3 +36,34 @@ include("allure-spring-web")
 include("allure-test-filter")
 include("allure-testng")
 
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+    plugins {
+        id("com.diffplug.spotless") version "5.13.0"
+        id("com.github.johnrengelman.shadow") version "7.0.0"
+        id("com.gradle.enterprise") version "3.6.2"
+        id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+        id("io.qameta.allure") version "2.8.1"
+        id("io.spring.dependency-management") version "1.0.11.RELEASE"
+        id("ru.vyarus.quality") version "4.6.0"
+        kotlin("jvm") version "1.5.0"
+    }
+}
+
+plugins {
+    id("com.gradle.enterprise")
+}
+
+val isCiServer = System.getenv().containsKey("CI")
+
+if (isCiServer) {
+    gradleEnterprise {
+        buildScan {
+            termsOfServiceUrl = "https://gradle.com/terms-of-service"
+            termsOfServiceAgree = "yes"
+            tag("CI")
+        }
+    }
+}

From 2e5f2ab440d35cf95adcaf1a0f46bbd762843bf6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Jul 2021 13:28:06 +0300
Subject: [PATCH 115/486] bump aspectjrt from 1.9.6 to 1.9.7 (via #614)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index f147bf796..6ff4f4eee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -143,7 +143,7 @@ configure(libs) {
             dependency("io.github.glytching:junit-extensions:2.4.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
-            dependency("org.aspectj:aspectjrt:1.9.6")
+            dependency("org.aspectj:aspectjrt:1.9.7")
             dependency("org.aspectj:aspectjweaver:1.9.7")
             dependency("org.assertj:assertj-core:3.20.2")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")

From 8a909f38b8d9a70a29ba2f4b2a4ef25e2d77c8ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Jul 2021 13:28:27 +0300
Subject: [PATCH 116/486] bump selenide from 5.22.2 to 5.22.3 (via #616)

---
 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 90f42559d..3ad862498 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.22.2"
+val selenideVersion = "5.22.3"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From e1ce0045b4ecc292af87fd686967802e61697bc9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Jul 2021 11:19:40 +0300
Subject: [PATCH 117/486] bump resteasy-client from 4.6.1.Final to 4.6.2.Final
 (via #617)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 6ff4f4eee..fe4c025f4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -148,7 +148,7 @@ configure(libs) {
             dependency("org.assertj:assertj-core:3.20.2")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
-            dependency("org.jboss.resteasy:resteasy-client:4.6.1.Final")
+            dependency("org.jboss.resteasy:resteasy-client:4.6.2.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
             dependency("org.mockito:mockito-core:3.11.2")
             dependencySet("org.slf4j:1.7.30") {

From 7434c8fc4ef6f52c9f37275f964bab022bf9709f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Jul 2021 11:20:49 +0300
Subject: [PATCH 118/486] bump jackson-bom from 2.12.3 to 2.12.4 (via #618)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index fe4c025f4..9d70f01b8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -130,7 +130,7 @@ configure(libs) {
 
     dependencyManagement {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.12.3")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.12.4")
             mavenBom("org.junit:junit-bom:5.7.2")
         }
         dependencies {

From 4216353929c20161078995f2062fd3ee4930374e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Jul 2021 13:06:17 +0300
Subject: [PATCH 119/486] bump resteasy-client from 4.6.2.Final to 4.7.0.Final
 (via #619)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 9d70f01b8..82f7a5c60 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -148,7 +148,7 @@ configure(libs) {
             dependency("org.assertj:assertj-core:3.20.2")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
-            dependency("org.jboss.resteasy:resteasy-client:4.6.2.Final")
+            dependency("org.jboss.resteasy:resteasy-client:4.7.0.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
             dependency("org.mockito:mockito-core:3.11.2")
             dependencySet("org.slf4j:1.7.30") {

From afd18c185391d02a3c49a0b081b75076c31d79f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Jul 2021 20:49:10 +0300
Subject: [PATCH 120/486] bump spring-web from 5.3.8 to 5.3.9 (via #622)

---
 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 402caf966..eeb135979 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Spring Web Integration"
 
 val agent: Configuration by configurations.creating
 
-val springWebVersion = "5.3.8"
+val springWebVersion = "5.3.9"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 8617007001abdf2917b3977bbc4b606eb4ba54e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Jul 2021 20:49:29 +0300
Subject: [PATCH 121/486] bump commons-io from 2.10.0 to 2.11.0 (via #621)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 82f7a5c60..239053293 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -138,7 +138,7 @@ configure(libs) {
             dependency("com.google.inject:guice:5.0.1")
             dependency("com.google.testing.compile:compile-testing:0.19")
             dependency("com.squareup.retrofit2:retrofit:2.9.0")
-            dependency("commons-io:commons-io:2.10.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.4.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")

From 85a7576a26a89a917905cdacf00bf72470c70fa3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Aug 2021 14:11:59 +0300
Subject: [PATCH 122/486] bump selenide from 5.22.3 to 5.23.2 (via #630)

---
 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 3ad862498..f3cc9694f 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.22.3"
+val selenideVersion = "5.23.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From c460e6821a7ca2b233c2002539b470be6269d72d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Aug 2021 14:12:26 +0300
Subject: [PATCH 123/486] bump resteasy-client from 4.7.0.Final to 4.7.1.Final
 (via #629)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 239053293..1720a15ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -148,7 +148,7 @@ configure(libs) {
             dependency("org.assertj:assertj-core:3.20.2")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
-            dependency("org.jboss.resteasy:resteasy-client:4.7.0.Final")
+            dependency("org.jboss.resteasy:resteasy-client:4.7.1.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
             dependency("org.mockito:mockito-core:3.11.2")
             dependencySet("org.slf4j:1.7.30") {

From d38b41fcbdb9071920c7ec8c2e9802c2c232b249 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Aug 2021 14:48:54 +0300
Subject: [PATCH 124/486] bump json-unit from 2.26.0 to 2.27.0 (via #605)

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

diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts
index 5ac50cad0..a269142be 100644
--- a/allure-jsonunit/build.gradle.kts
+++ b/allure-jsonunit/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure JsonUnit Integration"
 
 val agent: Configuration by configurations.creating
 
-val jsonUnitVersion = "2.26.0"
+val jsonUnitVersion = "2.27.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From ec57b2d425ac057262f5ecf383e5c30d0813347f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Aug 2021 13:45:39 +0300
Subject: [PATCH 125/486] bump selenide from 5.23.2 to 5.23.3 (via #633)

---
 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 f3cc9694f..ed603c671 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.23.2"
+val selenideVersion = "5.23.3"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 57f0e36a77ad986dc7e213afce1879245f0cc8c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 13:30:09 +0300
Subject: [PATCH 126/486] bump mockito-core from 3.11.2 to 3.12.1 (via #635)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 1720a15ee..8a09674e0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -150,7 +150,7 @@ configure(libs) {
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.7.1.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
-            dependency("org.mockito:mockito-core:3.11.2")
+            dependency("org.mockito:mockito-core:3.12.1")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From 0726017b8de588b20b2817401239de89f8c4d945 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Aug 2021 12:27:34 +0300
Subject: [PATCH 127/486] bump mockito-core from 3.12.1 to 3.12.3 (via #637)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 8a09674e0..18ea1502b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -150,7 +150,7 @@ configure(libs) {
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.7.1.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
-            dependency("org.mockito:mockito-core:3.12.1")
+            dependency("org.mockito:mockito-core:3.12.3")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From 02b58d74378aaa2cf0c83064f0a11f61adeeb43f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Aug 2021 12:40:47 +0300
Subject: [PATCH 128/486] bump json-unit from 2.27.0 to 2.28.0 (via #636)

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

diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts
index a269142be..355cfea5d 100644
--- a/allure-jsonunit/build.gradle.kts
+++ b/allure-jsonunit/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure JsonUnit Integration"
 
 val agent: Configuration by configurations.creating
 
-val jsonUnitVersion = "2.27.0"
+val jsonUnitVersion = "2.28.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 8377aefa10c5dbf24009a357c68edc9c38d38fa1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Aug 2021 13:24:40 +0300
Subject: [PATCH 129/486] bump mockito-core from 3.12.3 to 3.12.4 (via #638)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 18ea1502b..56f72db2c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -150,7 +150,7 @@ configure(libs) {
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.7.1.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
-            dependency("org.mockito:mockito-core:3.12.3")
+            dependency("org.mockito:mockito-core:3.12.4")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From 8de7551f39995cfefc6fe679c1b74dbc83292135 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Aug 2021 18:41:39 +0300
Subject: [PATCH 130/486] bump selenide from 5.23.3 to 5.24.0 (via #641)

---
 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 ed603c671..2467793cc 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.23.3"
+val selenideVersion = "5.24.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 50ba3a52babfcffb5eed1f91610c5625bdff7a11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Aug 2021 18:42:00 +0300
Subject: [PATCH 131/486] bump jackson-bom from 2.12.4 to 2.12.5 (via #639)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 56f72db2c..29b9b4eee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -130,7 +130,7 @@ configure(libs) {
 
     dependencyManagement {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.12.4")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.12.5")
             mavenBom("org.junit:junit-bom:5.7.2")
         }
         dependencies {

From 4a927db3168b147cb13f6b10fec7e3d2c79ed8de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Sep 2021 12:09:01 +0300
Subject: [PATCH 132/486] bump selenide from 5.24.0 to 5.24.2 (via #647)

---
 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 2467793cc..3163b2202 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.24.0"
+val selenideVersion = "5.24.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 2a00f36e6ea7cfec6818da7e2ec31d917c04c44e Mon Sep 17 00:00:00 2001
From: a-simeshin <89605031+a-simeshin@users.noreply.github.com>
Date: Fri, 3 Sep 2021 16:31:49 +0300
Subject: [PATCH 133/486] add hamcrest integration (via #642)

---
 allure-hamcrest/build.gradle.kts              |  32 +++++
 .../allure/hamcrest/AllureHamcrestAssert.java | 129 +++++++++++++++++
 .../src/main/resources/META-INF/aop-ajc.xml   |   6 +
 ...mcrestAssertionNameContainsReasonTest.java |  65 +++++++++
 ...AllureHamcrestCollectionsMatchersTest.java | 132 ++++++++++++++++++
 .../AllureHamcrestLogicalMatchersTest.java    |  74 ++++++++++
 .../AllureHamcrestNumberMatchersTest.java     |  84 +++++++++++
 .../AllureHamcrestObjectMatchersTest.java     |  97 +++++++++++++
 .../AllureHamcrestTextMatchersTest.java       |  89 ++++++++++++
 build.gradle.kts                              |   1 +
 settings.gradle.kts                           |   1 +
 11 files changed, 710 insertions(+)
 create mode 100644 allure-hamcrest/build.gradle.kts
 create mode 100644 allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
 create mode 100644 allure-hamcrest/src/main/resources/META-INF/aop-ajc.xml
 create mode 100644 allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java
 create mode 100644 allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
 create mode 100644 allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java
 create mode 100644 allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java
 create mode 100644 allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java
 create mode 100644 allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java

diff --git a/allure-hamcrest/build.gradle.kts b/allure-hamcrest/build.gradle.kts
new file mode 100644
index 000000000..3907ff9a9
--- /dev/null
+++ b/allure-hamcrest/build.gradle.kts
@@ -0,0 +1,32 @@
+description = "Allure Hamcrest Assertions Integration"
+
+val agent: Configuration by configurations.creating
+
+dependencies {
+    agent("org.aspectj:aspectjweaver")
+    api(project(":allure-java-commons"))
+    compileOnly("org.aspectj:aspectjrt")
+    implementation("org.hamcrest:hamcrest")
+    testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    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")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.hamcrest"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+    doFirst {
+        jvmArgs("-javaagent:${agent.singleFile}")
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..cf836d8f1
--- /dev/null
+++ b/allure-hamcrest/src/main/java/io/qameta/allure/hamcrest/AllureHamcrestAssert.java
@@ -0,0 +1,129 @@
+/*
+ *  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.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.hamcrest.Matcher;
+import org.hamcrest.StringDescription;
+
+import java.util.UUID;
+
+import static io.qameta.allure.util.ResultsUtils.getStatus;
+
+/**
+ * <p>
+ * Aspect "interceptor" for automatic logging to the Allure report.
+ * </p>
+ * <p>
+ * This aspect should work for all asserts that are in the Hamcrest library, since they all go through a single method
+ * to start the comparison.
+ * </p>
+ * <p>
+ * In addition to the standard comparisons that are already in the Hamcrest library, this aspect should work correctly
+ * with custom matchers if developers correctly implemented the describeMismatch and / or describeMismatchSafely
+ * methods in the TypeSafeMatcher class.
+ * </p>
+ *
+ * @author a-simeshin (Simeshin Artem)
+ * @see org.hamcrest.TypeSafeMatcher
+ */
+@Aspect
+@SuppressWarnings("all")
+public class AllureHamcrestAssert {
+
+    private static InheritableThreadLocal<AllureLifecycle> lifecycle = new InheritableThreadLocal<AllureLifecycle>() {
+        @Override
+        protected AllureLifecycle initialValue() {
+            return Allure.getLifecycle();
+        }
+    };
+
+    public static AllureLifecycle getLifecycle() {
+        return lifecycle.get();
+    }
+
+    @Pointcut("execution(void org.hamcrest.MatcherAssert.**(..))")
+    public void initAssertThat() {
+    }
+
+    /**
+     * <p>
+     * assertThat(String comment, Object actual, Matcher expected) - one and only one central entry point for all
+     * asserts. Based on this rule, you only need to log a method with three arguments.
+     * </p>
+     * <p>
+     * Even if there is no comment as the first argument, an empty string will be passed as the first argument.
+     * </p>
+     * <p>
+     * For example assertThat(value123.get(), is(equalTo("value123"))) will be proxied to the metod
+     * assertThat("", value123.get(), is(equalTo("value123")))
+     * </p>
+     *
+     * @param joinPoint - entry point with args and method name
+     */
+    @Before("initAssertThat()")
+    public void catchAndStartStep(final JoinPoint joinPoint) {
+        if (joinPoint.getArgs().length == 3) {
+            final String reason = (String) joinPoint.getArgs()[0];
+            final String actual = ObjectUtils.toString(joinPoint.getArgs()[1]);
+            final StringDescription description = new StringDescription();
+            final String expecting = description.appendText("assert \"")
+                    .appendText(actual)
+                    .appendText("\" ")
+                    .appendDescriptionOf((Matcher) joinPoint.getArgs()[2])
+                    .toString();
+
+            getLifecycle().startStep(
+                    UUID.randomUUID().toString(),
+                    new StepResult()
+                            .setName(reason.isEmpty() ? expecting : expecting + " | " + reason)
+                            .setDescription("Hamcrest assert")
+                            .setStatus(Status.PASSED)
+            );
+        }
+    }
+
+    @AfterThrowing(pointcut = "initAssertThat()", throwing = "e")
+    public void stepFailed(final Throwable e) {
+        getLifecycle().updateStep(s -> s.setStatus(getStatus(e).orElse(Status.BROKEN)));
+        getLifecycle().stopStep();
+    }
+
+    @AfterReturning(pointcut = "initAssertThat()")
+    public void stepStop() {
+        getLifecycle().updateStep(s -> s.setStatus(Status.PASSED));
+        getLifecycle().stopStep();
+    }
+
+    /**
+     * For tests only.
+     *
+     * @param allure allure lifecycle to set
+     */
+    public static void setLifecycle(final AllureLifecycle allure) {
+        lifecycle.set(allure);
+    }
+}
diff --git a/allure-hamcrest/src/main/resources/META-INF/aop-ajc.xml b/allure-hamcrest/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 000000000..5a9f73e6c
--- /dev/null
+++ b/allure-hamcrest/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.hamcrest.AllureHamcrestAssert"/>
+    </aspects>
+</aspectj>
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
new file mode 100644
index 000000000..6086258f9
--- /dev/null
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestAssertionNameContainsReasonTest.java
@@ -0,0 +1,65 @@
+/*
+ *  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.hamcrest;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalToIgnoringCase;
+
+/**
+ * This tests should cover cases when reason string exists in assertion.
+ */
+@SuppressWarnings("all")
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class AllureHamcrestAssertionNameContainsReasonTest {
+
+    @Test
+    void hamcrestAssertNameWithComment() {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(
+                        "Business always likes something weird",
+                        "TheBiscuit",
+                        equalToIgnoringCase("thebiscuit")
+                ),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly("assert \"TheBiscuit\" a string equal to \"thebiscuit\" ignoring case | Business always likes something weird");
+    }
+
+    @Test
+    void hamcrestAssertNameWoComment() {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(
+                        "TheBiscuit",
+                        equalToIgnoringCase("thebiscuit")
+                ),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly("assert \"TheBiscuit\" a string equal to \"thebiscuit\" ignoring case");
+    }
+}
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
new file mode 100644
index 000000000..805b593c4
--- /dev/null
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestCollectionsMatchersTest.java
@@ -0,0 +1,132 @@
+/*
+ *  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.hamcrest;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+import org.assertj.core.api.Assertions;
+import org.hamcrest.Matcher;
+import org.junit.jupiter.api.Test;
+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;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * All tests should cover http://hamcrest.org/JavaHamcrest/tutorial "Collections" section
+ * <ui>
+ * <li>array</li>
+ * <li>hasEntry</li>
+ * <li>hasKey</li>
+ * <li>hasValue</li>
+ * <li>hasItem</li>
+ * <li>hasItems</li>
+ * <li>hasItemInArray</li>
+ * </ui>
+ */
+@SuppressWarnings("all")
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class AllureHamcrestCollectionsMatchersTest {
+
+    @Test
+    void hamcrestAssertNameForArrayMatchers() {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(new Integer[]{1,2,3}, is(array(equalTo(1), equalTo(2), equalTo(3)))),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly("assert \"[1, 2, 3]\" is [<1>, <2>, <3>]");
+    }
+
+    private static Stream<Arguments> mapTestCases() {
+        HashMap<String, Integer> map = new HashMap<String, Integer>();
+        map.put("key1", 1);
+        map.put("key2", 2);
+        map.put("key3", 3);
+
+        return Stream.of(
+                Arguments.of(
+                        map, hasEntry(equalTo("key1"), equalTo(1)),
+                        "assert \"{key1=1, key2=2, key3=3}\" map containing [\"key1\"-><1>]"
+                ),
+                Arguments.of(
+                        map, hasKey(equalTo("key2")),
+                        "assert \"{key1=1, key2=2, key3=3}\" map containing [\"key2\"->ANYTHING]"
+                ),
+                Arguments.of(
+                        map, hasValue(equalTo(3)),
+                        "assert \"{key1=1, key2=2, key3=3}\" map containing [ANYTHING-><3>]"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("mapTestCases")
+    void hamcrestAssertNameForMapMatchers(Map actual, Matcher matcher, String expectedName) {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(actual, matcher),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly(expectedName);
+    }
+
+    private static Stream<Arguments> iterableTestCases() {
+        List<String> list = Arrays.asList("val1", "val2", "val3");
+
+        return Stream.of(
+                Arguments.of(
+                        list, hasItem(equalTo("key1")),
+                        "assert \"[val1, val2, val3]\" a collection containing \"key1\""
+                ),
+                Arguments.of(
+                        list, hasItems(startsWith("v"), endsWith("l2")),
+                        "assert \"[val1, val2, val3]\" (a collection containing a string starting with \"v\" and a collection containing a string ending with \"l2\")"
+                ),
+                Arguments.of(
+                        list, hasItemInArray(Arrays.asList("val1", "val2")),
+                        "assert \"[val1, val2, val3]\" an array containing <[val1, val2]>"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("iterableTestCases")
+    void hamcrestAssertNameForIterableMatchers(Iterable actual, Matcher matcher, String expectedName) {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(actual, matcher),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly(expectedName);
+    }
+}
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
new file mode 100644
index 000000000..f2c810425
--- /dev/null
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestLogicalMatchersTest.java
@@ -0,0 +1,74 @@
+/*
+ *  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.hamcrest;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+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;
+
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * All tests should cover http://hamcrest.org/JavaHamcrest/tutorial "Logical" section
+ * <ui>
+ * <li>allOf</li>
+ * <li>anyOf</li>
+ * <li>not</li>
+ * </ui>
+ */
+@SuppressWarnings("all")
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class AllureHamcrestLogicalMatchersTest {
+
+    private static Stream<Arguments> testCases() {
+        return Stream.of(
+                Arguments.of(
+                        "thebiscuit", allOf(startsWith("the"), containsString("biscuit")),
+                        "assert \"thebiscuit\" (a string starting with \"the\" and a string containing \"biscuit\")"
+                ),
+                Arguments.of(
+                        "thebiscuit", anyOf(startsWith("the"), containsString("test")),
+                        "assert \"thebiscuit\" (a string starting with \"the\" or a string containing \"test\")"
+                ),
+                Arguments.of(
+                        "test", is(not(anyOf(startsWith("the"), containsString("biscuit")))),
+                        "assert \"test\" is not (a string starting with \"the\" or a string containing \"biscuit\")"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("testCases")
+    void hamcrestAssertNameForLogicalMatchers(String actual, Matcher matcher, String expectedName) {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(actual, matcher),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly(expectedName);
+    }
+}
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
new file mode 100644
index 000000000..c6d43e44c
--- /dev/null
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestNumberMatchersTest.java
@@ -0,0 +1,84 @@
+/*
+ *  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.hamcrest;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+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;
+
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * All tests should cover http://hamcrest.org/JavaHamcrest/tutorial "Number" section
+ * <ui>
+ * <li>closeTo</li>
+ * <li>greaterThan</li>
+ * <li>greaterThanOrEqualTo</li>
+ * <li>lessThan</li>
+ * <li>lessThanOrEqualTo</li>
+ * </ui>
+ */
+@SuppressWarnings("all")
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class AllureHamcrestNumberMatchersTest {
+
+    private static Stream<Arguments> testCases() {
+        return Stream.of(
+                Arguments.of(
+                        0.434d, is(closeTo(0.41d, 0.45d)),
+                        "assert \"0.434\" is a numeric value within <0.45> of <0.41>"
+                ),
+                Arguments.of(
+                        0.434d, is(greaterThan(0.41d)),
+                        "assert \"0.434\" is a value greater than <0.41>"
+                ),
+                Arguments.of(
+                        0.434d, is(greaterThanOrEqualTo(0.41d)),
+                        "assert \"0.434\" is a value equal to or greater than <0.41>"
+                ),
+                Arguments.of(
+                        0.41d, is(lessThan(0.434d)),
+                        "assert \"0.41\" is a value less than <0.434>"
+                ),
+                Arguments.of(
+                        0.41d, is(lessThanOrEqualTo(0.434d)),
+                        "assert \"0.41\" is a value less than or equal to <0.434>"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("testCases")
+    void hamcrestAssertNameForNumberMatchers(double actual, Matcher matcher, String expectedName) {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(actual, matcher),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly(expectedName);
+    }
+}
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
new file mode 100644
index 000000000..3b0170d24
--- /dev/null
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestObjectMatchersTest.java
@@ -0,0 +1,97 @@
+/*
+ *  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.hamcrest;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+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;
+
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * All tests should cover http://hamcrest.org/JavaHamcrest/tutorial "Object" section
+ * <ui>
+ * <li>equalTo</li>
+ * <li>hasToString</li>
+ * <li>instanceOf</li>
+ * <li>isCompatibleType in new version typeCompatibleWith</li>
+ * <li>notNullValue</li>
+ * <li>nullValue</li>
+ * <li>sameInstance</li>
+ * </ui>
+ */
+@SuppressWarnings("all")
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class AllureHamcrestObjectMatchersTest {
+
+    private static Stream<Arguments> testCases() {
+        final String testVal = "test_test";
+
+        return Stream.of(
+                Arguments.of(
+                        "thebiscuit", is(equalTo("thebiscuit")),
+                        "assert \"thebiscuit\" is \"thebiscuit\""
+                ),
+                Arguments.of(
+                        true, hasToString("TRUE"),
+                        "assert \"true\" with toString() \"TRUE\""
+                ),
+                Arguments.of(
+                        Arrays.asList("key1", "key2"), instanceOf(Iterable.class),
+                        "assert \"[key1, key2]\" an instance of java.lang.Iterable"
+                ),
+                Arguments.of(
+                        Integer.class, typeCompatibleWith(Number.class),
+                        "assert \"class java.lang.Integer\" type < java.lang.Number"
+                ),
+                Arguments.of(
+                        "test", is(notNullValue()),
+                        "assert \"test\" is not null"
+                ),
+                Arguments.of(
+                        "test", is(not(nullValue())),
+                        "assert \"test\" is not null"
+                ),
+                Arguments.of(
+                        testVal, is(sameInstance(testVal)),
+                        "assert \"test_test\" is sameInstance(\"test_test\")"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("testCases")
+    void hamcrestAssertNameForObjectMatchers(Object actual, Matcher matcher, String expectedName) {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(actual, matcher),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly(expectedName);
+    }
+}
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
new file mode 100644
index 000000000..ec401a53b
--- /dev/null
+++ b/allure-hamcrest/src/test/java/io/qameta/allure/hamcrest/AllureHamcrestTextMatchersTest.java
@@ -0,0 +1,89 @@
+/*
+ *  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.hamcrest;
+
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.model.TestResult;
+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;
+
+import java.util.stream.Stream;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * All tests should cover http://hamcrest.org/JavaHamcrest/tutorial "Text" section
+ * <ui>
+ * <li>equalToIgnoringCase</li>
+ * <li>equalToIgnoringWhiteSpace(deprecated) - suggesting in code to use equalToCompressingWhiteSpace</li>
+ * <li>containsString</li>
+ * <li>endsWith</li>
+ * <li>startsWith</li>
+ * </ui>
+ */
+@SuppressWarnings("all")
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class AllureHamcrestTextMatchersTest {
+
+    private static Stream<Arguments> testCases() {
+        return Stream.of(
+                Arguments.of(
+                        "thebiscuit", equalToIgnoringCase("TheBiscuit"),
+                        "assert \"thebiscuit\" a string equal to \"TheBiscuit\" ignoring case"
+                ),
+                Arguments.of(
+                        "The Biscuit", equalToIgnoringWhiteSpace("TheBiscuit"),
+                        "assert \"The Biscuit\" a string equal to \"TheBiscuit\" compressing white space"
+                ),
+                Arguments.of(
+                        "The Biscuit", equalToCompressingWhiteSpace("TheBiscuit"),
+                        "assert \"The Biscuit\" a string equal to \"TheBiscuit\" compressing white space"
+                ),
+                Arguments.of(
+                        "The Biscuit", containsString("TheBiscuit"),
+                        "assert \"The Biscuit\" a string containing \"TheBiscuit\""
+                ),
+                Arguments.of(
+                        "The Biscuit", endsWith("Biscuit"),
+                        "assert \"The Biscuit\" a string ending with \"Biscuit\""
+                ),
+                Arguments.of(
+                        "The Biscuit", startsWith("Biscuit"),
+                        "assert \"The Biscuit\" a string starting with \"Biscuit\""
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("testCases")
+    void hamcrestAssertNameForTextMatchers(String actual, Matcher matcher, String expectedName) {
+        final TestResult testResult = runWithinTestContext(
+                () -> assertThat(actual, matcher),
+                AllureHamcrestAssert::setLifecycle
+        ).getTestResults().get(0);
+
+        Assertions.assertThat(testResult.getSteps())
+                .flatExtracting(StepResult::getName)
+                .containsExactly(expectedName);
+    }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
index 29b9b4eee..17d863173 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -141,6 +141,7 @@ configure(libs) {
             dependency("commons-io:commons-io:2.11.0")
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.4.0")
+            dependency("org.hamcrest:hamcrest:2.2")
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
             dependency("org.aspectj:aspectjrt:1.9.7")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 34c483a40..f0b8302ea 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,6 +11,7 @@ include("allure-cucumber4-jvm")
 include("allure-cucumber5-jvm")
 include("allure-cucumber6-jvm")
 include("allure-descriptions-javadoc")
+include("allure-hamcrest")
 include("allure-httpclient")
 include("allure-java-commons")
 include("allure-java-commons-test")

From 1bdb1850b106deadfc0fff2681bfa829daec32d3 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 3 Sep 2021 16:46:33 +0300
Subject: [PATCH 134/486] disable fail-fast for builds

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6009acaf8..085003dbe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,6 +15,7 @@ jobs:
     name: "Build"
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         java-version: [ '8.0.x', '11.0.x' ]
     steps:

From 2d7f9e4486379ecb46cc850b3c4d9726e4e1f04e Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 3 Sep 2021 17:25:45 +0300
Subject: [PATCH 135/486] update labeler config

---
 .github/labeler.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index ca8c814d0..c22e48e72 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -80,3 +80,5 @@
 "theme:testng":
   - "allure-testng/**"
 
+"theme:hamcrest":
+  - "allure-hamcrest/**"

From c2daac06899d11cc49b1c26daf516a8ad352754d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 18:48:47 +0300
Subject: [PATCH 136/486] bump junit-extensions from 2.4.0 to 2.5.0 (via #649)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 17d863173..9abd1280b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -140,7 +140,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.4.0")
+            dependency("io.github.glytching:junit-extensions:2.5.0")
             dependency("org.hamcrest:hamcrest:2.2")
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")

From 78b60184ae8c189c96756b9da7be6e2d358f3cbe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Sep 2021 12:19:09 +0300
Subject: [PATCH 137/486] bump junit-bom from 5.7.2 to 5.8.0 (via #650)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 9abd1280b..01a525b29 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -131,7 +131,7 @@ configure(libs) {
     dependencyManagement {
         imports {
             mavenBom("com.fasterxml.jackson:jackson-bom:2.12.5")
-            mavenBom("org.junit:junit-bom:5.7.2")
+            mavenBom("org.junit:junit-bom:5.8.0")
         }
         dependencies {
             dependency("com.github.tomakehurst:wiremock:2.27.2")

From 708a1f113842fadfc6d0cb092bb084b319525a49 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 13 Sep 2021 13:26:36 +0300
Subject: [PATCH 138/486] add new params api (via #648)

---
 .github/PULL_REQUEST_TEMPLATE.md              |   2 +-
 .../main/java/io/qameta/allure/Allure.java    | 121 +++++++++++++++++-
 .../src/main/java/io/qameta/allure/Param.java |  71 ++++++++++
 .../io/qameta/allure/util/AspectUtils.java    |  34 +++--
 .../io/qameta/allure/util/ParameterUtils.java |  64 +++++++++
 .../io/qameta/allure/util/ResultsUtils.java   |  16 ++-
 .../java/io/qameta/allure/AllureTest.java     |  25 ++++
 .../allure/aspects/StepsAspectsTest.java      |  31 +++++
 ...ectUtilsTest.java => ObjectUtilsTest.java} |   2 +-
 9 files changed, 344 insertions(+), 22 deletions(-)
 create mode 100644 allure-java-commons/src/main/java/io/qameta/allure/Param.java
 create mode 100644 allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java
 rename allure-java-commons/src/test/java/io/qameta/allure/util/{AspectUtilsTest.java => ObjectUtilsTest.java} (98%)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 0dec83312..8178c9b61 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@ Thank you so much for sending us a pull request!
 
 Make sure you have a clear name for your pull request. 
 The name should start with a capital letter and no dot is required in the end of the sentence.
-To link the request with isses use the following notation: (fixes #123, fixes #321\)
+To link the request with issues use the following notation: (fixes #123, fixes #321\)
 
 An example of good pull request names:
 * Add Cucumber integration (fixes #123\)
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 9e494de21..90f069556 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
@@ -247,12 +247,60 @@ public static void label(final String name, final String value) {
     /**
      * Adds parameter to current test or step (or fixture) if any. Takes no effect
      * if no test run at the moment.
+     * <p>
+     * Shortcut for {@link #parameter(String, Object, Boolean, Parameter.Mode)}.
      *
      * @param name  the name of parameter.
      * @param value the value of parameter.
      */
     public static <T> T parameter(final String name, final T value) {
-        final Parameter parameter = createParameter(name, value);
+        return parameter(name, value, null, null);
+    }
+
+    /**
+     * Adds parameter to current test or step (or fixture) if any. Takes no effect
+     * if no test run at the moment.
+     * <p>
+     * Shortcut for {@link #parameter(String, Object, Boolean, Parameter.Mode)}.
+     *
+     * @param name     the name of parameter.
+     * @param value    the value of parameter.
+     * @param excluded true if parameter should be excluded from history key calculation, false otherwise.
+     * @return the specified value.
+     */
+    public static <T> T parameter(final String name, final T value, final Boolean excluded) {
+        return parameter(name, value, excluded, null);
+    }
+
+    /**
+     * Adds parameter to current test or step (or fixture) if any. Takes no effect
+     * if no test run at the moment.
+     * <p>
+     * Shortcut for {@link #parameter(String, Object, Boolean, Parameter.Mode)}.
+     *
+     * @param name  the name of parameter.
+     * @param value the value of parameter.
+     * @param mode  the parameter mode.
+     * @return the specified value.
+     */
+    public static <T> T parameter(final String name, final T value,
+                                  final Parameter.Mode mode) {
+        return parameter(name, value, null, mode);
+    }
+
+    /**
+     * Adds parameter to current test or step (or fixture) if any. Takes no effect
+     * if no test run at the moment.
+     *
+     * @param name     the name of parameter.
+     * @param value    the value of parameter.
+     * @param excluded true if parameter should be excluded from history key calculation, false otherwise.
+     * @param mode     the parameter mode.
+     * @return the specified value.
+     */
+    public static <T> T parameter(final String name, final T value,
+                                  final Boolean excluded, final Parameter.Mode mode) {
+        final Parameter parameter = createParameter(name, value, excluded, mode);
         getLifecycle().updateTestCase(testResult -> testResult.getParameters().add(parameter));
         return value;
     }
@@ -485,12 +533,66 @@ public interface ThrowableContextRunnableVoid<T> {
     /**
      * Step context.
      */
+    @SuppressWarnings("MultipleStringLiterals")
     public interface StepContext {
 
+        /**
+         * Sets step's name.
+         *
+         * @param name the deserted name of step.
+         */
         void name(String name);
 
+        /**
+         * Adds parameter to a step.
+         *
+         * @param name  the name of parameter.
+         * @param value the value.
+         * @param <T>   the type of value.
+         * @return the value.
+         */
         <T> T parameter(String name, T value);
 
+        /**
+         * Adds parameter to a step.
+         *
+         * @param name     the name of parameter.
+         * @param value    the value.
+         * @param excluded true if parameter should be excluded from history key generation, false otherwise.
+         * @param <T>      the type of value.
+         * @return the value.
+         */
+        default <T> T parameter(String name, T value, Boolean excluded) {
+            throw new UnsupportedOperationException("method is not implemented");
+        }
+
+        /**
+         * Adds parameter to a step.
+         *
+         * @param name  the name of parameter.
+         * @param value the value.
+         * @param mode  the parameter's mode.
+         * @param <T>   the type of value.
+         * @return the value.
+         */
+        default <T> T parameter(String name, T value, Parameter.Mode mode) {
+            throw new UnsupportedOperationException("method is not implemented");
+        }
+
+        /**
+         * Adds parameter to a step.
+         *
+         * @param name     the name of parameter.
+         * @param value    the value.
+         * @param excluded true if parameter should be excluded from history key generation, false otherwise.
+         * @param mode     the parameter's mode.
+         * @param <T>      the type of value.
+         * @return the value.
+         */
+        default <T> T parameter(String name, T value, Boolean excluded, Parameter.Mode mode) {
+            throw new UnsupportedOperationException("method is not implemented");
+        }
+
     }
 
     /**
@@ -511,7 +613,22 @@ public void name(final String name) {
 
         @Override
         public <T> T parameter(final String name, final T value) {
-            final Parameter param = createParameter(name, value);
+            return parameter(name, value, null, null);
+        }
+
+        @Override
+        public <T> T parameter(final String name, final T value, final Boolean excluded) {
+            return parameter(name, value, excluded, null);
+        }
+
+        @Override
+        public <T> T parameter(final String name, final T value, final Parameter.Mode mode) {
+            return parameter(name, value, null, mode);
+        }
+
+        @Override
+        public <T> T parameter(final String name, final T value, final Boolean excluded, final Parameter.Mode mode) {
+            final Parameter param = createParameter(name, value, excluded, mode);
             getLifecycle().updateStep(uuid, stepResult -> stepResult.getParameters().add(param));
             return value;
         }
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
new file mode 100644
index 000000000..33e34f5bc
--- /dev/null
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Param.java
@@ -0,0 +1,71 @@
+/*
+ *  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;
+
+import io.qameta.allure.model.Parameter;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation used to add parameters to results
+ * from method parameters.
+ *
+ * @see Parameter
+ * @see Parameter.Mode
+ * @see Allure#parameter(String, Object)
+ */
+@Documented
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.PARAMETER})
+public @interface Param {
+
+    /**
+     * Alias for {@link #name()}. Overrides value, specified in {@link #name()}.
+     */
+    String value() default "";
+
+    /**
+     * The name of parameter. Be careful, changing parameter's name
+     * may affect method signature and, as result, may get different
+     * test case generated.
+     * <p>
+     * If not specified, the parameter name from reflection will be used.
+     *
+     * @return the name of parameter.
+     */
+    String name() default "";
+
+    /**
+     * The parameter mode.
+     *
+     * @return the parameter mode.
+     */
+    Parameter.Mode mode() default Parameter.Mode.DEFAULT;
+
+    /**
+     * Set it to true to exclude the parameter from historyKey generation.
+     *
+     * @return true if parameter is excluded, false otherwise.
+     */
+    boolean excluded() default false;
+
+}
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 98c83e7b6..640298f9d 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
@@ -15,6 +15,7 @@
  */
 package io.qameta.allure.util;
 
+import io.qameta.allure.Param;
 import io.qameta.allure.model.Parameter;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
@@ -25,6 +26,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 import static io.qameta.allure.util.NamingUtils.processNameTemplate;
 import static io.qameta.allure.util.ResultsUtils.createParameter;
@@ -38,19 +40,6 @@ private AspectUtils() {
         throw new IllegalStateException("Do not instance");
     }
 
-    /**
-     * @deprecated use {@link AspectUtils#getName(String,JoinPoint)} instead.
-     */
-    @Deprecated
-    public static String getName(final String nameTemplate,
-                                 final MethodSignature methodSignature,
-                                 final Object... args) {
-        return Optional.of(nameTemplate)
-                .filter(v -> !v.isEmpty())
-                .map(value -> processNameTemplate(value, getParametersMap(methodSignature, args)))
-                .orElseGet(methodSignature::getName);
-    }
-
     public static String getName(final String nameTemplate, final JoinPoint joinPoint) {
         return Optional.of(nameTemplate)
                 .filter(v -> !v.isEmpty())
@@ -81,9 +70,26 @@ public static Map<String, Object> getParametersMap(final JoinPoint joinPoint) {
     }
 
     public static List<Parameter> getParameters(final MethodSignature signature, final Object... args) {
+        final java.lang.reflect.Parameter[] params = signature.getMethod().getParameters();
         return IntStream
                 .range(0, args.length)
-                .mapToObj(index -> createParameter(signature.getParameterNames()[index], args[index]))
+                .mapToObj(index -> {
+                    final Parameter parameter = createParameter(signature.getParameterNames()[index], args[index]);
+                    final java.lang.reflect.Parameter ref = params[index];
+                    Stream.of(ref.getAnnotationsByType(Param.class))
+                            .findFirst()
+                            .ifPresent(param -> {
+                                Stream.of(param.value(), param.name())
+                                        .map(String::trim)
+                                        .filter(name -> name.length() > 0)
+                                        .findFirst()
+                                        .ifPresent(parameter::setName);
+
+                                parameter.setMode(param.mode());
+                                parameter.setExcluded(param.excluded());
+                            });
+                    return parameter;
+                })
                 .collect(Collectors.toList());
     }
 
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
new file mode 100644
index 000000000..f0e68f7ec
--- /dev/null
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ParameterUtils.java
@@ -0,0 +1,64 @@
+/*
+ *  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.util;
+
+import io.qameta.allure.Param;
+import io.qameta.allure.model.Parameter;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public final class ParameterUtils {
+
+    private ParameterUtils() {
+        throw new IllegalStateException("do not instance");
+    }
+
+    public static List<Parameter> createParameters(final Method method,
+                                                   final Object... args) {
+        final java.lang.reflect.Parameter[] parameters = method.getParameters();
+        return IntStream.range(0, parameters.length)
+                .mapToObj(i -> {
+                    final java.lang.reflect.Parameter parameter = parameters[i];
+                    final Object value = args[i];
+                    final Param annotation = parameter.getAnnotation(Param.class);
+                    if (Objects.isNull(annotation)) {
+                        return ResultsUtils.createParameter(parameter.getName(), value);
+                    }
+                    final String name = Stream.of(annotation.value(), annotation.name(), parameter.getName())
+                            .map(String::trim)
+                            .filter(s -> s.length() > 0)
+                            .findFirst()
+                            .orElseGet(() -> "arg" + i);
+
+                    return ResultsUtils.createParameter(
+                            name,
+                            value,
+                            annotation.excluded(),
+                            annotation.mode()
+                    );
+                })
+                .collect(Collectors.toList());
+    }
+
+}
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 c49cba794..6b5194826 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,8 +64,7 @@
         "ClassDataAbstractionCoupling",
         "PMD.ExcessiveImports",
         "PMD.TooManyMethods",
-        "PMD.GodClass",
-        "deprecation"
+        "PMD.GodClass"
 })
 public final class ResultsUtils {
 
@@ -109,7 +108,16 @@ private ResultsUtils() {
     }
 
     public static Parameter createParameter(final String name, final Object value) {
-        return new Parameter().setName(name).setValue(ObjectUtils.toString(value));
+        return createParameter(name, value, null, null);
+    }
+
+    public static Parameter createParameter(final String name, final Object value,
+                                            final Boolean excluded, final Parameter.Mode mode) {
+        return new Parameter()
+                .setName(name)
+                .setValue(ObjectUtils.toString(value))
+                .setExcluded(excluded)
+                .setMode(mode);
     }
 
     public static Label createSuiteLabel(final String suite) {
@@ -353,7 +361,7 @@ private static String getRealHostName() {
             try {
                 cachedHost = InetAddress.getLocalHost().getHostName();
             } catch (UnknownHostException e) {
-                LOGGER.debug("Could not get host name {}", e);
+                LOGGER.debug("Could not get host name", e);
                 cachedHost = "default";
             }
         }
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 ac7dbccc9..9e874187c 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
@@ -180,6 +180,31 @@ void shouldAddParameter() {
                 );
     }
 
+    @Test
+    void shouldAddParameterWithModeAndExcluded() {
+        final Parameter first = current().nextObject(Parameter.class);
+        final Parameter second = current().nextObject(Parameter.class);
+        final Parameter third = current().nextObject(Parameter.class);
+
+        final AllureResults results = runWithinTestContext(
+                () -> {
+                    parameter(first.getName(), first.getValue(), first.getMode());
+                    parameter(second.getName(), second.getValue(), second.getExcluded());
+                    parameter(third.getName(), third.getValue(), third.getExcluded(), third.getMode());
+                },
+                Allure::setLifecycle
+        );
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getExcluded, Parameter::getMode)
+                .contains(
+                        tuple(first.getName(), first.getValue(), null, first.getMode()),
+                        tuple(second.getName(), second.getValue(), second.getExcluded(), null),
+                        tuple(third.getName(), third.getValue(), third.getExcluded(), third.getMode())
+                );
+    }
+
     @Test
     void shouldAddLinks() {
         final io.qameta.allure.model.Link first = current().nextObject(Link.class);
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 72e3d2f5e..eb2cfb8c5 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
@@ -16,6 +16,7 @@
 package io.qameta.allure.aspects;
 
 import io.qameta.allure.Issue;
+import io.qameta.allure.Param;
 import io.qameta.allure.Step;
 import io.qameta.allure.model.Parameter;
 import io.qameta.allure.model.Status;
@@ -30,6 +31,7 @@
 import java.util.stream.Collectors;
 
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static io.qameta.allure.test.TestData.randomString;
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
@@ -285,6 +287,35 @@ void shouldSupportParallelStepsRun() {
                 );
     }
 
+    @Test
+    void shouldProcessParamAnnotation() {
+        final String p1 = randomString(10);
+        final String p2 = randomString(10);
+        final String p3 = randomString(10);
+        final String p4 = randomString(10);
+        final AllureResults results = runWithinTestContext(() -> stepWithParamAnnotation(p1, p2, p3, p4));
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .flatExtracting(StepResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getExcluded, Parameter::getMode)
+                .containsExactlyInAnyOrder(
+                        tuple("Named", p1, false, Parameter.Mode.DEFAULT),
+                        tuple("Excluded", p2, true, Parameter.Mode.DEFAULT),
+                        tuple("Masked", p3, false, Parameter.Mode.MASKED),
+                        tuple("Masked", p4, false, Parameter.Mode.HIDDEN)
+                );
+
+    }
+
+    @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) {
+    }
+
     @Step
     void stepWithDefaultName() {
     }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/AspectUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
similarity index 98%
rename from allure-java-commons/src/test/java/io/qameta/allure/util/AspectUtilsTest.java
rename to allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
index ea5af2cde..64045ea81 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/AspectUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/ObjectUtilsTest.java
@@ -23,7 +23,7 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-class AspectUtilsTest {
+class ObjectUtilsTest {
 
     @Issue("191")
     @Test

From d55c4e2e7ddf26055917af1996c845994a22a33a Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 13 Sep 2021 14:02:08 +0300
Subject: [PATCH 139/486] update release badge

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

diff --git a/README.md b/README.md
index fa8419abf..210b43700 100644
--- a/README.md
+++ b/README.md
@@ -5,15 +5,13 @@
 [twitter]: https://twitter.com/QametaSoftware "Qameta Software"
 [twitter-team]: https://twitter.com/QametaSoftware/lists/team/members "Team"
 
-[bintray]: https://bintray.com/qameta/maven/allure-java "Bintray"
-[bintray-badge]: https://img.shields.io/bintray/v/qameta/maven/allure-java.svg?style=flat
-
 [CONTRIBUTING.md]: .github/CONTRIBUTING.md
 [docs]: https://docs.qameta.io/allure/2.0/
 
 # Allure Java Integrations 
 
-[![Build](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml/badge.svg)](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml) [![bintray-badge][]][bintray]
+[![Build](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml/badge.svg)](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml) 
+[![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.
 

From ce6db2439f5523349897066e6583c6aaa62b19c1 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 13 Sep 2021 11:26:45 +0000
Subject: [PATCH 140/486] release 2.15.0

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

diff --git a/gradle.properties b/gradle.properties
index 8f2c540cd..bcdaff6df 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.15-SNAPSHOT
+version=2.15.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 3961ffd34f5adf284a871c59108d7f2a0f9f560a Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 13 Sep 2021 11:26:45 +0000
Subject: [PATCH 141/486] set next development version 2.16

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

diff --git a/gradle.properties b/gradle.properties
index bcdaff6df..d93364bd4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.15.0
+version=2.16-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From cd3b25fa87d6936866b74e1119fa047d57c047e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Sep 2021 12:07:34 +0300
Subject: [PATCH 142/486] bump selenide from 5.24.2 to 5.24.3 (via #651)

---
 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 3163b2202..dd2810966 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.24.2"
+val selenideVersion = "5.24.3"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 626e491aa097c6f79522dce12a91fd830c5f66ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Sep 2021 12:29:15 +0300
Subject: [PATCH 143/486] bump spring-web from 5.3.9 to 5.3.10 (via #654)

---
 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 eeb135979..d1664391a 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Spring Web Integration"
 
 val agent: Configuration by configurations.creating
 
-val springWebVersion = "5.3.9"
+val springWebVersion = "5.3.10"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 2304aa972f14f355e818edcf77cc9dcf72e9c2bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Sep 2021 12:09:17 +0300
Subject: [PATCH 144/486] bump assertj-core from 3.20.2 to 3.21.0 (via #656)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 01a525b29..be917889a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -146,7 +146,7 @@ configure(libs) {
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
             dependency("org.aspectj:aspectjrt:1.9.7")
             dependency("org.aspectj:aspectjweaver:1.9.7")
-            dependency("org.assertj:assertj-core:3.20.2")
+            dependency("org.assertj:assertj-core:3.21.0")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.7.1.Final")

From 7de53d5688fb1fff0cb1b98c8f63f5059de59991 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Sep 2021 12:09:47 +0300
Subject: [PATCH 145/486] bump selenide from 5.24.3 to 5.24.4 (via #657)

---
 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 dd2810966..97624db28 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.24.3"
+val selenideVersion = "5.24.4"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 038cc14afb85cbc3a21dae9244ba12029d8b31ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Sep 2021 13:17:50 +0300
Subject: [PATCH 146/486] bump resteasy-client from 4.7.1.Final to 4.7.2.Final
 (via #659)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index be917889a..35e4c98cd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -149,7 +149,7 @@ configure(libs) {
             dependency("org.assertj:assertj-core:3.21.0")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
-            dependency("org.jboss.resteasy:resteasy-client:4.7.1.Final")
+            dependency("org.jboss.resteasy:resteasy-client:4.7.2.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
             dependency("org.mockito:mockito-core:3.12.4")
             dependencySet("org.slf4j:1.7.30") {

From c6720b9d48fee3bc1ee88448561562e7ee6001db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Sep 2021 13:18:19 +0300
Subject: [PATCH 147/486] bump junit-bom from 5.8.0 to 5.8.1 (via #658)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 35e4c98cd..fb2a362fd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -131,7 +131,7 @@ configure(libs) {
     dependencyManagement {
         imports {
             mavenBom("com.fasterxml.jackson:jackson-bom:2.12.5")
-            mavenBom("org.junit:junit-bom:5.8.0")
+            mavenBom("org.junit:junit-bom:5.8.1")
         }
         dependencies {
             dependency("com.github.tomakehurst:wiremock:2.27.2")

From d9e43819524a891d3c85bfe6f47b60fe0d71c624 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Oct 2021 12:42:54 +0300
Subject: [PATCH 148/486] bump jackson-bom from 2.12.5 to 2.13.0 (via #661)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index fb2a362fd..844eec864 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -130,7 +130,7 @@ configure(libs) {
 
     dependencyManagement {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.12.5")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.13.0")
             mavenBom("org.junit:junit-bom:5.8.1")
         }
         dependencies {

From 16769f15f3b2a7d5b483bd07c7c39b6967e878c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Oct 2021 18:51:30 +0300
Subject: [PATCH 149/486] bump actions/checkout from 2.3.4 to 2.3.5 (via #665)

---
 .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 085003dbe..fc3e01626 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '8.0.x', '11.0.x' ]
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2.3.5
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 02bf97606..1ffdb053c 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@v2.3.4
+      - uses: actions/checkout@v2.3.5
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5afc8430b..0623733b1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
         run: |
           expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
 
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2.3.5
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From 31185933eaf5c5483efa5ae74e60b5023cb9ea33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Oct 2021 18:51:50 +0300
Subject: [PATCH 150/486] bump mockito-core from 3.12.4 to 4.0.0 (via #664)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 844eec864..f397ba00b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -151,7 +151,7 @@ configure(libs) {
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.7.2.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
-            dependency("org.mockito:mockito-core:3.12.4")
+            dependency("org.mockito:mockito-core:4.0.0")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From 217ba4c5f6330dcd0475a5ee1e44ce460a089877 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Oct 2021 13:28:40 +0300
Subject: [PATCH 151/486] bump spring-web from 5.3.10 to 5.3.11 (via #666)

---
 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 d1664391a..c27735318 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Spring Web Integration"
 
 val agent: Configuration by configurations.creating
 
-val springWebVersion = "5.3.10"
+val springWebVersion = "5.3.11"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 37dd45fd4cd4b60d0f44875a18d11bc5088f3252 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Oct 2021 16:11:45 +0300
Subject: [PATCH 152/486] bump spring-web from 5.3.11 to 5.3.12 (via #667)

---
 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 c27735318..a2a23e9f3 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Spring Web Integration"
 
 val agent: Configuration by configurations.creating
 
-val springWebVersion = "5.3.11"
+val springWebVersion = "5.3.12"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From ea3adc91f154db1491409f2804f355a8e76e0e87 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Mon, 25 Oct 2021 16:25:25 +0300
Subject: [PATCH 153/486] bump gradle wrapper

---
 gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes
 gradlew                           |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
GIT binary patch
delta 18435
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
B8dv}T

delta 17845
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
X49Luk)baa85H9$5YCsTPT`SVRWMtMW

diff --git a/gradlew b/gradlew
index 4f906e0c8..744e882ed 100755
--- a/gradlew
+++ b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

From bb1821b221aa8e330186bf6c671926c81042e9bc Mon Sep 17 00:00:00 2001
From: Boris Osipov <osipov.boris@gmail.com>
Date: Tue, 26 Oct 2021 14:28:35 +0300
Subject: [PATCH 154/486] bump selenide version and don't expose selenide to
 pom.xml (via #670)

---
 allure-selenide/build.gradle.kts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts
index 97624db28..20de1e0d5 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,12 +2,13 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "5.24.4"
+val selenideVersion = "6.0.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
-    implementation("com.codeborne:selenide:$selenideVersion")
+    compileOnly("com.codeborne:selenide:$selenideVersion")
+    testImplementation("com.codeborne:selenide:$selenideVersion")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")

From 1fc9e6b2f1135b4d6f55bc19432426d5a3832f2d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Oct 2021 14:29:39 +0300
Subject: [PATCH 155/486] bump selenide from 6.0.2 to 6.0.3 (via #671)

---
 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 20de1e0d5..c7e05cf52 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure Selenide Integration"
 
 val agent: Configuration by configurations.creating
 
-val selenideVersion = "6.0.2"
+val selenideVersion = "6.0.3"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 365ebf4170819afec980980df2661220e7c0e0fe Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 28 Oct 2021 18:55:52 +0300
Subject: [PATCH 156/486] update release configuration (via #672)

---
 .github/release-drafter.yml         | 25 -------------------------
 .github/release.yml                 | 22 ++++++++++++++++++++++
 .github/workflows/release-draft.yml | 14 --------------
 .github/workflows/release.yml       | 23 ++++++++---------------
 4 files changed, 30 insertions(+), 54 deletions(-)
 delete mode 100644 .github/release-drafter.yml
 create mode 100644 .github/release.yml
 delete mode 100644 .github/workflows/release-draft.yml

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
deleted file mode 100644
index c17d77dbe..000000000
--- a/.github/release-drafter.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name-template: '$NEXT_MINOR_VERSION'
-tag-template: '$NEXT_MINOR_VERSION'
-categories:
-  - title: '🚀 New Features'
-    labels:
-      - 'type:new feature'
-  - title: '🔬 Improvements'
-    labels:
-      - 'type:improvement'
-  - title: '🐞 Bug Fixes'
-    labels:
-      - 'type:bug'
-  - title: '⬆️ Dependency Updates'
-    labels:
-      - 'type:dependencies'
-
-change-template: '* $TITLE (via #$NUMBER) - @$AUTHOR'
-exclude-labels:
-  - 'type:internal'
-template: |
-  $CHANGES
-
-  ## 👀 Links
-
-  [Commits since $PREVIOUS_TAG](https://github.com/allure-framework/allure-java/compare/$PREVIOUS_TAG...master)
diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 000000000..c382d697b
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,22 @@
+# release.yml
+
+changelog:
+  categories:
+    - title: '🚀 New Features'
+      labels:
+        - 'type:new feature'
+    - title: '🔬 Improvements'
+      labels:
+        - 'type:improvement'
+    - title: '🐞 Bug Fixes'
+      labels:
+        - 'type:bug'
+    - title: '⬆️ Dependency Updates'
+      labels:
+        - 'type:dependencies'
+    - title: '⛔️ Security'
+      labels:
+        - 'type:security'
+    - title: '👻 Internal changes'
+      labels:
+        - 'type:internal'
diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml
deleted file mode 100644
index ea9ee55ca..000000000
--- a/.github/workflows/release-draft.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Release Draft
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  update_draft_release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: toolmantim/release-drafter@v5.15.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0623733b1..52a66524b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,11 +17,9 @@ jobs:
       - name: "Check release version"
         run: |
           expr "${{ github.event.inputs.releaseVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-
       - name: "Check next version"
         run: |
           expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-
       - uses: actions/checkout@v2.3.5
         with:
           token: ${{ secrets.QAMETA_CI }}
@@ -30,34 +28,29 @@ jobs:
         run: |
           git config --global user.name qameta-ci
           git config --global user.email qameta-ci@qameta.io
-
-      - name: "Set release version in gradle.properties file"
+      - name: "Set release version"
         run: |
           sed -i -e '/version=/s/.*/version=${{ github.event.inputs.releaseVersion }}/g' gradle.properties
           cat gradle.properties
-
       - name: "Commit release version and create tag"
         run: |
           git commit -am "release ${{ github.event.inputs.releaseVersion }}"
           git tag ${{ github.event.inputs.releaseVersion }}
           git push origin ${{ github.event.inputs.releaseVersion }}
-
-      - name: "Set next development version in gradle.properties file"
+      - name: "Set next development version"
         run: |
           sed -i -e '/version=/s/.*/version=${{ github.event.inputs.nextVersion }}-SNAPSHOT/g' gradle.properties
           cat gradle.properties
-
       - name: "Commit next development version and push it"
         run: |
           git commit -am "set next development version ${{ github.event.inputs.nextVersion }}"
-          git push origin ${GITHUB_REF}
-
+          git push origin ${{ github.ref }}
       - name: "Publish Github Release"
-        uses: toolmantim/release-drafter@v5.15.0
+        uses: octokit/request-action@v2.x
         with:
-          tag: ${{ github.event.inputs.releaseVersion }}
-          publish: "true"
-          version: ${{ github.event.inputs.releaseVersion }}
+          route: POST /repos/${{ github.repository }}/releases
+          tag_name: ${{ github.event.inputs.releaseVersion }}
+          generate_release_notes: true
+          target_commitish: ${{ github.ref }}
         env:
           GITHUB_TOKEN: ${{ secrets.QAMETA_CI }}
-

From cc9956f3d2acb2b243f34fdedcb7644e8537c80a Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Thu, 28 Oct 2021 15:57:32 +0000
Subject: [PATCH 157/486] release 2.16.0

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

diff --git a/gradle.properties b/gradle.properties
index d93364bd4..10e8f71af 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.16-SNAPSHOT
+version=2.16.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From e45db67b1f728adf335404d1a1026852847d7a68 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Thu, 28 Oct 2021 15:57:33 +0000
Subject: [PATCH 158/486] set next development version 2.17

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

diff --git a/gradle.properties b/gradle.properties
index 10e8f71af..c34fa2e10 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.16.0
+version=2.17-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 2e38ce28b700c08c58a5b4ee87a268f673d7e5ee Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 1 Nov 2021 19:09:42 +0300
Subject: [PATCH 159/486] use allure gradle plugin (via #673)

---
 allure-assertj/build.gradle.kts              |  6 ----
 allure-attachments/build.gradle.kts          |  6 ----
 allure-citrus/build.gradle.kts               |  6 ----
 allure-cucumber-jvm/build.gradle.kts         |  6 ----
 allure-cucumber2-jvm/build.gradle.kts        |  6 ----
 allure-cucumber3-jvm/build.gradle.kts        |  6 ----
 allure-cucumber4-jvm/build.gradle.kts        |  6 ----
 allure-cucumber5-jvm/build.gradle.kts        |  6 ----
 allure-cucumber6-jvm/build.gradle.kts        |  6 ----
 allure-descriptions-javadoc/build.gradle.kts |  4 ---
 allure-hamcrest/build.gradle.kts             |  8 +----
 allure-httpclient/build.gradle.kts           |  6 ----
 allure-java-commons/build.gradle.kts         |  6 ----
 allure-java-migration/build.gradle.kts       |  6 ----
 allure-jax-rs/build.gradle.kts               |  6 ----
 allure-jbehave/build.gradle.kts              |  6 ----
 allure-jsonunit/build.gradle.kts             |  6 ----
 allure-junit-platform/build.gradle.kts       |  6 ----
 allure-junit4-aspect/build.gradle.kts        |  3 --
 allure-junit4/build.gradle.kts               |  6 ----
 allure-junit5-assert/build.gradle.kts        |  6 ----
 allure-junit5/build.gradle.kts               |  6 ----
 allure-model/build.gradle.kts                |  6 ----
 allure-okhttp/build.gradle.kts               |  6 ----
 allure-okhttp3/build.gradle.kts              |  6 ----
 allure-reader/build.gradle.kts               |  6 ----
 allure-rest-assured/build.gradle.kts         |  6 ----
 allure-scalatest/build.gradle.kts            |  6 ----
 allure-selenide/build.gradle.kts             |  6 ----
 allure-spock/build.gradle.kts                |  6 ----
 allure-spring-web/build.gradle.kts           |  6 ----
 allure-test-filter/build.gradle.kts          |  6 ----
 allure-testng/build.gradle.kts               |  6 ----
 build.gradle.kts                             | 38 +++++++++++---------
 settings.gradle.kts                          |  5 ++-
 35 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/allure-assertj/build.gradle.kts b/allure-assertj/build.gradle.kts
index e8e064ed9..e38cca0ea 100644
--- a/allure-assertj/build.gradle.kts
+++ b/allure-assertj/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure AssertJ Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("org.aspectj:aspectjrt")
     compileOnly("org.assertj:assertj-core")
@@ -25,7 +22,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-attachments/build.gradle.kts b/allure-attachments/build.gradle.kts
index bfbe95e7c..c5010a3c0 100644
--- a/allure-attachments/build.gradle.kts
+++ b/allure-attachments/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure Attachments"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("org.freemarker:freemarker")
     testImplementation("org.apache.commons:commons-lang3")
@@ -26,7 +23,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-citrus/build.gradle.kts b/allure-citrus/build.gradle.kts
index bd740f9a7..dbad67a9c 100644
--- a/allure-citrus/build.gradle.kts
+++ b/allure-citrus/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure Citrus Integration"
 
-val agent: Configuration by configurations.creating
-
 val citrusVersion = "2.8.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("com.consol.citrus:citrus-core:$citrusVersion")
     testImplementation("com.consol.citrus:citrus-http:$citrusVersion")
@@ -32,7 +29,4 @@ tasks.jar {
 tasks.test {
     useJUnitPlatform()
     exclude("**/samples/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber-jvm/build.gradle.kts b/allure-cucumber-jvm/build.gradle.kts
index 3bde4ddfc..e8922f691 100644
--- a/allure-cucumber-jvm/build.gradle.kts
+++ b/allure-cucumber-jvm/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure CucumberJVM Integration"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "1.2.6"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("info.cukes:cucumber-core:$cucumberVersion")
     implementation("info.cukes:cucumber-java:$cucumberVersion")
@@ -30,7 +27,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber2-jvm/build.gradle.kts b/allure-cucumber2-jvm/build.gradle.kts
index 3201d1c25..1ce0094c1 100644
--- a/allure-cucumber2-jvm/build.gradle.kts
+++ b/allure-cucumber2-jvm/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure CucumberJVM 2.0 Integration"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "2.4.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("io.cucumber:cucumber-core:$cucumberVersion")
     implementation("io.cucumber:cucumber-java:$cucumberVersion")
@@ -29,7 +26,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber3-jvm/build.gradle.kts b/allure-cucumber3-jvm/build.gradle.kts
index 681f1ab7c..0bc20295e 100644
--- a/allure-cucumber3-jvm/build.gradle.kts
+++ b/allure-cucumber3-jvm/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure CucumberJVM 3.0 Integration"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "3.0.2"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("io.cucumber:cucumber-core:$cucumberVersion")
     implementation("io.cucumber:cucumber-java:$cucumberVersion")
@@ -29,7 +26,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber4-jvm/build.gradle.kts b/allure-cucumber4-jvm/build.gradle.kts
index 28e68c347..37b660454 100644
--- a/allure-cucumber4-jvm/build.gradle.kts
+++ b/allure-cucumber4-jvm/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure CucumberJVM 4.0"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "4.8.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("io.cucumber:cucumber-core:$cucumberVersion")
     implementation("io.cucumber:cucumber-java:$cucumberVersion")
@@ -29,7 +26,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber5-jvm/build.gradle.kts b/allure-cucumber5-jvm/build.gradle.kts
index 3899bbf31..e39b579e4 100644
--- a/allure-cucumber5-jvm/build.gradle.kts
+++ b/allure-cucumber5-jvm/build.gradle.kts
@@ -1,12 +1,9 @@
 description = "Allure CucumberJVM 5.0"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "5.1.2"
 val cucumberGherkinVersion = "5.1.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
     implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
@@ -32,7 +29,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-cucumber6-jvm/build.gradle.kts b/allure-cucumber6-jvm/build.gradle.kts
index c2553e5c7..a0dd9cb50 100644
--- a/allure-cucumber6-jvm/build.gradle.kts
+++ b/allure-cucumber6-jvm/build.gradle.kts
@@ -1,12 +1,9 @@
 description = "Allure CucumberJVM 6.0"
 
-val agent: Configuration by configurations.creating
-
 val cucumberVersion = "6.10.2"
 val cucumberGherkinVersion = "18.0.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
     implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
@@ -32,7 +29,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-descriptions-javadoc/build.gradle.kts b/allure-descriptions-javadoc/build.gradle.kts
index 8735dc765..4ec8e85c2 100644
--- a/allure-descriptions-javadoc/build.gradle.kts
+++ b/allure-descriptions-javadoc/build.gradle.kts
@@ -3,7 +3,6 @@ description = "Allure Javadoc Descriptions"
 val agent: Configuration by configurations.creating
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api("commons-io:commons-io")
     api(project(":allure-java-commons"))
     testImplementation("com.google.testing.compile:compile-testing")
@@ -26,7 +25,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-hamcrest/build.gradle.kts b/allure-hamcrest/build.gradle.kts
index 3907ff9a9..8ccb0ee47 100644
--- a/allure-hamcrest/build.gradle.kts
+++ b/allure-hamcrest/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure Hamcrest Assertions Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("org.aspectj:aspectjrt")
     implementation("org.hamcrest:hamcrest")
@@ -26,7 +23,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
-}
\ No newline at end of file
+}
diff --git a/allure-httpclient/build.gradle.kts b/allure-httpclient/build.gradle.kts
index bb9cbcc46..087e00bfb 100644
--- a/allure-httpclient/build.gradle.kts
+++ b/allure-httpclient/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure Apache HttpClient Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
     implementation("org.apache.httpcomponents:httpclient")
     testImplementation("com.github.tomakehurst:wiremock")
@@ -27,7 +24,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts
index 0c4f06028..65c5ae82d 100644
--- a/allure-java-commons/build.gradle.kts
+++ b/allure-java-commons/build.gradle.kts
@@ -4,10 +4,7 @@ plugins {
 
 description = "Allure Java Commons"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api("org.slf4j:slf4j-api")
     api(project(":allure-model"))
     compileOnly("org.aspectj:aspectjrt")
@@ -68,8 +65,5 @@ tasks {
     test {
         dependsOn(shadowJar)
         useJUnitPlatform()
-        doFirst {
-            jvmArgs("-javaagent:${agent.singleFile}")
-        }
     }
 }
diff --git a/allure-java-migration/build.gradle.kts b/allure-java-migration/build.gradle.kts
index c31df1fa6..f6a0f755e 100644
--- a/allure-java-migration/build.gradle.kts
+++ b/allure-java-migration/build.gradle.kts
@@ -1,12 +1,9 @@
 description = "Allure Java Migration Utils"
 
-val agent: Configuration by configurations.creating
-
 val junitVersion = "4.13.2"
 val testNgVersion = "6.14.3"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api("org.apache.commons:commons-lang3")
     api("org.aspectj:aspectjrt")
     api(project(":allure-java-commons"))
@@ -35,7 +32,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-jax-rs/build.gradle.kts b/allure-jax-rs/build.gradle.kts
index 441bb7573..4e1e965e8 100644
--- a/allure-jax-rs/build.gradle.kts
+++ b/allure-jax-rs/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure JAX-RS Filter Integration"
 
-val agent: Configuration by configurations.creating
-
 val javaxWsRsApiVersion = "2.1.1"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
     implementation("javax.ws.rs:javax.ws.rs-api:$javaxWsRsApiVersion")
     testImplementation("com.github.tomakehurst:wiremock")
@@ -29,7 +26,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-jbehave/build.gradle.kts b/allure-jbehave/build.gradle.kts
index 36edee469..a5270026f 100644
--- a/allure-jbehave/build.gradle.kts
+++ b/allure-jbehave/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure JBehave Integration"
 
-val agent: Configuration by configurations.creating
-
 val jbehaveVersion = "4.8.2"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("org.jbehave:jbehave-core:$jbehaveVersion")
     testImplementation("org.assertj:assertj-core")
@@ -27,7 +24,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts
index 355cfea5d..9fbf8bba8 100644
--- a/allure-jsonunit/build.gradle.kts
+++ b/allure-jsonunit/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure JsonUnit Integration"
 
-val agent: Configuration by configurations.creating
-
 val jsonUnitVersion = "2.28.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
     implementation("com.fasterxml.jackson.core:jackson-databind")
     implementation("net.javacrumbs.json-unit:json-unit:$jsonUnitVersion")
@@ -29,8 +26,5 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
 
diff --git a/allure-junit-platform/build.gradle.kts b/allure-junit-platform/build.gradle.kts
index 417709e6b..4cf244bf2 100644
--- a/allure-junit-platform/build.gradle.kts
+++ b/allure-junit-platform/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure JUnit Platform Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("org.junit.jupiter:junit-jupiter-api")
     implementation("org.junit.platform:junit-platform-launcher")
@@ -35,9 +32,6 @@ tasks.test {
     systemProperty("junit.jupiter.execution.parallel.enabled", "false")
     useJUnitPlatform()
     exclude("**/features/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
 
 val spiOffJar: Jar by tasks.creating(Jar::class) {
diff --git a/allure-junit4-aspect/build.gradle.kts b/allure-junit4-aspect/build.gradle.kts
index 9b002dbd4..3f9bb39c6 100644
--- a/allure-junit4-aspect/build.gradle.kts
+++ b/allure-junit4-aspect/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure JUnit 4 Aspect HACK"
 
-val agent: Configuration by configurations.creating
-
 val junitVersion = "4.13.2"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-junit4"))
     implementation("junit:junit:$junitVersion")
     implementation("org.aspectj:aspectjrt")
diff --git a/allure-junit4/build.gradle.kts b/allure-junit4/build.gradle.kts
index 08eddfe47..9e026c739 100644
--- a/allure-junit4/build.gradle.kts
+++ b/allure-junit4/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure JUnit 4 Integration"
 
-val agent: Configuration by configurations.creating
-
 val junitVersion = "4.13.2"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("junit:junit:$junitVersion")
     testImplementation("org.assertj:assertj-core")
@@ -28,7 +25,4 @@ tasks.jar {
 tasks.test {
     useJUnitPlatform()
     exclude("**/samples/*", "SampleTestInDefaultPackage.java")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-junit5-assert/build.gradle.kts b/allure-junit5-assert/build.gradle.kts
index d7584fa3c..047084bd4 100644
--- a/allure-junit5-assert/build.gradle.kts
+++ b/allure-junit5-assert/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure Junit5 Assertions Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-junit5"))
     compileOnly("org.aspectj:aspectjrt")
     implementation("org.junit.jupiter:junit-jupiter-api")
@@ -24,8 +21,5 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
 
diff --git a/allure-junit5/build.gradle.kts b/allure-junit5/build.gradle.kts
index 0b63accf3..7b15f0fd4 100644
--- a/allure-junit5/build.gradle.kts
+++ b/allure-junit5/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure JUnit 5 Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-junit-platform"))
     implementation("org.junit.jupiter:junit-jupiter-api")
     implementation("org.junit.platform:junit-platform-launcher")
@@ -33,9 +30,6 @@ tasks.test {
     systemProperty("junit.jupiter.execution.parallel.enabled", "false")
     useJUnitPlatform()
     exclude("**/features/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
 
 val spiOffJar: Jar by tasks.creating(Jar::class) {
diff --git a/allure-model/build.gradle.kts b/allure-model/build.gradle.kts
index dcc2389fc..056557707 100644
--- a/allure-model/build.gradle.kts
+++ b/allure-model/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure Model Integration"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     testImplementation("io.github.benas:random-beans")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
@@ -22,7 +19,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-okhttp/build.gradle.kts b/allure-okhttp/build.gradle.kts
index 2cd38e5f3..7a4f3a92f 100644
--- a/allure-okhttp/build.gradle.kts
+++ b/allure-okhttp/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure OkHttp Integration"
 
-val agent: Configuration by configurations.creating
-
 val okhttpVersion = "2.7.5"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
     implementation("com.squareup.okhttp:okhttp:$okhttpVersion")
     testImplementation("com.github.tomakehurst:wiremock")
@@ -29,7 +26,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-okhttp3/build.gradle.kts b/allure-okhttp3/build.gradle.kts
index 249b74867..b6a123e5f 100644
--- a/allure-okhttp3/build.gradle.kts
+++ b/allure-okhttp3/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure OkHttp3 Integration"
 
-val agent: Configuration by configurations.creating
-
 val okhttpVersion = "3.14.9"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
     implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
     testImplementation("com.github.tomakehurst:wiremock")
@@ -29,7 +26,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-reader/build.gradle.kts b/allure-reader/build.gradle.kts
index 73ca0bf02..432fd8158 100644
--- a/allure-reader/build.gradle.kts
+++ b/allure-reader/build.gradle.kts
@@ -1,9 +1,6 @@
 description = "Allure Model Reader Module"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-model"))
     implementation("com.fasterxml.jackson.core:jackson-databind")
     testImplementation("org.assertj:assertj-core")
@@ -23,7 +20,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-rest-assured/build.gradle.kts b/allure-rest-assured/build.gradle.kts
index 70620242a..8c01ecf40 100644
--- a/allure-rest-assured/build.gradle.kts
+++ b/allure-rest-assured/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure Rest-Assured Integration"
 
-val agent: Configuration by configurations.creating
-
 val restAssuredVersion = "4.4.0"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
     implementation("io.rest-assured:rest-assured:$restAssuredVersion")
     testImplementation("com.github.tomakehurst:wiremock")
@@ -30,7 +27,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts
index 037863975..382bbfbf5 100644
--- a/allure-scalatest/build.gradle.kts
+++ b/allure-scalatest/build.gradle.kts
@@ -78,10 +78,7 @@ val installAll by tasks.creating {
     dependsOn(availableScalaVersions.map { "installScala_${it.replace('.', '_')}" })
 }
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     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")
@@ -116,7 +113,4 @@ tasks.test {
     systemProperty("junit.jupiter.execution.parallel.enabled", "false")
     useJUnitPlatform()
     exclude("**/testdata/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts
index c7e05cf52..13ebdc1e4 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure Selenide Integration"
 
-val agent: Configuration by configurations.creating
-
 val selenideVersion = "6.0.3"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     compileOnly("com.codeborne:selenide:$selenideVersion")
     testImplementation("com.codeborne:selenide:$selenideVersion")
@@ -28,7 +25,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-spock/build.gradle.kts b/allure-spock/build.gradle.kts
index 60bea8f12..d0315fd85 100644
--- a/allure-spock/build.gradle.kts
+++ b/allure-spock/build.gradle.kts
@@ -2,12 +2,9 @@ description = "Allure Spock Framework Integration"
 
 apply(plugin = "groovy")
 
-val agent: Configuration by configurations.creating
-
 val spockFrameworkVersion = "1.3-groovy-2.5"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("org.spockframework:spock-core:$spockFrameworkVersion")
     testImplementation("org.assertj:assertj-core")
@@ -31,7 +28,4 @@ tasks.jar {
 tasks.test {
     useJUnitPlatform()
     exclude("**/samples/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-spring-web/build.gradle.kts b/allure-spring-web/build.gradle.kts
index a2a23e9f3..b8f3eac3c 100644
--- a/allure-spring-web/build.gradle.kts
+++ b/allure-spring-web/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure Spring Web Integration"
 
-val agent: Configuration by configurations.creating
-
 val springWebVersion = "5.3.12"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-attachments"))
     implementation("org.springframework:spring-web:$springWebVersion")
     testImplementation("com.github.tomakehurst:wiremock")
@@ -30,7 +27,4 @@ tasks.jar {
 
 tasks.test {
     useJUnitPlatform()
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
diff --git a/allure-test-filter/build.gradle.kts b/allure-test-filter/build.gradle.kts
index 86c73354c..547df0125 100644
--- a/allure-test-filter/build.gradle.kts
+++ b/allure-test-filter/build.gradle.kts
@@ -4,10 +4,7 @@ plugins {
 
 description = "Allure Test Filter"
 
-val agent: Configuration by configurations.creating
-
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     implementation(project(":allure-java-commons"))
     internal("com.fasterxml.jackson.core:jackson-databind")
     testAnnotationProcessor("org.slf4j:slf4j-simple")
@@ -69,9 +66,6 @@ tasks {
         systemProperty("junit.jupiter.execution.parallel.enabled", "false")
         useJUnitPlatform()
         exclude("**/features/*")
-        doFirst {
-            jvmArgs("-javaagent:${agent.singleFile}")
-        }
     }
 }
 
diff --git a/allure-testng/build.gradle.kts b/allure-testng/build.gradle.kts
index f6b2d0107..54b744093 100644
--- a/allure-testng/build.gradle.kts
+++ b/allure-testng/build.gradle.kts
@@ -1,11 +1,8 @@
 description = "Allure TestNG Integration"
 
-val agent: Configuration by configurations.creating
-
 val testNgVersion = "6.14.3"
 
 dependencies {
-    agent("org.aspectj:aspectjweaver")
     api(project(":allure-java-commons"))
     implementation("org.testng:testng:$testNgVersion")
     implementation(project(":allure-test-filter"))
@@ -34,9 +31,6 @@ tasks.test {
         suites("src/test/resources/testng.xml")
     })
     exclude("**/samples/*")
-    doFirst {
-        jvmArgs("-javaagent:${agent.singleFile}")
-    }
 }
 
 val spiOffJar: Jar by tasks.creating(Jar::class) {
diff --git a/build.gradle.kts b/build.gradle.kts
index f397ba00b..983261822 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,3 @@
-import io.qameta.allure.gradle.task.AllureReport
-
 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")
@@ -23,7 +21,8 @@ plugins {
     signing
     id("com.diffplug.spotless")
     id("io.github.gradle-nexus.publish-plugin")
-    id("io.qameta.allure")
+    id("io.qameta.allure-adapter") apply false
+    id("io.qameta.allure-report")
     id("io.spring.dependency-management")
     id("ru.vyarus.quality")
 }
@@ -121,12 +120,13 @@ configure(subprojects) {
 
 configure(libs) {
     val project = this
+    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 = "io.qameta.allure")
     apply(plugin = "ru.vyarus.quality")
-    apply(plugin = "com.diffplug.spotless")
-    apply(plugin = "io.spring.dependency-management")
 
     dependencyManagement {
         imports {
@@ -215,6 +215,17 @@ configure(libs) {
         }
     }
 
+    allure {
+        adapter {
+            autoconfigure.set(false)
+            aspectjWeaver.set(true)
+            aspectjVersion.set("1.9.7")
+
+            // in order to disable dependencySubstitution (spi-off classifier)
+            autoconfigureListeners.set(true)
+        }
+    }
+
     quality {
         configDir = qualityConfigsDir
         checkstyleVersion = "8.36.1"
@@ -274,11 +285,6 @@ configure(libs) {
         encoding("UTF-8")
     }
 
-    allure {
-        autoconfigure = false
-        aspectjweaver = false
-    }
-
     java {
         withJavadocJar()
         withSourcesJar()
@@ -296,12 +302,10 @@ configure(libs) {
 }
 
 allure {
-    version = "2.13.5"
-    autoconfigure = false
-    aspectjweaver = false
+    version.set("2.16.0")
 }
 
-val aggregatedReport by tasks.creating(AllureReport::class) {
-    clean = true
-    resultsDirs = subprojects.map { file("${it.buildDir}/allure-results") }.filter { it.exists() }
+repositories {
+    mavenLocal()
+    mavenCentral()
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f0b8302ea..c8e819b22 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -46,7 +46,10 @@ pluginManagement {
         id("com.github.johnrengelman.shadow") version "7.0.0"
         id("com.gradle.enterprise") version "3.6.2"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
-        id("io.qameta.allure") version "2.8.1"
+        id("io.qameta.allure-adapter") version "2.9.6"
+        id("io.qameta.allure-aggregate-report") version "2.9.6"
+        id("io.qameta.allure-download") version "2.9.6"
+        id("io.qameta.allure-report") version "2.9.6"
         id("io.spring.dependency-management") version "1.0.11.RELEASE"
         id("ru.vyarus.quality") version "4.6.0"
         kotlin("jvm") version "1.5.0"

From 9f693791b01f2dc0d84ceb3c9e1bfec19947790b Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Tue, 2 Nov 2021 14:23:24 +0300
Subject: [PATCH 160/486] add support for provided labels for cucumber-jvm
 integrations (via #674)

---
 .../allure/cucumberjvm/LabelBuilder.java      |  1 +
 .../cucumberjvm/AllureCucumberJvmTest.java    | 19 ++++++++++++++++++
 .../allure/cucumber2jvm/LabelBuilder.java     |  2 ++
 .../cucumber2jvm/AllureCucumber2JvmTest.java  | 18 +++++++++++++++++
 .../allure/cucumber3jvm/LabelBuilder.java     |  2 ++
 .../cucumber3jvm/AllureCucumber3JvmTest.java  | 19 ++++++++++++++++++
 .../allure/cucumber4jvm/LabelBuilder.java     |  1 +
 .../cucumber4jvm/AllureCucumber4JvmTest.java  | 20 +++++++++++++++++++
 .../allure/cucumber5jvm/LabelBuilder.java     |  1 +
 .../cucumber5jvm/AllureCucumber5JvmTest.java  | 20 +++++++++++++++++++
 .../allure/cucumber6jvm/LabelBuilder.java     |  1 +
 .../cucumber6jvm/AllureCucumber6JvmTest.java  | 20 +++++++++++++++++++
 12 files changed, 124 insertions(+)

diff --git a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java
index 8acfe213d..c022b8531 100644
--- a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java
+++ b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java
@@ -112,6 +112,7 @@ class LabelBuilder {
             }
         }
 
+        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
         getScenarioLabels().addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
diff --git a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java
index ea5db2632..e5274cbef 100644
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java
+++ b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java
@@ -41,6 +41,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.ResourceLock;
 
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
@@ -55,6 +56,8 @@
 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).
@@ -404,6 +407,22 @@ void shouldUseUuid() {
                 .allMatch(uuid -> nonNull(uuid) && uuid.matches("[\\-a-z0-9]+"), "UUID");
     }
 
+    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm1-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", "cucumberjvm1-test-provided")
+                );
+    }
+
     private AllureResults runFeature(final String featureResource,
                                      final String... moreOptions) {
         final AllureResultsWriterStub writer = new AllureResultsWriterStub();
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
index b222a988a..18b36ae0a 100644
--- 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
@@ -20,6 +20,7 @@
 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;
 
@@ -114,6 +115,7 @@ class LabelBuilder {
             }
         }
 
+        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
         getScenarioLabels().addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
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
index 10498f014..55c217cb5 100644
--- 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
@@ -45,6 +45,7 @@
 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;
@@ -61,6 +62,8 @@
 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).
@@ -555,6 +558,21 @@ void shouldSetStatusFailedOnFailedAndUndefinedSteps() {
                 .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)) {
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
index 2401d6481..e73fc9c41 100644
--- 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
@@ -20,6 +20,7 @@
 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;
 
@@ -114,6 +115,7 @@ class LabelBuilder {
             }
         }
 
+        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
         getScenarioLabels().addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
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
index d6aaf4e46..29b64f837 100644
--- 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
@@ -45,6 +45,7 @@
 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;
@@ -61,6 +62,8 @@
 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).
@@ -568,6 +571,22 @@ void shouldSetStatusFailedOnFailedAndUndefinedSteps() {
                 .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);
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 ef7dcf7f1..9958e8e85 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
@@ -115,6 +115,7 @@ class LabelBuilder {
         final String featureName = feature.getName();
         final String uri = scenario.getUri();
 
+        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
         getScenarioLabels().addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
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 4ddbb50eb..95d08f2f8 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
@@ -49,6 +49,7 @@
 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;
@@ -70,6 +71,8 @@
 import static java.lang.Thread.currentThread;
 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).
@@ -730,6 +733,23 @@ void shouldHandleAmbigiousStepsExceptions() {
                 );
     }
 
+    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm4-test-provided")
+    @Test
+    void shouldSupportProvidedLabels() {
+        final AllureResultsWriterStub results = new AllureResultsWriterStub();
+        runFeature(results, "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", "cucumberjvm4-test-provided")
+                );
+    }
+
     private byte runFeature(final AllureResultsWriterStub writer,
                             final String featureResource,
                             final String... moreOptions) {
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 68063215e..d888a5c1e 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
@@ -112,6 +112,7 @@ class LabelBuilder {
         final String featureName = feature.getName();
         final URI uri = scenario.getUri();
 
+        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
         getScenarioLabels().addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
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 afd6c9567..6541f639b 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
@@ -41,6 +41,7 @@
 import io.qameta.allure.test.AllureResultsWriterStub;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.ResourceLock;
 
 import java.nio.charset.StandardCharsets;
 import java.time.Clock;
@@ -55,6 +56,8 @@
 
 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).
@@ -713,6 +716,23 @@ void shouldHandleAmbigiousStepsExceptions() {
                 );
     }
 
+    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm5-test-provided")
+    @Test
+    void shouldSupportProvidedLabels() {
+        final AllureResultsWriterStub results = new AllureResultsWriterStub();
+        runFeature(results, "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", "cucumberjvm5-test-provided")
+                );
+    }
+
     private byte runFeature(final AllureResultsWriterStub writer,
                             final String featureResource,
                             final String... moreOptions) {
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 3a51a15dc..7058c714b 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
@@ -112,6 +112,7 @@ class LabelBuilder {
         final String featureName = feature.getName();
         final URI uri = scenario.getUri();
 
+        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
         getScenarioLabels().addAll(Arrays.asList(
                 createHostLabel(),
                 createThreadLabel(),
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 fdc541590..98c79cce8 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
@@ -41,6 +41,7 @@
 import io.qameta.allure.test.AllureResultsWriterStub;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.ResourceLock;
 
 import java.nio.charset.StandardCharsets;
 import java.time.Clock;
@@ -55,6 +56,8 @@
 
 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).
@@ -713,6 +716,23 @@ void shouldHandleAmbigiousStepsExceptions() {
                 );
     }
 
+    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm6-test-provided")
+    @Test
+    void shouldSupportProvidedLabels() {
+        final AllureResultsWriterStub results = new AllureResultsWriterStub();
+        runFeature(results, "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", "cucumberjvm6-test-provided")
+                );
+    }
+
     private byte runFeature(final AllureResultsWriterStub writer,
                             final String featureResource,
                             final String... moreOptions) {

From 2e5e43359d852488e32d0c1ffe27c438be6264d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Nov 2021 15:44:59 +0300
Subject: [PATCH 161/486] bump actions/checkout from 2.3.5 to 2.4.0 (via #675)

---
 .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 fc3e01626..76fe22870 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '8.0.x', '11.0.x' ]
     steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1ffdb053c..79868e2a2 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@v2.3.5
+      - uses: actions/checkout@v2.4.0
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 52a66524b..10a55d378 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@v2.3.5
+      - uses: actions/checkout@v2.4.0
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From dff0563e086552b234ca90561b6ac881cc1403b7 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Wed, 3 Nov 2021 12:53:20 +0000
Subject: [PATCH 162/486] release 2.16.1

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

diff --git a/gradle.properties b/gradle.properties
index c34fa2e10..20b6ae314 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.17-SNAPSHOT
+version=2.16.1
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From f18cede3bef36b7f2bec3a47ad5eb982797b027d Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Wed, 3 Nov 2021 12:53:21 +0000
Subject: [PATCH 163/486] set next development version 2.17

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

diff --git a/gradle.properties b/gradle.properties
index 20b6ae314..c34fa2e10 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.16.1
+version=2.17-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From c8fa70484a12b568d04e927457cff1bef7b8da4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Nov 2021 14:28:02 +0300
Subject: [PATCH 164/486] bump resteasy-client from 4.7.2.Final to 4.7.3.Final
 (via #676)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 983261822..36e7982d1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -149,7 +149,7 @@ configure(libs) {
             dependency("org.assertj:assertj-core:3.21.0")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.freemarker:freemarker:2.3.31")
-            dependency("org.jboss.resteasy:resteasy-client:4.7.2.Final")
+            dependency("org.jboss.resteasy:resteasy-client:4.7.3.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
             dependency("org.mockito:mockito-core:4.0.0")
             dependencySet("org.slf4j:1.7.30") {

From 2c21ebe91c29236b7214f52ea0bb760c4b179ff8 Mon Sep 17 00:00:00 2001
From: Sergey <sergey.shakur@gmail.com>
Date: Mon, 8 Nov 2021 15:02:31 +0200
Subject: [PATCH 165/486] fix response name caching for rest assured (fixes
 #678, via #679)

---
 .../allure/restassured/AllureRestAssured.java | 10 ++--
 .../restassured/AllureRestAssuredTest.java    | 52 +++++++++++++++++--
 2 files changed, 55 insertions(+), 7 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 c08d960ba..a916012fe 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
@@ -33,6 +33,7 @@
 
 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;
 
 /**
  * Allure logger filter for Rest-assured.
@@ -105,10 +106,11 @@ public Response filter(final FilterableRequestSpecification requestSpec,
         );
 
         final Response response = filterContext.next(requestSpec, responseSpec);
-        if (Objects.isNull(responseAttachmentName)) {
-            responseAttachmentName = response.getStatusLine();
-        }
-        final HttpResponseAttachment responseAttachment = create(responseAttachmentName)
+
+        final String attachmentName = ofNullable(responseAttachmentName)
+                .orElse(response.getStatusLine());
+
+        final HttpResponseAttachment responseAttachment = create(attachmentName)
                 .setResponseCode(response.getStatusCode())
                 .setHeaders(toMapConverter(response.getHeaders()))
                 .setBody(prettifier.getPrettifiedBodyIfPossible(response, response.getBody()))
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 e92d5d866..d3121ed0f 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
@@ -16,6 +16,7 @@
 package io.qameta.allure.restassured;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import com.google.common.collect.ImmutableList;
@@ -23,14 +24,19 @@
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResults;
 import io.restassured.RestAssured;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 import org.junit.jupiter.params.provider.ArgumentsSource;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
@@ -68,6 +74,41 @@ void shouldCreateAttachment(final List<String> attachmentNames, final AllureRest
                 .isEqualTo(attachmentNames);
     }
 
+    @Test
+    void shouldProperlySetAttachmentNameForSingleFilterInstance() {
+        final AllureRestAssured filter = new AllureRestAssured();
+
+        final ResponseDefinitionBuilder responseBuilderOne = WireMock.aResponse()
+                .withStatus(200)
+                .withBody("some body");
+
+        final ResponseDefinitionBuilder responseBuilderTwo = WireMock.aResponse()
+                .withStatus(400)
+                .withBody("some other body");
+
+        RestAssured.replaceFiltersWith(filter);
+        final AllureResults resultsOne = executeWithStub(responseBuilderOne);
+
+        RestAssured.replaceFiltersWith(filter);
+        final AllureResults resultsTwo = executeWithStub(responseBuilderTwo);
+
+        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))
+                .hasSize(2)
+                .anyMatch(res -> res.equals("HTTP/1.1 400 Bad Request"));
+    }
+
     @ParameterizedTest
     @ArgumentsSource(AttachmentArgumentProvider.class)
     void shouldCatchAttachmentBody(final List<String> attachmentNames, final AllureRestAssured filter) {
@@ -91,15 +132,20 @@ void shouldCatchAttachmentBody(final List<String> attachmentNames, final AllureR
     }
 
     protected final AllureResults execute() {
+        return executeWithStub(WireMock.aResponse().withBody("some body"));
+    }
+
+    protected final AllureResults executeWithStub(ResponseDefinitionBuilder responseBuilder) {
         final WireMockServer server = new WireMockServer(WireMockConfiguration.options().dynamicPort());
+        final int statusCode = responseBuilder.build().getStatus();
 
         return runWithinTestContext(() -> {
             server.start();
             WireMock.configureFor(server.port());
 
-            WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello")).willReturn(WireMock.aResponse().withBody("some body")));
+            WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/hello")).willReturn(responseBuilder));
             try {
-                RestAssured.when().get(server.url("/hello")).then().statusCode(200);
+                RestAssured.when().get(server.url("/hello")).then().statusCode(statusCode);
             } finally {
                 server.stop();
                 RestAssured.replaceFiltersWith(ImmutableList.of());

From 156812de46db75413bf99f98fcdfe3c86faf625e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Nov 2021 12:16:02 +0300
Subject: [PATCH 166/486] bump spring-web from 5.3.12 to 5.3.13 (via #682)

---
 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 b8f3eac3c..4841fe9d4 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.12"
+val springWebVersion = "5.3.13"
 
 dependencies {
     api(project(":allure-attachments"))

From d27d555a0dab10bd3781cf522fcf45e76d82d9de Mon Sep 17 00:00:00 2001
From: jsa34 <31512041+jsa34@users.noreply.github.com>
Date: Tue, 23 Nov 2021 13:29:21 +0000
Subject: [PATCH 167/486] add cucumberjvm 7 (fixes #684, via #683)

---
 allure-cucumber7-jvm/build.gradle.kts         |  32 +
 .../cucumber7jvm/AllureCucumber7Jvm.java      | 440 ++++++++++
 .../allure/cucumber7jvm/LabelBuilder.java     | 192 +++++
 .../qameta/allure/cucumber7jvm/TagParser.java |  71 ++
 .../testsourcemodel/TestSourcesModel.java     | 186 +++++
 .../TestSourcesModelProxy.java                |  76 ++
 .../cucumber7jvm/AllureCucumber7JvmTest.java  | 768 ++++++++++++++++++
 .../cucumber7jvm/samples/AmbigiousSteps.java  |  40 +
 .../cucumber7jvm/samples/AttachmentSteps.java |  39 +
 .../samples/BackgroundFeatureSteps.java       |  43 +
 .../samples/BrokenFeatureSteps.java           |  30 +
 .../samples/DatatableFeatureSteps.java        |  31 +
 .../cucumber7jvm/samples/HookSteps.java       |  64 ++
 .../cucumber7jvm/samples/PendingSteps.java    |  32 +
 .../samples/SimpleFeatureSteps.java           |  55 ++
 .../src/test/resources/allure.properties      |   3 +
 .../test/resources/features/ambigious.feature |   5 +
 .../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 |  98 +++
 .../resources/features/multi-examples.feature |  17 +
 .../test/resources/features/parallel.feature  |  17 +
 .../test/resources/features/pending.feature   |   6 +
 .../features/scenario_description.feature     |  19 +
 .../test/resources/features/simple.feature    |   7 +
 .../src/test/resources/features/tags.feature  |  13 +
 .../test/resources/features/undefined.feature |   6 +
 build.gradle.kts                              |   2 +-
 settings.gradle.kts                           |   1 +
 34 files changed, 2356 insertions(+), 1 deletion(-)
 create mode 100644 allure-cucumber7-jvm/build.gradle.kts
 create mode 100644 allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
 create mode 100644 allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
 create mode 100644 allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
 create mode 100644 allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
 create mode 100644 allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java
 create mode 100644 allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
 create mode 100644 allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
 create mode 100644 allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
 create mode 100644 allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java
 create mode 100644 allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java
 create mode 100644 allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java
 create mode 100644 allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
 create mode 100644 allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java
 create mode 100644 allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java
 create mode 100644 allure-cucumber7-jvm/src/test/resources/allure.properties
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/ambigious.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/attachments.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/background.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/broken.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/datatable.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/description.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/examples.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/failed.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/hooks.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/multi-examples.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/parallel.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/pending.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/scenario_description.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/simple.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/tags.feature
 create mode 100644 allure-cucumber7-jvm/src/test/resources/features/undefined.feature

diff --git a/allure-cucumber7-jvm/build.gradle.kts b/allure-cucumber7-jvm/build.gradle.kts
new file mode 100644
index 000000000..b6104c0aa
--- /dev/null
+++ b/allure-cucumber7-jvm/build.gradle.kts
@@ -0,0 +1,32 @@
+description = "Allure CucumberJVM 7.0"
+
+val cucumberVersion = "7.0.0"
+val cucumberGherkinVersion = "22.0.0"
+
+dependencies {
+    api(project(":allure-java-commons"))
+    compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion")
+    implementation("io.cucumber:gherkin:$cucumberGherkinVersion")
+    testImplementation("io.cucumber:gherkin:$cucumberGherkinVersion")
+    testImplementation("io.cucumber:cucumber-core:$cucumberVersion")
+    testImplementation("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"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.cucumber7jvm"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
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
new file mode 100644
index 000000000..467f533af
--- /dev/null
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java
@@ -0,0 +1,440 @@
+/*
+ *  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.cucumber7jvm;
+
+import io.cucumber.messages.types.Examples;
+import io.cucumber.messages.types.Feature;
+import io.cucumber.messages.types.Scenario;
+import io.cucumber.messages.types.TableRow;
+import io.cucumber.plugin.ConcurrentEventListener;
+import io.cucumber.plugin.event.DataTableArgument;
+import io.cucumber.plugin.event.EmbedEvent;
+import io.cucumber.plugin.event.EventHandler;
+import io.cucumber.plugin.event.EventPublisher;
+import io.cucumber.plugin.event.HookTestStep;
+import io.cucumber.plugin.event.HookType;
+import io.cucumber.plugin.event.PickleStepTestStep;
+import io.cucumber.plugin.event.Result;
+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.TestStepFinished;
+import io.cucumber.plugin.event.TestStepStarted;
+import io.cucumber.plugin.event.WriteEvent;
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.cucumber7jvm.testsourcemodel.TestSourcesModelProxy;
+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.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+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 7.0.
+ */
+@SuppressWarnings({
+        "ClassDataAbstractionCoupling",
+        "ClassFanOutComplexity",
+        "PMD.ExcessiveImports",
+        "PMD.GodClass",
+})
+public class AllureCucumber7Jvm implements ConcurrentEventListener {
+
+    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;
+    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 AllureCucumber7Jvm() {
+        this(Allure.getLifecycle());
+    }
+
+    public AllureCucumber7Jvm(final AllureLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    /*
+    Event Handlers
+     */
+    @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);
+    }
+
+    private void handleFeatureStartedHandler(final TestSourceRead event) {
+        testSources.addTestSourceReadEvent(event.getUri(), 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 Deque<String> tags = new LinkedList<>(currentTestCase.get().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 TestResult result = new TestResult()
+                .setUuid(getTestCaseUuid(currentTestCase.get()))
+                .setHistoryId(getHistoryId(currentTestCase.get()))
+                .setFullName(featureName + ": " + name)
+                .setName(name)
+                .setLabels(labelBuilder.getScenarioLabels())
+                .setLinks(labelBuilder.getScenarioLinks());
+
+        final Scenario scenarioDefinition =
+                testSources.getScenarioDefinition(
+                        currentFeatureFile.get(),
+                        currentTestCase.get().getLocation().getLine()
+                );
+
+        if (scenarioDefinition.getExamples() != null) {
+            result.setParameters(
+                    getExamplesAsParameters(scenarioDefinition, currentTestCase.get())
+            );
+        }
+
+        final String description = Stream.of(feature.getDescription(), scenarioDefinition.getDescription())
+                .filter(Objects::nonNull)
+                .filter(s -> !s.isEmpty())
+                .collect(Collectors.joining("\n"));
+
+        if (!description.isEmpty()) {
+            result.setDescription(description);
+        }
+
+        final TestResultContainer resultContainer = new TestResultContainer()
+                .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
+                .setUuid(getTestContainerUuid())
+                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase.get())));
+
+        lifecycle.scheduleTestCase(result);
+        lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
+        lifecycle.startTestCase(getTestCaseUuid(currentTestCase.get()));
+    }
+
+    private void handleTestCaseFinished(final TestCaseFinished event) {
+
+        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 StepArgument stepArgument = pickleStep.getStep().getArgument();
+            if (stepArgument instanceof DataTableArgument) {
+                final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
+                createDataTableAttachment(dataTableArgument);
+            }
+        } else if (event.getTestStep() instanceof HookTestStep) {
+            initHook((HookTestStep) event.getTestStep());
+        }
+    }
+
+    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.getTestStep() instanceof HookTestStep) {
+            handleHookStep(event);
+        } else {
+            handlePickleStep(event);
+        }
+    }
+
+    private void handleWriteEvent(final WriteEvent event) {
+        lifecycle.addAttachment(
+                "Text output",
+                TEXT_PLAIN,
+                TXT_EXTENSION,
+                Objects.toString(event.getText()).getBytes(StandardCharsets.UTF_8)
+        );
+    }
+
+    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 = testCase.getUri().toString()
+                .substring(testCase.getUri().toString().lastIndexOf('/') + 1)
+                + ":" + testCase.getLocation().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 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();
+
+        if (!maybeExample.isPresent()) {
+            return Collections.emptyList();
+        }
+
+        final Examples examples = maybeExample.get();
+
+        final Optional<TableRow> maybeRow = examples.getTableBody().stream()
+                .filter(example -> example.getLocation().getLine() == localCurrentTestCase.getLocation().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) {
+        final List<List<String>> rowsInTable = dataTableArgument.cells();
+        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 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.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);
+        }
+
+        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.getResult());
+        final StatusDetails statusDetails;
+        if (event.getResult().getStatus() == io.cucumber.plugin.event.Status.UNDEFINED) {
+            updateTestCaseStatus(Status.PASSED);
+
+            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);
+        }
+
+        if (!Status.PASSED.equals(stepStatus) && stepStatus != null) {
+            forbidTestCaseStatusChange.set(true);
+        }
+
+        final TagParser tagParser = new TagParser(currentFeature.get(), currentTestCase.get());
+        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));
+        }
+    }
+}
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
new file mode 100644
index 000000000..961138543
--- /dev/null
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java
@@ -0,0 +1,192 @@
+/*
+ *  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.cucumber7jvm;
+
+import io.cucumber.messages.types.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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+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.createLabel;
+import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
+import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
+import static io.qameta.allure.util.ResultsUtils.createSuiteLabel;
+import static io.qameta.allure.util.ResultsUtils.createTestClassLabel;
+import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
+
+/**
+ * Scenario labels and links builder.
+ */
+@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount", "MultipleStringLiterals"})
+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<String> tags) {
+        final TagParser tagParser = new TagParser(feature, scenario);
+
+        while (tags.peek() != null) {
+            final String tag = tags.remove();
+
+            if (tag.contains(COMPOSITE_TAG_DELIMITER)) {
+
+                final String[] tagParts = tag.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(tag);
+                    continue;
+                }
+
+                switch (tagKey) {
+                    case SEVERITY:
+                        getScenarioLabels().add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase()));
+                        break;
+                    case TMS_LINK:
+                        getScenarioLinks().add(ResultsUtils.createTmsLink(tagValue));
+                        break;
+                    case ISSUE_LINK:
+                        getScenarioLinks().add(ResultsUtils.createIssueLink(tagValue));
+                        break;
+                    case PLAIN_LINK:
+                        getScenarioLinks().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));
+                        break;
+                }
+            } else if (tagParser.isPureSeverityTag(tag)) {
+                getScenarioLabels().add(ResultsUtils.createSeverityLabel(tag.substring(1)));
+            } else if (!tagParser.isResultTag(tag)) {
+                getScenarioLabels().add(getTagLabel(tag));
+            }
+        }
+
+        final String featureName = feature.getName();
+        final URI uri = scenario.getUri();
+
+        getScenarioLabels().addAll(ResultsUtils.getProvidedLabels());
+        getScenarioLabels().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)
+                .ifPresent(getScenarioLabels()::add);
+    }
+
+    public List<Label> getScenarioLabels() {
+        return scenarioLabels;
+    }
+
+    public List<Link> getScenarioLinks() {
+        return scenarioLinks;
+    }
+
+    private Label getTagLabel(final String tag) {
+        return ResultsUtils.createTagLabel(tag.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(ResultsUtils.createLink(null, name, null, type));
+        } else {
+            LOGGER.warn("Composite named tag {} does not match regex {}. Skipping", tagString,
+                    namedLinkPatternString);
+        }
+    }
+
+    private Optional<String> featurePackage(final String uriString, final String featureName) {
+        final Optional<URI> maybeUri = safeUri(uriString);
+        if (!maybeUri.isPresent()) {
+            return Optional.empty();
+        }
+        URI uri = maybeUri.get();
+
+        if (!uri.isOpaque()) {
+            final URI work = new File("").toURI();
+            uri = work.relativize(uri);
+        }
+        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(".")));
+    }
+
+    private static Optional<URI> safeUri(final String uri) {
+        try {
+            return Optional.of(URI.create(uri));
+        } catch (Exception e) {
+            LOGGER.debug("could not parse feature uri {}", uri, e);
+        }
+        return Optional.empty();
+    }
+}
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
new file mode 100644
index 000000000..8ef92b7ab
--- /dev/null
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/TagParser.java
@@ -0,0 +1,71 @@
+/*
+ *  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.cucumber7jvm;
+
+import io.cucumber.messages.types.Feature;
+import io.cucumber.plugin.event.TestCase;
+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;
+    }
+
+    public boolean isFlaky() {
+        return getStatusDetailByTag(FLAKY);
+    }
+
+    public boolean isMuted() {
+        return getStatusDetailByTag(MUTED);
+    }
+
+    public boolean isKnown() {
+        return getStatusDetailByTag(KNOWN);
+    }
+
+    private boolean getStatusDetailByTag(final String tagName) {
+        return scenario.getTags().stream()
+                .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})
+                .contains(tag.toUpperCase());
+    }
+
+    public boolean isPureSeverityTag(final String tag) {
+        return Arrays.stream(SeverityLevel.values())
+                .map(SeverityLevel::value)
+                .map(value -> "@" + value)
+                .anyMatch(value -> value.equalsIgnoreCase(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
new file mode 100644
index 000000000..7741c41dc
--- /dev/null
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModel.java
@@ -0,0 +1,186 @@
+/*
+ *  Copyright 2020 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.cucumber7jvm.testsourcemodel;
+
+import io.cucumber.gherkin.Gherkin;
+import io.cucumber.messages.types.Background;
+import io.cucumber.messages.types.Envelope;
+import io.cucumber.messages.types.Examples;
+import io.cucumber.messages.types.Feature;
+import io.cucumber.messages.types.FeatureChild;
+import io.cucumber.messages.types.GherkinDocument;
+import io.cucumber.messages.types.RuleChild;
+import io.cucumber.messages.types.Scenario;
+import io.cucumber.messages.types.Step;
+import io.cucumber.messages.types.TableRow;
+import io.cucumber.plugin.event.TestSourceRead;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+
+import static io.cucumber.gherkin.Gherkin.makeSourceEnvelope;
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
+
+final class TestSourcesModel {
+    private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();
+    private final Map<URI, GherkinDocument> pathToAstMap = new HashMap<>();
+    private final Map<URI, Map<Long, AstNode>> pathToNodeMap = new HashMap<>();
+
+    public static Scenario getScenarioDefinition(final AstNode astNode) {
+        AstNode candidate = astNode;
+        while (candidate != null && !(candidate.node instanceof Scenario)) {
+            candidate = candidate.parent;
+        }
+        return candidate == null ? null : (Scenario) candidate.node;
+    }
+
+    public void addTestSourceReadEvent(final URI path, final TestSourceRead event) {
+        pathToReadEventMap.put(path, event);
+    }
+
+    public Feature getFeature(final URI path) {
+        if (!pathToAstMap.containsKey(path)) {
+            parseGherkinSource(path);
+        }
+        if (pathToAstMap.containsKey(path)) {
+            return pathToAstMap.get(path).getFeature();
+        }
+        return null;
+    }
+
+    private void parseGherkinSource(final URI path) {
+        if (!pathToReadEventMap.containsKey(path)) {
+            return;
+        }
+        final String source = pathToReadEventMap.get(path).getSource();
+
+        final List<Envelope> sources = singletonList(
+                makeSourceEnvelope(source, path.toString()));
+
+        final List<Envelope> envelopes = Gherkin.fromSources(
+                sources,
+                true,
+                true,
+                true,
+                () -> String.valueOf(UUID.randomUUID())).collect(toList());
+
+        final GherkinDocument gherkinDocument = envelopes.stream()
+                .map(Envelope::getGherkinDocument)
+                .filter(Objects::nonNull)
+                .findFirst()
+                .orElse(null);
+
+        pathToAstMap.put(path, gherkinDocument);
+        final Map<Long, AstNode> nodeMap = new HashMap<>();
+        final AstNode currentParent = createAstNode(Objects.requireNonNull(gherkinDocument).getFeature(), null);
+        for (FeatureChild child : gherkinDocument.getFeature().getChildren()) {
+            processFeatureDefinition(nodeMap, child, currentParent);
+        }
+        pathToNodeMap.put(path, nodeMap);
+
+    }
+
+    private void processFeatureDefinition(
+            final Map<Long, AstNode> nodeMap, final FeatureChild child, final AstNode currentParent) {
+        if (child.getBackground() != null) {
+            processBackgroundDefinition(nodeMap, child.getBackground(), currentParent);
+        } else if (child.getScenario() != null) {
+            processScenarioDefinition(nodeMap, child.getScenario(), currentParent);
+        } else if (child.getRule() != null) {
+            final AstNode childNode = createAstNode(child.getRule(), currentParent);
+            nodeMap.put(child.getRule().getLocation().getLine(), childNode);
+            for (RuleChild ruleChild : child.getRule().getChildren()) {
+                processRuleDefinition(nodeMap, ruleChild, childNode);
+            }
+        }
+    }
+
+    private void processBackgroundDefinition(
+            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()) {
+            nodeMap.put(step.getLocation().getLine(), createAstNode(step, childNode));
+        }
+    }
+
+    private void processScenarioDefinition(
+            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()) {
+            nodeMap.put(step.getLocation().getLine(), createAstNode(step, childNode));
+        }
+        if (child.getExamples().size() > 0) {
+            processScenarioOutlineExamples(nodeMap, child, childNode);
+        }
+    }
+
+    private void processRuleDefinition(
+            final Map<Long, AstNode> nodeMap, final RuleChild child, final AstNode currentParent) {
+        if (child.getBackground() != null) {
+            processBackgroundDefinition(nodeMap, child.getBackground(), currentParent);
+        } else if (child.getScenario() != null) {
+            processScenarioDefinition(nodeMap, child.getScenario(), currentParent);
+        }
+    }
+
+    private void processScenarioOutlineExamples(
+            final Map<Long, AstNode> nodeMap, final Scenario scenarioOutline, final AstNode parent
+    ) {
+        for (Examples examples : scenarioOutline.getExamples()) {
+            final AstNode examplesNode = createAstNode(examples, parent);
+            final TableRow headerRow = examples.getTableHeader();
+            final AstNode headerNode = createAstNode(headerRow, examplesNode);
+            nodeMap.put(headerRow.getLocation().getLine(), headerNode);
+            for (int i = 0; i < examples.getTableBody().size(); ++i) {
+                final TableRow examplesRow = examples.getTableBody().get(i);
+                final AstNode expandedScenarioNode = createAstNode(examplesRow, examplesNode);
+                nodeMap.put(examplesRow.getLocation().getLine(), expandedScenarioNode);
+            }
+        }
+    }
+
+    public AstNode getAstNode(final URI path, final int line) {
+        if (!pathToNodeMap.containsKey(path)) {
+            parseGherkinSource(path);
+        }
+        if (pathToNodeMap.containsKey(path)) {
+            return pathToNodeMap.get(path).get((long) line);
+        }
+        return null;
+    }
+
+    private AstNode createAstNode(final Object node, final AstNode astNode) {
+        return new AstNode(node, astNode);
+    }
+
+    private static class AstNode {
+        private final Object node;
+        private final AstNode parent;
+
+        AstNode(final Object node, final AstNode parent) {
+            this.node = node;
+            this.parent = parent;
+        }
+    }
+}
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
new file mode 100644
index 000000000..662adf763
--- /dev/null
+++ b/allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/testsourcemodel/TestSourcesModelProxy.java
@@ -0,0 +1,76 @@
+/*
+ *  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.cucumber7jvm.testsourcemodel;
+
+import io.cucumber.gherkin.GherkinDialect;
+import io.cucumber.gherkin.GherkinDialectProvider;
+import io.cucumber.messages.types.Feature;
+import io.cucumber.messages.types.Scenario;
+import io.cucumber.plugin.event.TestSourceRead;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class TestSourcesModelProxy {
+
+    private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();
+    private final TestSourcesModel testSources;
+
+    public TestSourcesModelProxy() {
+        this.testSources = new TestSourcesModel();
+    }
+
+    public void addTestSourceReadEvent(final URI path, final TestSourceRead event) {
+        this.pathToReadEventMap.put(path, event);
+        testSources.addTestSourceReadEvent(path, event);
+    }
+
+    public Feature getFeature(final URI path) {
+        return testSources.getFeature(path);
+    }
+
+    public Scenario getScenarioDefinition(final URI path, final int line) {
+        return TestSourcesModel.getScenarioDefinition(testSources.getAstNode(path, line));
+    }
+
+    public String getKeywordFromSource(final URI uri, final int stepLine) {
+        return this.getKeywordFromSourceInternal(uri, stepLine);
+    }
+
+    private String getKeywordFromSourceInternal(final URI uri, final int stepLine) {
+        final Feature feature = getFeature(uri);
+        if (feature != null) {
+            final TestSourceRead event = this.getTestSourceReadEvent(uri);
+            final String trimmedSourceLine = Objects.requireNonNull(event).getSource().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 URI uri) {
+        if (this.pathToReadEventMap.containsKey(uri)) {
+            return pathToReadEventMap.get(uri);
+        }
+        return null;
+    }
+}
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
new file mode 100644
index 000000000..56cd80f72
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
@@ -0,0 +1,768 @@
+/*
+ *  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.cucumber7jvm;
+
+import io.cucumber.core.eventbus.EventBus;
+import io.cucumber.core.feature.FeatureParser;
+import io.cucumber.core.feature.FeatureWithLines;
+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.model.Attachment;
+import io.qameta.allure.model.FixtureResult;
+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.AllureResultsWriterStub;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.ResourceLock;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Clock;
+import java.time.Instant;
+import java.util.*;
+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;
+import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@SuppressWarnings("unchecked")
+class AllureCucumber7JvmTest {
+
+    @AllureFeatures.Base
+    @Test
+    void shouldSetName() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName)
+                .containsExactlyInAnyOrder("Add a to b");
+    }
+
+    @AllureFeatures.PassedTests
+    @Test
+    void shouldSetStatus() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.PASSED);
+    }
+
+    @AllureFeatures.FailedTests
+    @Test
+    void shouldSetFailedStatus() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/failed.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.FAILED);
+    }
+
+    @AllureFeatures.FailedTests
+    @Test
+    void shouldSetStatusDetails() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/failed.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatusDetails)
+                .extracting(StatusDetails::getMessage)
+                .containsExactlyInAnyOrder("expecting 15 to be equal to 123");
+    }
+
+    @AllureFeatures.BrokenTests
+    @Test
+    void shouldSetBrokenStatus() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/broken.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.BROKEN);
+    }
+
+    @AllureFeatures.Stages
+    @Test
+    void shouldSetStage() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStage)
+                .containsExactlyInAnyOrder(Stage.FINISHED);
+    }
+
+    @AllureFeatures.Timings
+    @Test
+    void shouldSetStart() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+        final long after = Instant.now().toEpochMilli();
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStart)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @AllureFeatures.Timings
+    @Test
+    void shouldSetStop() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+        final long after = Instant.now().toEpochMilli();
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStop)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @AllureFeatures.FullName
+    @Test
+    void shouldSetFullName() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getFullName)
+                .containsExactlyInAnyOrder("Simple feature: Add a to b");
+    }
+
+    @AllureFeatures.Descriptions
+    @Test
+    void shouldSetDescription() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "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 = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        expected,
+                        expected
+                );
+    }
+
+    @AllureFeatures.Descriptions
+    @Test
+    void shouldSetScenarioDescription() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/scenario_description.feature");
+
+        final String expected = "This is description for current feature.\n"
+                + "It should appear on each scenario in report";
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getDescription)
+                .containsExactlyInAnyOrder(
+                        expected + "\n    scenario description 1",
+                        expected + "\n    scenario description 2"
+                );
+    }
+
+    @AllureFeatures.Attachments
+    @Test
+    void shouldAddDataTableAttachment() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/datatable.feature");
+
+        final List<Attachment> attachments = writer.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 = writer.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 AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/attachments.feature");
+
+        final List<Attachment> attachments = writer.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("TextAttachment", "text/plain"),
+                        tuple("ImageAttachment", "image/png")
+                );
+
+        final List<String> attachmentContents = writer.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 AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/background.feature");
+
+        final List<TestResult> testResults = writer.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 AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/examples.feature");
+
+        final List<TestResult> testResults = writer.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() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/multi-examples.feature");
+
+        final List<TestResult> testResults = writer.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() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/multi-examples.feature", "--tags", "@ExamplesTag2");
+
+        final List<TestResult> testResults = writer.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 AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/tags.feature");
+
+        final List<TestResult> testResults = writer.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 AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/tags.feature");
+
+        final List<TestResult> testResults = writer.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 AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/tags.feature");
+
+        final List<TestResult> testResults = writer.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 shouldAddThreadHostLabels() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/tags.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName)
+                .contains("host", "thread");
+    }
+
+    @AllureFeatures.MarkerAnnotations
+    @Test
+    void shouldAddCommonLabels() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/tags.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        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")
+                );
+    }
+
+    @AllureFeatures.Steps
+    @Test
+    void shouldProcessUndefinedSteps() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/undefined.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.SKIPPED);
+
+        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)
+                );
+    }
+
+    @AllureFeatures.SkippedTests
+    @AllureFeatures.Steps
+    @Test
+    void shouldProcessPendingExceptionsInSteps() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/pending.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getStatus)
+                .containsExactlyInAnyOrder(Status.SKIPPED);
+
+        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)
+                );
+    }
+
+    @AllureFeatures.Base
+    @Test
+    void shouldSupportDryRunForSimpleFeatures() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature", "--dry-run");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Add a to b", Status.PASSED)
+                );
+
+        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)
+                );
+    }
+
+    @AllureFeatures.Fixtures
+    @AllureFeatures.Base
+    @Test
+    void shouldSupportDryRunForHooks() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/hooks.feature", "--dry-run", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+
+        final List<TestResult> testResults = writer.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())
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.beforeHook()", Status.PASSED)
+                );
+
+        assertThat(writer.getTestResultContainers().get(0).getAfters())
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.afterHook()", Status.PASSED)
+                );
+
+        assertThat(testResults.get(0).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)
+                );
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldPersistHistoryIdForScenarios() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults.get(0).getHistoryId())
+                .isEqualTo("8eea9ed4458a49d418859d1398580671");
+    }
+
+    @AllureFeatures.History
+    @Test
+    void shouldPersistHistoryIdForExamples() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/examples.feature", "--threads", "2");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getHistoryId)
+                .containsExactlyInAnyOrder("42a7821e775ec18b112f92e96f0510a5", "afb27d131ed8d41b3f867895a26d2590");
+    }
+
+    private Comparator<TestResult> byHistoryId =
+            Comparator.comparing(TestResult::getHistoryId);
+
+    @AllureFeatures.Parallel
+    @Test
+    void shouldProcessScenariosInParallelMode() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/parallel.feature", "--threads", "3");
+
+        final List<TestResult> testResults = writer.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(3);
+
+        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(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(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")
+                );
+    }
+
+    @AllureFeatures.Fixtures
+    @AllureFeatures.Stages
+    @Test
+    void shouldDisplayHooksAsStages() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/hooks.feature", "-t",
+                "@WithHooks or @BeforeHookWithException or @AfterHookWithException");
+
+        final List<TestResult> testResults = writer.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)
+                );
+
+        assertThat(testResults.get(0).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)
+                );
+
+
+        assertThat(writer.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())
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.afterHook()", Status.PASSED)
+                );
+
+        assertThat(testResults.get(1).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)
+                );
+
+
+        assertThat(writer.getTestResultContainers().get(1).getBefores())
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.beforeHookWithException()", Status.FAILED)
+                );
+
+
+        assertThat(testResults.get(2).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)
+                );
+
+        assertThat(writer.getTestResultContainers().get(2).getAfters())
+                .extracting(FixtureResult::getName, FixtureResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.cucumber7jvm.samples.HookSteps.afterHookWithException()", Status.FAILED)
+                );
+
+    }
+
+    @AllureFeatures.BrokenTests
+    @Test
+    void shouldHandleAmbigiousStepsExceptions() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/ambigious.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults)
+                .extracting(TestResult::getName, TestResult::getStatus)
+                .containsExactlyInAnyOrder(
+                        tuple("Simple scenario with ambigious steps", Status.SKIPPED)
+                );
+
+        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)
+                );
+    }
+
+    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm7-test-provided")
+    @Test
+    void shouldSupportProvidedLabels() {
+        final AllureResultsWriterStub results = new AllureResultsWriterStub();
+        runFeature(results, "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", "cucumberjvm7-test-provided")
+                );
+    }
+
+    @SystemProperty(name="cucumber.junit-platform.naming-strategy", value="long")
+    private byte runFeature(final AllureResultsWriterStub writer,
+                            final String featureResource,
+                            final String... moreOptions) {
+
+        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
+        final AllureCucumber7Jvm cucumber7jvm = new AllureCucumber7Jvm(lifecycle);
+        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 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 Runtime runtime = Runtime.builder()
+                .withClassLoader(classLoader)
+                .withRuntimeOptions(options)
+                .withAdditionalPlugins(cucumber7jvm)
+                .withFeatureSupplier(supplier)
+                .build();
+
+        runtime.run();
+        return runtime.exitStatus();
+    }
+}
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
new file mode 100644
index 000000000..c74d4c10d
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AmbigiousSteps.java
@@ -0,0 +1,40 @@
+/*
+ *  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.cucumber7jvm.samples;
+
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class AmbigiousSteps {
+
+    @When("^ambigious step (.+)$")
+    public void ambigious_1() {
+        // nothing here
+    }
+
+    @When("^ambigious step ([a-z]+)$")
+    public void ambigious_2() {
+        // nothing here
+    }
+
+    @Then("^something bad should happen")
+    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
new file mode 100644
index 000000000..c0242a460
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/AttachmentSteps.java
@@ -0,0 +1,39 @@
+/*
+ *  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.cucumber7jvm.samples;
+
+import io.cucumber.java.Scenario;
+import io.cucumber.java.Before;
+import io.cucumber.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.attach("text attachment".getBytes(), "text/plain", "TextAttachment");
+    }
+
+    @Given("step with scenario embed")
+    public void stepWithScenarioEmbed() {
+        scenario.attach("image attachment".getBytes(), "image/png", "ImageAttachment");
+    }
+}
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
new file mode 100644
index 000000000..5442225d0
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BackgroundFeatureSteps.java
@@ -0,0 +1,43 @@
+/*
+ *  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.cucumber7jvm.samples;
+
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.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-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
new file mode 100644
index 000000000..df3f7042b
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/BrokenFeatureSteps.java
@@ -0,0 +1,30 @@
+/*
+ *  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.cucumber7jvm.samples;
+
+import io.cucumber.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-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
new file mode 100644
index 000000000..ae937b57f
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/DatatableFeatureSteps.java
@@ -0,0 +1,31 @@
+/*
+ *  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.cucumber7jvm.samples;
+
+import io.cucumber.datatable.DataTable;
+import io.cucumber.java.en.Given;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@SuppressWarnings("unused")
+public class DatatableFeatureSteps {
+
+    @Given("^users are:$")
+    public void usersAre(DataTable table) {
+    }
+
+}
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
new file mode 100644
index 000000000..247572252
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/HookSteps.java
@@ -0,0 +1,64 @@
+/*
+ *  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.cucumber7jvm.samples;
+
+import io.cucumber.java.After;
+import io.cucumber.java.Before;
+import org.assertj.core.api.Assertions;
+
+/**
+ * @author letsrokk (Dmitry Mayer).
+ */
+public class HookSteps {
+
+    @Before("@WithHooks")
+    public void beforeHook(){
+        // nothing
+    }
+
+    @After("@WithHooks")
+    public void afterHook(){
+        // nothing
+    }
+
+    @Before("@BeforeHookWithException")
+    public void beforeHookWithException(){
+        Assertions.fail("Exception in Hook step");
+    }
+
+    @After("@AfterHookWithException")
+    public void afterHookWithException(){
+        Assertions.fail("Exception in Hook step");
+    }
+
+    @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-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
new file mode 100644
index 000000000..060e5c1dc
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/PendingSteps.java
@@ -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.cucumber7jvm.samples;
+
+import io.cucumber.java.PendingException;
+import io.cucumber.java.en.Given;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class PendingSteps {
+
+    @Given("^step is yet to be implemented$")
+    public void stepIsYetToBeImplemented() {
+        // Write code here that turns the phrase above into concrete actions
+        throw new PendingException();
+    }
+
+}
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
new file mode 100644
index 000000000..69d63049b
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/samples/SimpleFeatureSteps.java
@@ -0,0 +1,55 @@
+/*
+ *  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.cucumber7jvm.samples;
+
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import org.assertj.core.api.Assertions;
+
+/**
+ * @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) {
+        // use manual fail for more stable message format
+        if (this.c != arg1) {
+            Assertions.fail("expecting %d to be equal to %d", this.c, arg1);
+        }
+    }
+
+}
diff --git a/allure-cucumber7-jvm/src/test/resources/allure.properties b/allure-cucumber7-jvm/src/test/resources/allure.properties
new file mode 100644
index 000000000..dbfefee44
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/allure.properties
@@ -0,0 +1,3 @@
+allure.model.indentOutput=true
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
diff --git a/allure-cucumber7-jvm/src/test/resources/features/ambigious.feature b/allure-cucumber7-jvm/src/test/resources/features/ambigious.feature
new file mode 100644
index 000000000..921223a39
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/ambigious.feature
@@ -0,0 +1,5 @@
+Feature: Feature with ambigious steps
+
+  Scenario: Simple scenario with ambigious steps
+    When ambigious step present
+    Then something bad should happen
diff --git a/allure-cucumber7-jvm/src/test/resources/features/attachments.feature b/allure-cucumber7-jvm/src/test/resources/features/attachments.feature
new file mode 100644
index 000000000..1585fbe81
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/attachments.feature
@@ -0,0 +1,8 @@
+@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-cucumber7-jvm/src/test/resources/features/background.feature b/allure-cucumber7-jvm/src/test/resources/features/background.feature
new file mode 100644
index 000000000..307f10267
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/background.feature
@@ -0,0 +1,9 @@
+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-cucumber7-jvm/src/test/resources/features/broken.feature b/allure-cucumber7-jvm/src/test/resources/features/broken.feature
new file mode 100644
index 000000000..42bd7ba4f
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/broken.feature
@@ -0,0 +1,4 @@
+Feature: Simple feature
+
+  Scenario: Exception during step
+    Given everything is broken
diff --git a/allure-cucumber7-jvm/src/test/resources/features/datatable.feature b/allure-cucumber7-jvm/src/test/resources/features/datatable.feature
new file mode 100644
index 000000000..ea5e94d3b
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/datatable.feature
@@ -0,0 +1,8 @@
+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-cucumber7-jvm/src/test/resources/features/description.feature b/allure-cucumber7-jvm/src/test/resources/features/description.feature
new file mode 100644
index 000000000..935b6731a
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/description.feature
@@ -0,0 +1,17 @@
+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-cucumber7-jvm/src/test/resources/features/examples.feature b/allure-cucumber7-jvm/src/test/resources/features/examples.feature
new file mode 100644
index 000000000..ecba7b79e
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/examples.feature
@@ -0,0 +1,11 @@
+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-cucumber7-jvm/src/test/resources/features/failed.feature b/allure-cucumber7-jvm/src/test/resources/features/failed.feature
new file mode 100644
index 000000000..a70f8ec79
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/failed.feature
@@ -0,0 +1,7 @@
+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-cucumber7-jvm/src/test/resources/features/hooks.feature b/allure-cucumber7-jvm/src/test/resources/features/hooks.feature
new file mode 100644
index 000000000..aca3f5b1b
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/hooks.feature
@@ -0,0 +1,98 @@
+Feature: Scenarios with hooks
+
+  @WithHooks
+  Scenario: Simple scenario with Before and After hooks
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
+
+  @BeforeHookWithException
+  Scenario: Simple scenario with Before hook with Exception
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
+
+  @AfterHookWithException
+  Scenario: Simple scenario with After hook with Exception
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
+
+  @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-cucumber7-jvm/src/test/resources/features/multi-examples.feature b/allure-cucumber7-jvm/src/test/resources/features/multi-examples.feature
new file mode 100644
index 000000000..04fb2cfef
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/multi-examples.feature
@@ -0,0 +1,17 @@
+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-cucumber7-jvm/src/test/resources/features/parallel.feature b/allure-cucumber7-jvm/src/test/resources/features/parallel.feature
new file mode 100644
index 000000000..a99d46839
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/parallel.feature
@@ -0,0 +1,17 @@
+Feature: Parallel execution of pickles
+
+  Scenario Outline: Simple scenario outline with 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      |
+
+  Scenario: Simple scenario
+    Given a is 7
+    And b is 8
+    When I add a to b
+    Then result is 15
diff --git a/allure-cucumber7-jvm/src/test/resources/features/pending.feature b/allure-cucumber7-jvm/src/test/resources/features/pending.feature
new file mode 100644
index 000000000..5ad9c3438
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/pending.feature
@@ -0,0 +1,6 @@
+Feature: Simple feature with Pending steps
+
+  Scenario: Step is not implemented
+    Given a is 5
+    When step is yet to be implemented
+    Then b is 10
diff --git a/allure-cucumber7-jvm/src/test/resources/features/scenario_description.feature b/allure-cucumber7-jvm/src/test/resources/features/scenario_description.feature
new file mode 100644
index 000000000..fe49efe31
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/scenario_description.feature
@@ -0,0 +1,19 @@
+Feature: Descriptions feature
+
+This is description for current feature.
+It should appear on each scenario in report
+
+  Scenario: Add a to b (1)
+    scenario description 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)
+    scenario description 2
+    Given a is 1
+    And b is 2
+    When I add a to b
+    Then result is 3
+
diff --git a/allure-cucumber7-jvm/src/test/resources/features/simple.feature b/allure-cucumber7-jvm/src/test/resources/features/simple.feature
new file mode 100644
index 000000000..c5b5f2b5f
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/simple.feature
@@ -0,0 +1,7 @@
+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-cucumber7-jvm/src/test/resources/features/tags.feature b/allure-cucumber7-jvm/src/test/resources/features/tags.feature
new file mode 100644
index 000000000..2632623ee
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/tags.feature
@@ -0,0 +1,13 @@
+@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-cucumber7-jvm/src/test/resources/features/undefined.feature b/allure-cucumber7-jvm/src/test/resources/features/undefined.feature
new file mode 100644
index 000000000..39475ff7d
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/undefined.feature
@@ -0,0 +1,6 @@
+Feature: Simple feature with undefined steps
+
+  Scenario: Step is not defined
+    Given  a is 5
+    When step is undefined
+    Then b is 10
diff --git a/build.gradle.kts b/build.gradle.kts
index 36e7982d1..a71d2ddaf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -198,7 +198,7 @@ configure(libs) {
             systemProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug")
             systemProperty("allure.model.indentOutput", "true")
             systemProperty("junit.jupiter.execution.parallel.enabled", true)
-            systemProperty("junit.jupiter.execution.parallel.mode.default", true)
+            systemProperty("junit.jupiter.execution.parallel.mode.default", "same_thread")
             testLogging {
                 listOf(org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED)
             }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c8e819b22..0e2ae0157 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,6 +10,7 @@ include("allure-cucumber3-jvm")
 include("allure-cucumber4-jvm")
 include("allure-cucumber5-jvm")
 include("allure-cucumber6-jvm")
+include("allure-cucumber7-jvm")
 include("allure-descriptions-javadoc")
 include("allure-hamcrest")
 include("allure-httpclient")

From 61411f1b6fdc5f4e198b7cb97d4b2bd297f8d75d Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Tue, 30 Nov 2021 14:06:48 +0300
Subject: [PATCH 168/486] better support for junit5 parameterised tests (via
 #687)

---
 .../junitplatform/AllureJunitPlatform.java    | 126 +++++++++++++-----
 .../AllureJunitPlatformTest.java              |  61 ++++++++-
 .../ParameterisedTestsWithDisplayName.java    |  33 +++++
 .../features/ReportEntryParameter.java        |  93 +++++++++++++
 .../io/qameta/allure/junit5/AllureJunit5.java |  49 +++++++
 .../allure/junit5/AllureJunit5Test.java       |  81 +++++++++++
 .../junit5/features/ParameterisedTests.java   |  49 +++++++
 .../junit5/features/SkipOtherInjectables.java |  37 +++++
 gradle/quality-configs/pmd/pmd.xml            |   4 +-
 9 files changed, 498 insertions(+), 35 deletions(-)
 create mode 100644 allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java
 create mode 100644 allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.java
 create mode 100644 allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
 create mode 100644 allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.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 a4164acdd..a81c04e56 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
@@ -22,6 +22,7 @@
 import io.qameta.allure.SeverityLevel;
 import io.qameta.allure.model.FixtureResult;
 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;
@@ -89,12 +90,18 @@
 })
 public class AllureJunitPlatform implements TestExecutionListener {
 
+    public static final String ALLURE_PARAMETER = "allure.parameter";
+    public static final String ALLURE_PARAMETER_VALUE_KEY = "value";
+    public static final String ALLURE_PARAMETER_MODE_KEY = "mode";
+    public static final String ALLURE_PARAMETER_EXCLUDED_KEY = "excluded";
+
     public static final String ALLURE_FIXTURE = "allure.fixture";
     public static final String PREPARE = "prepare";
     public static final String TEAR_DOWN = "tear_down";
     public static final String EVENT_START = "start";
     public static final String EVENT_STOP = "stop";
     public static final String EVENT_FAILURE = "failure";
+
     public static final String JUNIT_PLATFORM_UNIQUE_ID = "junit.platform.uniqueid";
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureJunitPlatform.class);
     private static final String STDOUT = "stdout";
@@ -188,40 +195,17 @@ public void executionSkipped(final TestIdentifier testIdentifier,
         );
     }
 
-    @SuppressWarnings({"ReturnCount", "PMD.NcssCount"})
+    @SuppressWarnings({"ReturnCount", "PMD.NcssCount", "CyclomaticComplexity"})
     @Override
     public void reportingEntryPublished(final TestIdentifier testIdentifier,
                                         final ReportEntry entry) {
         final Map<String, String> keyValuePairs = entry.getKeyValuePairs();
         if (keyValuePairs.containsKey(ALLURE_FIXTURE)) {
-            final String type = keyValuePairs.get(ALLURE_FIXTURE);
-            final String event = keyValuePairs.get("event");
-
-            // skip for invalid events
-            if (Objects.isNull(type) || Objects.isNull(event)) {
-                return;
-            }
-
-            switch (event) {
-                case EVENT_START:
-                    final Optional<String> maybeParent = containers.get(testIdentifier);
-                    if (!maybeParent.isPresent()) {
-                        return;
-                    }
-                    final String parentUuid = maybeParent.get();
-                    startFixture(parentUuid, type, keyValuePairs);
-                    return;
-                case EVENT_FAILURE:
-                    failFixture(keyValuePairs);
-                    resetContext(testIdentifier);
-                    return;
-                case EVENT_STOP:
-                    stopFixture(keyValuePairs);
-                    resetContext(testIdentifier);
-                    return;
-                default:
-                    break;
-            }
+            processFixtureEvent(testIdentifier, keyValuePairs);
+            return;
+        }
+        if (keyValuePairs.containsKey(ALLURE_PARAMETER)) {
+            processParameterEvent(keyValuePairs);
             return;
         }
 
@@ -236,6 +220,63 @@ public void reportingEntryPublished(final TestIdentifier testIdentifier,
 
     }
 
+    private void processParameterEvent(final Map<String, String> keyValuePairs) {
+        final String name = keyValuePairs.get(ALLURE_PARAMETER);
+        final String value = keyValuePairs.get(ALLURE_PARAMETER_VALUE_KEY);
+
+        final Parameter parameter = ResultsUtils.createParameter(name, value);
+        if (keyValuePairs.containsKey(ALLURE_PARAMETER_MODE_KEY)) {
+            final String modeString = keyValuePairs.get(ALLURE_PARAMETER_MODE_KEY);
+            Stream.of(Parameter.Mode.values())
+                    .filter(mode -> mode.name().equalsIgnoreCase(modeString))
+                    .findAny()
+                    .ifPresent(parameter::setMode);
+        }
+        if (keyValuePairs.containsKey(ALLURE_PARAMETER_EXCLUDED_KEY)) {
+            final String excludedString = keyValuePairs.get(ALLURE_PARAMETER_EXCLUDED_KEY);
+            Optional.ofNullable(excludedString)
+                    .map(Boolean::parseBoolean)
+                    .ifPresent(parameter::setExcluded);
+        }
+
+        getLifecycle().updateTestCase(tr -> tr.getParameters()
+                .add(parameter)
+        );
+    }
+
+    @SuppressWarnings({"ReturnCount"})
+    private void processFixtureEvent(final TestIdentifier testIdentifier,
+                                     final Map<String, String> keyValuePairs) {
+        final String type = keyValuePairs.get(ALLURE_FIXTURE);
+        final String event = keyValuePairs.get("event");
+
+        // skip for invalid events
+        if (Objects.isNull(type) || Objects.isNull(event)) {
+            return;
+        }
+
+        switch (event) {
+            case EVENT_START:
+                final Optional<String> maybeParent = containers.get(testIdentifier);
+                if (!maybeParent.isPresent()) {
+                    return;
+                }
+                final String parentUuid = maybeParent.get();
+                startFixture(parentUuid, type, keyValuePairs);
+                return;
+            case EVENT_FAILURE:
+                failFixture(keyValuePairs);
+                resetContext(testIdentifier);
+                return;
+            case EVENT_STOP:
+                stopFixture(keyValuePairs);
+                resetContext(testIdentifier);
+                return;
+            default:
+                break;
+        }
+    }
+
     private void resetContext(final TestIdentifier testIdentifier) {
         // in case of fixtures that reported within a test we need to return current
         // test case uuid to allure thread local storage
@@ -362,13 +403,38 @@ private void startTestCase(final TestIdentifier testIdentifier) {
         final Optional<Class<?>> testClass = testSource
                 .flatMap(AllureJunitPlatformUtils::getTestClass);
 
+        final boolean testTemplate = "test-template-invocation"
+                .equals(testIdentifier.getUniqueIdObject().getLastSegment().getType());
+
+        final Optional<TestIdentifier> maybeParent = Optional.of(testPlanStorage)
+                .map(ThreadLocal::get)
+                .flatMap(tp -> tp.getParent(testIdentifier));
+
         final TestResult result = new TestResult()
                 .setUuid(uuid)
-                .setName(testIdentifier.getDisplayName())
+                .setName(testTemplate && maybeParent.isPresent()
+                        ? maybeParent.get().getDisplayName() + " " + testIdentifier.getDisplayName()
+                        : testIdentifier.getDisplayName()
+                )
                 .setLabels(getTags(testIdentifier))
+                .setTestCaseId(testTemplate
+                        ? maybeParent.map(TestIdentifier::getUniqueId)
+                        .orElseGet(testIdentifier::getUniqueId)
+                        : testIdentifier.getUniqueId()
+                )
                 .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.getLabels().addAll(getProvidedLabels());
 
         result.getLabels().add(getJUnitPlatformUniqueId(testIdentifier));
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 3ee5ed814..4c8ee1121 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
@@ -32,8 +32,10 @@
 import io.qameta.allure.junitplatform.features.OwnerTest;
 import io.qameta.allure.junitplatform.features.ParallelTests;
 import io.qameta.allure.junitplatform.features.ParameterisedTests;
+import io.qameta.allure.junitplatform.features.ParameterisedTestsWithDisplayName;
 import io.qameta.allure.junitplatform.features.PassedTests;
 import io.qameta.allure.junitplatform.features.RepeatedTests;
+import io.qameta.allure.junitplatform.features.ReportEntryParameter;
 import io.qameta.allure.junitplatform.features.SeverityTest;
 import io.qameta.allure.junitplatform.features.SkippedInBeforeAllTests;
 import io.qameta.allure.junitplatform.features.SkippedTests;
@@ -53,6 +55,7 @@
 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;
@@ -209,9 +212,9 @@ void shouldProcessBrokenInAfterAllTests() {
                         tr -> Optional.of(tr).map(TestResult::getStatusDetails).map(StatusDetails::getMessage).orElse(null))
                 .containsExactlyInAnyOrder(
                         tuple("BrokenInAfterAllTests", Status.BROKEN, "Exception in @AfterAll"),
-                        tuple("[1] value=a", Status.PASSED, null),
-                        tuple("[2] value=b", Status.PASSED, null),
-                        tuple("[3] value=c", Status.PASSED, null),
+                        tuple("parameterisedTest(String) [1] value=a", Status.PASSED, null),
+                        tuple("parameterisedTest(String) [2] value=b", Status.PASSED, null),
+                        tuple("parameterisedTest(String) [3] value=c", Status.PASSED, null),
                         tuple("test1()", Status.PASSED, null),
                         tuple("test2()", Status.PASSED, null)
                 );
@@ -323,7 +326,10 @@ void shouldProcessParametrisedTests() {
                 .hasSize(2)
                 .filteredOn(hasStatus(Status.PASSED))
                 .flatExtracting(TestResult::getName)
-                .containsExactlyInAnyOrder("[1] argument=Hello", "[2] argument=World");
+                .containsExactlyInAnyOrder(
+                        "testWithStringParameter(String) [1] argument=Hello",
+                        "testWithStringParameter(String) [2] argument=World"
+                );
     }
 
     @Test
@@ -773,4 +779,51 @@ void shouldPopulateTestCaseId() {
                 .first()
                 .isEqualTo("[engine:junit-jupiter]/[class:io.qameta.allure.junitplatform.features.JupiterUniqueIdTest]/[method:jupiterTest()]");
     }
+
+    @AllureFeatures.Parameters
+    @Test
+    void shouldAllowUsageOfDisplayForParameterisedTests() {
+        final AllureResults results = runClasses(ParameterisedTestsWithDisplayName.class);
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .extracting(
+                        TestResult::getName
+                )
+                .containsExactlyInAnyOrder(
+                        "Second Test [1] value=a",
+                        "Second Test [2] value=b"
+                );
+    }
+
+    @AllureFeatures.Parameters
+    @Test
+    void shouldProcessAllureParameterReportingEvents() {
+        final AllureResults results = runClasses(ReportEntryParameter.class);
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .filteredOn("name", "simpleParameterEvent(TestReporter)")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .containsExactlyInAnyOrder(
+                        tuple("some parameter name", "some parameter value", null, null)
+                );
+        assertThat(testResults)
+                .filteredOn("name", "multipleParameterEvent(TestReporter)")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .containsExactlyInAnyOrder(
+                        tuple("first name", "first value", null, null),
+                        tuple("second name", "second value", null, null),
+                        tuple("third name", "third value", null, null)
+                );
+        assertThat(testResults)
+                .filteredOn("name", "modeAndExcluded(TestReporter)")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .containsExactlyInAnyOrder(
+                        tuple("hidden excluded", "hidden excluded value", Parameter.Mode.HIDDEN, true),
+                        tuple("default excluded", "default excluded value", Parameter.Mode.DEFAULT, true),
+                        tuple("masked not excluded", "masked not excluded value", Parameter.Mode.MASKED, false)
+                );
+    }
 }
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
new file mode 100644
index 000000000..dfb83eff8
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ParameterisedTestsWithDisplayName.java
@@ -0,0 +1,33 @@
+/*
+ *  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.junitplatform.features;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class ParameterisedTestsWithDisplayName {
+
+    @DisplayName("Second Test")
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void first(String value) {
+    }
+
+}
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
new file mode 100644
index 000000000..c7dc820d3
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/ReportEntryParameter.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.junitplatform.features;
+
+import io.qameta.allure.model.Parameter;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestReporter;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_EXCLUDED_KEY;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_MODE_KEY;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_VALUE_KEY;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class ReportEntryParameter {
+
+    @Test
+    void simpleParameterEvent(TestReporter testReporter) {
+        testReporter.publishEntry(buildEvent("some parameter name", "some parameter value"));
+    }
+
+    @Test
+    void multipleParameterEvent(TestReporter testReporter) {
+        testReporter.publishEntry(buildEvent("first name", "first value"));
+        testReporter.publishEntry(buildEvent("second name", "second value"));
+        testReporter.publishEntry(buildEvent("third name", "third value"));
+    }
+
+    @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
+        ));
+    }
+
+    private Map<String, String> buildEvent(final String name,
+                                           final String value) {
+        return buildEvent(name, value, null, null);
+    }
+
+    private Map<String, String> buildEvent(final String name,
+                                           final String value,
+                                           final Parameter.Mode mode,
+                                           final Boolean excluded) {
+        final Map<String, String> data = new HashMap<>();
+        data.put(ALLURE_PARAMETER, name);
+        data.put(ALLURE_PARAMETER_VALUE_KEY, value);
+        if (Objects.nonNull(mode)) {
+            data.put(ALLURE_PARAMETER_MODE_KEY, mode.name());
+        }
+        if (Objects.nonNull(excluded)) {
+            data.put(ALLURE_PARAMETER_EXCLUDED_KEY, excluded.toString());
+        }
+
+        return data;
+    }
+
+
+}
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 9f2e2b04f..2ac552bd8 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
@@ -15,20 +15,28 @@
  */
 package io.qameta.allure.junit5;
 
+import io.qameta.allure.Param;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.util.ObjectUtils;
 import io.qameta.allure.util.ResultsUtils;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Stream;
 
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_FIXTURE;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_EXCLUDED_KEY;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_MODE_KEY;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_VALUE_KEY;
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.EVENT_FAILURE;
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.EVENT_START;
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.EVENT_STOP;
@@ -41,6 +49,47 @@
 @SuppressWarnings("MultipleStringLiterals")
 public class AllureJunit5 implements InvocationInterceptor {
 
+    @Override
+    public void interceptTestTemplateMethod(final Invocation<Void> invocation,
+                                            final ReflectiveInvocationContext<Method> invocationContext,
+                                            final ExtensionContext extensionContext) throws Throwable {
+        sendParameterEvent(invocationContext, extensionContext);
+        invocation.proceed();
+    }
+
+    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 Class<?> parameterType = parameter.getType();
+            // Skip default jupiter injectables as TestInfo, TestReporter and TempDirectory
+            if (parameterType.getPackage().getName().startsWith("org.junit.jupiter.api")) {
+                continue;
+            }
+            final Object value = invocationContext.getArguments().get(i);
+            final Map<String, String> map = new HashMap<>();
+            map.put(ALLURE_PARAMETER, parameter.getName());
+            map.put(ALLURE_PARAMETER_VALUE_KEY, ObjectUtils.toString(value));
+
+            Stream.of(parameter.getAnnotationsByType(Param.class))
+                    .findFirst()
+                    .ifPresent(param -> {
+                        Stream.of(param.value(), param.name())
+                                .map(String::trim)
+                                .filter(name -> name.length() > 0)
+                                .findFirst()
+                                .ifPresent(name -> map.put(ALLURE_PARAMETER, name));
+
+                        map.put(ALLURE_PARAMETER_MODE_KEY, param.mode().name());
+                        map.put(ALLURE_PARAMETER_EXCLUDED_KEY, Boolean.toString(param.excluded()));
+                    });
+
+            extensionContext.publishReportEntry(map);
+        }
+    }
+
     @Override
     public void interceptBeforeAllMethod(
             final Invocation<Void> invocation,
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 db61285fe..c69eeff77 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
@@ -24,8 +24,11 @@
 import io.qameta.allure.junit5.features.AllFixtureSupport;
 import io.qameta.allure.junit5.features.BeforeEachFixtureFailureSupport;
 import io.qameta.allure.junit5.features.EachFixtureSupport;
+import io.qameta.allure.junit5.features.ParameterisedTests;
+import io.qameta.allure.junit5.features.SkipOtherInjectables;
 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;
@@ -54,6 +57,84 @@
 @SuppressWarnings("unchecked")
 class AllureJunit5Test {
 
+    @Test
+    void shouldSupportParametersForParameterisedTests() {
+        final AllureResults results = runClasses(ParameterisedTests.class);
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "first(String) [1] value=a")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .contains(
+                        tuple("value", "a", null, null)
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "first(String) [2] value=b")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .contains(
+                        tuple("value", "b", null, null)
+                );
+
+    }
+
+    @Test
+    void shouldSupportParamAnnotationForParameters() {
+        final AllureResults results = runClasses(ParameterisedTests.class);
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "third(String) [1] value=a")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .contains(
+                        tuple("some value", "a", Parameter.Mode.DEFAULT, false)
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("name", "third(String) [2] value=b")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .contains(
+                        tuple("some value", "b", Parameter.Mode.DEFAULT, false)
+                );
+
+    }
+
+    @Test
+    void shouldSkipReportingOfTestInjectablesTestReporterForRegularTest() {
+        final AllureResults results = runClasses(SkipOtherInjectables.class);
+
+        assertThat(results.getTestResults())
+                .filteredOn("fullName", "io.qameta.allure.junit5.features.SkipOtherInjectables.regularTestWithReporterInjection")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .isEmpty();
+    }
+
+    @Test
+    void shouldSkipReportingOfTestInjectablesTestReporterForParameterisedTest() {
+        final AllureResults results = runClasses(SkipOtherInjectables.class);
+
+        assertThat(results.getTestResults())
+                .filteredOn("fullName", "io.qameta.allure.junit5.features.SkipOtherInjectables.testReporterInjection")
+                .filteredOn("name", "testReporterInjection(String, TestReporter) [1] value=a")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .contains(
+                        tuple("value", "a", null, null)
+                );
+
+        assertThat(results.getTestResults())
+                .filteredOn("fullName", "io.qameta.allure.junit5.features.SkipOtherInjectables.testReporterInjection")
+                .filteredOn("name", "testReporterInjection(String, TestReporter) [2] value=b")
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue, Parameter::getMode, Parameter::getExcluded)
+                .contains(
+                        tuple("value", "b", null, null)
+                );
+    }
+
     @Test
     void shouldSupportBeforeEachFixture() {
         final AllureResults results = runClasses(EachFixtureSupport.class);
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
new file mode 100644
index 000000000..e1ab37cf2
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedTests.java
@@ -0,0 +1,49 @@
+/*
+ *  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.junit5.features;
+
+import io.qameta.allure.Param;
+import org.junit.jupiter.api.TestReporter;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class ParameterisedTests {
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void first(String value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void second(String value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void third(@Param("some value") String value) {
+    }
+
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void testReporterInjection(String value, TestReporter testReporter) {
+    }
+
+}
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
new file mode 100644
index 000000000..4e566370b
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/SkipOtherInjectables.java
@@ -0,0 +1,37 @@
+/*
+ *  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.junit5.features;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestReporter;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class SkipOtherInjectables {
+
+    @Test
+    void regularTestWithReporterInjection(TestReporter testReporter) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"a", "b"})
+    void testReporterInjection(String value, TestReporter testReporter) {
+    }
+
+}
diff --git a/gradle/quality-configs/pmd/pmd.xml b/gradle/quality-configs/pmd/pmd.xml
index 181a946aa..ad5ac393c 100644
--- a/gradle/quality-configs/pmd/pmd.xml
+++ b/gradle/quality-configs/pmd/pmd.xml
@@ -144,7 +144,9 @@
 
 
     <!-- Performance (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_performance.html) -->
-    <rule ref="category/java/performance.xml"/>
+    <rule ref="category/java/performance.xml">
+        <exclude name="AvoidInstantiatingObjectsInLoops"/>
+    </rule>
 
 
     <!-- Security (no rules) -->

From 86294ec04b5c64e5d60bc159bd216582384f590e Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Tue, 30 Nov 2021 14:25:52 +0300
Subject: [PATCH 169/486] fix label verify

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

diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml
index 077315bba..c9980ead9 100644
--- a/.github/workflows/labels-verify.yml
+++ b/.github/workflows/labels-verify.yml
@@ -2,7 +2,7 @@ name: "Verify type labels"
 
 on:
   pull_request:
-    types: [ opened, labeled, unlabeled, synchronize ]
+    types: [ labeled, unlabeled ]
 
 jobs:
   triage:

From 5b5a2f7791922934210501081e6c2642368e4470 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Nov 2021 14:26:47 +0300
Subject: [PATCH 170/486] bump mockito-core from 4.0.0 to 4.1.0 (via #685)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index a71d2ddaf..9d1e5314a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -151,7 +151,7 @@ configure(libs) {
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.7.3.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
-            dependency("org.mockito:mockito-core:4.0.0")
+            dependency("org.mockito:mockito-core:4.1.0")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From f7be472b6d091fc951ab1143e61135b1f009ae42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Nov 2021 14:43:27 +0300
Subject: [PATCH 171/486] bump junit-bom from 5.8.1 to 5.8.2 (via #688)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 9d1e5314a..472a978e3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -131,7 +131,7 @@ configure(libs) {
     dependencyManagement {
         imports {
             mavenBom("com.fasterxml.jackson:jackson-bom:2.13.0")
-            mavenBom("org.junit:junit-bom:5.8.1")
+            mavenBom("org.junit:junit-bom:5.8.2")
         }
         dependencies {
             dependency("com.github.tomakehurst:wiremock:2.27.2")

From d35fb9d6e091139ca84b063f551aef592dc5330a Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Tue, 30 Nov 2021 15:04:32 +0300
Subject: [PATCH 172/486] fix reader deprecations (via #686)

---
 .../allure/reader/AllureEnumDeserializer.java  |  5 ++++-
 .../reader/AllureObjectMapperFactory.java      | 18 ++++++++----------
 .../reader/ParameterModeDeserializer.java      |  3 +++
 .../allure/reader/StageDeserializer.java       |  3 +++
 .../allure/reader/StatusDeserializer.java      |  3 +++
 5 files changed, 21 insertions(+), 11 deletions(-)

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 2e0be5da6..6508d198e 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
@@ -24,9 +24,12 @@
 import java.util.stream.Stream;
 
 /**
- * @author charlie (Dmitry Baev).
  * @param <T> the enum's type
+ * @author charlie (Dmitry Baev).
+ * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
  */
+@Deprecated
 /* package-private */ abstract class AllureEnumDeserializer<T extends Enum<T>> extends StdDeserializer<T> {
 
     private final Class<T> type;
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 acfade3ad..ad91d2899 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
@@ -18,10 +18,7 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import io.qameta.allure.model.Parameter;
-import io.qameta.allure.model.Stage;
-import io.qameta.allure.model.Status;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -33,14 +30,15 @@ private AllureObjectMapperFactory() {
     }
 
     public static ObjectMapper createMapper() {
-        return new ObjectMapper()
+        return JsonMapper.builder()
                 .enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME)
                 .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
+                .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
+                .enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)
                 .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-                .registerModule(new SimpleModule()
-                        .addDeserializer(Status.class, new StatusDeserializer())
-                        .addDeserializer(Stage.class, new StageDeserializer())
-                        .addDeserializer(Parameter.Mode.class, new ParameterModeDeserializer())
-                );
+                .disable(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES)
+                .disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
+                .disable(DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS)
+                .build();
     }
 }
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 68a68cd84..197a6c6d1 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
@@ -19,7 +19,10 @@
 
 /**
  * @author charlie (Dmitry Baev).
+ * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
  */
+@Deprecated
 public class ParameterModeDeserializer extends AllureEnumDeserializer<Parameter.Mode> {
     public ParameterModeDeserializer() {
         super(Parameter.Mode.class);
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 f8de06408..0bea2076c 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
@@ -19,7 +19,10 @@
 
 /**
  * @author charlie (Dmitry Baev).
+ * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
  */
+@Deprecated
 public class StageDeserializer extends AllureEnumDeserializer<Stage> {
     public StageDeserializer() {
         super(Stage.class);
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 5b86f6b35..eb499add8 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
@@ -19,7 +19,10 @@
 
 /**
  * @author charlie (Dmitry Baev).
+ * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
  */
+@Deprecated
 public class StatusDeserializer extends AllureEnumDeserializer<Status> {
     public StatusDeserializer() {
         super(Status.class);

From 6aa4043382cb51b97fecebaa152a15096d0139ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Nov 2021 15:07:22 +0300
Subject: [PATCH 173/486] bump com.gradle.enterprise from 3.6.2 to 3.7.2 (via
 #689)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0e2ae0157..faf5d3422 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -45,7 +45,7 @@ pluginManagement {
     plugins {
         id("com.diffplug.spotless") version "5.13.0"
         id("com.github.johnrengelman.shadow") version "7.0.0"
-        id("com.gradle.enterprise") version "3.6.2"
+        id("com.gradle.enterprise") version "3.7.2"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
         id("io.qameta.allure-adapter") version "2.9.6"
         id("io.qameta.allure-aggregate-report") version "2.9.6"

From 4dc896c8e1c96967361cecba134aa2b7d0e903d1 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Tue, 30 Nov 2021 16:39:51 +0300
Subject: [PATCH 174/486] add test case name model property (via #690)

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

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 a81c04e56..39bbe94f4 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
@@ -422,6 +422,10 @@ private void startTestCase(final TestIdentifier testIdentifier) {
                         .orElseGet(testIdentifier::getUniqueId)
                         : testIdentifier.getUniqueId()
                 )
+                .setTestCaseName(testTemplate
+                        ? maybeParent.map(TestIdentifier::getDisplayName)
+                        .orElseGet(testIdentifier::getDisplayName)
+                        : testIdentifier.getDisplayName())
                 .setHistoryId(getHistoryId(testIdentifier))
                 .setStage(Stage.RUNNING);
 
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 1c9cbb47e..fdbd569db 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
@@ -42,6 +42,7 @@ public class TestResult implements Serializable, ExecutableItem, WithLinks {
     private String uuid;
     private String historyId;
     private String testCaseId;
+    private String testCaseName;
     private String fullName;
     private List<Label> labels = new ArrayList<>();
     private List<Link> links = new ArrayList<>();
@@ -117,6 +118,26 @@ public TestResult setTestCaseId(final String value) {
         return this;
     }
 
+    /**
+     * Gets test case name.
+     *
+     * @return the test case name
+     */
+    public String getTestCaseName() {
+        return testCaseName;
+    }
+
+    /**
+     * Sets test case name.
+     *
+     * @param value the value
+     * @return self for method chaining.
+     */
+    public TestResult setTestCaseName(final String value) {
+        this.testCaseName = value;
+        return this;
+    }
+
     /**
      * Gets full name.
      *

From 7a82ab65b5acd50a045a621bd407725ac6a1019c Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Tue, 30 Nov 2021 13:40:58 +0000
Subject: [PATCH 175/486] release 2.17.0

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

diff --git a/gradle.properties b/gradle.properties
index c34fa2e10..1cec2183a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.17-SNAPSHOT
+version=2.17.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 7f131982716648f69c319c28fa80c45f084f1c83 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Tue, 30 Nov 2021 13:40:58 +0000
Subject: [PATCH 176/486] set next development version 2.18

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

diff --git a/gradle.properties b/gradle.properties
index 1cec2183a..08b7c16d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.17.0
+version=2.18-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 75e71917c2564004e1b1a2ce66569e338d5e6bcc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 15:21:41 +0300
Subject: [PATCH 177/486] bump ru.vyarus.quality from 4.6.0 to 4.7.0 (via #691)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index faf5d3422..a5842b04e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -52,7 +52,7 @@ pluginManagement {
         id("io.qameta.allure-download") version "2.9.6"
         id("io.qameta.allure-report") version "2.9.6"
         id("io.spring.dependency-management") version "1.0.11.RELEASE"
-        id("ru.vyarus.quality") version "4.6.0"
+        id("ru.vyarus.quality") version "4.7.0"
         kotlin("jvm") version "1.5.0"
     }
 }

From 3523c1e8e8003fc5d3545f3c5ce144276183e41d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Dec 2021 14:04:07 +0300
Subject: [PATCH 178/486] bump selenide from 6.0.3 to 6.1.1 (via #692)

---
 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 13ebdc1e4..e3c33fe7b 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Selenide Integration"
 
-val selenideVersion = "6.0.3"
+val selenideVersion = "6.1.1"
 
 dependencies {
     api(project(":allure-java-commons"))

From 883e5ab5e17976a11b109f185b5cc5f44e48647b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Dec 2021 15:27:13 +0300
Subject: [PATCH 179/486] bump com.github.johnrengelman.shadow from 7.0.0 to
 7.1.0 (via #693)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index a5842b04e..8abe6b745 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,7 +44,7 @@ pluginManagement {
     }
     plugins {
         id("com.diffplug.spotless") version "5.13.0"
-        id("com.github.johnrengelman.shadow") version "7.0.0"
+        id("com.github.johnrengelman.shadow") version "7.1.0"
         id("com.gradle.enterprise") version "3.7.2"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
         id("io.qameta.allure-adapter") version "2.9.6"

From dc9dfedc0807ea51ed740669680050b5baab6867 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 8 Dec 2021 15:32:38 +0300
Subject: [PATCH 180/486] fix junit5 npe (via #695)

---
 .../io/qameta/allure/junit5/AllureJunit5.java |  2 +-
 .../allure/junit5/AllureJunit5Test.java       | 35 ++++++-
 .../ParameterisedPrimitivesTests.java         | 96 +++++++++++++++++++
 3 files changed, 131 insertions(+), 2 deletions(-)
 create mode 100644 allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java

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 2ac552bd8..4f559d27e 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
@@ -65,7 +65,7 @@ private void sendParameterEvent(final ReflectiveInvocationContext<Method> invoca
 
             final Class<?> parameterType = parameter.getType();
             // Skip default jupiter injectables as TestInfo, TestReporter and TempDirectory
-            if (parameterType.getPackage().getName().startsWith("org.junit.jupiter.api")) {
+            if (parameterType.getCanonicalName().startsWith("org.junit.jupiter.api")) {
                 continue;
             }
             final Object value = invocationContext.getArguments().get(i);
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 c69eeff77..cec643536 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
@@ -24,6 +24,7 @@
 import io.qameta.allure.junit5.features.AllFixtureSupport;
 import io.qameta.allure.junit5.features.BeforeEachFixtureFailureSupport;
 import io.qameta.allure.junit5.features.EachFixtureSupport;
+import io.qameta.allure.junit5.features.ParameterisedPrimitivesTests;
 import io.qameta.allure.junit5.features.ParameterisedTests;
 import io.qameta.allure.junit5.features.SkipOtherInjectables;
 import io.qameta.allure.junitplatform.AllureJunitPlatform;
@@ -54,9 +55,41 @@
  * @author charlie (Dmitry Baev).
  */
 @AllureFeatures.Fixtures
-@SuppressWarnings("unchecked")
 class AllureJunit5Test {
 
+    @Test
+    void shouldSupportPrimitiveTypeParameters() {
+        final AllureResults results = runClasses(ParameterisedPrimitivesTests.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, tr -> tr.getParameters().size())
+                .containsExactlyInAnyOrder(
+                        tuple("booleansMethodSource(boolean, boolean) [1] a=true, b=true", 3),
+                        tuple("booleansMethodSource(boolean, boolean) [2] a=true, b=false", 3),
+                        tuple("booleansMethodSource(boolean, boolean) [3] a=false, b=true", 3),
+                        tuple("booleansMethodSource(boolean, boolean) [4] a=false, b=false", 3),
+                        tuple("floats(float) [1] value=0.1", 2),
+                        tuple("floats(float) [2] value=0.01", 2),
+                        tuple("shorts(int) [1] value=1", 2),
+                        tuple("shorts(int) [2] value=2", 2),
+                        tuple("shorts(int) [3] value=3", 2),
+                        tuple("ints(int) [1] value=1", 2),
+                        tuple("ints(int) [2] value=2", 2),
+                        tuple("ints(int) [3] value=3", 2),
+                        tuple("bytes(byte) [1] value=0", 2),
+                        tuple("bytes(byte) [2] value=1", 2),
+                        tuple("chars(char) [1] value=a", 2),
+                        tuple("chars(char) [2] value=b", 2),
+                        tuple("chars(char) [3] value=c", 2),
+                        tuple("longs(long) [1] value=0", 2),
+                        tuple("longs(long) [2] value=1", 2),
+                        tuple("nullMethodSource(String) [1] value=null", 2),
+                        tuple("doubles(double) [1] value=0.1", 2),
+                        tuple("doubles(double) [2] value=0.01", 2),
+                        tuple("booleans(boolean) [1] value=true", 2),
+                        tuple("booleans(boolean) [2] value=false", 2)
+                );
+    }
+
     @Test
     void shouldSupportParametersForParameterisedTests() {
         final AllureResults results = runClasses(ParameterisedTests.class);
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
new file mode 100644
index 000000000..d46252a9a
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedPrimitivesTests.java
@@ -0,0 +1,96 @@
+/*
+ *  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.junit5.features;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.stream.Stream;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class ParameterisedPrimitivesTests {
+
+    @ParameterizedTest
+    @ValueSource(bytes = {0, 1})
+    void bytes(byte value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(shorts = {1, 2, 3})
+    void shorts(int value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {1, 2, 3})
+    void ints(int value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(longs = {0L, 1L})
+    void longs(long value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(floats = {0.1f, 0.01f})
+    void floats(float value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(doubles = {0.1d, 0.01d})
+    void doubles(double value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(chars = {'a', 'b', 'c'})
+    void chars(char value) {
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void booleans(boolean value) {
+    }
+
+    @ParameterizedTest
+    @MethodSource("arguments")
+    void booleansMethodSource(final boolean a, final boolean b) {
+    }
+
+    @ParameterizedTest
+    @MethodSource("nulls")
+    void nullMethodSource(final String value) {
+    }
+
+    static Stream<Arguments> arguments() {
+        return Stream.of(
+                Arguments.of(true, true),
+                Arguments.of(true, false),
+                Arguments.of(false, true),
+                Arguments.of(false, false)
+        );
+    }
+
+    static Stream<Arguments> nulls() {
+        return Stream.of(
+                Arguments.of((String) null)
+        );
+    }
+
+
+}

From b12be56fb71dbf9d1ea64510aefcdc8e48d58b5b Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Wed, 8 Dec 2021 12:36:54 +0000
Subject: [PATCH 181/486] release 2.17.1

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

diff --git a/gradle.properties b/gradle.properties
index 08b7c16d4..358b0681a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.18-SNAPSHOT
+version=2.17.1
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 233d6996a67d52d416e1be53185d7fcb8e6a665a Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Wed, 8 Dec 2021 12:36:55 +0000
Subject: [PATCH 182/486] set next development version 2.18

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

diff --git a/gradle.properties b/gradle.properties
index 358b0681a..08b7c16d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.17.1
+version=2.18-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 5eead116dbfbcfb3d6ca88de9ff08c8e309815ec Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Mon, 13 Dec 2021 18:12:24 +0300
Subject: [PATCH 183/486] fix failure related to blank string parameters in
 junit 5 (fixes #697, via #698)

---
 .../junitplatform/AllureJunitPlatform.java    | 36 +++++++++++++---
 .../io/qameta/allure/junit5/AllureJunit5.java | 29 +++++++++----
 .../allure/junit5/AllureJunit5Test.java       | 18 +++++++-
 ...ParameterisedBlankParameterValueTests.java | 41 +++++++++++++++++++
 .../ParameterisedPrimitivesTests.java         |  5 ++-
 .../src/test/resources/allure.properties      |  1 +
 6 files changed, 115 insertions(+), 15 deletions(-)
 create mode 100644 allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.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 39bbe94f4..ae12f4eb3 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
@@ -50,6 +50,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -90,6 +91,9 @@
 })
 public class AllureJunitPlatform implements TestExecutionListener {
 
+    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";
     public static final String ALLURE_PARAMETER_MODE_KEY = "mode";
@@ -195,11 +199,11 @@ public void executionSkipped(final TestIdentifier testIdentifier,
         );
     }
 
-    @SuppressWarnings({"ReturnCount", "PMD.NcssCount", "CyclomaticComplexity"})
+    @SuppressWarnings({"ReturnCount", "PMD.NcssCount", "CyclomaticComplexity" })
     @Override
     public void reportingEntryPublished(final TestIdentifier testIdentifier,
                                         final ReportEntry entry) {
-        final Map<String, String> keyValuePairs = entry.getKeyValuePairs();
+        final Map<String, String> keyValuePairs = unwrap(entry.getKeyValuePairs());
         if (keyValuePairs.containsKey(ALLURE_FIXTURE)) {
             processFixtureEvent(testIdentifier, keyValuePairs);
             return;
@@ -220,11 +224,33 @@ 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);
+                    }
+                }
+        );
+        return res;
+    }
+
     private void processParameterEvent(final Map<String, String> keyValuePairs) {
         final String name = keyValuePairs.get(ALLURE_PARAMETER);
         final String value = keyValuePairs.get(ALLURE_PARAMETER_VALUE_KEY);
-
-        final Parameter parameter = ResultsUtils.createParameter(name, value);
+        final Parameter parameter;
+        if (Objects.nonNull(value) && value.startsWith(ALLURE_REPORT_ENTRY_BLANK_PREFIX)) {
+            parameter = ResultsUtils.createParameter(
+                    name,
+                    value.substring(ALLURE_REPORT_ENTRY_BLANK_PREFIX.length())
+            );
+        } else {
+            parameter = ResultsUtils.createParameter(name, value);
+        }
         if (keyValuePairs.containsKey(ALLURE_PARAMETER_MODE_KEY)) {
             final String modeString = keyValuePairs.get(ALLURE_PARAMETER_MODE_KEY);
             Stream.of(Parameter.Mode.values())
@@ -244,7 +270,7 @@ private void processParameterEvent(final Map<String, String> keyValuePairs) {
         );
     }
 
-    @SuppressWarnings({"ReturnCount"})
+    @SuppressWarnings({"ReturnCount" })
     private void processFixtureEvent(final TestIdentifier testIdentifier,
                                      final Map<String, String> keyValuePairs) {
         final String type = keyValuePairs.get(ALLURE_FIXTURE);
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 4f559d27e..f0fed32a9 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.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Stream;
@@ -37,6 +38,7 @@
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_EXCLUDED_KEY;
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_MODE_KEY;
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_PARAMETER_VALUE_KEY;
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.ALLURE_REPORT_ENTRY_BLANK_PREFIX;
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.EVENT_FAILURE;
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.EVENT_START;
 import static io.qameta.allure.junitplatform.AllureJunitPlatform.EVENT_STOP;
@@ -86,7 +88,7 @@ private void sendParameterEvent(final ReflectiveInvocationContext<Method> invoca
                         map.put(ALLURE_PARAMETER_EXCLUDED_KEY, Boolean.toString(param.excluded()));
                     });
 
-            extensionContext.publishReportEntry(map);
+            extensionContext.publishReportEntry(wrap(map));
         }
     }
 
@@ -128,22 +130,22 @@ protected void processFixture(final String type,
                                   final ExtensionContext extensionContext) throws Throwable {
         final String uuid = UUID.randomUUID().toString();
         try {
-            extensionContext.publishReportEntry(buildStartEvent(
+            extensionContext.publishReportEntry(wrap(buildStartEvent(
                     type,
                     uuid,
                     invocationContext.getExecutable()
-            ));
+            )));
             invocation.proceed();
-            extensionContext.publishReportEntry(buildStopEvent(
+            extensionContext.publishReportEntry(wrap(buildStopEvent(
                     type,
                     uuid
-            ));
+            )));
         } catch (Throwable throwable) {
-            extensionContext.publishReportEntry(buildFailureEvent(
+            extensionContext.publishReportEntry(wrap(buildFailureEvent(
                     type,
                     uuid,
                     throwable
-            ));
+            )));
             throw throwable;
         }
     }
@@ -184,4 +186,17 @@ public Map<String, String> buildFailureEvent(final String type,
         maybeDetails.map(StatusDetails::getTrace).ifPresent(trace -> map.put("trace", trace));
         return map;
     }
+
+    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);
+                    }
+                }
+        );
+        return res;
+    }
 }
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 cec643536..b1f457957 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
@@ -17,6 +17,7 @@
 
 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;
@@ -24,6 +25,7 @@
 import io.qameta.allure.junit5.features.AllFixtureSupport;
 import io.qameta.allure.junit5.features.BeforeEachFixtureFailureSupport;
 import io.qameta.allure.junit5.features.EachFixtureSupport;
+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.SkipOtherInjectables;
@@ -57,6 +59,20 @@
 @AllureFeatures.Fixtures
 class AllureJunit5Test {
 
+    @Issue("697")
+    @Test
+    void shouldSupportEmptyStringParameters() {
+        final AllureResults results = runClasses(ParameterisedBlankParameterValueTests.class);
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, tr -> tr.getParameters().size())
+                .containsExactlyInAnyOrder(
+                        tuple("first(String) [1] value=", 2),
+                        tuple("first(String) [2] value=   ", 2),
+                        tuple("first(String) [3] value=null", 2)
+                );
+    }
+
     @Test
     void shouldSupportPrimitiveTypeParameters() {
         final AllureResults results = runClasses(ParameterisedPrimitivesTests.class);
@@ -82,7 +98,7 @@ void shouldSupportPrimitiveTypeParameters() {
                         tuple("chars(char) [3] value=c", 2),
                         tuple("longs(long) [1] value=0", 2),
                         tuple("longs(long) [2] value=1", 2),
-                        tuple("nullMethodSource(String) [1] value=null", 2),
+                        tuple("nullMethodSource(String, Long) [1] stringValue=null, longValue=null", 3),
                         tuple("doubles(double) [1] value=0.1", 2),
                         tuple("doubles(double) [2] value=0.01", 2),
                         tuple("booleans(boolean) [1] value=true", 2),
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
new file mode 100644
index 000000000..6a5b1eab5
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/ParameterisedBlankParameterValueTests.java
@@ -0,0 +1,41 @@
+/*
+ *  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.junit5.features;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+public class ParameterisedBlankParameterValueTests {
+
+    @ParameterizedTest
+    @MethodSource("arguments")
+    void first(String value) {
+    }
+
+    static Stream<String> arguments() {
+        return Stream.of(
+                "",
+                "   ",
+                null
+        );
+    }
+
+}
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 d46252a9a..a257a3581 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
@@ -74,7 +74,8 @@ void booleansMethodSource(final boolean a, final boolean b) {
 
     @ParameterizedTest
     @MethodSource("nulls")
-    void nullMethodSource(final String value) {
+    void nullMethodSource(final String stringValue,
+                          final Long longValue) {
     }
 
     static Stream<Arguments> arguments() {
@@ -88,7 +89,7 @@ static Stream<Arguments> arguments() {
 
     static Stream<Arguments> nulls() {
         return Stream.of(
-                Arguments.of((String) null)
+                Arguments.of(null, null)
         );
     }
 
diff --git a/allure-junit5/src/test/resources/allure.properties b/allure-junit5/src/test/resources/allure.properties
index 9c0b0a2d7..4c9c3b8ee 100644
--- a/allure-junit5/src/test/resources/allure.properties
+++ b/allure-junit5/src/test/resources/allure.properties
@@ -1,2 +1,3 @@
 allure.results.directory=build/allure-results
 allure.label.epic=#project.description#
+allure.link.issue.pattern=https://github.com/allure-framework/allure-java/issues/{}

From e55d17cc352c1311638112fb915fa065be261d2b Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 13 Dec 2021 15:19:08 +0000
Subject: [PATCH 184/486] release 2.17.2

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

diff --git a/gradle.properties b/gradle.properties
index 08b7c16d4..efc4eeb91 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.18-SNAPSHOT
+version=2.17.2
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 713d8f0bfdcdc4f23241b2023f19f8f4a08b54fe Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 13 Dec 2021 15:19:09 +0000
Subject: [PATCH 185/486] set next development version 2.18

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

diff --git a/gradle.properties b/gradle.properties
index efc4eeb91..08b7c16d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.17.2
+version=2.18-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 19e8e8de7721423fbf254a9ea8e48f439bf24217 Mon Sep 17 00:00:00 2001
From: Boris Osipov <osipov.boris@gmail.com>
Date: Mon, 10 Jan 2022 15:49:37 +0300
Subject: [PATCH 186/486] fix framework labels for allure-cucumber integrations
 (via #703)

---
 .../main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java   | 2 +-
 .../java/io/qameta/allure/cucumber6jvm/AllureCucumber6Jvm.java  | 2 +-
 .../main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 d888a5c1e..ba18430d3 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
@@ -120,7 +120,7 @@ class LabelBuilder {
                 createStoryLabel(scenario.getName()),
                 createSuiteLabel(featureName),
                 createTestClassLabel(scenario.getName()),
-                createFrameworkLabel("cucumber4jvm"),
+                createFrameworkLabel("cucumber5jvm"),
                 createLanguageLabel("java"),
                 createLabel("gherkin_uri", uri.toString())
         ));
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 88ed7caea..c208ecd9f 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
@@ -68,7 +68,7 @@
 import static io.qameta.allure.util.ResultsUtils.md5;
 
 /**
- * Allure plugin for Cucumber JVM 5.0.
+ * Allure plugin for Cucumber JVM 6.0.
  */
 @SuppressWarnings({
         "ClassDataAbstractionCoupling",
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 7058c714b..2c0dcdc5f 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
@@ -120,7 +120,7 @@ class LabelBuilder {
                 createStoryLabel(scenario.getName()),
                 createSuiteLabel(featureName),
                 createTestClassLabel(scenario.getName()),
-                createFrameworkLabel("cucumber4jvm"),
+                createFrameworkLabel("cucumber6jvm"),
                 createLanguageLabel("java"),
                 createLabel("gherkin_uri", uri.toString())
         ));

From 805112ee1201d7dedf43d071d768befb12497673 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jan 2022 16:51:49 +0300
Subject: [PATCH 187/486] bump com.diffplug.spotless from 5.13.0 to 6.1.2 (via
 #702)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8abe6b745..b302ad05e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -43,7 +43,7 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("com.diffplug.spotless") version "5.13.0"
+        id("com.diffplug.spotless") version "6.1.2"
         id("com.github.johnrengelman.shadow") version "7.1.0"
         id("com.gradle.enterprise") version "3.7.2"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"

From ddbae27ce93d20da5b70997a96e874814578cc73 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 17 Feb 2022 18:05:22 +0300
Subject: [PATCH 188/486] junit-platform: allow listener reuse (via #711)

---
 .../junitplatform/AllureJunitPlatform.java    | 54 ++++++++++++----
 .../AllureJunitPlatformTest.java              | 62 +++++++++++++++++++
 2 files changed, 104 insertions(+), 12 deletions(-)

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 ae12f4eb3..88d154c72 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
@@ -115,8 +115,18 @@ public class AllureJunitPlatform implements TestExecutionListener {
 
     private final ThreadLocal<TestPlan> testPlanStorage = new InheritableThreadLocal<>();
 
-    private final Uuids tests = new Uuids();
-    private final Uuids containers = new Uuids();
+    private final ThreadLocal<Uuids> tests = new InheritableThreadLocal<Uuids>() {
+        @Override
+        protected Uuids initialValue() {
+            return new Uuids();
+        }
+    };
+    private final ThreadLocal<Uuids> containers = new InheritableThreadLocal<Uuids>() {
+        @Override
+        protected Uuids initialValue() {
+            return new Uuids();
+        }
+    };
 
     private final AllureLifecycle lifecycle;
 
@@ -135,11 +145,15 @@ public AllureLifecycle getLifecycle() {
     @Override
     public void testPlanExecutionStarted(final TestPlan testPlan) {
         testPlanStorage.set(testPlan);
+        tests.set(new Uuids());
+        containers.set(new Uuids());
     }
 
     @Override
     public void testPlanExecutionFinished(final TestPlan testPlan) {
         testPlanStorage.remove();
+        tests.remove();
+        containers.remove();
     }
 
     @Override
@@ -199,7 +213,7 @@ public void executionSkipped(final TestIdentifier testIdentifier,
         );
     }
 
-    @SuppressWarnings({"ReturnCount", "PMD.NcssCount", "CyclomaticComplexity" })
+    @SuppressWarnings({"ReturnCount", "PMD.NcssCount", "CyclomaticComplexity"})
     @Override
     public void reportingEntryPublished(final TestIdentifier testIdentifier,
                                         final ReportEntry entry) {
@@ -270,7 +284,7 @@ private void processParameterEvent(final Map<String, String> keyValuePairs) {
         );
     }
 
-    @SuppressWarnings({"ReturnCount" })
+    @SuppressWarnings({"ReturnCount"})
     private void processFixtureEvent(final TestIdentifier testIdentifier,
                                      final Map<String, String> keyValuePairs) {
         final String type = keyValuePairs.get(ALLURE_FIXTURE);
@@ -283,7 +297,7 @@ private void processFixtureEvent(final TestIdentifier testIdentifier,
 
         switch (event) {
             case EVENT_START:
-                final Optional<String> maybeParent = containers.get(testIdentifier);
+                final Optional<String> maybeParent = getContainer(testIdentifier);
                 if (!maybeParent.isPresent()) {
                     return;
                 }
@@ -308,7 +322,7 @@ private void resetContext(final TestIdentifier testIdentifier) {
         // test case uuid to allure thread local storage
         Optional.of(testIdentifier)
                 .filter(TestIdentifier::isTest)
-                .flatMap(tests::get)
+                .flatMap((TestIdentifier t) -> getTest(t))
                 .ifPresent(Allure.getLifecycle()::setCurrentTestCase);
     }
 
@@ -333,7 +347,7 @@ protected Status getStatus(final Throwable throwable) {
     }
 
     private void startTestContainer(final TestIdentifier testIdentifier) {
-        final String uuid = containers.getOrCreate(testIdentifier);
+        final String uuid = getOrCreateContainer(testIdentifier);
         final TestResultContainer result = new TestResultContainer()
                 .setUuid(uuid)
                 .setName(testIdentifier.getDisplayName());
@@ -342,7 +356,7 @@ private void startTestContainer(final TestIdentifier testIdentifier) {
     }
 
     private void stopTestContainer(final TestIdentifier testIdentifier) {
-        final Optional<String> maybeUuid = containers.get(testIdentifier);
+        final Optional<String> maybeUuid = getContainer(testIdentifier);
         if (!maybeUuid.isPresent()) {
             return;
         }
@@ -353,14 +367,14 @@ private void stopTestContainer(final TestIdentifier testIdentifier) {
                 .orElseGet(Collections::emptySet)
                 .stream()
                 .filter(TestIdentifier::isTest)
-                .map(tests::get)
+                .map(this::getTest)
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .distinct()
                 .collect(Collectors.toCollection(ArrayList::new));
 
         if (testIdentifier.isTest()) {
-            tests.get(testIdentifier).ifPresent(children::add);
+            getTest(testIdentifier).ifPresent(children::add);
         }
 
         getLifecycle().updateTestContainer(uuid, container -> container.setChildren(children));
@@ -421,7 +435,7 @@ private void stopFixture(final Map<String, String> keyValue) {
 
     @SuppressWarnings("PMD.NcssCount")
     private void startTestCase(final TestIdentifier testIdentifier) {
-        final String uuid = tests.getOrCreate(testIdentifier);
+        final String uuid = getOrCreateTest(testIdentifier);
 
         final Optional<TestSource> testSource = testIdentifier.getSource();
         final Optional<Method> testMethod = testSource
@@ -519,7 +533,7 @@ private void startTestCase(final TestIdentifier testIdentifier) {
     private void stopTestCase(final TestIdentifier testIdentifier,
                               final Status status,
                               final StatusDetails statusDetails) {
-        final Optional<String> maybeUuid = tests.get(testIdentifier);
+        final Optional<String> maybeUuid = getTest(testIdentifier);
         if (!maybeUuid.isPresent()) {
             return;
         }
@@ -614,6 +628,22 @@ private Label getJUnitPlatformUniqueId(final TestIdentifier testIdentifier) {
         return label;
     }
 
+    private Optional<String> getContainer(final TestIdentifier testIdentifier) {
+        return containers.get().get(testIdentifier);
+    }
+
+    private String getOrCreateContainer(final TestIdentifier testIdentifier) {
+        return containers.get().getOrCreate(testIdentifier);
+    }
+
+    private Optional<String> getTest(final TestIdentifier testIdentifier) {
+        return tests.get().get(testIdentifier);
+    }
+
+    private String getOrCreateTest(final TestIdentifier testIdentifier) {
+        return tests.get().getOrCreate(testIdentifier);
+    }
+
     private static class Uuids {
 
         private final Map<TestIdentifier, String> storage = new ConcurrentHashMap<>();
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 4c8ee1121..930c35764 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,7 +16,11 @@
 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;
@@ -63,9 +67,16 @@
 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.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.ResourceLock;
+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.nio.charset.StandardCharsets;
 import java.util.Collection;
@@ -826,4 +837,55 @@ void shouldProcessAllureParameterReportingEvents() {
                         tuple("masked not excluded", "masked not excluded value", Parameter.Mode.MASKED, false)
                 );
     }
+
+    @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);
+
+            // 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();
+        assertThat(testResults)
+                .hasSize(2);
+
+        final TestResult tr1 = testResults.get(0);
+        final TestResult tr2 = testResults.get(1);
+
+        assertThat(tr1)
+                .extracting(TestResult::getUuid)
+                .isNotEqualTo(tr2.getUuid());
+
+        assertThat(tr1)
+                .extracting(TestResult::getHistoryId)
+                .isEqualTo(tr2.getHistoryId());
+
+    }
 }

From b26edb05e40e8eddc7206b315d40f1d581bd8e52 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Thu, 17 Feb 2022 15:09:48 +0000
Subject: [PATCH 189/486] release 2.17.3

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

diff --git a/gradle.properties b/gradle.properties
index 08b7c16d4..8a23e01c8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.18-SNAPSHOT
+version=2.17.3
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 6e6f048b6af9b2c1f6bb5e9b90b17946f2c1c757 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Thu, 17 Feb 2022 15:09:49 +0000
Subject: [PATCH 190/486] set next development version 2.18

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

diff --git a/gradle.properties b/gradle.properties
index 8a23e01c8..08b7c16d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.17.3
+version=2.18-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 76af83a9ca55012cb9e0ed3aa6d8a75a77eea982 Mon Sep 17 00:00:00 2001
From: Sergei Portnov <3230150+prtnv@users.noreply.github.com>
Date: Thu, 14 Apr 2022 14:55:26 +0300
Subject: [PATCH 191/486] fix history id generation for cucumberjvm scenarios
 with same feature file name (via #627)

---
 .../allure/cucumber5jvm/AllureCucumber5Jvm.java | 14 +++++++++++---
 .../cucumber5jvm/AllureCucumber5JvmTest.java    | 17 +++++++++++++----
 .../test/resources/features/same/simple.feature |  7 +++++++
 .../allure/cucumber6jvm/AllureCucumber6Jvm.java | 14 +++++++++++---
 .../cucumber6jvm/AllureCucumber6JvmTest.java    | 17 +++++++++++++----
 .../test/resources/features/same/simple.feature |  7 +++++++
 .../allure/cucumber7jvm/AllureCucumber7Jvm.java | 14 +++++++++++---
 .../cucumber7jvm/AllureCucumber7JvmTest.java    | 17 +++++++++++++----
 .../test/resources/features/same/simple.feature |  7 +++++++
 9 files changed, 93 insertions(+), 21 deletions(-)
 create mode 100644 allure-cucumber5-jvm/src/test/resources/features/same/simple.feature
 create mode 100644 allure-cucumber6-jvm/src/test/resources/features/same/simple.feature
 create mode 100644 allure-cucumber7-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 724e058db..cd0c8aca5 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
@@ -51,6 +51,7 @@
 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;
@@ -100,6 +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();
 
     @SuppressWarnings("unused")
     public AllureCucumber5Jvm() {
@@ -276,12 +278,18 @@ private String getHookStepUuid(final HookTestStep step) {
     }
 
     private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = testCase.getUri().toString()
-                .substring(testCase.getUri().toString().lastIndexOf('/') + 1)
-                + ":" + testCase.getLine();
+        final String testCaseLocation = getTestCaseUri(testCase) + ":" + testCase.getLine();
         return md5(testCaseLocation);
     }
 
+    private String getTestCaseUri(final TestCase testCase) {
+        final String testCaseUri = testCase.getUri().toString();
+        if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
+            return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
+        }
+        return testCaseUri;
+    }
+
     private Status translateTestCaseStatus(final Result testCaseResult) {
         switch (testCaseResult.getStatus()) {
             case FAILED:
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 6541f639b..023c52017 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
@@ -565,7 +565,7 @@ void shouldPersistHistoryIdForScenarios() {
 
         final List<TestResult> testResults = writer.getTestResults();
         assertThat(testResults.get(0).getHistoryId())
-                .isEqualTo("8eea9ed4458a49d418859d1398580671");
+                .isEqualTo("892e5eabe51184301cf1358453c9f052");
     }
 
     @AllureFeatures.History
@@ -577,11 +577,20 @@ void shouldPersistHistoryIdForExamples() {
         final List<TestResult> testResults = writer.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
-                .containsExactlyInAnyOrder("42a7821e775ec18b112f92e96f0510a5", "afb27d131ed8d41b3f867895a26d2590");
+                .containsExactlyInAnyOrder("c0f824814a130048e9f86358363cf23e", "646aca5d0775cd4f13161e1ea1a68c39");
     }
 
-    private Comparator<TestResult> byHistoryId =
-            Comparator.comparing(TestResult::getHistoryId);
+    @AllureFeatures.History
+    @Test
+    void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+        runFeature(writer, "features/same/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults.get(0).getHistoryId())
+                .isNotEqualTo(testResults.get(1).getHistoryId());
+    }
 
     @AllureFeatures.Parallel
     @Test
diff --git a/allure-cucumber5-jvm/src/test/resources/features/same/simple.feature b/allure-cucumber5-jvm/src/test/resources/features/same/simple.feature
new file mode 100644
index 000000000..c5b5f2b5f
--- /dev/null
+++ b/allure-cucumber5-jvm/src/test/resources/features/same/simple.feature
@@ -0,0 +1,7 @@
+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-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 c208ecd9f..ed3bc9e66 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
@@ -50,6 +50,7 @@
 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;
@@ -99,6 +100,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();
 
     @SuppressWarnings("unused")
     public AllureCucumber6Jvm() {
@@ -279,12 +281,18 @@ private String getHookStepUuid(final HookTestStep step) {
     }
 
     private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = testCase.getUri().toString()
-                .substring(testCase.getUri().toString().lastIndexOf('/') + 1)
-                + ":" + testCase.getLocation().getLine();
+        final String testCaseLocation = getTestCaseUri(testCase) + ":" + testCase.getLocation().getLine();
         return md5(testCaseLocation);
     }
 
+    private String getTestCaseUri(final TestCase testCase) {
+        final String testCaseUri = testCase.getUri().toString();
+        if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
+            return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
+        }
+        return testCaseUri;
+    }
+
     private Status translateTestCaseStatus(final Result testCaseResult) {
         switch (testCaseResult.getStatus()) {
             case FAILED:
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 98c79cce8..68c61e24f 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
@@ -565,7 +565,7 @@ void shouldPersistHistoryIdForScenarios() {
 
         final List<TestResult> testResults = writer.getTestResults();
         assertThat(testResults.get(0).getHistoryId())
-                .isEqualTo("8eea9ed4458a49d418859d1398580671");
+                .isEqualTo("892e5eabe51184301cf1358453c9f052");
     }
 
     @AllureFeatures.History
@@ -577,11 +577,20 @@ void shouldPersistHistoryIdForExamples() {
         final List<TestResult> testResults = writer.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
-                .containsExactlyInAnyOrder("42a7821e775ec18b112f92e96f0510a5", "afb27d131ed8d41b3f867895a26d2590");
+                .containsExactlyInAnyOrder("c0f824814a130048e9f86358363cf23e", "646aca5d0775cd4f13161e1ea1a68c39");
     }
 
-    private Comparator<TestResult> byHistoryId =
-            Comparator.comparing(TestResult::getHistoryId);
+    @AllureFeatures.History
+    @Test
+    void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+        runFeature(writer, "features/same/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults.get(0).getHistoryId())
+                .isNotEqualTo(testResults.get(1).getHistoryId());
+    }
 
     @AllureFeatures.Parallel
     @Test
diff --git a/allure-cucumber6-jvm/src/test/resources/features/same/simple.feature b/allure-cucumber6-jvm/src/test/resources/features/same/simple.feature
new file mode 100644
index 000000000..c5b5f2b5f
--- /dev/null
+++ b/allure-cucumber6-jvm/src/test/resources/features/same/simple.feature
@@ -0,0 +1,7 @@
+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-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 467f533af..acb431134 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
@@ -50,6 +50,7 @@
 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;
@@ -99,6 +100,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();
 
     @SuppressWarnings("unused")
     public AllureCucumber7Jvm() {
@@ -279,12 +281,18 @@ private String getHookStepUuid(final HookTestStep step) {
     }
 
     private String getHistoryId(final TestCase testCase) {
-        final String testCaseLocation = testCase.getUri().toString()
-                .substring(testCase.getUri().toString().lastIndexOf('/') + 1)
-                + ":" + testCase.getLocation().getLine();
+        final String testCaseLocation = getTestCaseUri(testCase) + ":" + testCase.getLocation().getLine();
         return md5(testCaseLocation);
     }
 
+    private String getTestCaseUri(final TestCase testCase) {
+        final String testCaseUri = testCase.getUri().toString();
+        if (testCaseUri.startsWith(CUCUMBER_WORKING_DIR)) {
+            return testCaseUri.substring(CUCUMBER_WORKING_DIR.length());
+        }
+        return testCaseUri;
+    }
+
     private Status translateTestCaseStatus(final Result testCaseResult) {
         switch (testCaseResult.getStatus()) {
             case FAILED:
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 56cd80f72..34a42887a 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
@@ -565,7 +565,7 @@ void shouldPersistHistoryIdForScenarios() {
 
         final List<TestResult> testResults = writer.getTestResults();
         assertThat(testResults.get(0).getHistoryId())
-                .isEqualTo("8eea9ed4458a49d418859d1398580671");
+                .isEqualTo("892e5eabe51184301cf1358453c9f052");
     }
 
     @AllureFeatures.History
@@ -577,11 +577,20 @@ void shouldPersistHistoryIdForExamples() {
         final List<TestResult> testResults = writer.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
-                .containsExactlyInAnyOrder("42a7821e775ec18b112f92e96f0510a5", "afb27d131ed8d41b3f867895a26d2590");
+                .containsExactlyInAnyOrder("c0f824814a130048e9f86358363cf23e", "646aca5d0775cd4f13161e1ea1a68c39");
     }
 
-    private Comparator<TestResult> byHistoryId =
-            Comparator.comparing(TestResult::getHistoryId);
+    @AllureFeatures.History
+    @Test
+    void shouldPersistDifferentHistoryIdComparedToTheSameTestCaseInDifferentLocation() {
+        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
+        runFeature(writer, "features/simple.feature");
+        runFeature(writer, "features/same/simple.feature");
+
+        final List<TestResult> testResults = writer.getTestResults();
+        assertThat(testResults.get(0).getHistoryId())
+                .isNotEqualTo(testResults.get(1).getHistoryId());
+    }
 
     @AllureFeatures.Parallel
     @Test
diff --git a/allure-cucumber7-jvm/src/test/resources/features/same/simple.feature b/allure-cucumber7-jvm/src/test/resources/features/same/simple.feature
new file mode 100644
index 000000000..c5b5f2b5f
--- /dev/null
+++ b/allure-cucumber7-jvm/src/test/resources/features/same/simple.feature
@@ -0,0 +1,7 @@
+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

From afeefc080c93e155f0d42d5a3adfe5e15d3a0cd3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 14:55:54 +0300
Subject: [PATCH 192/486] bump actions/checkout from 2.4.0 to 3.0.0 (via #718)

---
 .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 76fe22870..2daa4e6c4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '8.0.x', '11.0.x' ]
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v3.0.0
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 79868e2a2..0c0d0335b 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@v2.4.0
+      - uses: actions/checkout@v3.0.0
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 10a55d378..521382bac 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@v2.4.0
+      - uses: actions/checkout@v3.0.0
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From 8112b91c012f5c2d5890c99abf549d0f8c920973 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 14:56:15 +0300
Subject: [PATCH 193/486] bump actions/setup-java from 2 to 3 (via #719)

---
 .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 2daa4e6c4..c314385ec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v3.0.0
 
       - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0c0d0335b..97ce93fb9 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3.0.0
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: 8.0.x

From 05be66b4fe5cd9e11e6efbac8262c0d8691ca10b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Apr 2022 11:28:16 +0700
Subject: [PATCH 194/486] bump actions/checkout from 3.0.0 to 3.0.2 (via #724)

---
 .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 c314385ec..f08fce06b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '8.0.x', '11.0.x' ]
     steps:
-      - uses: actions/checkout@v3.0.0
+      - uses: actions/checkout@v3.0.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 97ce93fb9..9ff564c62 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.0.0
+      - uses: actions/checkout@v3.0.2
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 521382bac..cdefd986d 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.0.0
+      - uses: actions/checkout@v3.0.2
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From ac23673e1ea5d48faaa3a85d25218a9cfaf58d9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Apr 2022 11:28:52 +0700
Subject: [PATCH 195/486] bump actions/labeler from 3 to 4 (via #714)

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

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 956bf2f95..e0d99fc81 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -7,6 +7,6 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v3
+      - uses: actions/labeler@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}

From 5af395685905dde7a4b96b980e1855cce9fe2f12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Apr 2022 11:29:24 +0700
Subject: [PATCH 196/486] bump com.github.johnrengelman.shadow from 7.1.0 to
 7.1.2 (via #704)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index b302ad05e..af1dec425 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,7 +44,7 @@ pluginManagement {
     }
     plugins {
         id("com.diffplug.spotless") version "6.1.2"
-        id("com.github.johnrengelman.shadow") version "7.1.0"
+        id("com.github.johnrengelman.shadow") version "7.1.2"
         id("com.gradle.enterprise") version "3.7.2"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
         id("io.qameta.allure-adapter") version "2.9.6"

From 09673d57eff8c7bc64d895bfd72a82f667e4515c Mon Sep 17 00:00:00 2001
From: Dmitrii Tuchs <d.tuchs@propellerads.net>
Date: Wed, 4 May 2022 05:30:54 +0300
Subject: [PATCH 197/486] add Interceptor for unary & server streaming grpc
 calls (via #655)

---
 README.md                                     |  34 +++
 allure-grpc/build.gradle.kts                  |  74 +++++++
 .../io/qameta/allure/grpc/AllureGrpc.java     | 203 ++++++++++++++++++
 .../allure/grpc/GrpcRequestAttachment.java    |  80 +++++++
 .../allure/grpc/GrpcResponseAttachment.java   | 107 +++++++++
 .../src/main/resources/tpl/grpc-request.ftl   |  33 +++
 .../src/main/resources/tpl/grpc-response.ftl  |  46 ++++
 .../io/qameta/allure/grpc/AllureGrpcTest.java | 137 ++++++++++++
 allure-grpc/src/test/proto/api.proto          |  17 ++
 .../src/test/resources/allure.properties      |   2 +
 build.gradle.kts                              |   2 +
 settings.gradle.kts                           |   2 +
 12 files changed, 737 insertions(+)
 create mode 100644 allure-grpc/build.gradle.kts
 create mode 100644 allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
 create mode 100644 allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
 create mode 100644 allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
 create mode 100644 allure-grpc/src/main/resources/tpl/grpc-request.ftl
 create mode 100644 allure-grpc/src/main/resources/tpl/grpc-response.ftl
 create mode 100644 allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
 create mode 100644 allure-grpc/src/test/proto/api.proto
 create mode 100644 allure-grpc/src/test/resources/allure.properties

diff --git a/README.md b/README.md
index 210b43700..afccb2d6b 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,40 @@ You can specify custom templates, which should be placed in src/main/resources/t
 
 ```
 
+## gRPC
+
+Interceptor for gRPC stubs, that generates attachment for allure.
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-grpc</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+.newBlockingStub(channel).withInterceptors(new AllureGrpc());
+```
+You can enable interception of response metadata (disabled by default)
+```
+.withInterceptors(new AllureGrpc()
+                .interceptResponseMetadata(true))
+```
+By default, a step will be marked as failed in case that response contains any statuses except 0(OK).
+You can change this behavior, for example, for negative scenarios
+```
+.withInterceptors(new AllureGrpc()
+                .markStepFailedOnNonZeroCode(false))
+```
+You can specify custom templates, which should be placed in src/main/resources/tpl folder:
+```
+.withInterceptors(new AllureGrpc()
+                .setRequestTemplate("custom-http-request.ftl")
+                .setResponseTemplate("custom-http-response.ftl"))
+```
+
 ## Http client
 
 Interceptors for Apache HTTP client, that generates attachment for allure.
diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts
new file mode 100644
index 000000000..0826a212c
--- /dev/null
+++ b/allure-grpc/build.gradle.kts
@@ -0,0 +1,74 @@
+import com.google.protobuf.gradle.*
+
+plugins {
+    id("com.google.protobuf")
+}
+
+description = "Allure gRPC Integration"
+
+val agent: Configuration by configurations.creating
+
+val grpcVersion = "1.46.0"
+val protobufVersion = "3.20.1"
+
+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")
+    testImplementation("com.google.protobuf:protobuf-java:$protobufVersion")
+    testImplementation("org.grpcmock:grpcmock-junit5")
+    testImplementation("javax.annotation:javax.annotation-api")
+    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.grpc"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+    doFirst {
+        jvmArgs("-javaagent:${agent.singleFile}")
+    }
+}
+
+sourceSets {
+    test {
+        java {
+            srcDir("build/generated/source/proto/test")
+            srcDir("src/test/java")
+        }
+    }
+}
+
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
+    }
+    plugins {
+        id("grpc") {
+            artifact = "io.grpc:protoc-gen-grpc-java:$grpcVersion"
+        }
+    }
+    generateProtoTasks {
+        ofSourceSet("test").forEach {
+            it.plugins {
+                id("grpc")
+            }
+        }
+    }
+}
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
new file mode 100644
index 000000000..2d2858a39
--- /dev/null
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/AllureGrpc.java
@@ -0,0 +1,203 @@
+/*
+ *  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.grpc;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.MessageOrBuilder;
+import com.google.protobuf.util.JsonFormat;
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.ClientCall;
+import io.grpc.ClientInterceptor;
+import io.grpc.ForwardingClientCall;
+import io.grpc.ForwardingClientCallListener;
+import io.grpc.Metadata;
+import io.grpc.MethodDescriptor;
+import io.qameta.allure.Allure;
+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.model.Status;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.util.ResultsUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Allure interceptor logger for gRPC.
+ *
+ * @author dtuchs (Dmitry Tuchs).
+ */
+@SuppressWarnings({
+        "PMD.AvoidFieldNameMatchingMethodName",
+        "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 boolean markStepFailedOnNonZeroCode = true;
+    private boolean interceptResponseMetadata;
+
+    public AllureGrpc setRequestTemplate(final String templatePath) {
+        this.requestTemplatePath = templatePath;
+        return this;
+    }
+
+    public AllureGrpc setResponseTemplate(final String templatePath) {
+        this.responseTemplatePath = templatePath;
+        return this;
+    }
+
+    public AllureGrpc markStepFailedOnNonZeroCode(final boolean value) {
+        this.markStepFailedOnNonZeroCode = value;
+        return this;
+    }
+
+    public AllureGrpc interceptResponseMetadata(final boolean value) {
+        this.interceptResponseMetadata = value;
+        return this;
+    }
+
+    @SuppressWarnings({"PMD.MethodArgumentCouldBeFinal", "PMD.NPathComplexity"})
+    @Override
+    public <T, A> ClientCall<T, A> interceptCall(MethodDescriptor<T, A> method,
+                                                 CallOptions callOptions,
+                                                 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<>();
+
+            @SuppressWarnings("PMD.MethodArgumentCouldBeFinal")
+            @Override
+            public void sendMessage(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;
+                }
+            }
+
+            @SuppressWarnings("PMD.MethodArgumentCouldBeFinal")
+            @Override
+            public void start(Listener<A> responseListener, 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) {
+                        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) + "]");
+                        }
+
+                        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);
+                    }
+
+                    @SuppressWarnings("PMD.MethodArgumentCouldBeFinal")
+                    @Override
+                    public void onMessage(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;
+                        }
+                    }
+                };
+                super.start(listener, headers);
+            }
+
+            private String trimGrpcMethodName(final String source) {
+                return source.substring(source.lastIndexOf('/'));
+            }
+        };
+    }
+}
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
new file mode 100644
index 000000000..ef32e4dde
--- /dev/null
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcRequestAttachment.java
@@ -0,0 +1,80 @@
+/*
+ *  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.grpc;
+
+import io.qameta.allure.attachment.AttachmentData;
+
+import java.util.Objects;
+
+public class GrpcRequestAttachment implements AttachmentData {
+
+    private final String name;
+    private final String url;
+    private final String body;
+
+    public GrpcRequestAttachment(final String name, final String url, final String body) {
+        this.name = name;
+        this.url = url;
+        this.body = body;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Builder for GrpcRequestAttachment.
+     */
+    @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName")
+    static final class Builder {
+
+        private final String name;
+
+        private final String url;
+
+        private String body;
+
+        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");
+            this.name = name;
+            this.url = url;
+        }
+
+        public static Builder create(final String attachmentName, final String url) {
+            return new Builder(attachmentName, url);
+        }
+
+        public Builder setBody(final String body) {
+            Objects.requireNonNull(body, "Body should not be null value");
+            this.body = body;
+            return this;
+        }
+
+        public GrpcRequestAttachment build() {
+            return new GrpcRequestAttachment(name, url, body);
+        }
+    }
+}
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
new file mode 100644
index 000000000..7824d9ee2
--- /dev/null
+++ b/allure-grpc/src/main/java/io/qameta/allure/grpc/GrpcResponseAttachment.java
@@ -0,0 +1,107 @@
+/*
+ *  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.grpc;
+
+import io.qameta.allure.attachment.AttachmentData;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class GrpcResponseAttachment implements AttachmentData {
+
+    private final String name;
+    private final String body;
+    private final String status;
+    private final Map<String, String> metadata;
+
+    public GrpcResponseAttachment(final String name,
+                                  final String body,
+                                  final String status,
+                                  final Map<String, String> metadata) {
+        this.name = name;
+        this.body = body;
+        this.status = status;
+        this.metadata = metadata;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public Map<String, String> getMetadata() {
+        return metadata;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Builder for GrpcResponseAttachment.
+     */
+    @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName")
+    static final class Builder {
+
+        private final String name;
+        private final Map<String, String> metadata = new HashMap<>();
+        private String body;
+        private String status;
+
+        private Builder(final String name) {
+            Objects.requireNonNull(name, "Name must not be null value");
+            this.name = name;
+        }
+
+        public static Builder create(final String attachmentName) {
+            return new Builder(attachmentName);
+        }
+
+        public Builder setBody(final String body) {
+            Objects.requireNonNull(body, "Body should not be null value");
+            this.body = body;
+            return this;
+        }
+
+        public Builder setStatus(final String status) {
+            Objects.requireNonNull(status, "Status should not be null value");
+            this.status = status;
+            return this;
+        }
+
+        public GrpcResponseAttachment.Builder setMetadata(final String key, final String value) {
+            Objects.requireNonNull(key, "Matadata key must not be null value");
+            Objects.requireNonNull(value, "Matadata value must not be null value");
+            this.metadata.put(key, value);
+            return this;
+        }
+
+        public GrpcResponseAttachment.Builder addMetadata(final Map<String, String> metadata) {
+            Objects.requireNonNull(metadata, "Metadata Map must not be null value");
+            this.metadata.putAll(metadata);
+            return this;
+        }
+
+        public GrpcResponseAttachment build() {
+            return new GrpcResponseAttachment(name, body, status, metadata);
+        }
+    }
+}
diff --git a/allure-grpc/src/main/resources/tpl/grpc-request.ftl b/allure-grpc/src/main/resources/tpl/grpc-request.ftl
new file mode 100644
index 000000000..7bab82e5e
--- /dev/null
+++ b/allure-grpc/src/main/resources/tpl/grpc-request.ftl
@@ -0,0 +1,33 @@
+<html>
+<#-- @ftlvariable name="data" type="io.qameta.allure.grpc.GrpcRequestAttachment" -->
+<head>
+    <meta http-equiv="content-type" content="text/html; charset = UTF-8">
+    <script src="https://yastatic.net/jquery/2.2.3/jquery.min.js" crossorigin="anonymous"></script>
+
+    <link href="https://yastatic.net/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
+    <script src="https://yastatic.net/bootstrap/3.3.6/js/bootstrap.min.js" crossorigin="anonymous"></script>
+
+    <link type="text/css" href="https://yandex.st/highlightjs/8.0/styles/github.min.css" rel="stylesheet"/>
+    <script type="text/javascript" src="https://yandex.st/highlightjs/8.0/highlight.min.js"></script>
+    <script type="text/javascript" src="https://yandex.st/highlightjs/8.0/languages/json.min.js"></script>
+    <script type="text/javascript">hljs.initHighlightingOnLoad();</script>
+
+    <style>
+        pre {
+            white-space: pre-wrap;
+        }
+    </style>
+</head>
+<body>
+<div>
+    <pre><code>gRPC: <#if data.url??>${data.url}<#else>Unknown</#if></code></pre>
+</div>
+
+<#if data.body??>
+    <h4>Request body</h4>
+    <div>
+        <pre><code>${data.body}</code></pre>
+    </div>
+</#if>
+</body>
+</html>
diff --git a/allure-grpc/src/main/resources/tpl/grpc-response.ftl b/allure-grpc/src/main/resources/tpl/grpc-response.ftl
new file mode 100644
index 000000000..48929888e
--- /dev/null
+++ b/allure-grpc/src/main/resources/tpl/grpc-response.ftl
@@ -0,0 +1,46 @@
+<html>
+<#-- @ftlvariable name="data" type="io.qameta.allure.grpc.GrpcResponseAttachment" -->
+<head>
+    <meta http-equiv="content-type" content="text/html; charset = UTF-8">
+    <script src="https://yastatic.net/jquery/2.2.3/jquery.min.js" crossorigin="anonymous"></script>
+
+    <link href="https://yastatic.net/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
+    <script src="https://yastatic.net/bootstrap/3.3.6/js/bootstrap.min.js" crossorigin="anonymous"></script>
+
+    <link type="text/css" href="https://yandex.st/highlightjs/8.0/styles/github.min.css" rel="stylesheet"/>
+    <script type="text/javascript" src="https://yandex.st/highlightjs/8.0/highlight.min.js"></script>
+    <script type="text/javascript" src="https://yandex.st/highlightjs/8.0/languages/json.min.js"></script>
+    <script type="text/javascript">hljs.initHighlightingOnLoad();</script>
+
+    <style>
+        pre {
+            white-space: pre-wrap;
+        }
+    </style>
+</head>
+<body>
+
+<div><h4>Status</h4>
+    <#if data.status??>
+        <pre><code><b>${data.status}</b></code></pre>
+    <#else>Unknown</#if>
+</div>
+
+<#if data.body??>
+    <h4>Response body</h4>
+    <div>
+        <pre><code>${data.body}</code></pre>
+    </div>
+</#if>
+
+<#if (data.metadata)?has_content>
+    <h4>Metadata</h4>
+    <div>
+        <#list data.metadata as key, value>
+            <div>${key}: ${value}</div>
+        </#list>
+    </div>
+</#if>
+
+</body>
+</html>
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
new file mode 100644
index 000000000..9e0bac54b
--- /dev/null
+++ b/allure-grpc/src/test/java/io/qameta/allure/grpc/AllureGrpcTest.java
@@ -0,0 +1,137 @@
+/*
+ *  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.grpc;
+
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.qameta.allure.model.Attachment;
+import io.qameta.allure.model.StepResult;
+import io.qameta.allure.test.AllureResults;
+import org.grpcmock.GrpcMock;
+import org.grpcmock.junit5.GrpcMockExtension;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.util.Iterator;
+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.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 ManagedChannel channel;
+    private TestServiceGrpc.TestServiceBlockingStub blockingStub;
+
+    @BeforeEach
+    void configureMock() {
+        channel = ManagedChannelBuilder.forAddress("localhost", GrpcMock.getGlobalPort())
+                .usePlaintext()
+                .build();
+        blockingStub = TestServiceGrpc.newBlockingStub(channel)
+                .withInterceptors(new AllureGrpc());
+
+        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()
+                )));
+    }
+
+    @AfterEach
+    void shutdownChannel() {
+        Optional.ofNullable(channel).ifPresent(ManagedChannel::shutdownNow);
+    }
+
+    @Test
+    void shouldCreateRequestAttachment() {
+        final Request request = Request.newBuilder()
+                .setTopic("1")
+                .build();
+
+        final AllureResults results = execute(request);
+
+        assertThat(results.getTestResults().get(0).getSteps())
+                .flatExtracting(StepResult::getAttachments)
+                .extracting(Attachment::getName)
+                .contains("gRPC request");
+    }
+
+    @Test
+    void shouldCreateResponseAttachment() {
+        final Request request = Request.newBuilder()
+                .setTopic("1")
+                .build();
+
+        final AllureResults results = execute(request);
+
+        assertThat(results.getTestResults().get(0).getSteps())
+                .flatExtracting(StepResult::getAttachments)
+                .extracting(Attachment::getName)
+                .contains("gRPC response");
+    }
+
+    @Test
+    void shouldCreateResponseAttachmentForServerStreamingResponse() {
+        final Request request = Request.newBuilder()
+                .setTopic("1")
+                .build();
+
+        final AllureResults results = executeStreaming(request);
+
+        assertThat(results.getTestResults().get(0).getSteps())
+                .flatExtracting(StepResult::getAttachments)
+                .extracting(Attachment::getName)
+                .contains("gRPC response (collection of elements from Server stream)");
+    }
+
+    protected final AllureResults execute(final Request request) {
+        return runWithinTestContext(() -> {
+            try {
+                final Response response = blockingStub.calculate(request);
+                assertThat(response.getMessage()).isEqualTo(RESPONSE_MESSAGE);
+            } catch (Exception e) {
+                throw new RuntimeException("Could not execute request " + request, e);
+            }
+        });
+    }
+
+    protected final AllureResults executeStreaming(final Request request) {
+        return runWithinTestContext(() -> {
+            try {
+                Iterator<Response> responseIterator = blockingStub.calculateServerStream(request);
+                while (responseIterator.hasNext()) {
+                    assertThat(responseIterator.next().getMessage()).isEqualTo(RESPONSE_MESSAGE);
+                }
+            } catch (Exception e) {
+                throw new RuntimeException("Could not execute request " + request, e);
+            }
+        });
+    }
+}
diff --git a/allure-grpc/src/test/proto/api.proto b/allure-grpc/src/test/proto/api.proto
new file mode 100644
index 000000000..552e76f6c
--- /dev/null
+++ b/allure-grpc/src/test/proto/api.proto
@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "io.qameta.allure.grpc";
+
+service TestService {
+  rpc Calculate (Request) returns (Response);
+  rpc CalculateServerStream (Request) returns (stream Response);
+}
+
+message Request {
+  string topic = 1;
+}
+
+message Response {
+  string message = 1;
+}
diff --git a/allure-grpc/src/test/resources/allure.properties b/allure-grpc/src/test/resources/allure.properties
new file mode 100644
index 000000000..9c0b0a2d7
--- /dev/null
+++ b/allure-grpc/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 472a978e3..ea904f2a8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -148,10 +148,12 @@ configure(libs) {
             dependency("org.aspectj:aspectjweaver:1.9.7")
             dependency("org.assertj:assertj-core:3.21.0")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
+            dependency("org.grpcmock:grpcmock-junit5:0.5.1")
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.7.3.Final")
             dependency("org.mock-server:mockserver-netty:5.11.2")
             dependency("org.mockito:mockito-core:4.1.0")
+            dependency("javax.annotation:javax.annotation-api:1.3.1")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index af1dec425..c638c2f2e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -12,6 +12,7 @@ include("allure-cucumber5-jvm")
 include("allure-cucumber6-jvm")
 include("allure-cucumber7-jvm")
 include("allure-descriptions-javadoc")
+include("allure-grpc")
 include("allure-hamcrest")
 include("allure-httpclient")
 include("allure-java-commons")
@@ -53,6 +54,7 @@ pluginManagement {
         id("io.qameta.allure-report") version "2.9.6"
         id("io.spring.dependency-management") version "1.0.11.RELEASE"
         id("ru.vyarus.quality") version "4.7.0"
+        id("com.google.protobuf") version "0.8.17"
         kotlin("jvm") version "1.5.0"
     }
 }

From fa335c9f26bf2ea694e794556523d2a4c94c7c84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 May 2022 15:58:10 +0700
Subject: [PATCH 198/486] bump aspectjweaver from 1.9.7 to 1.9.9.1 (via #726)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index ea904f2a8..66a735546 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -145,7 +145,7 @@ configure(libs) {
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
             dependency("org.aspectj:aspectjrt:1.9.7")
-            dependency("org.aspectj:aspectjweaver:1.9.7")
+            dependency("org.aspectj:aspectjweaver:1.9.9.1")
             dependency("org.assertj:assertj-core:3.21.0")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.grpcmock:grpcmock-junit5:0.5.1")

From 9e767458f5d616d203843965bd59ecebccc5124b Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Fri, 6 May 2022 18:23:01 +0700
Subject: [PATCH 199/486] increase gradle memory limit

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

diff --git a/gradle.properties b/gradle.properties
index 08b7c16d4..e988390e1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,9 +3,10 @@ version=2.18-SNAPSHOT
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.warning.mode=none
+org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=512m
 
 test.maxHeapSize=512m
 test.maxParallelForks=4
 
 # https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
-kotlin.stdlib.default.dependency=false
\ No newline at end of file
+kotlin.stdlib.default.dependency=false

From 639f90e4a6db5d4ed98aceea01fa6fee9680b132 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 May 2022 19:03:36 +0700
Subject: [PATCH 200/486] bump com.gradle.enterprise from 3.7.2 to 3.10 (via
 #730)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index c638c2f2e..1484d2003 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -46,7 +46,7 @@ pluginManagement {
     plugins {
         id("com.diffplug.spotless") version "6.1.2"
         id("com.github.johnrengelman.shadow") version "7.1.2"
-        id("com.gradle.enterprise") version "3.7.2"
+        id("com.gradle.enterprise") version "3.10"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
         id("io.qameta.allure-adapter") version "2.9.6"
         id("io.qameta.allure-aggregate-report") version "2.9.6"

From b9cb732068af17c356d2cd1ef711b75ff31f9508 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 May 2022 19:05:51 +0700
Subject: [PATCH 201/486] bump mockserver-netty from 5.11.2 to 5.13.2 (via
 #728)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 66a735546..be19e1fe2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -151,7 +151,7 @@ configure(libs) {
             dependency("org.grpcmock:grpcmock-junit5:0.5.1")
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.7.3.Final")
-            dependency("org.mock-server:mockserver-netty:5.11.2")
+            dependency("org.mock-server:mockserver-netty:5.13.2")
             dependency("org.mockito:mockito-core:4.1.0")
             dependency("javax.annotation:javax.annotation-api:1.3.1")
             dependencySet("org.slf4j:1.7.30") {

From 904228771360406b4819e67b7689f8c5daf289a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 May 2022 19:49:52 +0700
Subject: [PATCH 202/486] bump selenide from 6.1.1 to 6.4.0 (via #732)

---
 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 e3c33fe7b..f630385a0 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Selenide Integration"
 
-val selenideVersion = "6.1.1"
+val selenideVersion = "6.4.0"
 
 dependencies {
     api(project(":allure-java-commons"))

From 0bc5ab3014a67a4002d05a255fe60a991d24e7b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 7 May 2022 13:03:18 +0700
Subject: [PATCH 203/486] bump jbehave-core from 4.8.2 to 4.8.3 (via #736)

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

diff --git a/allure-jbehave/build.gradle.kts b/allure-jbehave/build.gradle.kts
index a5270026f..160a03e87 100644
--- a/allure-jbehave/build.gradle.kts
+++ b/allure-jbehave/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure JBehave Integration"
 
-val jbehaveVersion = "4.8.2"
+val jbehaveVersion = "4.8.3"
 
 dependencies {
     api(project(":allure-java-commons"))

From e86934933b96650fc5f10b03c2fc9a6ea1ceeade Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 7 May 2022 13:03:41 +0700
Subject: [PATCH 204/486] bump mockito-core from 4.1.0 to 4.5.1 (via #734)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index be19e1fe2..5d5ab5595 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -152,7 +152,7 @@ configure(libs) {
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.7.3.Final")
             dependency("org.mock-server:mockserver-netty:5.13.2")
-            dependency("org.mockito:mockito-core:4.1.0")
+            dependency("org.mockito:mockito-core:4.5.1")
             dependency("javax.annotation:javax.annotation-api:1.3.1")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")

From a79c6694e17da9aae8594f7f472cb2c2d31fbf6a Mon Sep 17 00:00:00 2001
From: Dzhamalov Gazimagomed <unixshaman@gmail.com>
Date: Mon, 16 May 2022 09:53:00 +0300
Subject: [PATCH 205/486] fix allure-cucumber7-jvm 7.3.0 compatibility issues
 (fixes #722, via #727)

---
 allure-cucumber7-jvm/build.gradle.kts         |  4 +-
 .../cucumber7jvm/AllureCucumber7Jvm.java      |  4 +-
 .../testsourcemodel/TestSourcesModel.java     | 68 ++++++++-----------
 3 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/allure-cucumber7-jvm/build.gradle.kts b/allure-cucumber7-jvm/build.gradle.kts
index b6104c0aa..eceb85428 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.0.0"
-val cucumberGherkinVersion = "22.0.0"
+val cucumberVersion = "7.3.2"
+val cucumberGherkinVersion = "23.0.1"
 
 dependencies {
     api(project(":allure-java-commons"))
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 acb431134..38f0e52f1 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
@@ -337,9 +337,9 @@ private List<Parameter> getExamplesAsParameters(
 
         final TableRow row = maybeRow.get();
 
-        return IntStream.range(0, examples.getTableHeader().getCells().size())
+        return IntStream.range(0, examples.getTableHeader().get().getCells().size())
                 .mapToObj(index -> {
-                    final String name = examples.getTableHeader().getCells().get(index).getValue();
+                    final String name = examples.getTableHeader().get().getCells().get(index).getValue();
                     final String value = row.getCells().get(index).getValue();
                     return createParameter(name, value);
                 })
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 7741c41dc..5ce13730f 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
@@ -15,7 +15,7 @@
  */
 package io.qameta.allure.cucumber7jvm.testsourcemodel;
 
-import io.cucumber.gherkin.Gherkin;
+import io.cucumber.gherkin.GherkinParser;
 import io.cucumber.messages.types.Background;
 import io.cucumber.messages.types.Envelope;
 import io.cucumber.messages.types.Examples;
@@ -24,20 +24,17 @@
 import io.cucumber.messages.types.GherkinDocument;
 import io.cucumber.messages.types.RuleChild;
 import io.cucumber.messages.types.Scenario;
+import io.cucumber.messages.types.Source;
+import io.cucumber.messages.types.SourceMediaType;
 import io.cucumber.messages.types.Step;
 import io.cucumber.messages.types.TableRow;
 import io.cucumber.plugin.event.TestSourceRead;
 
 import java.net.URI;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-
-import static io.cucumber.gherkin.Gherkin.makeSourceEnvelope;
-import static java.util.Collections.singletonList;
-import static java.util.stream.Collectors.toList;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 final class TestSourcesModel {
     private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();
@@ -61,7 +58,7 @@ public Feature getFeature(final URI path) {
             parseGherkinSource(path);
         }
         if (pathToAstMap.containsKey(path)) {
-            return pathToAstMap.get(path).getFeature();
+            return pathToAstMap.get(path).getFeature().orElse(null);
         }
         return null;
     }
@@ -72,26 +69,27 @@ private void parseGherkinSource(final URI path) {
         }
         final String source = pathToReadEventMap.get(path).getSource();
 
-        final List<Envelope> sources = singletonList(
-                makeSourceEnvelope(source, path.toString()));
+        final GherkinParser parser = GherkinParser.builder()
+                .build();
 
-        final List<Envelope> envelopes = Gherkin.fromSources(
-                sources,
-                true,
-                true,
-                true,
-                () -> String.valueOf(UUID.randomUUID())).collect(toList());
+        final Stream<Envelope> envelopes = parser.parse(
+                Envelope.of(new Source(path.toString(), source, SourceMediaType.TEXT_X_CUCUMBER_GHERKIN_PLAIN)));
 
-        final GherkinDocument gherkinDocument = envelopes.stream()
+        // TODO: What about empty gherkin docs?
+        final GherkinDocument gherkinDocument = envelopes
                 .map(Envelope::getGherkinDocument)
-                .filter(Objects::nonNull)
+                .filter(Optional::isPresent)
+                .map(Optional::get)
                 .findFirst()
                 .orElse(null);
 
         pathToAstMap.put(path, gherkinDocument);
         final Map<Long, AstNode> nodeMap = new HashMap<>();
-        final AstNode currentParent = createAstNode(Objects.requireNonNull(gherkinDocument).getFeature(), null);
-        for (FeatureChild child : gherkinDocument.getFeature().getChildren()) {
+
+        // TODO: What about gherkin docs with no features?
+        final Feature feature = gherkinDocument.getFeature().get();
+        final AstNode currentParent = new AstNode(feature, null);
+        for (FeatureChild child : feature.getChildren()) {
             processFeatureDefinition(nodeMap, child, currentParent);
         }
         pathToNodeMap.put(path, nodeMap);
@@ -100,17 +98,13 @@ private void parseGherkinSource(final URI path) {
 
     private void processFeatureDefinition(
             final Map<Long, AstNode> nodeMap, final FeatureChild child, final AstNode currentParent) {
-        if (child.getBackground() != null) {
-            processBackgroundDefinition(nodeMap, child.getBackground(), currentParent);
-        } else if (child.getScenario() != null) {
-            processScenarioDefinition(nodeMap, child.getScenario(), currentParent);
-        } else if (child.getRule() != null) {
-            final AstNode childNode = createAstNode(child.getRule(), currentParent);
-            nodeMap.put(child.getRule().getLocation().getLine(), childNode);
-            for (RuleChild ruleChild : child.getRule().getChildren()) {
-                processRuleDefinition(nodeMap, ruleChild, childNode);
-            }
-        }
+        child.getBackground().ifPresent(background -> processBackgroundDefinition(nodeMap, background, currentParent));
+        child.getScenario().ifPresent(scenario -> processScenarioDefinition(nodeMap, scenario, currentParent));
+        child.getRule().ifPresent(rule -> {
+            final AstNode childNode = new AstNode(rule, currentParent);
+            nodeMap.put(rule.getLocation().getLine(), childNode);
+            rule.getChildren().forEach(ruleChild -> processRuleDefinition(nodeMap, ruleChild, childNode));
+        });
     }
 
     private void processBackgroundDefinition(
@@ -137,11 +131,8 @@ private void processScenarioDefinition(
 
     private void processRuleDefinition(
             final Map<Long, AstNode> nodeMap, final RuleChild child, final AstNode currentParent) {
-        if (child.getBackground() != null) {
-            processBackgroundDefinition(nodeMap, child.getBackground(), currentParent);
-        } else if (child.getScenario() != null) {
-            processScenarioDefinition(nodeMap, child.getScenario(), currentParent);
-        }
+        child.getBackground().ifPresent(background -> processBackgroundDefinition(nodeMap, background, currentParent));
+        child.getScenario().ifPresent(scenario -> processScenarioDefinition(nodeMap, scenario, currentParent));
     }
 
     private void processScenarioOutlineExamples(
@@ -149,7 +140,8 @@ private void processScenarioOutlineExamples(
     ) {
         for (Examples examples : scenarioOutline.getExamples()) {
             final AstNode examplesNode = createAstNode(examples, parent);
-            final TableRow headerRow = examples.getTableHeader();
+            // TODO: Can tables without headers even exist?
+            final TableRow headerRow = examples.getTableHeader().get();
             final AstNode headerNode = createAstNode(headerRow, examplesNode);
             nodeMap.put(headerRow.getLocation().getLine(), headerNode);
             for (int i = 0; i < examples.getTableBody().size(); ++i) {

From 93282ee884f613e8b47c65162f54e628dd14c137 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 16 May 2022 07:06:24 +0000
Subject: [PATCH 206/486] release 2.18.0

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

diff --git a/gradle.properties b/gradle.properties
index e988390e1..a5b143533 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.18-SNAPSHOT
+version=2.18.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 6480174c1628867f7d6ec55b45a2b4f2bd4e1d37 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 16 May 2022 07:06:24 +0000
Subject: [PATCH 207/486] set next development version 2.19

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

diff --git a/gradle.properties b/gradle.properties
index a5b143533..fbac6486b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.18.0
+version=2.19-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From ce5a18c4ae03109bae75dabbaed59a373f8c937b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 14:01:21 +0700
Subject: [PATCH 208/486] bump guice from 5.0.1 to 5.1.0 (via #738)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 5d5ab5595..739d1b29e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -135,7 +135,7 @@ configure(libs) {
         }
         dependencies {
             dependency("com.github.tomakehurst:wiremock:2.27.2")
-            dependency("com.google.inject:guice:5.0.1")
+            dependency("com.google.inject:guice:5.1.0")
             dependency("com.google.testing.compile:compile-testing:0.19")
             dependency("com.squareup.retrofit2:retrofit:2.9.0")
             dependency("commons-io:commons-io:2.11.0")

From e42e6fb489f8f06e5eaa56c20e41c0e5e185e9f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 14:01:45 +0700
Subject: [PATCH 209/486] bump javax.annotation-api from 1.3.1 to 1.3.2 (via
 #735)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 739d1b29e..74854595e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -153,7 +153,7 @@ configure(libs) {
             dependency("org.jboss.resteasy:resteasy-client:4.7.3.Final")
             dependency("org.mock-server:mockserver-netty:5.13.2")
             dependency("org.mockito:mockito-core:4.5.1")
-            dependency("javax.annotation:javax.annotation-api:1.3.1")
+            dependency("javax.annotation:javax.annotation-api:1.3.2")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")
                 entry("slf4j-nop")

From f58667cc49d3d5e916a9443b84ad91ebba6abd42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 14:02:12 +0700
Subject: [PATCH 210/486] bump grpcmock-junit5 from 0.5.1 to 0.7.7 (via #733)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 74854595e..cd2d8d0c0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -148,7 +148,7 @@ configure(libs) {
             dependency("org.aspectj:aspectjweaver:1.9.9.1")
             dependency("org.assertj:assertj-core:3.21.0")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
-            dependency("org.grpcmock:grpcmock-junit5:0.5.1")
+            dependency("org.grpcmock:grpcmock-junit5:0.7.7")
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.7.3.Final")
             dependency("org.mock-server:mockserver-netty:5.13.2")

From afbe19c371ad9f96b52c257963fa042b37be807f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 14:18:11 +0700
Subject: [PATCH 211/486] bump com.diffplug.spotless from 6.1.2 to 6.6.1 (via
 #747)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1484d2003..63c3d4400 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,7 +44,7 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("com.diffplug.spotless") version "6.1.2"
+        id("com.diffplug.spotless") version "6.6.1"
         id("com.github.johnrengelman.shadow") version "7.1.2"
         id("com.gradle.enterprise") version "3.10"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"

From a1d2f1ede57e50ab0f3004a1ce1af367029a768e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 14:18:36 +0700
Subject: [PATCH 212/486] bump spring-web from 5.3.13 to 5.3.20 (via #746)

---
 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 4841fe9d4..5d7d4fcda 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.13"
+val springWebVersion = "5.3.20"
 
 dependencies {
     api(project(":allure-attachments"))

From 5f4b7f4bcd9fa0c2ea230ac2b8abe1b693c64e90 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 14:18:55 +0700
Subject: [PATCH 213/486] bump kotlin from 1.5.0 to 1.6.21 (via #745)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 63c3d4400..d69bec0e3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -55,7 +55,7 @@ pluginManagement {
         id("io.spring.dependency-management") version "1.0.11.RELEASE"
         id("ru.vyarus.quality") version "4.7.0"
         id("com.google.protobuf") version "0.8.17"
-        kotlin("jvm") version "1.5.0"
+        kotlin("jvm") version "1.6.21"
     }
 }
 

From 48ac04af8d0714400dd201624648ee33304e9156 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 14:19:16 +0700
Subject: [PATCH 214/486] bump selenide from 6.4.0 to 6.5.0 (via #744)

---
 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 f630385a0..8d9ad4ca5 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Selenide Integration"
 
-val selenideVersion = "6.4.0"
+val selenideVersion = "6.5.0"
 
 dependencies {
     api(project(":allure-java-commons"))

From 67dcbc5b7d058a59cac1da96bff219dfe494b896 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 14:56:42 +0700
Subject: [PATCH 215/486] bump jackson-bom from 2.13.0 to 2.13.3 (via #748)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index cd2d8d0c0..33de3923e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -130,7 +130,7 @@ configure(libs) {
 
     dependencyManagement {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.13.0")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.13.3")
             mavenBom("org.junit:junit-bom:5.8.2")
         }
         dependencies {

From da9b93f499b496db04c6d8b57aa894e9afbc6e98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 14:58:51 +0700
Subject: [PATCH 216/486] bump aspectjrt from 1.9.7 to 1.9.9.1 (via #749)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 33de3923e..9ce4cbc6f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -144,7 +144,7 @@ configure(libs) {
             dependency("org.hamcrest:hamcrest:2.2")
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
-            dependency("org.aspectj:aspectjrt:1.9.7")
+            dependency("org.aspectj:aspectjrt:1.9.9.1")
             dependency("org.aspectj:aspectjweaver:1.9.9.1")
             dependency("org.assertj:assertj-core:3.21.0")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")

From bf596abec6a282e51568fdf13489f0f82ce6f448 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 14:59:10 +0700
Subject: [PATCH 217/486] bump json-unit from 2.28.0 to 2.35.0 (via #750)

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

diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts
index 9fbf8bba8..b449271cd 100644
--- a/allure-jsonunit/build.gradle.kts
+++ b/allure-jsonunit/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure JsonUnit Integration"
 
-val jsonUnitVersion = "2.28.0"
+val jsonUnitVersion = "2.35.0"
 
 dependencies {
     api(project(":allure-attachments"))

From 0f4d8223d78ebc5d8319619d9f0036c06fa6791a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 14:59:23 +0700
Subject: [PATCH 218/486] bump com.gradle.enterprise from 3.10 to 3.10.1 (via
 #751)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index d69bec0e3..0dc156d4e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -46,7 +46,7 @@ pluginManagement {
     plugins {
         id("com.diffplug.spotless") version "6.6.1"
         id("com.github.johnrengelman.shadow") version "7.1.2"
-        id("com.gradle.enterprise") version "3.10"
+        id("com.gradle.enterprise") version "3.10.1"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
         id("io.qameta.allure-adapter") version "2.9.6"
         id("io.qameta.allure-aggregate-report") version "2.9.6"

From e8dd39cbc95ce66d17d9677bd22dc69330836e25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 15:10:05 +0700
Subject: [PATCH 219/486] bump assertj-core from 3.21.0 to 3.22.0 (via #753)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 9ce4cbc6f..4c44625ab 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -146,7 +146,7 @@ configure(libs) {
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
             dependency("org.aspectj:aspectjrt:1.9.9.1")
             dependency("org.aspectj:aspectjweaver:1.9.9.1")
-            dependency("org.assertj:assertj-core:3.21.0")
+            dependency("org.assertj:assertj-core:3.22.0")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.grpcmock:grpcmock-junit5:0.7.7")
             dependency("org.freemarker:freemarker:2.3.31")

From 4905091ddc7a071073e0ae9f8a17d9b0c2e5fc3f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 15:10:37 +0700
Subject: [PATCH 220/486] bump rest-assured from 4.4.0 to 5.0.1 (via #754)

---
 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 8c01ecf40..152d0d8de 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 = "4.4.0"
+val restAssuredVersion = "5.0.1"
 
 dependencies {
     api(project(":allure-attachments"))

From 2e67e8e67933bb45dad216632d8781a3ead9ba8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 15:11:12 +0700
Subject: [PATCH 221/486] bump com.google.protobuf from 0.8.17 to 0.8.18 (via
 #755)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0dc156d4e..2d129278e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -54,7 +54,7 @@ pluginManagement {
         id("io.qameta.allure-report") version "2.9.6"
         id("io.spring.dependency-management") version "1.0.11.RELEASE"
         id("ru.vyarus.quality") version "4.7.0"
-        id("com.google.protobuf") version "0.8.17"
+        id("com.google.protobuf") version "0.8.18"
         kotlin("jvm") version "1.6.21"
     }
 }

From bbd18ba5c8f5efdb53b34243beeb3d84dee17b82 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 23 May 2022 08:48:22 +0000
Subject: [PATCH 222/486] release 2.18.1

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

diff --git a/gradle.properties b/gradle.properties
index fbac6486b..8695fc457 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.19-SNAPSHOT
+version=2.18.1
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From be4d5ff0a4ed81395279a32883fb07c323115605 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Mon, 23 May 2022 08:48:23 +0000
Subject: [PATCH 223/486] set next development version 2.19

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

diff --git a/gradle.properties b/gradle.properties
index 8695fc457..fbac6486b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.18.1
+version=2.19-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 20120afb64e9dc9ef0818d621ea8fa4652d5fae6 Mon Sep 17 00:00:00 2001
From: dr29bart <dr29bart@gmail.com>
Date: Tue, 24 May 2022 03:26:09 -0500
Subject: [PATCH 224/486] assertj: add support for interface based assertions
 (via #742)

---
 .../qameta/allure/assertj/AllureAspectJ.java   |  9 ++-------
 .../allure/assertj/AllureAspectJTest.java      | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 7 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 4ecea1dd8..fbf10f7f0 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
@@ -55,16 +55,11 @@ protected AllureLifecycle initialValue() {
         }
     };
 
-    @Pointcut("execution(public org.assertj.core.api.AbstractAssert.new(..))")
+    @Pointcut("execution(!private org.assertj.core.api.AbstractAssert.new(..))")
     public void anyAssertCreation() {
         //pointcut body, should be empty
     }
 
-    @Pointcut("execution(public * org.assertj.core.api.AssertionsForClassTypes.*(..))")
-    public void anyAssertCreation2() {
-        //pointcut body, should be empty
-    }
-
     @Pointcut("execution(* org.assertj.core.api.AssertJProxySetup.*(..))")
     public void proxyMethod() {
         //pointcut body, should be empty
@@ -75,7 +70,7 @@ public void anyAssert() {
         //pointcut body, should be empty
     }
 
-    @After("anyAssertCreation() || anyAssertCreation2()")
+    @After("anyAssertCreation()")
     public void logAssertCreation(final JoinPoint joinPoint) {
         final String actual = joinPoint.getArgs().length > 0
                 ? ObjectUtils.toString(joinPoint.getArgs()[0])
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 a4c311e29..ede986a3a 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
@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -87,6 +88,23 @@ void shouldHandleByteArrayObject() {
                 );
     }
 
+    @AllureFeatures.Steps
+    @Test
+    void shouldHandleCollections() {
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat(Arrays.asList("a", "b"))
+                .containsExactly("a", "b");
+        }, AllureAspectJ::setLifecycle);
+
+        assertThat(results.getTestResults())
+            .flatExtracting(TestResult::getSteps)
+            .extracting(StepResult::getName)
+            .containsExactly(
+                "assertThat '[a, b]'",
+                "containsExactly '[a, b]'"
+            );
+    }
+
     @AllureFeatures.Steps
     @Test
     void softAssertions() {

From cda670496659a6e2d506e7fe1fdab54555087546 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Jun 2022 16:11:29 +0700
Subject: [PATCH 225/486] bump mockito-core from 4.5.1 to 4.6.1 (via #766)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 4c44625ab..b96e4af84 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -152,7 +152,7 @@ configure(libs) {
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:4.7.3.Final")
             dependency("org.mock-server:mockserver-netty:5.13.2")
-            dependency("org.mockito:mockito-core:4.5.1")
+            dependency("org.mockito:mockito-core:4.6.1")
             dependency("javax.annotation:javax.annotation-api:1.3.2")
             dependencySet("org.slf4j:1.7.30") {
                 entry("slf4j-api")

From 87f8712a12beb17e7613aea896f550018ee2f90a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Jun 2022 16:22:08 +0700
Subject: [PATCH 226/486] bump protobuf from 3.20.1 to 3.21.0 (via #762)

---
 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 0826a212c..7c8312755 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.46.0"
-val protobufVersion = "3.20.1"
+val protobufVersion = "3.21.0"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From d949bce9ea049b703b0841911bfc84a5efef187d Mon Sep 17 00:00:00 2001
From: InfoShare Devs <tomito14@interia.pl>
Date: Fri, 10 Jun 2022 12:23:09 +0200
Subject: [PATCH 227/486] fix(attachments): support null headers and cookies
 (fix #767, via #769)

---
 allure-attachments/src/main/resources/tpl/http-request.ftl  | 6 +++---
 allure-attachments/src/main/resources/tpl/http-response.ftl | 6 +++---
 .../java/io/qameta/allure/attachment/testdata/TestData.java | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/allure-attachments/src/main/resources/tpl/http-request.ftl b/allure-attachments/src/main/resources/tpl/http-request.ftl
index 5ef76b521..b4e31d632 100644
--- a/allure-attachments/src/main/resources/tpl/http-request.ftl
+++ b/allure-attachments/src/main/resources/tpl/http-request.ftl
@@ -6,7 +6,7 @@
 <h4>Body</h4>
 <div>
     <pre class="preformated-text">
-    ${data.body}
+    <#t>${data.body}
     </pre>
 </div>
 </#if>
@@ -15,7 +15,7 @@
 <h4>Headers</h4>
 <div>
     <#list data.headers as name, value>
-        <div>${name}: ${value}</div>
+        <div>${name}: ${value!"null"}</div>
     </#list>
 </div>
 </#if>
@@ -25,7 +25,7 @@
 <h4>Cookies</h4>
 <div>
     <#list data.cookies as name, value>
-        <div>${name}: ${value}</div>
+        <div>${name}: ${value!"null"}</div>
     </#list>
 </div>
 </#if>
diff --git a/allure-attachments/src/main/resources/tpl/http-response.ftl b/allure-attachments/src/main/resources/tpl/http-response.ftl
index 2bc55de9f..91fed7287 100644
--- a/allure-attachments/src/main/resources/tpl/http-response.ftl
+++ b/allure-attachments/src/main/resources/tpl/http-response.ftl
@@ -7,7 +7,7 @@
 <h4>Body</h4>
 <div>
     <pre class="preformated-text">
-    ${data.body}
+    <#t>${data.body}
     </pre>
 </div>
 </#if>
@@ -16,7 +16,7 @@
 <h4>Headers</h4>
 <div>
     <#list data.headers as name, value>
-        <div>${name}: ${value}</div>
+        <div>${name}: ${value!"null"}</div>
     </#list>
 </div>
 </#if>
@@ -26,7 +26,7 @@
 <h4>Cookies</h4>
 <div>
     <#list data.cookies as name, value>
-        <div>${name}: ${value}</div>
+        <div>${name}: ${value!"null"}</div>
     </#list>
 </div>
 </#if>
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 26eba1c6f..306f27b63 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
@@ -69,6 +69,7 @@ public static Map<String, String> randomMap() {
         final Map<String, String> map = new HashMap<>();
         map.put(randomString(), randomString());
         map.put(randomString(), randomString());
+        map.put(randomString(), null);
         return map;
     }
 }

From fe4b37b2184f99c360a328613f7704c7b7af7ec5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Jun 2022 17:23:40 +0700
Subject: [PATCH 228/486] bump selenide from 6.5.0 to 6.6.2 (via #775)

---
 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 8d9ad4ca5..3239bb6ff 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Selenide Integration"
 
-val selenideVersion = "6.5.0"
+val selenideVersion = "6.6.2"
 
 dependencies {
     api(project(":allure-java-commons"))

From 687df9b33ccfa267aae8c1c77d52ada7ed7f4759 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Jun 2022 17:24:14 +0700
Subject: [PATCH 229/486] bump rest-assured from 5.0.1 to 5.1.1 (via #774)

---
 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 152d0d8de..d2b534b18 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.0.1"
+val restAssuredVersion = "5.1.1"
 
 dependencies {
     api(project(":allure-attachments"))

From 3b2660aa1200f73cf7a078686c97cb59fe46b404 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Jun 2022 17:24:48 +0700
Subject: [PATCH 230/486] bump grpc from 1.46.0 to 1.47.0 (via #771)

---
 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 7c8312755..8aa2faba3 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.46.0"
+val grpcVersion = "1.47.0"
 val protobufVersion = "3.21.0"
 
 dependencies {

From 596cbcac84a3aa8352063a032efca6e13fada96a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 12:51:58 +0700
Subject: [PATCH 231/486] bump com.diffplug.spotless from 6.6.1 to 6.7.2 (via
 #780)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2d129278e..115e970fd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,7 +44,7 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("com.diffplug.spotless") version "6.6.1"
+        id("com.diffplug.spotless") version "6.7.2"
         id("com.github.johnrengelman.shadow") version "7.1.2"
         id("com.gradle.enterprise") version "3.10.1"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"

From dae361571768855c7e0dc1657e3a7f5ba98cbbad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 12:52:17 +0700
Subject: [PATCH 232/486] bump com.gradle.enterprise from 3.10.1 to 3.10.2 (via
 #778)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 115e970fd..9350a1805 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -46,7 +46,7 @@ pluginManagement {
     plugins {
         id("com.diffplug.spotless") version "6.7.2"
         id("com.github.johnrengelman.shadow") version "7.1.2"
-        id("com.gradle.enterprise") version "3.10.1"
+        id("com.gradle.enterprise") version "3.10.2"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
         id("io.qameta.allure-adapter") version "2.9.6"
         id("io.qameta.allure-aggregate-report") version "2.9.6"

From 2f18a6cc05bc4ea022067fdc856800334ec283d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 12:52:41 +0700
Subject: [PATCH 233/486] bump protobuf from 3.21.0 to 3.21.1 (via #777)

---
 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 8aa2faba3..11aeaaac7 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.47.0"
-val protobufVersion = "3.21.0"
+val protobufVersion = "3.21.1"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From b8711de0eba9bcbb62bcb58982e4f5fa31de38f2 Mon Sep 17 00:00:00 2001
From: Serge D <serge.danilyuk@gmail.com>
Date: Thu, 30 Jun 2022 18:00:10 +0200
Subject: [PATCH 234/486] fix(allure-grpc): infinite stuck on not ok status
 (via #786)

---
 .../io/qameta/allure/grpc/AllureGrpc.java     |  9 ++++++
 .../io/qameta/allure/grpc/AllureGrpcTest.java | 28 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

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 2d2858a39..d394a16aa 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
@@ -149,6 +149,15 @@ public void onClose(io.grpc.Status status, Metadata trailers) {
                                     .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) {
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 9e0bac54b..f75df916b 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
@@ -17,6 +17,8 @@
 
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
+import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
 import io.qameta.allure.model.Attachment;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.test.AllureResults;
@@ -33,6 +35,7 @@
 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.serverStreamingMethod;
 import static org.grpcmock.GrpcMock.unaryMethod;
 
@@ -111,6 +114,24 @@ void shouldCreateResponseAttachmentForServerStreamingResponse() {
                 .contains("gRPC response (collection of elements from Server stream)");
     }
 
+    @Test
+    void shouldCreateResponseAttachmentOnStatusException() {
+        final Status status = Status.NOT_FOUND;
+        GrpcMock.stubFor(unaryMethod(TestServiceGrpc.getCalculateMethod())
+                .willReturn(status));
+
+        final Request request = Request.newBuilder()
+                .setTopic("2")
+                .build();
+
+        final AllureResults results = executeException(request);
+
+        assertThat(results.getTestResults().get(0).getSteps())
+                .flatExtracting(StepResult::getAttachments)
+                .extracting(Attachment::getName)
+                .contains(status.getCode().name());
+    }
+
     protected final AllureResults execute(final Request request) {
         return runWithinTestContext(() -> {
             try {
@@ -121,7 +142,6 @@ protected final AllureResults execute(final Request request) {
             }
         });
     }
-
     protected final AllureResults executeStreaming(final Request request) {
         return runWithinTestContext(() -> {
             try {
@@ -134,4 +154,10 @@ protected final AllureResults executeStreaming(final Request request) {
             }
         });
     }
+
+    protected final AllureResults executeException(final Request request) {
+        return runWithinTestContext(() -> {
+                assertThatExceptionOfType(StatusRuntimeException.class).isThrownBy(() -> blockingStub.calculate(request));
+        });
+    }
 }

From 9fcfafb6ea5994ad38203c9d335a3f2f27cc5ed5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 14:28:29 +0300
Subject: [PATCH 235/486] bump selenide from 6.6.2 to 6.6.6 (via #791)

---
 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 3239bb6ff..a76094515 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Selenide Integration"
 
-val selenideVersion = "6.6.2"
+val selenideVersion = "6.6.6"
 
 dependencies {
     api(project(":allure-java-commons"))

From 44f2d5e918c9360aac81cc228769e49b166161d5 Mon Sep 17 00:00:00 2001
From: Nikolay Laptev <ceo@gemini-games.com>
Date: Wed, 6 Jul 2022 18:23:16 +0300
Subject: [PATCH 236/486] improvement(testng): introduce tag annotation (fixes
 #756, via #793)

---
 .../java/io/qameta/allure/testng/Tag.java     | 41 +++++++++++++
 .../java/io/qameta/allure/testng/Tags.java    | 34 +++++++++++
 .../allure/testng/AllureTestNgTest.java       | 27 ++++++++-
 .../testng/samples/PerTestFixtures.java       | 57 +++++++++++++++++++
 .../allure/testng/samples/TagClassTest.java   | 41 +++++++++++++
 .../allure/testng/samples/TagMethodTest.java  | 40 +++++++++++++
 ....xml => per-test-fixtures-combination.xml} |  2 +-
 .../src/test/resources/suites/tags.xml        | 11 ++++
 8 files changed, 250 insertions(+), 3 deletions(-)
 create mode 100644 allure-testng/src/main/java/io/qameta/allure/testng/Tag.java
 create mode 100644 allure-testng/src/main/java/io/qameta/allure/testng/Tags.java
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java
 create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java
 rename allure-testng/src/test/resources/suites/{per-test-tag-fixtures-combination.xml => per-test-fixtures-combination.xml} (79%)
 create mode 100644 allure-testng/src/test/resources/suites/tags.xml

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
new file mode 100644
index 000000000..3336c1e51
--- /dev/null
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/Tag.java
@@ -0,0 +1,41 @@
+/*
+ *  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.testng;
+
+import io.qameta.allure.LabelAnnotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import static io.qameta.allure.util.ResultsUtils.TAG_LABEL_NAME;
+
+/**
+ * @author neparij (Nikolay Laptev).
+ */
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Repeatable(Tags.class)
+@LabelAnnotation(name = TAG_LABEL_NAME)
+public @interface Tag {
+
+    String value();
+
+}
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
new file mode 100644
index 000000000..7c78a40f5
--- /dev/null
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/Tags.java
@@ -0,0 +1,34 @@
+/*
+ *  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.testng;
+
+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;
+
+/**
+ * @author neparij (Nikolay Laptev).
+ */
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Tags {
+
+    Tag[] 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 03d51515c..fabcd90d2 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
@@ -410,7 +410,7 @@ public void perTestTagFixtures(final XmlSuite.ParallelMode mode, final int threa
 
         final AllureResults results = runTestNgSuites(
                 parallel(mode, threadCount),
-                "suites/per-test-tag-fixtures-combination.xml"
+                "suites/per-test-fixtures-combination.xml"
         );
 
         List<TestResult> testResult = results.getTestResults();
@@ -703,6 +703,29 @@ public void ownerTest() {
                 );
     }
 
+    @AllureFeatures.MarkerAnnotations
+    @Test(description = "Should add tag to tests")
+    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(",", "[", "]"))
+                )
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.testng.samples.TagMethodTest.testWithTag", "[regress]"),
+                        tuple("io.qameta.allure.testng.samples.TagMethodTest.testWithTags", "[regress,smoke]"),
+                        tuple("io.qameta.allure.testng.samples.TagMethodTest.testWithoutTag", "[]"),
+                        tuple("io.qameta.allure.testng.samples.TagClassTest.testWithoutTag", "[class-tag]"),
+                        tuple("io.qameta.allure.testng.samples.TagClassTest.testWithTag", "[class-tag,method-tag-single]"),
+                        tuple("io.qameta.allure.testng.samples.TagClassTest.testWithTags", "[class-tag,method-tag-1,method-tag-2]")
+                );
+    }
+
     @AllureFeatures.Attachments
     @Test(description = "Should add attachments to tests")
     public void attachmentsTest() {
@@ -764,7 +787,7 @@ public void shouldSetCorrectStatusesForFixtures() {
                 "suites/per-suite-fixtures-combination.xml",
                 "suites/per-method-fixtures-combination.xml",
                 "suites/per-class-fixtures-combination.xml",
-                "suites/per-test-tag-fixtures-combination.xml",
+                "suites/per-test-fixtures-combination.xml",
                 "suites/failed-test-passed-fixture.xml"
         );
 
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
new file mode 100644
index 000000000..f77ed3f79
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PerTestFixtures.java
@@ -0,0 +1,57 @@
+/*
+ *  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.testng.samples;
+
+import io.qameta.allure.Step;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Egor Borisov ehborisov@gmail.com
+ */
+public class PerTestFixtures {
+
+    @BeforeTest
+    public void beforeTest1() {
+        step();
+    }
+
+    @BeforeTest
+    public void beforeTest2() {
+        step();
+    }
+
+    @Test
+    public void test() {
+        step();
+    }
+
+    @AfterTest
+    public void afterTest1() {
+        step();
+    }
+
+    @AfterTest
+    public void afterTest2() {
+        step();
+    }
+
+    @Step
+    public void step() {
+
+    }
+}
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
new file mode 100644
index 000000000..4c6d07bfa
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagClassTest.java
@@ -0,0 +1,41 @@
+/*
+ *  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.testng.samples;
+
+import io.qameta.allure.testng.Tag;
+import io.qameta.allure.testng.Tags;
+import org.testng.annotations.Test;
+
+/**
+ * @author neparij (Nikolay Laptev).
+ */
+@Tag("class-tag")
+public class TagClassTest {
+
+    @Test
+    @Tag("method-tag-single")
+    public void testWithTag() throws Exception {
+    }
+
+    @Test
+    @Tags({@Tag("method-tag-1"), @Tag("method-tag-2")})
+    public void testWithTags() throws Exception {
+    }
+
+    @Test
+    public void testWithoutTag() throws Exception {
+    }
+}
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
new file mode 100644
index 000000000..aabb2ed36
--- /dev/null
+++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/TagMethodTest.java
@@ -0,0 +1,40 @@
+/*
+ *  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.testng.samples;
+
+import io.qameta.allure.testng.Tag;
+import io.qameta.allure.testng.Tags;
+import org.testng.annotations.Test;
+
+/**
+ * @author neparij (Nikolay Laptev).
+ */
+public class TagMethodTest {
+
+    @Test
+    @Tag("regress")
+    public void testWithTag() throws Exception {
+    }
+
+    @Test
+    @Tags({@Tag("regress"), @Tag("smoke")})
+    public void testWithTags() throws Exception {
+    }
+
+    @Test
+    public void testWithoutTag() throws Exception {
+    }
+}
diff --git a/allure-testng/src/test/resources/suites/per-test-tag-fixtures-combination.xml b/allure-testng/src/test/resources/suites/per-test-fixtures-combination.xml
similarity index 79%
rename from allure-testng/src/test/resources/suites/per-test-tag-fixtures-combination.xml
rename to allure-testng/src/test/resources/suites/per-test-fixtures-combination.xml
index 390cd0f66..469f4847e 100644
--- a/allure-testng/src/test/resources/suites/per-test-tag-fixtures-combination.xml
+++ b/allure-testng/src/test/resources/suites/per-test-fixtures-combination.xml
@@ -4,7 +4,7 @@
 <suite name="Test suite 13">
     <test name="Test tag 13">
         <classes>
-            <class name="io.qameta.allure.testng.samples.TestTagFixtures">
+            <class name="io.qameta.allure.testng.samples.PerTestFixtures">
             </class>
         </classes>
     </test>
diff --git a/allure-testng/src/test/resources/suites/tags.xml b/allure-testng/src/test/resources/suites/tags.xml
new file mode 100644
index 000000000..f82f4844f
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/tags.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="Tags suite">
+    <test name="Tags tests">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.TagMethodTest"/>
+            <class name="io.qameta.allure.testng.samples.TagClassTest"/>
+        </classes>
+    </test>
+</suite>

From e5818c79ef3a3c9bf6ffe447c7523213b18d22e2 Mon Sep 17 00:00:00 2001
From: Dmitriy <hwoaran92@Mail.ru>
Date: Wed, 3 Aug 2022 16:52:31 +0300
Subject: [PATCH 237/486] fix(allure-descriptions-javadoc): fix signature hash
 calculation (via #796)

---
 allure-descriptions-javadoc/build.gradle.kts  |  1 +
 .../JavaDocDescriptionsProcessor.java         |  3 +-
 .../description/ProcessDescriptionsTest.java  | 40 +++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/allure-descriptions-javadoc/build.gradle.kts b/allure-descriptions-javadoc/build.gradle.kts
index 4ec8e85c2..266bcb3ab 100644
--- a/allure-descriptions-javadoc/build.gradle.kts
+++ b/allure-descriptions-javadoc/build.gradle.kts
@@ -9,6 +9,7 @@ dependencies {
     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"))
     testImplementation(project(":allure-junit-platform"))
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 747071fe2..6e772d727 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
@@ -69,7 +69,8 @@ public boolean process(final Set<? extends TypeElement> annotations, final Round
             }
             final String docs = elementUtils.getDocComment(el);
             final List<String> typeParams = ((ExecutableElement) el).getParameters().stream()
-                    .map(param -> param.asType().toString()).collect(Collectors.toList());
+                    .map(param -> processingEnv.getTypeUtils().asElement(param.asType()).toString())
+                    .collect(Collectors.toList());
             final String name = el.getSimpleName().toString();
             if (docs == null) {
                 messager.printMessage(Diagnostic.Kind.WARNING,
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 2cb881af9..c83467960 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
@@ -84,4 +84,44 @@ void skipUncommentedMethodTest() {
                 .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(
+                "io.qameta.allure.description.test.DescriptionSample",
+                "package io.qameta.allure.description.test;",
+                "import io.qameta.allure.Description;",
+                "import org.junit.jupiter.params.ParameterizedTest;",
+                "import org.junit.jupiter.params.provider.MethodSource;",
+                "import java.util.Arrays;",
+                "import java.util.List;",
+                "import java.util.stream.Stream;",
+                "",
+                "public class DescriptionSample {",
+                "",
+                "/**",
+                "* Captured javadoc description",
+                "*/",
+                "@ParameterizedTest",
+                "@MethodSource(\"provideStringListParameters\")",
+                "@Description(useJavaDoc = true)",
+                "public void sampleParametrizedTestWithGenericParameterAndJavadocComment(List<String> stringList) {",
+                "}",
+                "",
+                "private static Stream<List<String>> provideStringListParameters() {",
+                "return Stream.of(Arrays.asList(\"foo\", \"bar\"));",
+                "}",
+                "}"
+        );
+
+        Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
+        Compilation compilation = compiler.compile(source);
+        assertThat(compilation).generatedFile(
+                StandardLocation.CLASS_OUTPUT,
+                ALLURE_PACKAGE_NAME,
+                expectedMethodSignatureHash
+        );
+    }
 }

From a9d02651bf661f93c760da3fda796e7c00d49434 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 16:53:00 +0300
Subject: [PATCH 238/486] bump protobuf from 3.21.1 to 3.21.2 (via #794)

---
 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 11aeaaac7..44eacbbd6 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.47.0"
-val protobufVersion = "3.21.1"
+val protobufVersion = "3.21.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 6b75f0b850379fe18f80f6e023419ec705ea0386 Mon Sep 17 00:00:00 2001
From: Evgenii Plugatar <54626653+evpl@users.noreply.github.com>
Date: Tue, 9 Aug 2022 15:55:14 +0300
Subject: [PATCH 239/486] remove erroneous step/fixture mentions from javadoc
 (via #799)

---
 .../main/java/io/qameta/allure/Allure.java    | 32 +++++++++----------
 .../java/io/qameta/allure/Description.java    |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

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 90f069556..3bcaea8b6 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
@@ -193,7 +193,7 @@ public static <T> T step(final ThrowableContextRunnable<T, StepContext> runnable
     }
 
     /**
-     * Adds epic label to current test or step (or fixture) if any. Takes no effect
+     * Adds epic label to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #label(String, String)}.
      *
      * @param value the value of label.
@@ -203,7 +203,7 @@ public static void epic(final String value) {
     }
 
     /**
-     * Adds feature label to current test or step (or fixture) if any. Takes no effect
+     * Adds feature label to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #label(String, String)}.
      *
      * @param value the value of label.
@@ -213,7 +213,7 @@ public static void feature(final String value) {
     }
 
     /**
-     * Adds story label to current test or step (or fixture) if any. Takes no effect
+     * Adds story label to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #label(String, String)}.
      *
      * @param value the value of label.
@@ -223,7 +223,7 @@ public static void story(final String value) {
     }
 
     /**
-     * Adds suite label to current test or step (or fixture) if any. Takes no effect
+     * Adds suite label to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #label(String, String)}.
      *
      * @param value the value of label.
@@ -233,7 +233,7 @@ public static void suite(final String value) {
     }
 
     /**
-     * Adds label to current test or step (or fixture) if any. Takes no effect
+     * Adds label to current test if any. Takes no effect
      * if no test run at the moment.
      *
      * @param name  the name of label.
@@ -245,7 +245,7 @@ public static void label(final String name, final String value) {
     }
 
     /**
-     * Adds parameter to current test or step (or fixture) if any. Takes no effect
+     * Adds parameter to current test if any. Takes no effect
      * if no test run at the moment.
      * <p>
      * Shortcut for {@link #parameter(String, Object, Boolean, Parameter.Mode)}.
@@ -258,7 +258,7 @@ public static <T> T parameter(final String name, final T value) {
     }
 
     /**
-     * Adds parameter to current test or step (or fixture) if any. Takes no effect
+     * Adds parameter to current test if any. Takes no effect
      * if no test run at the moment.
      * <p>
      * Shortcut for {@link #parameter(String, Object, Boolean, Parameter.Mode)}.
@@ -273,7 +273,7 @@ public static <T> T parameter(final String name, final T value, final Boolean ex
     }
 
     /**
-     * Adds parameter to current test or step (or fixture) if any. Takes no effect
+     * Adds parameter to current test if any. Takes no effect
      * if no test run at the moment.
      * <p>
      * Shortcut for {@link #parameter(String, Object, Boolean, Parameter.Mode)}.
@@ -289,7 +289,7 @@ public static <T> T parameter(final String name, final T value,
     }
 
     /**
-     * Adds parameter to current test or step (or fixture) if any. Takes no effect
+     * Adds parameter to current test if any. Takes no effect
      * if no test run at the moment.
      *
      * @param name     the name of parameter.
@@ -306,7 +306,7 @@ public static <T> T parameter(final String name, final T value,
     }
 
     /**
-     * Adds issue link to current test or step (or fixture) if any. Takes no effect
+     * Adds issue link to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #link(String, String, String)}.
      *
      * @param name the name of link.
@@ -317,7 +317,7 @@ public static void issue(final String name, final String url) {
     }
 
     /**
-     * Adds tms link to current test or step (or fixture) if any. Takes no effect
+     * Adds tms link to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #link(String, String, String)}.
      *
      * @param name the name of link.
@@ -328,7 +328,7 @@ public static void tms(final String name, final String url) {
     }
 
     /**
-     * Adds link to current test or step (or fixture) if any. Takes no effect
+     * Adds link to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #link(String, String)}
      *
      * @param url the link's url.
@@ -338,7 +338,7 @@ public static void link(final String url) {
     }
 
     /**
-     * Adds link to current test or step (or fixture) if any. Takes no effect
+     * Adds link to current test if any. Takes no effect
      * if no test run at the moment. Shortcut for {@link #link(String, String, String)}
      *
      * @param name the name of link.
@@ -349,7 +349,7 @@ public static void link(final String name, final String url) {
     }
 
     /**
-     * Adds link to current test or step (or fixture) if any. Takes no effect
+     * Adds link to current test if any. Takes no effect
      * if no test run at the moment.
      *
      * @param name the name of link.
@@ -362,7 +362,7 @@ public static void link(final String name, final String type, final String url)
     }
 
     /**
-     * Adds description to current test or step (or fixture) if any. Takes no effect
+     * Adds description to current test if any. Takes no effect
      * if no test run at the moment. Expecting description provided in Markdown format.
      *
      * @param description the description in markdown format.
@@ -373,7 +373,7 @@ public static void description(final String description) {
     }
 
     /**
-     * Adds descriptionHtml to current test or step (or fixture) if any. Takes no effect
+     * Adds descriptionHtml to current test if any. Takes no effect
      * if no test run at the moment. Note that description will take no effect if descriptionHtml is
      * specified.
      *
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 a5833befb..c02c4405e 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 or for a step.
+ *  Annotation that allows to attach a description for a test.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)

From dbdca1a3505125b30f12509585ae6e6d7a0c7114 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Aug 2022 19:03:25 +0300
Subject: [PATCH 240/486] bump resteasy-client from 4.7.3.Final to 6.1.0.Final
 (via #802)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index b96e4af84..4711572e3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -150,7 +150,7 @@ configure(libs) {
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
             dependency("org.grpcmock:grpcmock-junit5:0.7.7")
             dependency("org.freemarker:freemarker:2.3.31")
-            dependency("org.jboss.resteasy:resteasy-client:4.7.3.Final")
+            dependency("org.jboss.resteasy:resteasy-client:6.1.0.Final")
             dependency("org.mock-server:mockserver-netty:5.13.2")
             dependency("org.mockito:mockito-core:4.6.1")
             dependency("javax.annotation:javax.annotation-api:1.3.2")

From 8e8fbdc186e962db09dfc6f4231e00f48bda35ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Aug 2022 19:14:19 +0300
Subject: [PATCH 241/486] bump grpcVersion from 1.47.0 to 1.48.1 (via #803)

---
 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 44eacbbd6..479e1c2d8 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.47.0"
+val grpcVersion = "1.48.1"
 val protobufVersion = "3.21.2"
 
 dependencies {

From 9aa3ffc866d2af705f84cc7766fd88f1b445c64d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Aug 2022 19:14:38 +0300
Subject: [PATCH 242/486] bump com.google.protobuf from 0.8.18 to 0.8.19 (via
 #804)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9350a1805..1b29add06 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -54,7 +54,7 @@ pluginManagement {
         id("io.qameta.allure-report") version "2.9.6"
         id("io.spring.dependency-management") version "1.0.11.RELEASE"
         id("ru.vyarus.quality") version "4.7.0"
-        id("com.google.protobuf") version "0.8.18"
+        id("com.google.protobuf") version "0.8.19"
         kotlin("jvm") version "1.6.21"
     }
 }

From ee56341de57bc6aa3e322391a55fd4325a481410 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 14:18:12 +0300
Subject: [PATCH 243/486] bump com.diffplug.spotless from 6.7.2 to 6.9.1 (via
 #807)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1b29add06..6b7b33d5d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,7 +44,7 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("com.diffplug.spotless") version "6.7.2"
+        id("com.diffplug.spotless") version "6.9.1"
         id("com.github.johnrengelman.shadow") version "7.1.2"
         id("com.gradle.enterprise") version "3.10.2"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"

From f7656bec7baa188a405e36db8affa1bb227d0c77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 14:18:35 +0300
Subject: [PATCH 244/486] bump kotlin from 1.6.21 to 1.7.10 (via #795)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6b7b33d5d..bcaaf95f0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -55,7 +55,7 @@ pluginManagement {
         id("io.spring.dependency-management") version "1.0.11.RELEASE"
         id("ru.vyarus.quality") version "4.7.0"
         id("com.google.protobuf") version "0.8.19"
-        kotlin("jvm") version "1.6.21"
+        kotlin("jvm") version "1.7.10"
     }
 }
 

From 66afe56e6f96bb8837a71d50b6991731001f636d Mon Sep 17 00:00:00 2001
From: Nir Tal <nirt236@gmail.com>
Date: Wed, 10 Aug 2022 19:30:52 +0300
Subject: [PATCH 245/486] add owner tag support for cucumber jvm7 (via #764)

---
 .../main/java/io/qameta/allure/cucumber7jvm/LabelBuilder.java | 4 ++++
 1 file changed, 4 insertions(+)

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 961138543..4889a23da 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
@@ -57,6 +57,7 @@ class LabelBuilder {
     private static final String ISSUE_LINK = "@ISSUE";
     private static final String TMS_LINK = "@TMSLINK";
     private static final String PLAIN_LINK = "@LINK";
+    private static final String OWNER = "@OWNER";
 
     private final List<Label> scenarioLabels = new ArrayList<>();
     private final List<Link> scenarioLinks = new ArrayList<>();
@@ -97,6 +98,9 @@ class LabelBuilder {
                     case PLAIN_LINK:
                         getScenarioLinks().add(ResultsUtils.createLink(null, tagValue, tagValue, null));
                         break;
+                    case OWNER:
+                        getScenarioLabels().add(ResultsUtils.createOwnerLabel(tagValue));
+                        break;
                     default:
                         LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey);
                         getScenarioLabels().add(getTagLabel(tag));

From b1d79e53abd022df7d2d5306f0e8b5303e470b22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 19:35:36 +0300
Subject: [PATCH 246/486] bump io.qameta.allure-report from 2.9.6 to 2.10.0
 (via #806)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index bcaaf95f0..fffa701de 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -48,10 +48,10 @@ pluginManagement {
         id("com.github.johnrengelman.shadow") version "7.1.2"
         id("com.gradle.enterprise") version "3.10.2"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
-        id("io.qameta.allure-adapter") version "2.9.6"
-        id("io.qameta.allure-aggregate-report") version "2.9.6"
-        id("io.qameta.allure-download") version "2.9.6"
-        id("io.qameta.allure-report") version "2.9.6"
+        id("io.qameta.allure-adapter") version "2.10.0"
+        id("io.qameta.allure-aggregate-report") version "2.10.0"
+        id("io.qameta.allure-download") version "2.10.0"
+        id("io.qameta.allure-report") version "2.10.0"
         id("io.spring.dependency-management") version "1.0.11.RELEASE"
         id("ru.vyarus.quality") version "4.7.0"
         id("com.google.protobuf") version "0.8.19"

From 0e55c9fcdfe938b29adfef2042133dd73d477bc6 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Wed, 10 Aug 2022 16:36:32 +0000
Subject: [PATCH 247/486] release 2.19.0

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

diff --git a/gradle.properties b/gradle.properties
index fbac6486b..b7432e588 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.19-SNAPSHOT
+version=2.19.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 0f519f40d66940841869dbc58097832001abe16b Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Wed, 10 Aug 2022 16:36:33 +0000
Subject: [PATCH 248/486] set next development version 2.20

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

diff --git a/gradle.properties b/gradle.properties
index b7432e588..ca870120f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.19.0
+version=2.20-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 3fadac65c5bf4843c7848b75e05e1723b1275eb0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Sep 2022 17:17:45 +0300
Subject: [PATCH 249/486] bump selenide from 6.6.6 to 6.7.3 (via #814)

---
 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 a76094515..0cc4eeebe 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Selenide Integration"
 
-val selenideVersion = "6.6.6"
+val selenideVersion = "6.7.3"
 
 dependencies {
     api(project(":allure-java-commons"))

From 21f7c14c5902bd39d9a6d94c25a4298a24bc2385 Mon Sep 17 00:00:00 2001
From: Dmitriy <hwoaran92@Mail.ru>
Date: Tue, 27 Sep 2022 07:41:32 +0300
Subject: [PATCH 250/486] fix(descriptions-javadoc): npe for primitive type
 parameters (via #820)

---
 .../JavaDocDescriptionsProcessor.java         |  8 ++++-
 .../description/ProcessDescriptionsTest.java  | 33 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

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 6e772d727..6efbe2fe9 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
@@ -28,6 +28,7 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
 import javax.lang.model.util.Elements;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
@@ -69,7 +70,7 @@ public boolean process(final Set<? extends TypeElement> annotations, final Round
             }
             final String docs = elementUtils.getDocComment(el);
             final List<String> typeParams = ((ExecutableElement) el).getParameters().stream()
-                    .map(param -> processingEnv.getTypeUtils().asElement(param.asType()).toString())
+                    .map(this::methodParameterTypeMapper)
                     .collect(Collectors.toList());
             final String name = el.getSimpleName().toString();
             if (docs == null) {
@@ -94,4 +95,9 @@ public boolean process(final Set<? extends TypeElement> annotations, final Round
 
         return true;
     }
+
+    private String methodParameterTypeMapper(final VariableElement parameter) {
+        final Element typeElement = processingEnv.getTypeUtils().asElement(parameter.asType());
+        return typeElement != null ? typeElement.toString() : parameter.asType().toString();
+    }
 }
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 c83467960..868004f6f 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
@@ -124,4 +124,37 @@ void captureDescriptionParametrizedTestWithGenericParameterTest() {
                 expectedMethodSignatureHash
         );
     }
+
+    @Test
+    void captureDescriptionParametrizedTestWithPrimitivesParameterTest() {
+        final String expectedMethodSignatureHash = "edeeeaa02f01218cc206e0c6ff024c7a";
+
+        JavaFileObject source = JavaFileObjects.forSourceLines(
+                "io.qameta.allure.description.test.DescriptionSample",
+                "package io.qameta.allure.description.test;",
+                "import io.qameta.allure.Description;",
+                "import org.junit.jupiter.params.ParameterizedTest;",
+                "import org.junit.jupiter.params.provider.ValueSource;",
+                "",
+                "public class DescriptionSample {",
+                "",
+                "/**",
+                "* Captured javadoc description",
+                "*/",
+                "@ParameterizedTest",
+                "@ValueSource(ints = {1, 2, 3})",
+                "@Description(useJavaDoc = true)",
+                "public void sampleParametrizedTestWithPrimitivesParameterAndJavadocComment(int someIntValue) {",
+                "}",
+                "}"
+        );
+
+        Compiler compiler = javac().withProcessors(new JavaDocDescriptionsProcessor());
+        Compilation compilation = compiler.compile(source);
+        assertThat(compilation).generatedFile(
+                StandardLocation.CLASS_OUTPUT,
+                ALLURE_PACKAGE_NAME,
+                expectedMethodSignatureHash
+        );
+    }
 }

From 2081e81b95d016487399655b36557cda0a9c96d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Sep 2022 10:12:03 +0530
Subject: [PATCH 251/486] bump grpc from 1.48.1 to 1.49.0 (via #817)

---
 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 479e1c2d8..4892d2639 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.48.1"
+val grpcVersion = "1.49.0"
 val protobufVersion = "3.21.2"
 
 dependencies {

From 302e0ace509836ea8e03ed55f826530d2292a382 Mon Sep 17 00:00:00 2001
From: a-simeshin <89605031+a-simeshin@users.noreply.github.com>
Date: Tue, 11 Oct 2022 19:23:17 +0300
Subject: [PATCH 252/486] awaitility support (via #829)

---
 README.md                                     | 427 +++++++++---------
 allure-awaitility/build.gradle.kts            |  30 ++
 allure-awaitility/readme.md                   |  66 +++
 .../awaitility/AllureAwaitilityListener.java  | 257 +++++++++++
 .../allure/awaitility/TemporalDuration.java   |  86 ++++
 .../ConditionListenersPositiveTest.java       | 166 +++++++
 .../GlobalSettingsNegativeTest.java           | 120 +++++
 .../GlobalSettingsPositiveTest.java           | 176 ++++++++
 settings.gradle.kts                           |   1 +
 9 files changed, 1124 insertions(+), 205 deletions(-)
 create mode 100644 allure-awaitility/build.gradle.kts
 create mode 100644 allure-awaitility/readme.md
 create mode 100644 allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
 create mode 100644 allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
 create mode 100644 allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
 create mode 100644 allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
 create mode 100644 allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java

diff --git a/README.md b/README.md
index afccb2d6b..169bc835f 100644
--- a/README.md
+++ b/README.md
@@ -1,205 +1,222 @@
-[license]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License 2.0"
-[blog]: https://qameta.io/blog
-[gitter]: https://gitter.im/allure-framework/allure-core
-[gitter-ru]: https://gitter.im/allure-framework/allure-ru
-[twitter]: https://twitter.com/QametaSoftware "Qameta Software"
-[twitter-team]: https://twitter.com/QametaSoftware/lists/team/members "Team"
-
-[CONTRIBUTING.md]: .github/CONTRIBUTING.md
-[docs]: https://docs.qameta.io/allure/2.0/
-
-# Allure Java Integrations 
-
-[![Build](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml/badge.svg)](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml) 
-[![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.
-
-All the artifacts are deployed to `https://dl.bintray.com/qameta/maven`.
-
-## TestNG
-
-The new TestNG adaptors is pretty much ready. To use the adaptor you should add the following dependency:
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-testng</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-also you need to configure AspectJ weaver to support steps.
-
-## JUnit 4
-
-The first draft of a new JUnit 4 adaptor is ready. To use the adaptor you should add the following dependency:
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-junit4</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-## JUnit 5
-
-To use JUnit 5 simply add the following dependency to your project:
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-junit5</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-## Selenide
-
-Listener for Selenide, that logging steps for Allure:
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-selenide</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-Usage example:
-```
-SelenideLogger.addListener("AllureSelenide", new AllureSelenide().screenshots(true).savePageSource(false));
-
-Capture selenium logs:
-SelenideLogger.addListener("AllureSelenide", new AllureSelenide().enableLogs(LogType.BROWSER, Level.ALL));
-https://github.com/SeleniumHQ/selenium/wiki/Logging
-```
-
-
-## Rest Assured
-
-Filter for rest-assured http client, that generates attachment for allure.
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-rest-assured</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-Usage example:
-```
-.filter(new AllureRestAssured())
-```
-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.
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-okhttp3</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-Usage example:
-```
-.addInterceptor(new AllureOkHttp3())
-```
-You can specify custom templates, which should be placed in src/main/resources/tpl folder:
-```
-.addInterceptor(new AllureOkHttp3()
-                .withRequestTemplate("custom-http-request.ftl")
-                .withResponseTemplate("custom-http-response.ftl"))
-
-```
-
-## gRPC
-
-Interceptor for gRPC stubs, that generates attachment for allure.
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-grpc</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-Usage example:
-```
-.newBlockingStub(channel).withInterceptors(new AllureGrpc());
-```
-You can enable interception of response metadata (disabled by default)
-```
-.withInterceptors(new AllureGrpc()
-                .interceptResponseMetadata(true))
-```
-By default, a step will be marked as failed in case that response contains any statuses except 0(OK).
-You can change this behavior, for example, for negative scenarios
-```
-.withInterceptors(new AllureGrpc()
-                .markStepFailedOnNonZeroCode(false))
-```
-You can specify custom templates, which should be placed in src/main/resources/tpl folder:
-```
-.withInterceptors(new AllureGrpc()
-                .setRequestTemplate("custom-http-request.ftl")
-                .setResponseTemplate("custom-http-response.ftl"))
-```
-
-## Http client
-
-Interceptors for Apache HTTP client, that generates attachment for allure.
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-httpclient</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-Usage example:
-```
-.addInterceptorFirst(new AllureHttpClientRequest())
-.addInterceptorLast(new AllureHttpClientResponse());
-```
-
-## JAX-RS Filter
-
-Filter that can be used with JAX-RS compliant clients such as RESTeasy and Jersey
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-jax-rs</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
-
-Usage example:
-```
-.register(AllureJaxRs.class)
-```
-
-## JsonUnit
-JsonPatchMatcher is extension of JsonUnit matcher, that generates pretty html attachment for differences based on [json diff patch](https://github.com/benjamine/jsondiffpatch/blob/master/docs/deltas.md).
-
-```xml
-<dependency>
-   <groupId>io.qameta.allure</groupId>
-   <artifactId>allure-jsonunit</artifactId>
-   <version>$LATEST_VERSION</version>
-</dependency>
-```
+[license]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License 2.0"
+[blog]: https://qameta.io/blog
+[gitter]: https://gitter.im/allure-framework/allure-core
+[gitter-ru]: https://gitter.im/allure-framework/allure-ru
+[twitter]: https://twitter.com/QametaSoftware "Qameta Software"
+[twitter-team]: https://twitter.com/QametaSoftware/lists/team/members "Team"
+
+[CONTRIBUTING.md]: .github/CONTRIBUTING.md
+[docs]: https://docs.qameta.io/allure/2.0/
+
+# Allure Java Integrations 
+
+[![Build](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml/badge.svg)](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml) 
+[![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.
+
+All the artifacts are deployed to `https://dl.bintray.com/qameta/maven`.
+
+## TestNG
+
+The new TestNG adaptors is pretty much ready. To use the adaptor you should add the following dependency:
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-testng</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+also you need to configure AspectJ weaver to support steps.
+
+## JUnit 4
+
+The first draft of a new JUnit 4 adaptor is ready. To use the adaptor you should add the following dependency:
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-junit4</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+## JUnit 5
+
+To use JUnit 5 simply add the following dependency to your project:
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-junit5</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+## Selenide
+
+Listener for Selenide, that logging steps for Allure:
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-selenide</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+SelenideLogger.addListener("AllureSelenide", new AllureSelenide().screenshots(true).savePageSource(false));
+
+Capture selenium logs:
+SelenideLogger.addListener("AllureSelenide", new AllureSelenide().enableLogs(LogType.BROWSER, Level.ALL));
+https://github.com/SeleniumHQ/selenium/wiki/Logging
+```
+
+
+## Rest Assured
+
+Filter for rest-assured http client, that generates attachment for allure.
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-rest-assured</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+.filter(new AllureRestAssured())
+```
+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.
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-okhttp3</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+.addInterceptor(new AllureOkHttp3())
+```
+You can specify custom templates, which should be placed in src/main/resources/tpl folder:
+```
+.addInterceptor(new AllureOkHttp3()
+                .withRequestTemplate("custom-http-request.ftl")
+                .withResponseTemplate("custom-http-response.ftl"))
+
+```
+
+## gRPC
+
+Interceptor for gRPC stubs, that generates attachment for allure.
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-grpc</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+.newBlockingStub(channel).withInterceptors(new AllureGrpc());
+```
+You can enable interception of response metadata (disabled by default)
+```
+.withInterceptors(new AllureGrpc()
+                .interceptResponseMetadata(true))
+```
+By default, a step will be marked as failed in case that response contains any statuses except 0(OK).
+You can change this behavior, for example, for negative scenarios
+```
+.withInterceptors(new AllureGrpc()
+                .markStepFailedOnNonZeroCode(false))
+```
+You can specify custom templates, which should be placed in src/main/resources/tpl folder:
+```
+.withInterceptors(new AllureGrpc()
+                .setRequestTemplate("custom-http-request.ftl")
+                .setResponseTemplate("custom-http-response.ftl"))
+```
+
+## Http client
+
+Interceptors for Apache HTTP client, that generates attachment for allure.
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-httpclient</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+.addInterceptorFirst(new AllureHttpClientRequest())
+.addInterceptorLast(new AllureHttpClientResponse());
+```
+
+## JAX-RS Filter
+
+Filter that can be used with JAX-RS compliant clients such as RESTeasy and Jersey
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-jax-rs</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+.register(AllureJaxRs.class)
+```
+
+## JsonUnit
+JsonPatchMatcher is extension of JsonUnit matcher, that generates pretty html attachment for differences based on [json diff patch](https://github.com/benjamine/jsondiffpatch/blob/master/docs/deltas.md).
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-jsonunit</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+## Awaitility
+Extended logging for poling and ignored exceptions for [awaitility](https://github.com/awaitility/awaitility). For 
+more usage example look into module `allure-awaitility`
+
+```xml
+<dependency>
+   <groupId>io.qameta.allure</groupId>
+   <artifactId>allure-awaitility</artifactId>
+   <version>$LATEST_VERSION</version>
+</dependency>
+```
+
+Usage example:
+```
+Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
+```
\ No newline at end of file
diff --git a/allure-awaitility/build.gradle.kts b/allure-awaitility/build.gradle.kts
new file mode 100644
index 000000000..2426a93bc
--- /dev/null
+++ b/allure-awaitility/build.gradle.kts
@@ -0,0 +1,30 @@
+description = "Allure Awaitlity Integration"
+
+val agent: Configuration by configurations.creating
+
+val awaitilityVersion = "4.2.0"
+
+dependencies {
+    agent("org.aspectj:aspectjweaver")
+    api(project(":allure-java-commons"))
+    implementation("org.awaitility:awaitility:$awaitilityVersion")
+    testImplementation("javax.annotation:javax.annotation-api")
+    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.awaitility"
+        ))
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
\ No newline at end of file
diff --git a/allure-awaitility/readme.md b/allure-awaitility/readme.md
new file mode 100644
index 000000000..5a93b6a42
--- /dev/null
+++ b/allure-awaitility/readme.md
@@ -0,0 +1,66 @@
+## Allure-awaitility
+Extended logging for poling and ignored exceptions for [awaitility](https://github.com/awaitility/awaitility)
+
+
+## Wiki
+For more information about awaitility highly recommended look into [awaitility usage guide](https://github.com/awaitility/awaitility/wiki/Usage)
+
+
+### Configuration examples
+Single line for all awaitility conditions in project
+```java
+Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
+```
+
+Moreover, it's possible logging only few unstable conditions with method `.conditionEvaluationListener()`
+```java
+final AtomicInteger atomicInteger = new AtomicInteger(0);
+await().with()
+        .conditionEvaluationListener(new AllureAwaitilityListener())
+        .alias("Checking that important counter reached value around 3")
+        .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+        .pollInterval(Duration.of(50, ChronoUnit.MILLIS))
+        .until(atomicInteger::getAndIncrement, is(3));
+```
+
+How it looks like:
+1. Top-level step with condition evaluation definition such as alias or default information.
+2. Second-level steps with poling process information
+3. Optional second-level step with timeout information
+4. Optional second-level steps with ignored information
+
+
+### TimeUnit
+Most awaitility users count time as milliseconds, but you can feel free to change print poll information.
+```java
+Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener().setUnit(TimeUnit.SECONDS));
+```
+
+
+### Exceptions handling
+By default, it's not possible to handle and log any exceptions, but you can try to 
+[ignore](https://github.com/awaitility/awaitility/wiki/Usage#ignoring-exceptions) and log ignored exceptions. 
+
+```java
+final AtomicInteger atomicInteger = new AtomicInteger(0);
+await().with()
+        .ignoreExceptions() //required
+        .atMost(Duration.of(1000, ChronoUnit.MILLIS))
+        .pollInterval(Duration.of(500, ChronoUnit.MILLIS))
+        .until(() -> {
+            if (atomicInteger.getAndIncrement() != 3) {
+                //this exception will be ignored by awaitility, but logged into Allure
+                throw new RuntimeException("Something wrong happens");
+            } else {
+                return true;
+            }
+        });
+```
+
+Then, if you are not impressed with the large volume of logged exceptions, there is the way to disable logging for 
+ignored exceptions globally.
+
+```java
+Awaitility.ignoreExceptionsByDefault();
+Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener().setLogIgnoredExceptions(false));
+```
\ No newline at end of file
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
new file mode 100644
index 000000000..82a0d837e
--- /dev/null
+++ b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java
@@ -0,0 +1,257 @@
+/*
+ *  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.awaitility;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
+import org.awaitility.Awaitility;
+import org.awaitility.core.ConditionEvaluationListener;
+import org.awaitility.core.ConditionFactory;
+import org.awaitility.core.EvaluatedCondition;
+import org.awaitility.core.IgnoredException;
+import org.awaitility.core.StartEvaluationEvent;
+import org.awaitility.core.TimeoutEvent;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+/**
+ * <p>
+ * Class implements Awaitility condition listener to log all awaiting and polls as {@link io.qameta.allure.Step}.
+ * </p>
+ * <p>
+ * Usage with single condition
+ * <pre>
+ * <code>
+ * Awaitility.await()
+ *     .conditionEvaluationListener(new AllureAwaitilityListener())
+ *     .until(() -> somethingHappen());
+ * </code>
+ * </pre>
+ * </p>
+ * <p>
+ * Usage globally for all conditions
+ * <pre>
+ * <code>
+ * Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
+ * </code>
+ * </pre>
+ * </p>
+ *
+ * @author a-simeshin (Simeshin Artem)
+ * @see org.awaitility.core.ConditionEvaluationListener
+ * @see Awaitility#setDefaultConditionEvaluationListener(ConditionEvaluationListener)
+ * @see ConditionFactory#conditionEvaluationListener(ConditionEvaluationListener)
+ * @see <a href="https://github.com/awaitility/awaitility/wiki/Usage#condition-evaluation-listener"> awaitlity wiki</a>
+ */
+@SuppressWarnings("unused")
+public class AllureAwaitilityListener implements ConditionEvaluationListener<Object> {
+
+    private TimeUnit unit;
+    private boolean logIgnoredExceptions;
+    private final String onStartStepTextPattern;
+    private final String onSatisfiedStepTextPattern;
+    private final String onAwaitStepTextPattern;
+    private final String onTimeoutStepTextPattern;
+    private final String onExceptionStepTextPattern;
+
+    private String currentConditionStepUUID;
+
+    private static InheritableThreadLocal<AllureLifecycle> lifecycle = new InheritableThreadLocal<AllureLifecycle>() {
+        @Override
+        protected AllureLifecycle initialValue() {
+            return Allure.getLifecycle();
+        }
+    };
+
+    public static AllureLifecycle getLifecycle() {
+        return lifecycle.get();
+    }
+
+    /**
+     * Default all args constructor with default params.
+     */
+    public AllureAwaitilityListener() {
+        this.unit = MILLISECONDS;
+        this.logIgnoredExceptions = true;
+        this.onStartStepTextPattern = "Awaitility: %s";
+        this.onSatisfiedStepTextPattern = "%s after %d %s (remaining time %d %s, last poll interval was %s)";
+        this.onAwaitStepTextPattern = "%s (elapsed time %d %s, remaining time %d %s (last poll interval was %s))";
+        this.onTimeoutStepTextPattern = "Condition timeout. %s";
+        this.onExceptionStepTextPattern = "Exception ignored. %s";
+    }
+
+    /**
+     * Set default timeunit used in awaitility in project for properly printing.
+     *
+     * @param unit default timeunit in project
+     * @return this factory
+     */
+    public AllureAwaitilityListener setUnit(final TimeUnit unit) {
+        this.unit = unit;
+        return this;
+    }
+
+    /**
+     * Set logging ignored exceptions. True by default.
+     *
+     * @param logging to log or not
+     * @return this factory
+     */
+    public AllureAwaitilityListener setLogIgnoredExceptions(final boolean logging) {
+        this.logIgnoredExceptions = logging;
+        return this;
+    }
+
+    /**
+     * Method creates top-level step with short description about condition.
+     *
+     * @param startEvaluationEvent condition evaluation started
+     */
+    @Override
+    public void beforeEvaluation(final StartEvaluationEvent<Object> startEvaluationEvent) {
+        currentConditionStepUUID = UUID.randomUUID().toString();
+        final String nameWoAlias = String.format(onStartStepTextPattern, startEvaluationEvent.getDescription());
+        final String nameWithAlias = String.format(onStartStepTextPattern, startEvaluationEvent.getAlias());
+        final String stepName = startEvaluationEvent.getAlias() != null ? nameWithAlias : nameWoAlias;
+        getLifecycle().startStep(
+                currentConditionStepUUID,
+                new StepResult()
+                        .setName(stepName)
+                        .setDescription("Awaitility condition started")
+                        .setStatus(Status.FAILED)
+        );
+    }
+
+    /**
+     * Logging timeout evaluation result. Method should create second-level step with useful info about timeout.
+     *
+     * @param timeoutEvent poling ended with timeout
+     */
+    @Override
+    public void onTimeout(final TimeoutEvent timeoutEvent) {
+        getLifecycle().updateStep(awaitilityCondition -> {
+            final String currentTimeoutStepUUID = UUID.randomUUID().toString();
+            getLifecycle().startStep(
+                    currentConditionStepUUID,
+                    currentTimeoutStepUUID,
+                    new StepResult()
+                            .setName(String.format(onTimeoutStepTextPattern, timeoutEvent.getDescription()))
+                            .setDescription("Awaitility condition timeout")
+                            .setStatus(Status.BROKEN)
+            );
+            getLifecycle().stopStep(currentTimeoutStepUUID);
+        });
+        getLifecycle().stopStep(currentConditionStepUUID);
+    }
+
+    /**
+     * Logging any evaluation result. Method should create second-level step with evaluation result and useful info.
+     *
+     * @param condition evaluation result for poling iteration
+     */
+    @Override
+    public void conditionEvaluated(final EvaluatedCondition<Object> condition) {
+        final String description = condition.getDescription();
+        final long elapsedTime = unit.convert(condition.getElapsedTimeInMS(), MILLISECONDS);
+        final long remainingTime = unit.convert(condition.getRemainingTimeInMS(), MILLISECONDS);
+        final String unitAsString = unit.toString().toLowerCase();
+
+        final String message;
+        if (condition.isSatisfied()) {
+            message =
+                    String.format(onSatisfiedStepTextPattern, description, elapsedTime, unitAsString, remainingTime,
+                            unitAsString, new TemporalDuration(condition.getPollInterval()));
+        } else {
+            message =
+                    String.format(onAwaitStepTextPattern, description, elapsedTime, unitAsString, remainingTime,
+                            unitAsString, new TemporalDuration(condition.getPollInterval()));
+        }
+
+        getLifecycle().updateStep(awaitilityCondition -> {
+            final String lastAwaitStepUUID = UUID.randomUUID().toString();
+            getLifecycle().startStep(
+                    currentConditionStepUUID,
+                    lastAwaitStepUUID,
+                    new StepResult()
+                            .setName(message)
+                            .setDescription("Awaitility condition satisfied or not, but awaiting still in progress")
+                            .setStatus(Status.PASSED)
+            );
+            getLifecycle().stopStep(lastAwaitStepUUID);
+            if (condition.isSatisfied()) {
+                awaitilityCondition.setStatus(Status.PASSED);
+                getLifecycle().stopStep(currentConditionStepUUID);
+            }
+        });
+    }
+
+    /**
+     * Logging ignored exceptions while poling conditions. Active only with
+     * <pre><code>await().with().ignoreExceptions()</code></pre>
+     * or
+     * <pre><code>Awaitility.ignoreExceptionsByDefault()</code></pre>
+     *
+     * @param ignoredException ignored exception
+     * @see Awaitility#ignoreExceptionsByDefault()
+     * @see Awaitility#ignoreExceptionByDefault(Class)
+     * @see ConditionFactory#ignoreExceptions()
+     * @see ConditionFactory#ignoreException(Class)
+     * @see <a href="https://github.com/awaitility/awaitility/wiki/Usage#ignoring-exceptions">awaitlity wiki</a>
+     */
+    @Override
+    public void exceptionIgnored(final IgnoredException ignoredException) {
+        if (logIgnoredExceptions) {
+            getLifecycle().updateStep(awaitilityCondition -> {
+                final String currentExceptionIgnoredStepUUID = UUID.randomUUID().toString();
+                final String message = String.format(
+                        onExceptionStepTextPattern, ignoredException.getThrowable().getMessage());
+                final StringWriter stringWriter = new StringWriter();
+                ignoredException.getThrowable().printStackTrace(new PrintWriter(stringWriter));
+                final String stackTrace = stringWriter.toString();
+                getLifecycle().startStep(
+                        currentConditionStepUUID,
+                        currentExceptionIgnoredStepUUID,
+                        new StepResult()
+                                .setName(message)
+                                .setDescription("Exception occurred and ignored, but awaiting still in progress")
+                                .setStatus(Status.SKIPPED)
+                );
+                getLifecycle().addAttachment(
+                        ignoredException.getThrowable().getMessage(), "text/plain", ".txt",
+                        stackTrace.getBytes(StandardCharsets.UTF_8));
+                getLifecycle().stopStep(currentExceptionIgnoredStepUUID);
+            });
+        }
+    }
+
+    /**
+     * For tests only.
+     *
+     * @param allure allure lifecycle to set
+     */
+    public static void setLifecycle(final AllureLifecycle 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
new file mode 100644
index 000000000..17a489e27
--- /dev/null
+++ b/allure-awaitility/src/main/java/io/qameta/allure/awaitility/TemporalDuration.java
@@ -0,0 +1,86 @@
+/*
+ *  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.awaitility;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalField;
+import java.time.temporal.UnsupportedTemporalTypeException;
+
+import static java.time.temporal.ChronoField.DAY_OF_MONTH;
+import static java.time.temporal.ChronoField.HOUR_OF_DAY;
+import static java.time.temporal.ChronoField.MILLI_OF_SECOND;
+import static java.time.temporal.ChronoField.MINUTE_OF_HOUR;
+import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
+import static java.time.temporal.ChronoField.SECOND_OF_MINUTE;
+import static java.time.temporal.ChronoField.YEAR;
+
+/**
+ * Class helper for Duration printing purposes.
+ */
+public class TemporalDuration implements TemporalAccessor {
+    private static final Temporal BASE = LocalDateTime.of(0, 1, 1, 0, 0, 0, 0);
+
+    private static final DateTimeFormatter DTF = new DateTimeFormatterBuilder().optionalStart()
+            .appendValue(YEAR)
+            .appendLiteral(" years ").optionalEnd()
+            .optionalStart().appendLiteral(' ').appendValue(MONTH_OF_YEAR).appendLiteral(" months ").optionalEnd()
+            .optionalStart().appendLiteral(' ').appendValue(DAY_OF_MONTH).appendLiteral(" days ").optionalEnd()
+            .optionalStart().appendLiteral(' ').appendValue(HOUR_OF_DAY).appendLiteral(" hours ").optionalEnd()
+            .optionalStart().appendLiteral(' ').appendValue(MINUTE_OF_HOUR).appendLiteral(" minutes ").optionalEnd()
+            .optionalStart().appendLiteral(' ').appendValue(SECOND_OF_MINUTE).appendLiteral(" seconds").optionalEnd()
+            .optionalStart().appendLiteral(' ').appendValue(MILLI_OF_SECOND).appendLiteral(" milliseconds")
+            .optionalEnd()
+            .toFormatter();
+
+    private final Duration duration;
+    private final Temporal temporal;
+
+    TemporalDuration(final Duration duration) {
+        this.duration = duration;
+        this.temporal = duration.addTo(BASE);
+    }
+
+    @Override
+    public boolean isSupported(final TemporalField field) {
+        if (!temporal.isSupported(field)) {
+            return false;
+        }
+        return temporal.getLong(field) - BASE.getLong(field) != 0L;
+    }
+
+    @Override
+    public long getLong(final TemporalField temporalField) {
+        if (!isSupported(temporalField)) {
+            throw new UnsupportedTemporalTypeException(temporalField.toString());
+        }
+        return temporal.getLong(temporalField) - BASE.getLong(temporalField);
+    }
+
+    @Override
+    public String toString() {
+        if (duration.compareTo(Duration.ofMillis(1)) < 0) {
+            return duration.toNanos() + " nanoseconds";
+        } else {
+            return DTF.format(this).trim();
+        }
+    }
+
+}
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
new file mode 100644
index 000000000..0ff23ee28
--- /dev/null
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/ConditionListenersPositiveTest.java
@@ -0,0 +1,166 @@
+/*
+ *  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.awaitility;
+
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.TestResult;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+class ConditionListenersPositiveTest {
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: listener into condition declaration, await without alias
+     * <p>
+     * Test should check that:
+     * <li>1. Allure has exactly 1 top-level step for 1 await condition</li>
+     * <li>2. Top level step has passed status</li>
+     * <li>3. Top level step has default name</li>
+     */
+    @Test
+    void 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));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+        assertAll(
+                () -> assertEquals(
+                        1, testResult.get(0).getSteps().size(),
+                        "Exactly 1 top level step for 1 awaitility condition"
+                ),
+                () -> assertEquals(
+                        Status.PASSED, testResult.get(0).getSteps().get(0).getStatus(),
+                        "Top level step has passed status"
+                ),
+                () -> assertEquals(
+                        "Awaitility: Starting evaluation",
+                        testResult.get(0).getSteps().get(0).getName(),
+                        "Top level step has default name because await() wo alias"
+                )
+        );
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: listener into condition declaration, await with alias
+     * <p>
+     * Test should check that:
+     * <li>1. Top level step has name with alias from await('alias')</li>
+     */
+    @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));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+        assertEquals(
+                "Awaitility: Counter should be at least 3",
+                testResult.get(0).getSteps().get(0).getName(),
+                "Top level step has name with alias"
+        );
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: listener into condition declaration, await without alias
+     * <p>
+     * Test should check that:
+     * <li>1. Allure has exactly 4 second-level steps for condition with 4 polls iteration</li>
+     * <li>2. All second-level steps should have passed status for successful condition evaluation</li>
+     * <li>3. All second-level steps should have information about polling intervals and evaluation</li>
+     */
+    @Test
+    void 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));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+        assertAll(
+                () -> assertEquals(
+                        4, testResult.get(0).getSteps().get(0).getSteps().size(),
+                        "Exactly 4 second level steps for 4 polling iterations"
+                ),
+                () -> assertEquals(
+                        4, (int) testResult.get(0).getSteps().get(0).getSteps().stream()
+                                .filter(x -> x.getStatus().equals(Status.PASSED)).count(),
+                        "All second level steps has passed statuses"
+                ),
+                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
+                        .contains("Lambda expression in io.qameta.allure.awaitility.ConditionListenersPositiveTest")
+                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
+                        .contains("expected <3> but was <0>")
+                        .contains("elapsed time")
+                        .contains("remaining time")
+                        .contains("last poll interval was"),
+                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
+                        .contains("Lambda expression in io.qameta.allure.awaitility.ConditionListenersPositiveTest")
+                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
+                        .contains("expected <3> but was <1>")
+                        .contains("elapsed time")
+                        .contains("remaining time")
+                        .contains("last poll interval was"),
+                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(2).getName())
+                        .contains("Lambda expression in io.qameta.allure.awaitility.ConditionListenersPositiveTest")
+                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
+                        .contains("expected <3> but was <2>")
+                        .contains("elapsed time")
+                        .contains("remaining time")
+                        .contains("last poll interval was"),
+                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(3).getName())
+                        .contains("Lambda expression in io.qameta.allure.awaitility.ConditionListenersPositiveTest")
+                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
+                        .contains("reached its end value of <3> after")
+                        .contains("remaining time")
+                        .contains("last poll interval was")
+        );
+    }
+
+}
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
new file mode 100644
index 000000000..6561331cc
--- /dev/null
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsNegativeTest.java
@@ -0,0 +1,120 @@
+/*
+ *  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.awaitility;
+
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.TestResult;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+class GlobalSettingsNegativeTest {
+
+    @AfterEach
+    void reset() {
+        Awaitility.reset();
+    }
+
+    @BeforeEach
+    void setup() {
+        Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
+    }
+
+    /**
+     * Negative test to check proper allure steps generation.
+     * <p>
+     * Precondition: static settings, await without alias
+     * <p>
+     * Test should check that:
+     * <li>1. Top level step has broken status</li>
+     */
+    @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));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+        assertEquals(
+                Status.FAILED, testResult.get(0).getSteps().get(0).getStatus(),
+                "Top level step has broken status"
+        );
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: static settings, await without alias
+     * <p>
+     * Test should check that:
+     * <li>1. Allure has exactly 2 second-level steps for condition with 2 polls iteration</li>
+     * <li>2. All second-level steps should have passed or broken status for successful and timeout evaluations</li>
+     * <li>3. All second-level steps should have information about polling intervals and evaluation</li>
+     */
+    @Test
+    void 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));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+        assertAll(
+                () -> assertEquals(
+                        2, testResult.get(0).getSteps().get(0).getSteps().size(),
+                        "Exactly 2 second level steps for 2 polling iterations"
+                ),
+                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
+                        .contains("Lambda expression in io.qameta.allure.awaitility.GlobalSettingsNegativeTest")
+                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
+                        .contains("expected <3> but was <0>")
+                        .contains("elapsed time")
+                        .contains("remaining time")
+                        .contains("last poll interval was"),
+                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getStatus())
+                        .isEqualTo(Status.PASSED),
+                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
+                        .contains("Condition timeout.")
+                        .contains("Lambda expression in io.qameta.allure.awaitility.GlobalSettingsNegativeTest")
+                        .contains("expected <3> but was <0> within 1 seconds"),
+                () -> 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
new file mode 100644
index 000000000..d4e3fd666
--- /dev/null
+++ b/allure-awaitility/src/test/java/io/qameta/allure/awaitility/GlobalSettingsPositiveTest.java
@@ -0,0 +1,176 @@
+/*
+ *  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.awaitility;
+
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.TestResult;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+class GlobalSettingsPositiveTest {
+
+    @AfterEach
+    void reset() {
+        Awaitility.reset();
+    }
+
+    @BeforeEach
+    void setup() {
+        Awaitility.setDefaultConditionEvaluationListener(new AllureAwaitilityListener());
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: static settings, await without alias
+     * <p>
+     * Test should check that:
+     * <li>1. Allure has exactly 1 top-level step for 1 await condition</li>
+     * <li>2. Top level step has passed status</li>
+     * <li>3. Top level step has default name</li>
+     */
+    @Test
+    void 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));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+        assertAll(
+                () -> assertEquals(
+                        1, testResult.get(0).getSteps().size(),
+                        "Exactly 1 top level step for 1 awaitility condition"
+                ),
+                () -> assertEquals(
+                        Status.PASSED, testResult.get(0).getSteps().get(0).getStatus(),
+                        "Top level step has passed status"
+                ),
+                () -> assertEquals(
+                        "Awaitility: Starting evaluation",
+                        testResult.get(0).getSteps().get(0).getName(),
+                        "Top level step has default name because await() wo alias"
+                )
+        );
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: static settings, await with alias
+     * <p>
+     * Test should check that:
+     * <li>1. Top level step has name with alias from await('alias')</li>
+     */
+    @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));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+        assertEquals(
+                "Awaitility: Counter should be at least 3",
+                testResult.get(0).getSteps().get(0).getName(),
+                "Top level step has name with alias"
+        );
+    }
+
+    /**
+     * Positive test to check proper allure steps generation.
+     * <p>
+     * Precondition: static settings, await without alias
+     * <p>
+     * Test should check that:
+     * <li>1. Allure has exactly 4 second-level steps for condition with 4 polls iteration</li>
+     * <li>2. All second-level steps should have passed status for successful condition evaluation</li>
+     * <li>3. All second-level steps should have information about polling intervals and evaluation</li>
+     */
+    @Test
+    void 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));
+                },
+                AllureAwaitilityListener::setLifecycle
+        ).getTestResults();
+        assertAll(
+                () -> assertEquals(
+                        4, testResult.get(0).getSteps().get(0).getSteps().size(),
+                        "Exactly 4 second level steps for 4 polling iterations"
+                ),
+                () -> assertEquals(
+                        4, (int) testResult.get(0).getSteps().get(0).getSteps().stream()
+                                .filter(x -> x.getStatus().equals(Status.PASSED)).count(),
+                        "All second level steps has passed statuses"
+                ),
+                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
+                        .contains("Lambda expression in io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
+                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
+                        .contains("expected <3> but was <0>")
+                        .contains("elapsed time")
+                        .contains("remaining time")
+                        .contains("last poll interval was"),
+                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
+                        .contains("Lambda expression in io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
+                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
+                        .contains("expected <3> but was <1>")
+                        .contains("elapsed time")
+                        .contains("remaining time")
+                        .contains("last poll interval was"),
+                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(2).getName())
+                        .contains("Lambda expression in io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
+                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
+                        .contains("expected <3> but was <2>")
+                        .contains("elapsed time")
+                        .contains("remaining time")
+                        .contains("last poll interval was"),
+                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(3).getName())
+                        .contains("Lambda expression in io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
+                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
+                        .contains("reached its end value of <3> after")
+                        .contains("remaining time")
+                        .contains("last poll interval was")
+        );
+    }
+
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index fffa701de..cb9df40d1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,6 +2,7 @@ rootProject.name = "allure-java"
 
 include("allure-assertj")
 include("allure-attachments")
+include("allure-awaitility")
 include("allure-bom")
 include("allure-citrus")
 include("allure-cucumber-jvm")

From 20bc3cc9bc860c6496d10b57685a0b931359ba97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 18:32:24 +0700
Subject: [PATCH 253/486] bump actions/checkout from 3.0.2 to 3.1.0 (via #827)

---
 .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 f08fce06b..6cb00564c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '8.0.x', '11.0.x' ]
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.1.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 9ff564c62..f21560f01 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.0.2
+      - uses: actions/checkout@v3.1.0
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cdefd986d..5059dba7d 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.0.2
+      - uses: actions/checkout@v3.1.0
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From 6b57902a4bae7fcc1fe4e98c4488a0159793c9e1 Mon Sep 17 00:00:00 2001
From: jsa34 <31512041+jsa34@users.noreply.github.com>
Date: Thu, 20 Oct 2022 07:50:51 +0100
Subject: [PATCH 254/486] bump cucumber-jvm7 deps (via #828)

---
 allure-cucumber7-jvm/build.gradle.kts                      | 4 ++--
 .../src/main/java/io/qameta/allure/AllureLifecycle.java    | 2 +-
 .../io/qameta/allure/internal/Allure2ModelJackson.java     | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/allure-cucumber7-jvm/build.gradle.kts b/allure-cucumber7-jvm/build.gradle.kts
index eceb85428..72936800d 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.3.2"
-val cucumberGherkinVersion = "23.0.1"
+val cucumberVersion = "7.8.1"
+val cucumberGherkinVersion = "24.0.0"
 
 dependencies {
     api(project(":allure-java-commons"))
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 7af06dd71..5b9e0065f 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
@@ -602,7 +602,7 @@ public String prepareAttachment(final String name, final String type, final Stri
                 .filter(ext -> !ext.isEmpty())
                 .map(ext -> ext.charAt(0) == '.' ? ext : "." + ext)
                 .orElse("");
-        final String source = UUID.randomUUID().toString() + ATTACHMENT_FILE_SUFFIX + extension;
+        final String source = UUID.randomUUID() + ATTACHMENT_FILE_SUFFIX + extension;
 
         final Optional<String> current = threadContext.getCurrent();
         if (!current.isPresent()) {
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 db9e137c5..6613230ca 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
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 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.model.Parameter;
@@ -46,10 +47,12 @@ private Allure2ModelJackson() {
     }
 
     public static ObjectMapper createMapper() {
-        return new ObjectMapper()
+        return JsonMapper
+                .builder()
                 .configure(USE_WRAPPER_NAME_AS_PROPERTY_NAME, true)
-                .setSerializationInclusion(NON_NULL)
+                .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())

From 7b86df6c60736d429d42584869156bb94445af7e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 13:51:14 +0700
Subject: [PATCH 255/486] bump protobuf from 3.21.2 to 3.21.6 (via #824)

---
 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 4892d2639..fdcc4f34f 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.49.0"
-val protobufVersion = "3.21.2"
+val protobufVersion = "3.21.6"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 7121e01dc7063e1524118bf4b7be3eba0ebfc0d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 10:22:05 +0700
Subject: [PATCH 256/486] bump com.gradle.enterprise from 3.10.2 to 3.11.2 (via
 #832)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index cb9df40d1..d29b9b4b7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -47,7 +47,7 @@ pluginManagement {
     plugins {
         id("com.diffplug.spotless") version "6.9.1"
         id("com.github.johnrengelman.shadow") version "7.1.2"
-        id("com.gradle.enterprise") version "3.10.2"
+        id("com.gradle.enterprise") version "3.11.2"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
         id("io.qameta.allure-adapter") version "2.10.0"
         id("io.qameta.allure-aggregate-report") version "2.10.0"

From ada0b6820dfd6a1562ca20a4a21a66c21d4d9088 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 10:22:41 +0700
Subject: [PATCH 257/486] bump grpcmock-junit5 from 0.7.7 to 0.8.0 (via #821)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 4711572e3..5c59ff623 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -148,7 +148,7 @@ configure(libs) {
             dependency("org.aspectj:aspectjweaver:1.9.9.1")
             dependency("org.assertj:assertj-core:3.22.0")
             dependency("org.codehaus.groovy:groovy-all:2.5.13")
-            dependency("org.grpcmock:grpcmock-junit5:0.7.7")
+            dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.jboss.resteasy:resteasy-client:6.1.0.Final")
             dependency("org.mock-server:mockserver-netty:5.13.2")

From 76a6717215d5cc4620db6ca6fa34de6141ae5392 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 26 Oct 2022 16:36:35 +0700
Subject: [PATCH 258/486] bump build deps (via #837)

---
 .../awaitility/AllureAwaitilityListener.java  |  2 +-
 .../main/java/io/qameta/allure/Allure.java    |  7 +--
 .../listener/ContainerLifecycleListener.java  | 16 +++----
 .../listener/FixtureLifecycleListener.java    | 12 ++---
 .../listener/StepLifecycleListener.java       | 12 ++---
 .../listener/TestLifecycleListener.java       | 20 ++++----
 .../allure/aspects/Allure1Annotations.java    |  2 +-
 allure-spock/build.gradle.kts                 |  3 +-
 build.gradle.kts                              | 48 +++++++++++--------
 .../quality-configs/checkstyle/checkstyle.xml | 10 ++--
 gradle/quality-configs/pmd/pmd.xml            |  5 +-
 gradle/quality-configs/spotbugs/exclude.xml   | 13 +++++
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 settings.gradle.kts                           |  8 ++--
 14 files changed, 93 insertions(+), 67 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 82a0d837e..86f1b1ae5 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
@@ -45,7 +45,7 @@
  * <code>
  * Awaitility.await()
  *     .conditionEvaluationListener(new AllureAwaitilityListener())
- *     .until(() -> somethingHappen());
+ *     .until(() -&gt; somethingHappen());
  * </code>
  * </pre>
  * </p>
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 3bcaea8b6..21c90d2fa 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
@@ -562,7 +562,7 @@ public interface StepContext {
          * @param <T>      the type of value.
          * @return the value.
          */
-        default <T> T parameter(String name, T value, Boolean excluded) {
+        default <T> T parameter(final String name, final T value, final Boolean excluded) {
             throw new UnsupportedOperationException("method is not implemented");
         }
 
@@ -575,7 +575,7 @@ default <T> T parameter(String name, T value, Boolean excluded) {
          * @param <T>   the type of value.
          * @return the value.
          */
-        default <T> T parameter(String name, T value, Parameter.Mode mode) {
+        default <T> T parameter(final String name, final T value, final Parameter.Mode mode) {
             throw new UnsupportedOperationException("method is not implemented");
         }
 
@@ -589,7 +589,8 @@ default <T> T parameter(String name, T value, Parameter.Mode mode) {
          * @param <T>      the type of value.
          * @return the value.
          */
-        default <T> T parameter(String name, T value, Boolean excluded, Parameter.Mode mode) {
+        default <T> T parameter(final String name, final T value,
+                                final Boolean excluded, final Parameter.Mode mode) {
             throw new UnsupportedOperationException("method is not implemented");
         }
 
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 6f8ae0ff3..73db041ad 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
@@ -24,35 +24,35 @@
  */
 public interface ContainerLifecycleListener extends LifecycleListener {
 
-    default void beforeContainerStart(TestResultContainer container) {
+    default void beforeContainerStart(final TestResultContainer container) {
         //do nothing
     }
 
-    default void afterContainerStart(TestResultContainer container) {
+    default void afterContainerStart(final TestResultContainer container) {
         //do nothing
     }
 
-    default void beforeContainerUpdate(TestResultContainer container) {
+    default void beforeContainerUpdate(final TestResultContainer container) {
         //do nothing
     }
 
-    default void afterContainerUpdate(TestResultContainer container) {
+    default void afterContainerUpdate(final TestResultContainer container) {
         //do nothing
     }
 
-    default void beforeContainerStop(TestResultContainer container) {
+    default void beforeContainerStop(final TestResultContainer container) {
         //do nothing
     }
 
-    default void afterContainerStop(TestResultContainer container) {
+    default void afterContainerStop(final TestResultContainer container) {
         //do nothing
     }
 
-    default void beforeContainerWrite(TestResultContainer container) {
+    default void beforeContainerWrite(final TestResultContainer container) {
         //do nothing
     }
 
-    default void afterContainerWrite(TestResultContainer container) {
+    default void afterContainerWrite(final TestResultContainer container) {
         //do nothing
     }
 
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 544c5f2d8..cb2e70558 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
@@ -24,27 +24,27 @@
  */
 public interface FixtureLifecycleListener extends LifecycleListener {
 
-    default void beforeFixtureStart(FixtureResult result) {
+    default void beforeFixtureStart(final FixtureResult result) {
         //do nothing
     }
 
-    default void afterFixtureStart(FixtureResult result) {
+    default void afterFixtureStart(final FixtureResult result) {
         //do nothing
     }
 
-    default void beforeFixtureUpdate(FixtureResult result) {
+    default void beforeFixtureUpdate(final FixtureResult result) {
         //do nothing
     }
 
-    default void afterFixtureUpdate(FixtureResult result) {
+    default void afterFixtureUpdate(final FixtureResult result) {
         //do nothing
     }
 
-    default void beforeFixtureStop(FixtureResult result) {
+    default void beforeFixtureStop(final FixtureResult result) {
         //do nothing
     }
 
-    default void afterFixtureStop(FixtureResult result) {
+    default void afterFixtureStop(final FixtureResult result) {
         //do nothing
     }
 
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 b943f2f5c..f59b5b812 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
@@ -24,27 +24,27 @@
  */
 public interface StepLifecycleListener extends LifecycleListener {
 
-    default void beforeStepStart(StepResult result) {
+    default void beforeStepStart(final StepResult result) {
         //do nothing
     }
 
-    default void afterStepStart(StepResult result) {
+    default void afterStepStart(final StepResult result) {
         //do nothing
     }
 
-    default void beforeStepUpdate(StepResult result) {
+    default void beforeStepUpdate(final StepResult result) {
         //do nothing
     }
 
-    default void afterStepUpdate(StepResult result) {
+    default void afterStepUpdate(final StepResult result) {
         //do nothing
     }
 
-    default void beforeStepStop(StepResult result) {
+    default void beforeStepStop(final StepResult result) {
         //do nothing
     }
 
-    default void afterStepStop(StepResult result) {
+    default void afterStepStop(final StepResult result) {
         //do nothing
     }
 
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 0005a4776..12a0b1ea6 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
@@ -24,43 +24,43 @@
  */
 public interface TestLifecycleListener extends LifecycleListener {
 
-    default void beforeTestSchedule(TestResult result) {
+    default void beforeTestSchedule(final TestResult result) {
         //do nothing
     }
 
-    default void afterTestSchedule(TestResult result) {
+    default void afterTestSchedule(final TestResult result) {
         //do nothing
     }
 
-    default void beforeTestUpdate(TestResult result) {
+    default void beforeTestUpdate(final TestResult result) {
         //do nothing
     }
 
-    default void afterTestUpdate(TestResult result) {
+    default void afterTestUpdate(final TestResult result) {
         //do nothing
     }
 
-    default void beforeTestStart(TestResult result) {
+    default void beforeTestStart(final TestResult result) {
         //do nothing
     }
 
-    default void afterTestStart(TestResult result) {
+    default void afterTestStart(final TestResult result) {
         //do nothing
     }
 
-    default void beforeTestStop(TestResult result) {
+    default void beforeTestStop(final TestResult result) {
         //do nothing
     }
 
-    default void afterTestStop(TestResult result) {
+    default void afterTestStop(final TestResult result) {
         //do nothing
     }
 
-    default void beforeTestWrite(TestResult result) {
+    default void beforeTestWrite(final TestResult result) {
         //do nothing
     }
 
-    default void afterTestWrite(TestResult result) {
+    default void afterTestWrite(final TestResult result) {
         //do nothing
     }
 
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 3bbfc613c..0bb4ebe84 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
@@ -65,7 +65,7 @@ public void updateTitle(final TestResult result) {
         if (type.isAnnotationPresent(Title.class)) {
             final Title title = type.getAnnotation(Title.class);
             final List<Label> labels = result.getLabels().stream()
-                    .filter(label -> !label.getName().equals(SUITE_LABEL))
+                    .filter(label -> !SUITE_LABEL.equals(label.getName()))
                     .collect(Collectors.toList());
             labels.add(new Label().setName(SUITE_LABEL).setValue(title.value()));
             result.setLabels(labels);
diff --git a/allure-spock/build.gradle.kts b/allure-spock/build.gradle.kts
index d0315fd85..9fbbe98ae 100644
--- a/allure-spock/build.gradle.kts
+++ b/allure-spock/build.gradle.kts
@@ -3,12 +3,13 @@ description = "Allure Spock Framework Integration"
 apply(plugin = "groovy")
 
 val spockFrameworkVersion = "1.3-groovy-2.5"
+val groovyVersion = "2.5.19"
 
 dependencies {
     api(project(":allure-java-commons"))
     implementation("org.spockframework:spock-core:$spockFrameworkVersion")
     testImplementation("org.assertj:assertj-core")
-    testImplementation("org.codehaus.groovy:groovy-all")
+    testImplementation("org.codehaus.groovy:groovy-all:${groovyVersion}")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.mockito:mockito-core")
     testImplementation("org.slf4j:slf4j-simple")
diff --git a/build.gradle.kts b/build.gradle.kts
index 5c59ff623..5692815a6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ val spotlessDtr by extra("$qualityConfigsDir/spotless")
 val libs = subprojects.filterNot { it.name in "allure-bom" }
 
 tasks.withType(Wrapper::class) {
-    gradleVersion = "7.1.1"
+    gradleVersion = "7.5.1"
 }
 
 plugins {
@@ -128,37 +128,40 @@ configure(libs) {
     apply(plugin = "java-library")
     apply(plugin = "ru.vyarus.quality")
 
+    val orgSlf4jVersion = "1.7.36"
+    val assertJVersion = "1.9.9.1"
+
     dependencyManagement {
         imports {
             mavenBom("com.fasterxml.jackson:jackson-bom:2.13.3")
             mavenBom("org.junit:junit-bom:5.8.2")
         }
         dependencies {
+            dependency("com.github.spotbugs:spotbugs:4.7.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.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("org.hamcrest:hamcrest:2.2")
+            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")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
-            dependency("org.aspectj:aspectjrt:1.9.9.1")
-            dependency("org.aspectj:aspectjweaver:1.9.9.1")
+            dependency("org.aspectj:aspectjrt:${assertJVersion}")
+            dependency("org.aspectj:aspectjweaver:${assertJVersion}")
             dependency("org.assertj:assertj-core:3.22.0")
-            dependency("org.codehaus.groovy:groovy-all:2.5.13")
-            dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.freemarker:freemarker:2.3.31")
+            dependency("org.grpcmock:grpcmock-junit5:0.8.0")
+            dependency("org.hamcrest:hamcrest:2.2")
             dependency("org.jboss.resteasy:resteasy-client:6.1.0.Final")
             dependency("org.mock-server:mockserver-netty:5.13.2")
             dependency("org.mockito:mockito-core:4.6.1")
-            dependency("javax.annotation:javax.annotation-api:1.3.2")
-            dependencySet("org.slf4j:1.7.30") {
-                entry("slf4j-api")
-                entry("slf4j-nop")
-                entry("slf4j-simple")
-            }
+            dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")
+            dependency("org.slf4j:slf4j-nop:${orgSlf4jVersion}")
+            dependency("org.slf4j:slf4j-simple:${orgSlf4jVersion}")
         }
         generatedPomCustomization {
             enabled(false)
@@ -221,26 +224,33 @@ configure(libs) {
         adapter {
             autoconfigure.set(false)
             aspectjWeaver.set(true)
-            aspectjVersion.set("1.9.7")
+            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) }
+            }
         }
     }
 
     quality {
         configDir = qualityConfigsDir
-        checkstyleVersion = "8.36.1"
-        pmdVersion = "6.27.0"
-        spotbugsVersion = "4.1.2"
-        codenarcVersion = "1.6"
+        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")
         afterEvaluate {
             val spotbugs = configurations.findByName("spotbugs")
             if (spotbugs != null) {
                 dependencies {
                     spotbugs("org.slf4j:slf4j-simple")
-                    spotbugs("com.github.spotbugs:spotbugs:4.2.3")
+                    spotbugs("com.github.spotbugs:spotbugs")
                 }
             }
         }
@@ -304,7 +314,7 @@ configure(libs) {
 }
 
 allure {
-    version.set("2.16.0")
+    version.set("2.19.0")
 }
 
 repositories {
diff --git a/gradle/quality-configs/checkstyle/checkstyle.xml b/gradle/quality-configs/checkstyle/checkstyle.xml
index b4ab1aa17..f1bbd4945 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"/>
 
 
@@ -152,10 +152,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 +211,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 ad5ac393c..50f8afec6 100644
--- a/gradle/quality-configs/pmd/pmd.xml
+++ b/gradle/quality-configs/pmd/pmd.xml
@@ -57,6 +57,7 @@
     <!-- 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="CognitiveComplexity"/>
         <exclude name="DataClass"/>
         <exclude name="ExcessiveClassLength"/> <!-- replaced by NcssCount -->
         <exclude name="ExcessiveImports"/>
@@ -107,13 +108,13 @@
 
     <!-- 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="BeanMembersShouldSerialize"/>
         <exclude name="DataflowAnomalyAnalysis"/>
-        <exclude name="DoNotCallSystemExit"/> <!-- earlier j2ee group-->
         <exclude name="EmptyFinalizer"/>
-        <exclude name="FinalizeOnlyCallsSuperFinalize"/>
         <exclude name="FinalizeDoesNotCallSuperFinalize"/>
+        <exclude name="FinalizeOnlyCallsSuperFinalize"/>
         <exclude name="JUnitSpelling"/>
         <exclude name="JUnitStaticSuite"/>
         <exclude name="LoggerIsNotStaticFinal"/>
diff --git a/gradle/quality-configs/spotbugs/exclude.xml b/gradle/quality-configs/spotbugs/exclude.xml
index 69e9c65e2..fb6124d4c 100644
--- a/gradle/quality-configs/spotbugs/exclude.xml
+++ b/gradle/quality-configs/spotbugs/exclude.xml
@@ -34,4 +34,17 @@
         </And>
     </Match>
 
+    <Match>
+        <Bug pattern="EI_EXPOSE_REP"/>
+    </Match>
+    <Match>
+        <Bug pattern="EI_EXPOSE_REP2"/>
+    </Match>
+    <Match>
+        <Bug pattern="EI_EXPOSE_STATIC_REP2"/>
+    </Match>
+    <Match>
+        <Bug pattern="MS_EXPOSE_REP"/>
+    </Match>
+
 </FindBugsFilter>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 05679dc3c..ae04661ee 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.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d29b9b4b7..f00253405 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -49,10 +49,10 @@ pluginManagement {
         id("com.github.johnrengelman.shadow") version "7.1.2"
         id("com.gradle.enterprise") version "3.11.2"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
-        id("io.qameta.allure-adapter") version "2.10.0"
-        id("io.qameta.allure-aggregate-report") version "2.10.0"
-        id("io.qameta.allure-download") version "2.10.0"
-        id("io.qameta.allure-report") version "2.10.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-report") version "2.11.2"
         id("io.spring.dependency-management") version "1.0.11.RELEASE"
         id("ru.vyarus.quality") version "4.7.0"
         id("com.google.protobuf") version "0.8.19"

From 8a8dbaafb2e53985cfe218461afcd79fd53f5d59 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 26 Oct 2022 16:48:47 +0700
Subject: [PATCH 259/486] spock 2 (fixes #239, fixes #510, via #838)

---
 .../qameta/allure/util/AnnotationUtils.java   |  22 ++
 .../io/qameta/allure/util/ResultsUtils.java   |   8 +-
 .../junitplatform/AllureJunitPlatform.java    |  22 +-
 allure-spock2/build.gradle.kts                |  60 +++
 .../io/qameta/allure/spock2/AllureSpock2.java | 238 ++++++++++++
 ...StatementsLabelsToStepsTransformation.java | 174 +++++++++
 .../src/main/resources/META-INF/aop-ajc.xml   |   7 +
 ...odehaus.groovy.transform.ASTTransformation |   1 +
 ...amework.runtime.extension.IGlobalExtension |   1 +
 .../allure/spock2/AllureSpock2Test.java       | 347 ++++++++++++++++++
 .../allure/spock2/samples/BrokenTest.groovy   |  29 ++
 .../spock2/samples/DataDrivenTest.groovy      |  35 ++
 .../allure/spock2/samples/FailedTest.groovy   |  49 +++
 .../allure/spock2/samples/JiraIssue.groovy    |  37 ++
 .../allure/spock2/samples/OneTest.groovy      |  29 ++
 .../spock2/samples/ParametersTest.groovy      |  33 ++
 .../spock2/samples/StepsAndBlocks.groovy      |  46 +++
 .../spock2/samples/TestWithAnnotations.groovy |  58 +++
 .../samples/TestWithAnnotationsOnClass.groovy |  58 +++
 .../samples/TestWithCustomAnnotations.groovy  |  39 ++
 .../spock2/samples/TestWithSteps.groovy       |  33 ++
 .../allure/spock2/samples/XrayId.groovy       |  37 ++
 .../src/test/resources/allure.properties      |   2 +
 settings.gradle.kts                           |   1 +
 24 files changed, 1361 insertions(+), 5 deletions(-)
 create mode 100644 allure-spock2/build.gradle.kts
 create mode 100644 allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
 create mode 100644 allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
 create mode 100644 allure-spock2/src/main/resources/META-INF/aop-ajc.xml
 create mode 100644 allure-spock2/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
 create mode 100644 allure-spock2/src/main/services/org.spockframework.runtime.extension.IGlobalExtension
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy
 create mode 100644 allure-spock2/src/test/resources/allure.properties

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 6fd4cee07..b575111e0 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
@@ -15,8 +15,10 @@
  */
 package io.qameta.allure.util;
 
+import io.qameta.allure.Flaky;
 import io.qameta.allure.LabelAnnotation;
 import io.qameta.allure.LinkAnnotation;
+import io.qameta.allure.Muted;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import org.slf4j.Logger;
@@ -55,6 +57,26 @@ private AnnotationUtils() {
         throw new IllegalStateException("Do not instance");
     }
 
+    /**
+     * Returns true if {@link io.qameta.allure.Flaky} annotation is present.
+     *
+     * @param annotatedElement the element to search annotations on.
+     * @return true if {@link io.qameta.allure.Flaky} annotation is present, false otherwise.
+     */
+    public static boolean isFlaky(final AnnotatedElement annotatedElement) {
+        return annotatedElement.isAnnotationPresent(Flaky.class);
+    }
+
+    /**
+     * Returns true if {@link io.qameta.allure.Muted} annotation is present.
+     *
+     * @param annotatedElement the element to search annotations on.
+     * @return true if {@link io.qameta.allure.Muted} annotation is present, false otherwise.
+     */
+    public static boolean isMuted(final AnnotatedElement annotatedElement) {
+        return annotatedElement.isAnnotationPresent(Muted.class);
+    }
+
     /**
      * Returns links created from Allure meta annotations specified on annotated element.
      *
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 6b5194826..998542ed3 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
@@ -286,8 +286,12 @@ 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)));
+                        .setMessage(Optional
+                                .ofNullable(throwable.getMessage())
+                                .orElse(throwable.getClass().getName())
+                        )
+                        .setTrace(getStackTraceAsString(throwable))
+                );
     }
 
     public static Optional<String> getJavadocDescription(final ClassLoader classLoader,
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 88d154c72..43599443f 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
@@ -242,8 +242,8 @@ 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)) {
+                        && 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);
@@ -544,7 +544,23 @@ private void stopTestCase(final TestIdentifier testIdentifier,
             }
             result.setStage(Stage.FINISHED);
             result.setStatus(status);
-            result.setStatusDetails(statusDetails);
+
+            final StatusDetails currentSd = result.getStatusDetails();
+            if (Objects.isNull(currentSd)) {
+                result.setStatusDetails(statusDetails);
+            } else if (Objects.nonNull(statusDetails)) {
+                Optional.of(statusDetails)
+                        .map(StatusDetails::getMessage)
+                        .ifPresent(currentSd::setMessage);
+
+                Optional.of(statusDetails)
+                        .map(StatusDetails::getTrace)
+                        .ifPresent(currentSd::setTrace);
+
+                currentSd.setMuted(currentSd.isMuted() || statusDetails.isMuted());
+                currentSd.setFlaky(currentSd.isFlaky() || statusDetails.isFlaky());
+                currentSd.setKnown(currentSd.isKnown() || statusDetails.isKnown());
+            }
         });
         getLifecycle().stopTestCase(uuid);
         getLifecycle().writeTestCase(uuid);
diff --git a/allure-spock2/build.gradle.kts b/allure-spock2/build.gradle.kts
new file mode 100644
index 000000000..cd6c61a91
--- /dev/null
+++ b/allure-spock2/build.gradle.kts
@@ -0,0 +1,60 @@
+description = "Allure Spock 2 Framework Integration"
+
+plugins {
+    groovy
+}
+
+val spockFrameworkVersion = "2.3-groovy-3.0"
+val groovyVersion = "3.0.13"
+
+dependencies {
+    api(project(":allure-java-commons"))
+    implementation("org.spockframework:spock-core:$spockFrameworkVersion")
+    compileOnly("org.aspectj:aspectjrt")
+    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.codehaus.groovy:groovy-all:${groovyVersion}")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.junit.platform:junit-platform-launcher")
+    testImplementation("org.mockito:mockito-core")
+    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.spock2"
+        ))
+    }
+
+    from("src/main/services") {
+        into("META-INF/services")
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+    exclude("**/samples/*")
+}
+
+val spiOffJar: Jar by tasks.creating(Jar::class) {
+    from(sourceSets.getByName("main").output)
+    archiveClassifier.set("spi-off")
+}
+
+publishing {
+    publications {
+        named<MavenPublication>("maven") {
+            artifact(spiOffJar)
+        }
+    }
+}
+
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
new file mode 100644
index 000000000..92abda7c9
--- /dev/null
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -0,0 +1,238 @@
+/*
+ *  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;
+
+import io.qameta.allure.Allure;
+import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.Label;
+import io.qameta.allure.model.Link;
+import io.qameta.allure.model.Parameter;
+import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StatusDetails;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.util.AnnotationUtils;
+import io.qameta.allure.util.ResultsUtils;
+import org.spockframework.runtime.AbstractRunListener;
+import org.spockframework.runtime.extension.IGlobalExtension;
+import org.spockframework.runtime.model.ErrorInfo;
+import org.spockframework.runtime.model.FeatureInfo;
+import org.spockframework.runtime.model.IterationInfo;
+import org.spockframework.runtime.model.MethodInfo;
+import org.spockframework.runtime.model.SpecInfo;
+
+import java.lang.reflect.Method;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+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.createPackageLabel;
+import static io.qameta.allure.util.ResultsUtils.createParameter;
+import static io.qameta.allure.util.ResultsUtils.createParentSuiteLabel;
+import static io.qameta.allure.util.ResultsUtils.createSubSuiteLabel;
+import static io.qameta.allure.util.ResultsUtils.createSuiteLabel;
+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.firstNonEmpty;
+import static io.qameta.allure.util.ResultsUtils.getMd5Digest;
+import static io.qameta.allure.util.ResultsUtils.getProvidedLabels;
+import static io.qameta.allure.util.ResultsUtils.getStatus;
+import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
+import static io.qameta.allure.util.ResultsUtils.md5;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Comparator.comparing;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@SuppressWarnings({
+        "PMD.NcssCount"
+})
+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 AllureLifecycle lifecycle;
+
+    @SuppressWarnings("unused")
+    public AllureSpock2() {
+        this(Allure.getLifecycle());
+    }
+
+    public AllureSpock2(final AllureLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    @Override
+    public void start() {
+        //do nothing at this point
+    }
+
+    @Override
+    public void visitSpec(final SpecInfo spec) {
+        spec.addListener(this);
+    }
+
+    @Override
+    public void stop() {
+        //do nothing at this point
+    }
+
+    @Override
+    public void beforeIteration(final IterationInfo iteration) {
+        final String uuid = testResults.get();
+
+        final FeatureInfo feature = iteration.getFeature();
+        final MethodInfo methodInfo = feature.getFeatureMethod();
+        final Method method = methodInfo.getReflection();
+        final Set<Label> featureLabels = AnnotationUtils.getLabels(method);
+        final Set<Link> featureLinks = AnnotationUtils.getLinks(method);
+        final SpecInfo specInfo = feature.getSpec();
+        final Class<?> clazz = specInfo.getReflection();
+        final Set<Label> specLabels = AnnotationUtils.getLabels(clazz);
+        final Set<Link> specLinks = AnnotationUtils.getLinks(clazz);
+        final boolean flaky = AnnotationUtils.isFlaky(method) || AnnotationUtils.isFlaky(clazz);
+        final boolean muted = AnnotationUtils.isMuted(method) || AnnotationUtils.isMuted(clazz);
+
+        final List<Parameter> parameters = getParameters(feature.getDataVariables(), iteration.getDataValues());
+        final SpecInfo subSpec = specInfo.getSubSpec();
+        final SpecInfo superSpec = specInfo.getSuperSpec();
+        final String packageName = specInfo.getPackage();
+        final String specName = specInfo.getName();
+        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")
+        ));
+
+        if (Objects.nonNull(subSpec)) {
+            labels.add(createSubSuiteLabel(subSpec.getName()));
+        }
+
+        if (Objects.nonNull(superSpec)) {
+            labels.add(createParentSuiteLabel(superSpec.getName()));
+        }
+
+        labels.addAll(featureLabels);
+        labels.addAll(specLabels);
+        labels.addAll(getProvidedLabels());
+
+        final List<Link> links = new ArrayList<>(featureLinks);
+        links.addAll(specLinks);
+
+        final String qualifiedName = getQualifiedName(iteration);
+        final TestResult result = new TestResult()
+                .setUuid(uuid)
+                .setHistoryId(getHistoryId(qualifiedName, parameters))
+                .setTestCaseName(iteration.getName())
+                .setTestCaseId(md5(qualifiedName))
+                .setFullName(qualifiedName)
+                .setName(
+                        firstNonEmpty(testMethodName, iteration.getName(), qualifiedName)
+                                .orElse("Unknown")
+                )
+                .setStatusDetails(new StatusDetails()
+                        .setFlaky(flaky)
+                        .setMuted(muted)
+                )
+                .setParameters(parameters)
+                .setLinks(links)
+                .setLabels(labels);
+
+        ResultsUtils.processDescription(
+                getClass().getClassLoader(),
+                method,
+                result::setDescription,
+                result::setDescriptionHtml
+        );
+
+        getLifecycle().scheduleTestCase(result);
+        getLifecycle().startTestCase(uuid);
+    }
+
+    private String getQualifiedName(final IterationInfo iteration) {
+        return iteration.getFeature().getSpec().getReflection().getName() + "." + iteration.getName();
+    }
+
+    private String getHistoryId(final String name, final List<Parameter> parameters) {
+        final MessageDigest digest = getMd5Digest();
+        digest.update(name.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);
+    }
+
+    @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))
+        );
+    }
+
+    @Override
+    public void afterIteration(final IterationInfo iteration) {
+        final String uuid = testResults.get();
+        testResults.remove();
+
+        getLifecycle().updateTestCase(uuid, testResult -> {
+            if (Objects.isNull(testResult.getStatus())) {
+                testResult.setStatus(Status.PASSED);
+            }
+        });
+        getLifecycle().stopTestCase(uuid);
+        getLifecycle().writeTestCase(uuid);
+    }
+
+    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]))
+                .collect(Collectors.toList());
+    }
+
+    public AllureLifecycle getLifecycle() {
+        return lifecycle;
+    }
+}
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
new file mode 100644
index 000000000..e97e15594
--- /dev/null
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
@@ -0,0 +1,174 @@
+/*
+ *  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.spock2.compiler;
+
+import io.qameta.allure.Allure;
+import org.codehaus.groovy.ast.ASTNode;
+import org.codehaus.groovy.ast.ClassHelper;
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.ConstructorNode;
+import org.codehaus.groovy.ast.FieldNode;
+import org.codehaus.groovy.ast.GroovyClassVisitor;
+import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.PropertyNode;
+import org.codehaus.groovy.ast.expr.ArgumentListExpression;
+import org.codehaus.groovy.ast.expr.ConstantExpression;
+import org.codehaus.groovy.ast.expr.StaticMethodCallExpression;
+import org.codehaus.groovy.ast.stmt.BlockStatement;
+import org.codehaus.groovy.ast.stmt.ExpressionStatement;
+import org.codehaus.groovy.ast.stmt.Statement;
+import org.codehaus.groovy.classgen.VariableScopeVisitor;
+import org.codehaus.groovy.control.CompilePhase;
+import org.codehaus.groovy.control.SourceUnit;
+import org.codehaus.groovy.transform.ASTTransformation;
+import org.codehaus.groovy.transform.GroovyASTTransformation;
+import org.spockframework.compiler.AstNodeCache;
+import org.spockframework.compiler.AstUtil;
+import org.spockframework.compiler.ErrorReporter;
+import org.spockframework.compiler.SourceLookup;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+@GroovyASTTransformation(phase = CompilePhase.SEMANTIC_ANALYSIS)
+public class AllureStatementsLabelsToStepsTransformation implements ASTTransformation {
+
+    @Override
+    public void visit(final ASTNode[] nodes, final SourceUnit sourceUnit) {
+        new Impl().visit(sourceUnit);
+    }
+
+    /**
+     * Use of nested class defers linking until after groovy version check.
+     */
+    private static class Impl {
+        private static final AstNodeCache NODE_CACHE = new AstNodeCache();
+
+        private void visit(final SourceUnit sourceUnit) {
+            final ErrorReporter errorReporter = new ErrorReporter(sourceUnit);
+            final SourceLookup sourceLookup = new SourceLookup(sourceUnit);
+
+            try {
+                sourceUnit.getAST().getClasses().stream()
+                        .filter(this::isSpec)
+                        .forEach(clazz -> processSpec(sourceUnit, clazz, errorReporter));
+            } finally {
+                sourceLookup.close();
+            }
+        }
+
+        private boolean isSpec(final ClassNode clazz) {
+            return clazz.isDerivedFrom(NODE_CACHE.Specification);
+        }
+
+        private void processSpec(final SourceUnit sourceUnit,
+                                 final ClassNode clazz,
+                                 final ErrorReporter errorReporter) {
+            try {
+                clazz.visitContents(new MethodVisitor());
+                if (!sourceUnit.getErrorCollector().hasErrors()) {
+                    new VariableScopeVisitor(sourceUnit).visitClass(clazz);
+                }
+            } 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.",
+                        e, clazz.getName()
+                );
+            }
+        }
+    }
+
+    /**
+     * Adds Allure steps for statements with labels.
+     */
+    private static class MethodVisitor implements GroovyClassVisitor {
+
+        private static final ClassNode ALLURE = ClassHelper.makeWithoutCaching(Allure.class);
+
+        @Override
+        public void visitClass(final ClassNode node) {
+            // do nothing
+        }
+
+        @Override
+        public void visitConstructor(final ConstructorNode node) {
+            // do nothing
+        }
+
+        @Override
+        public void visitMethod(final MethodNode node) {
+            final List<Statement> newStatements = AstUtil.getStatements(node).stream()
+                    .flatMap(statement -> Stream.concat(
+                            getAllureStepStatements(statement),
+                            Stream.of(statement)
+                    ))
+                    .collect(Collectors.toList());
+
+            node.setCode(new BlockStatement(
+                    newStatements,
+                    ((BlockStatement) node.getCode()).getVariableScope())
+            );
+        }
+
+        @Override
+        public void visitField(final FieldNode node) {
+            // do nothing
+        }
+
+        @Override
+        public void visitProperty(final PropertyNode node) {
+            // do nothing
+        }
+
+        @SuppressWarnings("PMD.AvoidDeeplyNestedIfStmts")
+        private static Stream<Statement> getAllureStepStatements(final Statement statement) {
+            if (Objects.nonNull(statement.getStatementLabels())
+                && !statement.getStatementLabels().isEmpty()) {
+                final String labels = String.join(" ", statement.getStatementLabels());
+                final StringBuilder builder = new StringBuilder(labels);
+
+                if (statement instanceof ExpressionStatement) {
+                    final ExpressionStatement es = (ExpressionStatement) statement;
+                    if (es.getExpression() instanceof ConstantExpression) {
+                        final Object value = ((ConstantExpression) es.getExpression()).getValue();
+                        if (value instanceof String) {
+                            builder.append(": ").append(value);
+                        }
+                    }
+                }
+
+                final String stepName = builder.toString();
+
+                return Stream.of(new ExpressionStatement(
+                        new StaticMethodCallExpression(
+                                ALLURE,
+                                "step",
+                                new ArgumentListExpression(
+                                        new ConstantExpression(stepName)
+                                )
+                        )
+                ));
+            }
+            return Stream.empty();
+        }
+    }
+}
diff --git a/allure-spock2/src/main/resources/META-INF/aop-ajc.xml b/allure-spock2/src/main/resources/META-INF/aop-ajc.xml
new file mode 100644
index 000000000..09e38300c
--- /dev/null
+++ b/allure-spock2/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-spock2/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/allure-spock2/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
new file mode 100644
index 000000000..8d032ed1f
--- /dev/null
+++ b/allure-spock2/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
@@ -0,0 +1 @@
+io.qameta.allure.spock2.compiler.AllureStatementsLabelsToStepsTransformation
diff --git a/allure-spock2/src/main/services/org.spockframework.runtime.extension.IGlobalExtension b/allure-spock2/src/main/services/org.spockframework.runtime.extension.IGlobalExtension
new file mode 100644
index 000000000..9ac0ecfb8
--- /dev/null
+++ b/allure-spock2/src/main/services/org.spockframework.runtime.extension.IGlobalExtension
@@ -0,0 +1 @@
+io.qameta.allure.spock2.AllureSpock2
\ No newline at end of file
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
new file mode 100644
index 000000000..efa50b44b
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -0,0 +1,347 @@
+/*
+ *  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;
+
+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.junitplatform.AllurePostDiscoveryFilter;
+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.StepResult;
+import io.qameta.allure.model.TestResult;
+import io.qameta.allure.spock2.samples.BrokenTest;
+import io.qameta.allure.spock2.samples.DataDrivenTest;
+import io.qameta.allure.spock2.samples.FailedTest;
+import io.qameta.allure.spock2.samples.OneTest;
+import io.qameta.allure.spock2.samples.ParametersTest;
+import io.qameta.allure.spock2.samples.StepsAndBlocks;
+import io.qameta.allure.spock2.samples.TestWithAnnotations;
+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.test.AllureResults;
+import io.qameta.allure.test.AllureResultsWriterStub;
+import io.qameta.allure.testfilter.TestPlan;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.commons.util.ReflectionUtils;
+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 org.spockframework.runtime.GlobalExtensionRegistry;
+import org.spockframework.runtime.RunContext;
+import org.spockframework.runtime.SpockEngine;
+
+import java.time.Instant;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class AllureSpock2Test {
+
+    @Test
+    void shouldStoreTestsInformation() {
+        final AllureResults results = runClasses(OneTest.class);
+        assertThat(results.getTestResults())
+                .hasSize(1);
+    }
+
+    @Test
+    void shouldSupportTestsWithStepsAndBlocks() {
+        final AllureResults results = runClasses(StepsAndBlocks.class);
+        assertThat(results.getTestResults())
+                .hasSize(1);
+
+        final TestResult tr = results.getTestResults().get(0);
+
+        assertThat(tr.getSteps())
+                .extracting(StepResult::getName)
+                .containsExactly(
+                        "given: asd",
+                        "step1",
+                        "step2",
+                        "step some",
+                        "when",
+                        "step3",
+                        "step4",
+                        "then",
+                        "step5",
+                        "step6"
+                );
+    }
+
+    @Test
+    void shouldSetTestStart() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResults results = runClasses(OneTest.class);
+
+        final long after = Instant.now().toEpochMilli();
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStart)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @Test
+    void shouldSetTestStop() {
+        final long before = Instant.now().toEpochMilli();
+        final AllureResults results = runClasses(OneTest.class);
+        final long after = Instant.now().toEpochMilli();
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStop)
+                .allMatch(v -> v >= before && v <= after);
+    }
+
+    @Test
+    void shouldSetTestFullName() {
+        final AllureResults results = runClasses(OneTest.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getFullName)
+                .containsExactly("io.qameta.allure.spock2.samples.OneTest.Simple Test");
+    }
+
+    @Test
+    void shouldSetStageFinished() {
+        final AllureResults results = runClasses(OneTest.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStage)
+                .containsExactly(Stage.FINISHED);
+    }
+
+    @Test
+    void shouldProcessFailedTest() {
+        final AllureResults results = runClasses(FailedTest.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStatus)
+                .containsExactly(Status.FAILED);
+    }
+
+    @Test
+    void shouldProcessBrokenTest() {
+        final AllureResults results = runClasses(BrokenTest.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getStatus)
+                .containsExactly(Status.BROKEN);
+    }
+
+    @Test
+    void shouldAddStepsToTest() {
+        final AllureResults results = runClasses(TestWithSteps.class);
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("expect", "step1", "step2", "step3");
+    }
+
+    @Test
+    void shouldProcessMethodAnnotations() {
+        final AllureResults results = runClasses(TestWithAnnotations.class);
+        assertThat(results.getTestResults())
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", "epic1"),
+                        tuple("epic", "epic2"),
+                        tuple("epic", "epic3"),
+                        tuple("feature", "feature1"),
+                        tuple("feature", "feature2"),
+                        tuple("feature", "feature3"),
+                        tuple("story", "story1"),
+                        tuple("story", "story2"),
+                        tuple("story", "story3"),
+                        tuple("owner", "some-owner")
+                );
+    }
+
+    @Test
+    void shouldProcessClassAnnotations() {
+        final AllureResults results = runClasses(TestWithAnnotationsOnClass.class);
+        assertThat(results.getTestResults())
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getValue)
+                .contains(
+                        "epic1", "epic2", "epic3",
+                        "feature1", "feature2", "feature3",
+                        "story1", "story2", "story3",
+                        "some-owner"
+                );
+    }
+
+    @Test
+    void shouldProcessCustomAnnotations() {
+        final AllureResults results = runClasses(TestWithCustomAnnotations.class);
+        assertThat(results.getTestResults())
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .extracting(Label::getValue)
+                .contains(
+                        "epic", "feature", "story", "AS-1", "XRT-1"
+                );
+    }
+
+    @Test
+    void shouldProcessFlakyAnnotation() {
+        final AllureResults results = runClasses(TestWithAnnotations.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, tr -> tr.getStatusDetails().isFlaky())
+                .containsExactlyInAnyOrder(
+                        tuple("someTest", true)
+                );
+    }
+
+    @Test
+    void shouldProcessMutedAnnotation() {
+        final AllureResults results = runClasses(TestWithAnnotations.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, tr -> tr.getStatusDetails().isMuted())
+                .containsExactlyInAnyOrder(
+                        tuple("someTest", true)
+                );
+    }
+
+    @Test
+    void shouldSetDisplayName() {
+        final AllureResults results = runClasses(OneTest.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName)
+                .containsExactly("Simple Test");
+    }
+
+    @Test
+    void shouldSetLinks() {
+        final AllureResults results = runClasses(FailedTest.class);
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getLinks)
+                .extracting(Link::getName)
+                .containsExactlyInAnyOrder("link-1", "link-2", "issue-1", "issue-2", "tms-1", "tms-2");
+    }
+
+    @Test
+    void shouldSetParameters() {
+        final AllureResults results = runClasses(ParametersTest.class);
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getParameters)
+                .extracting(Parameter::getName, Parameter::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("a", "1"),
+                        tuple("b", "3"),
+                        tuple("c", "3")
+                );
+    }
+
+    @Test
+    void shouldSupportDataDrivenTests() {
+        final AllureResults results = runClasses(DataDrivenTest.class);
+        assertThat(results.getTestResults())
+                .extracting(
+                        TestResult::getName,
+                        TestResult::getFullName,
+                        TestResult::getTestCaseName,
+                        TestResult::getTestCaseId,
+                        TestResult::getHistoryId
+                )
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Simple Test [a: 1, b: 3, c: 3, #0]",
+                                "io.qameta.allure.spock2.samples.DataDrivenTest.Simple Test",
+                                "Simple Test",
+                                "c7d975849471fd7b3d9e6637744a3154",
+                                "8d0c81dcc577daba0013d9f64eac328b"
+                        ),
+                        tuple(
+                                "Simple Test [a: 7, b: 4, c: 7, #1]",
+                                "io.qameta.allure.spock2.samples.DataDrivenTest.Simple Test",
+                                "Simple Test",
+                                "c7d975849471fd7b3d9e6637744a3154",
+                                "29f09c26cfc058d5aa5e83cdf84f4e9d"
+                        ),
+                        tuple(
+                                "Simple Test [a: 0, b: 0, c: 0, #2]",
+                                "io.qameta.allure.spock2.samples.DataDrivenTest.Simple Test",
+                                "Simple Test",
+                                "c7d975849471fd7b3d9e6637744a3154",
+                                "e9a7c12cf7d0cf84d4a2ee322435c10f"
+                        )
+                );
+    }
+
+    @Step("Run classes {classes}")
+    public static AllureResults runClasses(final Class<?>... classes) {
+        return runClasses(null, 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()
+                .filters(new AllurePostDiscoveryFilter(testPlan))
+                .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));
+
+        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);
+            launcher.execute(request);
+            return writerStub;
+        } finally {
+            Allure.setLifecycle(defaultLifecycle);
+            StepsAspects.setLifecycle(defaultLifecycle);
+            AttachmentsAspects.setLifecycle(defaultLifecycle);
+        }
+    }
+
+}
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
new file mode 100644
index 000000000..ec7f8c110
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/BrokenTest.groovy
@@ -0,0 +1,29 @@
+/*
+ *  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 BrokenTest extends Specification {
+
+    def "brokenTest"() throws Exception {
+        expect:
+        throw new RuntimeException("Hello, everybody")
+    }
+}
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
new file mode 100644
index 000000000..572f7489a
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/DataDrivenTest.groovy
@@ -0,0 +1,35 @@
+/*
+ *  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 DataDrivenTest extends Specification {
+
+    def "Simple Test"() {
+        expect:
+        Math.max(a, b) == c
+
+        where:
+        a | b || c
+        1 | 3 || 3
+        7 | 4 || 7
+        0 | 0 || 0
+    }
+}
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
new file mode 100644
index 000000000..f0a224322
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FailedTest.groovy
@@ -0,0 +1,49 @@
+/*
+ *  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 io.qameta.allure.Issue
+import io.qameta.allure.Issues
+import io.qameta.allure.Link
+import io.qameta.allure.Links
+import io.qameta.allure.TmsLink
+import io.qameta.allure.TmsLinks
+import org.junit.Test
+import spock.lang.Specification
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class FailedTest extends Specification {
+
+    @Test
+    @Links([
+            @Link("link-1"),
+            @Link("link-2")
+    ])
+    @Issues([
+            @Issue("issue-1"),
+            @Issue("issue-2")
+    ])
+    @TmsLinks([
+            @TmsLink("tms-1"),
+            @TmsLink("tms-2")
+    ])
+    def "failedTest"() {
+        expect:
+        false
+    }
+}
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
new file mode 100644
index 000000000..a35128212
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/JiraIssue.groovy
@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2020 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 io.qameta.allure.LabelAnnotation
+
+import java.lang.annotation.Documented
+import java.lang.annotation.ElementType
+import java.lang.annotation.Inherited
+import java.lang.annotation.Retention
+import java.lang.annotation.RetentionPolicy
+import java.lang.annotation.Target
+
+/**
+ * @author vbragin
+ */
+@Documented
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@LabelAnnotation(name = "jira")
+@interface JiraIssue {
+    String value();
+}
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
new file mode 100644
index 000000000..cbbaa607e
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy
@@ -0,0 +1,29 @@
+/*
+ *  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 OneTest extends Specification {
+
+    def "Simple Test"() {
+        expect:
+        true
+    }
+}
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
new file mode 100644
index 000000000..252f16ec1
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/ParametersTest.groovy
@@ -0,0 +1,33 @@
+/*
+ *  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 ParametersTest extends Specification {
+
+    def "Simple Test"() {
+        expect:
+        Math.max(a, b) == c
+
+        where:
+        a | b || c
+        1 | 3 || 3
+    }
+}
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
new file mode 100644
index 000000000..2c3db006e
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy
@@ -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.spock2.samples
+
+import io.qameta.allure.Step
+import spock.lang.Specification
+
+import static io.qameta.allure.Allure.step
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+
+class StepsAndBlocks extends Specification {
+
+    def "test with steps and blocks"() {
+        given: "asd"
+        step "step1"
+        step "step2"
+        "step some"()
+        when:
+        step "step3"
+        step "step4"
+        then:
+        step "step5"
+        step "step6"
+    }
+
+    @Step
+    def "step some"() {
+        println "yaaa"
+    }
+}
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
new file mode 100644
index 000000000..83a22bed1
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotations.groovy
@@ -0,0 +1,58 @@
+/*
+ *  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 io.qameta.allure.Epic
+import io.qameta.allure.Epics
+import io.qameta.allure.Feature
+import io.qameta.allure.Features
+import io.qameta.allure.Flaky
+import io.qameta.allure.Muted
+import io.qameta.allure.Owner
+import io.qameta.allure.Stories
+import io.qameta.allure.Story
+import org.junit.Test
+import spock.lang.Specification
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class TestWithAnnotations extends Specification {
+
+    @Test
+    @Epic("epic1")
+    @Epics([
+            @Epic("epic2"),
+            @Epic("epic3")
+    ])
+    @Features([
+            @Feature("feature1"),
+            @Feature("feature2")
+    ])
+    @Feature("feature3")
+    @Story("story1")
+    @Stories([
+            @Story("story2"),
+            @Story("story3")]
+    )
+    @Owner("some-owner")
+    @Flaky
+    @Muted
+    def "someTest"() {
+        expect:
+        true
+    }
+}
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
new file mode 100644
index 000000000..07d8bb17e
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithAnnotationsOnClass.groovy
@@ -0,0 +1,58 @@
+/*
+ *  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 io.qameta.allure.Epic
+import io.qameta.allure.Epics
+import io.qameta.allure.Feature
+import io.qameta.allure.Features
+import io.qameta.allure.Flaky
+import io.qameta.allure.Muted
+import io.qameta.allure.Owner
+import io.qameta.allure.Stories
+import io.qameta.allure.Story
+import org.junit.Test
+import spock.lang.Specification
+
+/**
+ * @author vbragin
+ */
+@Epic("epic1")
+@Features([
+        @Feature("feature1"),
+        @Feature("feature2")
+])
+@Feature("feature3")
+@Story("story1")
+@Stories([
+        @Story("story2"),
+        @Story("story3")]
+)
+class TestWithAnnotationsOnClass extends Specification {
+
+    @Test
+    @Flaky
+    @Epics([
+            @Epic("epic2"),
+            @Epic("epic3")
+    ])
+    @Muted
+    @Owner("some-owner")
+    def "someTest"() {
+        expect:
+        true
+    }
+}
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
new file mode 100644
index 000000000..311364270
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithCustomAnnotations.groovy
@@ -0,0 +1,39 @@
+/*
+ *  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 io.qameta.allure.Epic
+import io.qameta.allure.Feature
+import io.qameta.allure.Story
+import org.junit.Test
+import spock.lang.Specification
+
+/**
+ * @author vbragin
+ */
+class TestWithCustomAnnotations extends Specification {
+
+    @Test
+    @Epic("epic")
+    @Feature("feature")
+    @Story("story")
+    @JiraIssue("AS-1")
+    @XrayId("XRT-1")
+    def "someTest"() {
+        expect:
+        true
+    }
+}
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
new file mode 100644
index 000000000..ac6029158
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/TestWithSteps.groovy
@@ -0,0 +1,33 @@
+/*
+ *  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 static io.qameta.allure.Allure.step
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class TestWithSteps extends Specification {
+
+    def "testWithSteps"() {
+        expect:
+        step "step1"
+        step "step2"
+        step "step3"
+    }
+}
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
new file mode 100644
index 000000000..ab73089df
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/XrayId.groovy
@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2020 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 io.qameta.allure.LabelAnnotation
+
+import java.lang.annotation.Documented
+import java.lang.annotation.ElementType
+import java.lang.annotation.Inherited
+import java.lang.annotation.Retention
+import java.lang.annotation.RetentionPolicy
+import java.lang.annotation.Target
+
+/**
+ * @author vbragin
+ */
+@Documented
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@LabelAnnotation(name = "xray")
+@interface XrayId {
+    String value();
+}
diff --git a/allure-spock2/src/test/resources/allure.properties b/allure-spock2/src/test/resources/allure.properties
new file mode 100644
index 000000000..9c0b0a2d7
--- /dev/null
+++ b/allure-spock2/src/test/resources/allure.properties
@@ -0,0 +1,2 @@
+allure.results.directory=build/allure-results
+allure.label.epic=#project.description#
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f00253405..49ca5b665 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -36,6 +36,7 @@ include("allure-scalatest")
 include("allure-selenide")
 include("allure-servlet-api")
 include("allure-spock")
+include("allure-spock2")
 include("allure-spring-web")
 include("allure-test-filter")
 include("allure-testng")

From c85957f2fdaf5e43f6684d9dc3d506b1b428bb18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 13:06:39 +0700
Subject: [PATCH 260/486] bump grpc from 1.49.0 to 1.50.2 (via #841)

---
 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 fdcc4f34f..027179d0f 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.49.0"
+val grpcVersion = "1.50.2"
 val protobufVersion = "3.21.6"
 
 dependencies {

From 253e5b73a53f71d1ccc07f50287e6ecd7304e27c Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Tue, 1 Nov 2022 13:17:39 +0700
Subject: [PATCH 261/486] add support for fixtures for spock2 (fixes #839, via
 #840)

---
 allure-spock2/build.gradle.kts                |   2 +-
 .../io/qameta/allure/spock2/AllureSpock2.java | 213 +++++++++++++++++-
 .../allure/spock2/AllureSpock2Test.java       | 206 +++++++++++++++++
 .../allure/spock2/samples/FailedTest.groovy   |   9 +-
 .../allure/spock2/samples/FixturesTest.groovy |  57 +++++
 .../spock2/samples/HelloSpockSpec.groovy      |  31 +++
 .../allure/spock2/samples/OneTest.groovy      |   4 +
 .../allure/spock2/samples/SpecFixtures.groovy |  42 ++++
 .../spock2/samples/SpecInheritanceSpec.groovy |  38 ++++
 .../spock2/samples/StreamsListener.groovy     |  31 +++
 .../spock2/samples/TestWithAnnotations.groovy |  12 +-
 .../samples/TestWithAnnotationsOnClass.groovy |  12 +-
 .../samples/TestWithCustomAnnotations.groovy  |   2 -
 13 files changed, 625 insertions(+), 34 deletions(-)
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
 create mode 100644 allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StreamsListener.groovy

diff --git a/allure-spock2/build.gradle.kts b/allure-spock2/build.gradle.kts
index cd6c61a91..50c5c4ba9 100644
--- a/allure-spock2/build.gradle.kts
+++ b/allure-spock2/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     testAnnotationProcessor(project(":allure-descriptions-javadoc"))
     testImplementation("io.github.glytching:junit-extensions")
     testImplementation("org.assertj:assertj-core")
-    testImplementation("org.codehaus.groovy:groovy-all:${groovyVersion}")
+    testImplementation("org.codehaus.groovy:groovy:${groovyVersion}")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     testImplementation("org.junit.platform:junit-platform-launcher")
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 92abda7c9..0e9881d18 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
@@ -17,20 +17,29 @@
 
 import io.qameta.allure.Allure;
 import io.qameta.allure.AllureLifecycle;
+import io.qameta.allure.model.FixtureResult;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 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.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;
 import org.spockframework.runtime.model.ErrorInfo;
 import org.spockframework.runtime.model.FeatureInfo;
 import org.spockframework.runtime.model.IterationInfo;
 import org.spockframework.runtime.model.MethodInfo;
+import org.spockframework.runtime.model.MethodKind;
 import org.spockframework.runtime.model.SpecInfo;
 
 import java.lang.reflect.Method;
@@ -38,6 +47,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
@@ -71,7 +81,9 @@
 @SuppressWarnings({
         "PMD.NcssCount"
 })
-public class AllureSpock2 extends AbstractRunListener implements IGlobalExtension {
+public class AllureSpock2 extends AbstractRunListener implements IGlobalExtension, IStandardStreamsListener {
+
+    private final StandardStreamsCapturer streamsCapturer = new StandardStreamsCapturer();
 
     private final ThreadLocal<String> testResults = new InheritableThreadLocal<String>() {
         @Override
@@ -89,6 +101,7 @@ public AllureSpock2() {
 
     public AllureSpock2(final AllureLifecycle lifecycle) {
         this.lifecycle = lifecycle;
+        this.streamsCapturer.addStandardStreamsListener(this);
     }
 
     @Override
@@ -99,6 +112,32 @@ public void start() {
     @Override
     public void visitSpec(final SpecInfo spec) {
         spec.addListener(this);
+
+        final String specContainerUuid = UUID.randomUUID().toString();
+        spec.addInterceptor(new AllureContainerInterceptor(specContainerUuid));
+
+        spec.getAllFixtureMethods().forEach(methodInfo -> {
+            if (methodInfo.getKind().isSpecScopedFixtureMethod()) {
+                methodInfo.addInterceptor(new AllureSpecFixtureMethodInterceptor(specContainerUuid));
+            }
+            if (methodInfo.getKind().isFeatureScopedFixtureMethod()) {
+                methodInfo.addInterceptor(new AllureFeatureFixtureMethodInterceptor());
+            }
+        });
+
+        // add each feature to this container
+        spec.getAllFeatures().stream()
+                .map(FeatureInfo::getFeatureMethod)
+                .filter(Objects::nonNull)
+                .forEach(fm -> fm.addInterceptor(i -> {
+                    getLifecycle().getCurrentTestCaseOrStep().ifPresent(uuid -> {
+                        getLifecycle().updateTestContainer(
+                                specContainerUuid,
+                                c -> c.getChildren().add(uuid)
+                        );
+                    });
+                    i.proceed();
+                }));
     }
 
     @Override
@@ -106,6 +145,37 @@ 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();
@@ -184,6 +254,7 @@ public void beforeIteration(final IterationInfo iteration) {
 
         getLifecycle().scheduleTestCase(result);
         getLifecycle().startTestCase(uuid);
+
     }
 
     private String getQualifiedName(final IterationInfo iteration) {
@@ -226,6 +297,16 @@ 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]))
@@ -235,4 +316,134 @@ private List<Parameter> getParameters(final List<String> names, final Object...
     public AllureLifecycle getLifecycle() {
         return lifecycle;
     }
+
+    /**
+     * IMethodInterceptor that reports feature fixture methods.
+     * Creates container and fixture result for feature fixtures. Such fixtures (setup/cleanup) are
+     * executed within iteration, so we can access current test uuid
+     * 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 AllureFeatureFixtureMethodInterceptor() {
+            this(UUID.randomUUID().toString());
+        }
+
+        private AllureFeatureFixtureMethodInterceptor(final String containerUuid) {
+            super(containerUuid);
+        }
+
+        @Override
+        public void intercept(final IMethodInvocation invocation) throws Throwable {
+            final String uuid = getLifecycle().getCurrentTestCase().orElse(null);
+            if (Objects.isNull(uuid)) {
+                invocation.proceed();
+                return;
+            }
+
+            final TestResultContainer container = new TestResultContainer()
+                    .setUuid(containerUuid);
+
+            container.getChildren().add(uuid);
+
+            getLifecycle().startTestContainer(container);
+
+            try {
+                super.intercept(invocation);
+            } finally {
+                getLifecycle().stopTestContainer(containerUuid);
+                getLifecycle().writeTestContainer(containerUuid);
+                getLifecycle().setCurrentTestCase(uuid);
+            }
+        }
+    }
+
+    /**
+     * IMethodInterceptor that reports spec fixture methods. All spec fixture methods
+     * are using the same container. Container is managed by {@link  AllureContainerInterceptor}.
+     */
+    @SuppressWarnings("FinalClass")
+    private class AllureSpecFixtureMethodInterceptor implements IMethodInterceptor {
+
+        protected final String containerUuid;
+
+        private AllureSpecFixtureMethodInterceptor(final String containerUuid) {
+            this.containerUuid = containerUuid;
+        }
+
+        @Override
+        public void intercept(final IMethodInvocation invocation) throws Throwable {
+            final String fixtureUuid = UUID.randomUUID().toString();
+
+            final MethodKind kind = invocation.getMethod().getKind();
+            final String fixtureName = kind.name().toLowerCase(Locale.ENGLISH).replace('_', ' ');
+
+            final FixtureResult fixtureResult = new FixtureResult()
+                    .setName(fixtureName);
+
+            if (kind.isSetupMethod()) {
+                getLifecycle().startPrepareFixture(
+                        containerUuid,
+                        fixtureUuid,
+                        fixtureResult
+                );
+            } else {
+                getLifecycle().startTearDownFixture(
+                        containerUuid,
+                        fixtureUuid,
+                        fixtureResult
+                );
+            }
+
+            try {
+                invocation.proceed();
+                getLifecycle().updateFixture(
+                        fixtureUuid,
+                        f -> f.setStatus(Status.PASSED)
+                );
+            } catch (Throwable throwable) {
+                getLifecycle().updateFixture(
+                        fixtureUuid,
+                        f -> f
+                                .setStatus(getStatus(throwable).orElse(Status.BROKEN))
+                                .setStatusDetails(getStatusDetails(throwable).orElse(null))
+                );
+                ExceptionUtils.sneakyThrow(throwable);
+            } finally {
+                getLifecycle().stopFixture(fixtureUuid);
+            }
+        }
+
+    }
+
+    /**
+     * IMethodInterceptor that creates container per spec.
+     */
+    @SuppressWarnings("FinalClass")
+    private class AllureContainerInterceptor implements IMethodInterceptor {
+
+        private final String containerUuid;
+
+        private AllureContainerInterceptor(final String containerUuid) {
+            this.containerUuid = containerUuid;
+        }
+
+        @Override
+        public void intercept(final IMethodInvocation invocation) throws Throwable {
+            final TestResultContainer container = new TestResultContainer()
+                    .setUuid(containerUuid);
+
+            getLifecycle().startTestContainer(container);
+
+            try {
+                invocation.proceed();
+            } finally {
+                getLifecycle().stopTestContainer(containerUuid);
+                getLifecycle().writeTestContainer(containerUuid);
+            }
+        }
+    }
+
 }
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 efa50b44b..8188969e8 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
@@ -21,6 +21,8 @@
 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;
 import io.qameta.allure.model.Link;
 import io.qameta.allure.model.Parameter;
@@ -28,12 +30,18 @@
 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.spock2.samples.BrokenTest;
 import io.qameta.allure.spock2.samples.DataDrivenTest;
+import io.qameta.allure.spock2.samples.DerivedSpec;
 import io.qameta.allure.spock2.samples.FailedTest;
+import io.qameta.allure.spock2.samples.FixturesTest;
+import io.qameta.allure.spock2.samples.HelloSpockSpec;
 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.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;
@@ -41,6 +49,8 @@
 import io.qameta.allure.test.AllureResults;
 import io.qameta.allure.test.AllureResultsWriterStub;
 import io.qameta.allure.testfilter.TestPlan;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.lang3.tuple.Triple;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.engine.discovery.ClassSelector;
@@ -55,6 +65,12 @@
 import org.spockframework.runtime.SpockEngine;
 
 import java.time.Instant;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -72,6 +88,16 @@ 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);
@@ -96,6 +122,27 @@ void shouldSupportTestsWithStepsAndBlocks() {
                 );
     }
 
+    @Test
+    void shouldSupportBlocks() {
+        final AllureResults results = runClasses(HelloSpockSpec.class);
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, this::printSteps)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "length of Spock's and his friends' names [name: Spock, length: 5, #0]",
+                                "expect, where"
+                        ),
+                        tuple(
+                                "length of Spock's and his friends' names [name: Kirk, length: 4, #1]",
+                                "expect, where"
+                        ),
+                        tuple(
+                                "length of Spock's and his friends' names [name: Scotty, length: 6, #2]",
+                                "expect, where"
+                        )
+                );
+    }
+
     @Test
     void shouldSetTestStart() {
         final long before = Instant.now().toEpochMilli();
@@ -294,6 +341,159 @@ void shouldSupportDataDrivenTests() {
                 );
     }
 
+    @Test
+    void shouldSupportFixtures() {
+        final AllureResults results = runClasses(FixturesTest.class);
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(
+                        FixtureResult::getName,
+                        this::printSteps
+                )
+                .containsExactlyInAnyOrder(
+                        tuple("setup spec", "setupSpec step 1, setupSpec step 2"),
+                        tuple("setup", "setup step 1, setup step 2"),
+                        tuple("setup", "setup step 1, setup step 2")
+                );
+
+        assertThat(results.getTestResultContainers())
+                .flatExtracting(TestResultContainer::getAfters)
+                .extracting(
+                        FixtureResult::getName,
+                        this::printSteps
+                )
+                .containsExactlyInAnyOrder(
+                        tuple("cleanup spec", "cleanupSpec step 1, cleanupSpec step 2"),
+                        tuple("cleanup", "cleanup step 1, cleanup step 2"),
+                        tuple("cleanup", "cleanup step 1, cleanup step 2")
+                );
+
+
+        final TestResult tr1 = results.getTestResults().stream()
+                .filter(tr -> "First Test".equals(tr.getName()))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("can't find a test"));
+
+        final TestResult tr2 = results.getTestResults().stream()
+                .filter(tr -> "Second Test".equals(tr.getName()))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("can't find a test"));
+
+        assertThat(results.getTestResultContainers())
+                .extracting(TestResultContainer::getChildren)
+                .usingDefaultElementComparator()
+                .containsExactlyInAnyOrder(
+                        Collections.singletonList(tr1.getUuid()),
+                        Collections.singletonList(tr1.getUuid()),
+                        Collections.singletonList(tr2.getUuid()),
+                        Collections.singletonList(tr2.getUuid()),
+                        Arrays.asList(tr1.getUuid(), tr2.getUuid())
+                );
+    }
+
+    @Test
+    void shouldSupportFixturesFromDerivedSpecs() {
+        final AllureResults results = runClasses(DerivedSpec.class);
+
+        final List<Triple<String, List<String>, List<String>>> fixtures = getTrFixtures(results);
+
+        assertThat(fixtures)
+                .extracting(Triple::getLeft, Triple::getMiddle, Triple::getRight)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "baseSpecMethod",
+                                Arrays.asList(
+                                        "setup [ base setup() ] ",
+                                        "setup [ derived setup() ] ",
+                                        "setup spec [ base setupSpec() ] ",
+                                        "setup spec [ derived setupSpec() ] "
+                                ),
+                                Arrays.asList(
+                                        "cleanup [ base cleanup() ] ",
+                                        "cleanup [ derived cleanup() ] ",
+                                        "cleanup spec [ base cleanupSpec() ] ",
+                                        "cleanup spec [ derived cleanupSpec() ] "
+                                )
+                        ),
+                        tuple(
+                                "derivedSpecMethod",
+                                Arrays.asList(
+                                        "setup [ base setup() ] ",
+                                        "setup [ derived setup() ] ",
+                                        "setup spec [ base setupSpec() ] ",
+                                        "setup spec [ derived setupSpec() ] "
+                                ),
+                                Arrays.asList(
+                                        "cleanup [ base cleanup() ] ",
+                                        "cleanup [ derived cleanup() ] ",
+                                        "cleanup spec [ base cleanupSpec() ] ",
+                                        "cleanup spec [ derived cleanupSpec() ] "
+                                )
+                        )
+                );
+
+    }
+
+    private List<Triple<String, List<String>, List<String>>> getTrFixtures(final AllureResults results) {
+        final Map<String, List<TestResultContainer>> trContainers = results.getTestResultContainers().stream()
+                .flatMap(container -> container.getChildren().stream().map(child -> Pair.of(child, container)))
+                .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);
+                })
+                .collect(Collectors.toList());
+
+    }
+
+    @Test
+    void shouldNotMixUpFixturesBetweenTests() {
+        final AllureResults results = runClasses(OneTest.class, SpecFixtures.class);
+
+        assertThat(results.getTestResults())
+                .extracting(TestResult::getName, this::printSteps)
+                .containsExactlyInAnyOrder(
+                        tuple("Simple Test", "expect"),
+                        tuple("test with spec fixtures", "expect then and when given: the end")
+                );
+
+        final List<Triple<String, List<String>, List<String>>> trFixtures = getTrFixtures(results);
+
+        assertThat(trFixtures)
+                .extracting(Triple::getLeft, Triple::getMiddle, Triple::getRight)
+                .containsExactlyInAnyOrder(
+                        tuple(
+                                "Simple Test",
+                                Collections.singletonList("setup [ OneTest#setup ] "),
+                                Collections.emptyList()
+                        ),
+                        tuple(
+                                "test with spec fixtures",
+                                Collections.singletonList("setup spec [ SpecFixtures#setupSpec ] "),
+                                Collections.singletonList("cleanup spec [ SpecFixtures#cleanupSpec ] ")
+                        )
+                );
+    }
+
     @Step("Run classes {classes}")
     public static AllureResults runClasses(final Class<?>... classes) {
         return runClasses(null, classes);
@@ -344,4 +544,10 @@ public static AllureResults runClasses(final TestPlan testPlan, final Class<?>..
         }
     }
 
+    private String printSteps(final ExecutableItem item) {
+        return item.getSteps().stream()
+                .map(StepResult::getName)
+                .collect(Collectors.joining(", "));
+    }
+
 }
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 f0a224322..e0e1cb8f6 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
@@ -15,13 +15,7 @@
  */
 package io.qameta.allure.spock2.samples
 
-import io.qameta.allure.Issue
-import io.qameta.allure.Issues
-import io.qameta.allure.Link
-import io.qameta.allure.Links
-import io.qameta.allure.TmsLink
-import io.qameta.allure.TmsLinks
-import org.junit.Test
+import io.qameta.allure.*
 import spock.lang.Specification
 
 /**
@@ -29,7 +23,6 @@ import spock.lang.Specification
  */
 class FailedTest extends Specification {
 
-    @Test
     @Links([
             @Link("link-1"),
             @Link("link-2")
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
new file mode 100644
index 000000000..f0b747b35
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/FixturesTest.groovy
@@ -0,0 +1,57 @@
+/*
+ *  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 static io.qameta.allure.Allure.step
+
+/**
+ * @author charlie (Dmitry Baev).
+ */
+class FixturesTest extends Specification {
+
+    def setupSpec() {
+        step "setupSpec step 1"
+        step "setupSpec step 2"
+    }
+
+    def cleanupSpec() {
+        step "cleanupSpec step 1"
+        step "cleanupSpec step 2"
+    }
+
+    def setup() {
+        step "setup step 1"
+        step "setup step 2"
+    }
+
+    def cleanup() {
+        step "cleanup step 1"
+        step "cleanup step 2"
+    }
+
+    def "First Test"() {
+        expect:
+        true
+    }
+
+    def "Second Test"() {
+        expect:
+        true
+    }
+}
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
new file mode 100644
index 000000000..b8ab906df
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/HelloSpockSpec.groovy
@@ -0,0 +1,31 @@
+/*
+ *  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.spock2.samples
+
+import spock.lang.Specification
+
+class HelloSpockSpec extends Specification {
+  def "length of Spock's and his friends' names"() {
+    expect:
+    name.size() == length
+
+    where:
+    name     | length
+    "Spock"  | 5
+    "Kirk"   | 4
+    "Scotty" | 6
+  }
+}
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 cbbaa607e..c5b4efdb8 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
@@ -22,6 +22,10 @@ import spock.lang.Specification
  */
 class OneTest extends Specification {
 
+    def setup() {
+        println "OneTest#setup"
+    }
+
     def "Simple Test"() {
         expect:
         true
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
new file mode 100644
index 000000000..41a74e6fe
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy
@@ -0,0 +1,42 @@
+/*
+ *  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 SpecFixtures extends Specification {
+
+    def setupSpec() {
+        println "SpecFixtures#setupSpec"
+    }
+
+    def cleanupSpec() {
+        println "SpecFixtures#cleanupSpec"
+    }
+
+    def "test with spec fixtures"() {
+        given:
+        when:
+        and:
+        then:
+        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
new file mode 100644
index 000000000..060ad1ef9
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy
@@ -0,0 +1,38 @@
+/*
+ *  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.spock2.samples
+
+import spock.lang.Specification
+
+abstract class BaseSpec extends Specification {
+  def setupSpec() { println 'base setupSpec()' }
+  def cleanupSpec() { println 'base cleanupSpec()' }
+
+  def setup() { println 'base setup()' }
+  def cleanup() { println 'base cleanup()' }
+
+  def baseSpecMethod() { setup: println 'base spec method' }
+}
+
+class DerivedSpec extends BaseSpec {
+  def setupSpec() { println 'derived setupSpec()' }
+  def cleanupSpec() { println 'derived cleanupSpec()' }
+
+  def setup() { println 'derived setup()' }
+  def cleanup() { println 'derived cleanup()' }
+
+  def derivedSpecMethod() { setup: println 'derived spec method' }
+}
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
new file mode 100644
index 000000000..bddf79ee3
--- /dev/null
+++ b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StreamsListener.groovy
@@ -0,0 +1,31 @@
+/*
+ *  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
+    }
+}
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 83a22bed1..d5065cafd 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
@@ -15,16 +15,7 @@
  */
 package io.qameta.allure.spock2.samples
 
-import io.qameta.allure.Epic
-import io.qameta.allure.Epics
-import io.qameta.allure.Feature
-import io.qameta.allure.Features
-import io.qameta.allure.Flaky
-import io.qameta.allure.Muted
-import io.qameta.allure.Owner
-import io.qameta.allure.Stories
-import io.qameta.allure.Story
-import org.junit.Test
+import io.qameta.allure.*
 import spock.lang.Specification
 
 /**
@@ -32,7 +23,6 @@ import spock.lang.Specification
  */
 class TestWithAnnotations extends Specification {
 
-    @Test
     @Epic("epic1")
     @Epics([
             @Epic("epic2"),
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 07d8bb17e..169711214 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
@@ -15,16 +15,7 @@
  */
 package io.qameta.allure.spock2.samples
 
-import io.qameta.allure.Epic
-import io.qameta.allure.Epics
-import io.qameta.allure.Feature
-import io.qameta.allure.Features
-import io.qameta.allure.Flaky
-import io.qameta.allure.Muted
-import io.qameta.allure.Owner
-import io.qameta.allure.Stories
-import io.qameta.allure.Story
-import org.junit.Test
+import io.qameta.allure.*
 import spock.lang.Specification
 
 /**
@@ -43,7 +34,6 @@ import spock.lang.Specification
 )
 class TestWithAnnotationsOnClass extends Specification {
 
-    @Test
     @Flaky
     @Epics([
             @Epic("epic2"),
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 311364270..78e290cdf 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
@@ -18,7 +18,6 @@ package io.qameta.allure.spock2.samples
 import io.qameta.allure.Epic
 import io.qameta.allure.Feature
 import io.qameta.allure.Story
-import org.junit.Test
 import spock.lang.Specification
 
 /**
@@ -26,7 +25,6 @@ import spock.lang.Specification
  */
 class TestWithCustomAnnotations extends Specification {
 
-    @Test
     @Epic("epic")
     @Feature("feature")
     @Story("story")

From 0ae1c296b4a161844243fc98af8e0f6165d40977 Mon Sep 17 00:00:00 2001
From: Vini <34344290+vinipx@users.noreply.github.com>
Date: Tue, 1 Nov 2022 07:30:00 +0100
Subject: [PATCH 262/486] feat[testng] make display of disabled tests in report
 configurable (fixes #369, via #825)

---
 .../io/qameta/allure/testng/AllureTestNg.java | 16 +++++--
 .../testng/config/AllureTestNgConfig.java     | 47 +++++++++++++++++++
 .../allure/testng/AllureTestNgTest.java       | 27 ++++++++++-
 .../allure/testng/samples/DisabledTest.java   |  4 ++
 .../src/test/resources/suites/gh-369.xml      | 10 ++++
 5 files changed, 97 insertions(+), 7 deletions(-)
 create mode 100644 allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
 create mode 100644 allure-testng/src/test/resources/suites/gh-369.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 bf0b0ca7d..5c5e974ae 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
@@ -30,6 +30,7 @@
 import io.qameta.allure.model.StatusDetails;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
+import io.qameta.allure.testng.config.AllureTestNgConfig;
 import io.qameta.allure.util.AnnotationUtils;
 import io.qameta.allure.util.ObjectUtils;
 import io.qameta.allure.util.ResultsUtils;
@@ -138,10 +139,13 @@ public class AllureTestNg implements
     private final AllureLifecycle lifecycle;
     private final AllureTestNgTestFilter testFilter;
 
+    private final AllureTestNgConfig config;
+
     public AllureTestNg(final AllureLifecycle lifecycle,
                         final AllureTestNgTestFilter testFilter) {
         this.lifecycle = lifecycle;
         this.testFilter = testFilter;
+        this.config = AllureTestNgConfig.loadConfigProperties();
     }
 
     public AllureTestNg(final AllureLifecycle lifecycle) {
@@ -200,11 +204,13 @@ public void onStart(final ITestContext context) {
                 .distinct()
                 .forEach(this::onBeforeClass);
 
-        context.getExcludedMethods().stream()
-                .filter(ITestNGMethod::isTest)
-                .filter(method -> !method.getEnabled())
-                .filter(testFilter::isSelected)
-                .forEach(method -> createFakeResult(context, method));
+        if (!config.isHideDisabledTests()) {
+            context.getExcludedMethods().stream()
+                    .filter(ITestNGMethod::isTest)
+                    .filter(method -> !method.getEnabled())
+                    .filter(testFilter::isSelected)
+                    .forEach(method -> createFakeResult(context, method));
+        }
     }
 
     protected void createFakeResult(final ITestContext context, final ITestNGMethod method) {
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
new file mode 100644
index 000000000..d4ab05e74
--- /dev/null
+++ b/allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
@@ -0,0 +1,47 @@
+/*
+ *  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.testng.config;
+
+import io.qameta.allure.util.PropertiesUtils;
+
+import java.util.Properties;
+
+import static java.lang.Boolean.parseBoolean;
+
+public class AllureTestNgConfig {
+
+    public static final String ALLURE_TESTNG_HIDE_DISABLED_TESTS = "allure.testng.hide.disabled.tests";
+    private boolean hideDisabledTests;
+
+    public AllureTestNgConfig(final Properties properties) {
+        this.hideDisabledTests = parseBoolean(properties.getProperty(ALLURE_TESTNG_HIDE_DISABLED_TESTS));
+    }
+
+    public boolean isHideDisabledTests() {
+        return hideDisabledTests;
+    }
+
+    public AllureTestNgConfig setHideDisabledTests(final boolean hide) {
+        this.hideDisabledTests = hide;
+        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 fabcd90d2..e3bda742b 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
@@ -38,6 +38,7 @@
 import io.qameta.allure.test.AllureResultsWriterStub;
 import io.qameta.allure.testfilter.TestPlan;
 import io.qameta.allure.testfilter.TestPlanV1_0;
+import io.qameta.allure.testng.config.AllureTestNgConfig;
 import io.qameta.allure.testng.samples.PriorityTests;
 import io.qameta.allure.testng.samples.TestsWithIdForFilter;
 import org.assertj.core.api.Condition;
@@ -59,6 +60,7 @@
 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;
@@ -72,6 +74,7 @@
 @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");
@@ -106,6 +109,13 @@ public static Object[][] parallelConfiguration() {
         };
     }
 
+    @Test
+    public void shouldSetConfigurationProperty() {
+        AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
+        allureTestNgConfig.setHideDisabledTests(true);
+        assertThat(allureTestNgConfig.isHideDisabledTests()).isEqualTo(true);
+    }
+
     @AllureFeatures.Parallel
     @Test(description = "Parallel data provider tests")
     public void parallelDataProvider() {
@@ -1062,12 +1072,25 @@ public void shouldDisplayDisabledTests() {
 
         assertThat(results.getTestResults())
                 .extracting(TestResult::getName, TestResult::getStatus)
-                .containsExactly(
-                        tuple("disabled", null)
+                .containsExactlyInAnyOrder(
+                        tuple("disabled", null),
+                        tuple("enabled", Status.PASSED)
                 );
 
     }
 
+    @AllureFeatures.IgnoredTests
+    @Issue("369")
+    @Test
+    public void shouldNotDisplayDisabledTests() {
+        System.setProperty(ALLURE_TESTNG_HIDE_DISABLED_TESTS, "true");
+        final AllureResults results = runTestNgSuites("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")
     @AllureFeatures.Parameters
     @Issue("129")
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 1ecc3ae67..82e1c751d 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
@@ -25,4 +25,8 @@ public class DisabledTest {
     @Test(enabled = false)
     public void disabled() {
     }
+
+    @Test
+    public void enabled() {
+    }
 }
diff --git a/allure-testng/src/test/resources/suites/gh-369.xml b/allure-testng/src/test/resources/suites/gh-369.xml
new file mode 100644
index 000000000..739a9f87f
--- /dev/null
+++ b/allure-testng/src/test/resources/suites/gh-369.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="Github Issues">
+    <test name="gh-369">
+        <classes>
+            <class name="io.qameta.allure.testng.samples.DisabledTest"/>
+        </classes>
+    </test>
+</suite>

From e91fb588572ed9397911e988035bc000cd93b354 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Thu, 3 Nov 2022 10:59:33 +0700
Subject: [PATCH 263/486] ignore junit platform spock engine reporting when
 spock 2 is configured (via #842)

---
 .../junitplatform/AllureJunitPlatform.java    | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

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 43599443f..90b505280 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
@@ -87,7 +87,8 @@
         "ClassFanOutComplexity",
         "MultipleStringLiterals",
         "ClassDataAbstractionCoupling",
-        "PMD.GodClass"
+        "PMD.GodClass",
+        "PMD.TooManyMethods"
 })
 public class AllureJunitPlatform implements TestExecutionListener {
 
@@ -113,6 +114,11 @@ 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 String ENGINE_SPOCK2 = "spock";
+
     private final ThreadLocal<TestPlan> testPlanStorage = new InheritableThreadLocal<>();
 
     private final ThreadLocal<Uuids> tests = new InheritableThreadLocal<Uuids>() {
@@ -142,6 +148,26 @@ public AllureLifecycle getLifecycle() {
         return lifecycle;
     }
 
+    private boolean shouldSkipReportingFor(final TestIdentifier testIdentifier) {
+        return !testIdentifier.getParentId().isPresent()
+               || HAS_SPOCK2_IN_CLASSPATH && engineIs(testIdentifier, ENGINE_SPOCK2);
+    }
+
+    private boolean engineIs(final TestIdentifier testIdentifier, final String engineId) {
+        return testIdentifier.getUniqueIdObject().getEngineId()
+                .filter(v -> Objects.equals(engineId, v))
+                .isPresent();
+    }
+
+    private static boolean isClassAvailableOnClasspath(final String clazz) {
+        try {
+            AllureJunitPlatform.class.getClassLoader().loadClass(clazz);
+            return true;
+        } catch (Exception ignored) {
+            return false;
+        }
+    }
+
     @Override
     public void testPlanExecutionStarted(final TestPlan testPlan) {
         testPlanStorage.set(testPlan);
@@ -158,8 +184,7 @@ public void testPlanExecutionFinished(final TestPlan testPlan) {
 
     @Override
     public void executionStarted(final TestIdentifier testIdentifier) {
-        // skip root
-        if (!testIdentifier.getParentId().isPresent()) {
+        if (shouldSkipReportingFor(testIdentifier)) {
             return;
         }
         // create container for every TestIdentifier. We need containers for tests in order
@@ -174,8 +199,7 @@ public void executionStarted(final TestIdentifier testIdentifier) {
     @Override
     public void executionFinished(final TestIdentifier testIdentifier,
                                   final TestExecutionResult testExecutionResult) {
-        // skip root
-        if (!testIdentifier.getParentId().isPresent()) {
+        if (shouldSkipReportingFor(testIdentifier)) {
             return;
         }
         final Status status = extractStatus(testExecutionResult);
@@ -196,8 +220,7 @@ public void executionFinished(final TestIdentifier testIdentifier,
     @Override
     public void executionSkipped(final TestIdentifier testIdentifier,
                                  final String reason) {
-        // skip root
-        if (!testIdentifier.getParentId().isPresent()) {
+        if (shouldSkipReportingFor(testIdentifier)) {
             return;
         }
         final TestPlan testPlan = testPlanStorage.get();
@@ -217,6 +240,10 @@ public void executionSkipped(final TestIdentifier testIdentifier,
     @Override
     public void reportingEntryPublished(final TestIdentifier testIdentifier,
                                         final ReportEntry entry) {
+        if (shouldSkipReportingFor(testIdentifier)) {
+            return;
+        }
+
         final Map<String, String> keyValuePairs = unwrap(entry.getKeyValuePairs());
         if (keyValuePairs.containsKey(ALLURE_FIXTURE)) {
             processFixtureEvent(testIdentifier, keyValuePairs);
@@ -322,7 +349,7 @@ private void resetContext(final TestIdentifier testIdentifier) {
         // test case uuid to allure thread local storage
         Optional.of(testIdentifier)
                 .filter(TestIdentifier::isTest)
-                .flatMap((TestIdentifier t) -> getTest(t))
+                .flatMap(this::getTest)
                 .ifPresent(Allure.getLifecycle()::setCurrentTestCase);
     }
 

From 6a5f40f6f2f86d1855700da03d2b8198844b198a Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Thu, 3 Nov 2022 04:00:58 +0000
Subject: [PATCH 264/486] release 2.20.0

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

diff --git a/gradle.properties b/gradle.properties
index ca870120f..c480d60b5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.20-SNAPSHOT
+version=2.20.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 4615903102d08871fd41bf78d9c7e8ba5a446b71 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Thu, 3 Nov 2022 04:00:59 +0000
Subject: [PATCH 265/486] set next development version 2.21

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

diff --git a/gradle.properties b/gradle.properties
index c480d60b5..1aa563c4c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.20.0
+version=2.21-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 3914c075738273160ded821780ddfa077bbc01eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 11:56:31 +0400
Subject: [PATCH 266/486] bump mockserver-netty from 5.13.2 to 5.14.0 (via
 #843)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 5692815a6..f7ea8dad6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -157,7 +157,7 @@ configure(libs) {
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.hamcrest:hamcrest:2.2")
             dependency("org.jboss.resteasy:resteasy-client:6.1.0.Final")
-            dependency("org.mock-server:mockserver-netty:5.13.2")
+            dependency("org.mock-server:mockserver-netty:5.14.0")
             dependency("org.mockito:mockito-core:4.6.1")
             dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")
             dependency("org.slf4j:slf4j-nop:${orgSlf4jVersion}")

From f8922e626bc6f2bf7a41b20032fa86e663033d18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 13:37:27 +0400
Subject: [PATCH 267/486] bump jackson-bom from 2.13.3 to 2.14.0 (via #844)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index f7ea8dad6..8fc56b159 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -133,7 +133,7 @@ configure(libs) {
 
     dependencyManagement {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.13.3")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.14.0")
             mavenBom("org.junit:junit-bom:5.8.2")
         }
         dependencies {

From 2249e761e78335b97c0837bed9292a302385c8c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 15:09:11 +0400
Subject: [PATCH 268/486] bump com.google.protobuf from 0.8.19 to 0.9.1 (via
 #834)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 49ca5b665..cb74f9d59 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -56,7 +56,7 @@ pluginManagement {
         id("io.qameta.allure-report") version "2.11.2"
         id("io.spring.dependency-management") version "1.0.11.RELEASE"
         id("ru.vyarus.quality") version "4.7.0"
-        id("com.google.protobuf") version "0.8.19"
+        id("com.google.protobuf") version "0.9.1"
         kotlin("jvm") version "1.7.10"
     }
 }

From 33e4f59ef6fdcd7a9b4ced81ef3a8c0bed2679e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 16:15:13 +0400
Subject: [PATCH 269/486] bump com.diffplug.spotless from 6.9.1 to 6.11.0 (via
 #823)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index cb74f9d59..3537a8148 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -46,7 +46,7 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("com.diffplug.spotless") version "6.9.1"
+        id("com.diffplug.spotless") version "6.11.0"
         id("com.github.johnrengelman.shadow") version "7.1.2"
         id("com.gradle.enterprise") version "3.11.2"
         id("io.github.gradle-nexus.publish-plugin") version "1.1.0"

From 6d74e8fc5fee6efcc062cc912c9ec98a777f609d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 16:53:00 +0400
Subject: [PATCH 270/486] bump assertj-core from 3.22.0 to 3.23.1 (via #772)

---
 .../test/java/io/qameta/allure/assertj/AllureAspectJTest.java   | 2 +-
 build.gradle.kts                                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 ede986a3a..12437b900 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
@@ -100,7 +100,7 @@ void shouldHandleCollections() {
             .flatExtracting(TestResult::getSteps)
             .extracting(StepResult::getName)
             .containsExactly(
-                "assertThat '[a, b]'",
+                "assertThatList '[a, b]'",
                 "containsExactly '[a, b]'"
             );
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index 8fc56b159..138771530 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -152,7 +152,7 @@ configure(libs) {
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")
-            dependency("org.assertj:assertj-core:3.22.0")
+            dependency("org.assertj:assertj-core:3.23.1")
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.hamcrest:hamcrest:2.2")

From a75a7d5f304b86ecebe8042b3d2e718a8a906169 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Nov 2022 12:42:41 +0700
Subject: [PATCH 271/486] bump resteasy-client from 6.1.0.Final to 6.2.1.Final
 (via #849)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 138771530..feb7403f2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -156,7 +156,7 @@ configure(libs) {
             dependency("org.freemarker:freemarker:2.3.31")
             dependency("org.grpcmock:grpcmock-junit5:0.8.0")
             dependency("org.hamcrest:hamcrest:2.2")
-            dependency("org.jboss.resteasy:resteasy-client:6.1.0.Final")
+            dependency("org.jboss.resteasy:resteasy-client:6.2.1.Final")
             dependency("org.mock-server:mockserver-netty:5.14.0")
             dependency("org.mockito:mockito-core:4.6.1")
             dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")

From 4df40ba7108df420349b0efee29db35fed76f8cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Nov 2022 12:43:02 +0700
Subject: [PATCH 272/486] bump com.gradle.enterprise from 3.11.2 to 3.11.4 (via
 #848)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3537a8148..b3be2cd95 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.gradle.enterprise") version "3.11.2"
+        id("com.gradle.enterprise") version "3.11.4"
         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 d4b8c6874aa356a93ff95048504e10337d05afaa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Nov 2022 12:43:23 +0700
Subject: [PATCH 273/486] bump protobufVersion from 3.21.6 to 3.21.9 (via #847)

---
 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 027179d0f..6ec555287 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.50.2"
-val protobufVersion = "3.21.6"
+val protobufVersion = "3.21.9"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From 67035cafb045b88719908d15cb85da529e387c3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Dec 2022 13:02:13 +0700
Subject: [PATCH 274/486] bump selenide from 6.7.3 to 6.10.2 (via #857)

---
 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 0cc4eeebe..a22ee1d0d 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Selenide Integration"
 
-val selenideVersion = "6.7.3"
+val selenideVersion = "6.10.2"
 
 dependencies {
     api(project(":allure-java-commons"))

From d8bc74549956cf3d1605cd3cdcbfed79714a1179 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Dec 2022 13:02:36 +0700
Subject: [PATCH 275/486] bump jackson-bom from 2.14.0 to 2.14.1 (via #853)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index feb7403f2..28e57bf1e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -133,7 +133,7 @@ configure(libs) {
 
     dependencyManagement {
         imports {
-            mavenBom("com.fasterxml.jackson:jackson-bom:2.14.0")
+            mavenBom("com.fasterxml.jackson:jackson-bom:2.14.1")
             mavenBom("org.junit:junit-bom:5.8.2")
         }
         dependencies {

From 91c9366c9f79604b92a8000b5e6a50c7cdbe471c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Dec 2022 12:00:57 +0700
Subject: [PATCH 276/486] bump io.spring.dependency-management from
 1.0.11.RELEASE to 1.1.0 (via #860)

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

diff --git a/settings.gradle.kts b/settings.gradle.kts
index b3be2cd95..515a5f77b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -54,7 +54,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.0.11.RELEASE"
+        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"
         kotlin("jvm") version "1.7.10"

From eab345a7553021ec8161609d6edaa9f203aa8734 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Dec 2022 12:02:09 +0700
Subject: [PATCH 277/486] bump actions/checkout from 3.1.0 to 3.2.0 (via #858)

---
 .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 6cb00564c..1393bc49b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         java-version: [ '8.0.x', '11.0.x' ]
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v3.2.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 f21560f01..d0d9cdff6 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.1.0
+      - uses: actions/checkout@v3.2.0
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5059dba7d..acb68508f 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.1.0
+      - uses: actions/checkout@v3.2.0
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From cb7c69d1a920517f6f60c0e945d1da522d7fc1ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Dec 2022 12:02:31 +0700
Subject: [PATCH 278/486] bump grpcVersion from 1.50.2 to 1.51.0 (via #859)

---
 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 6ec555287..2c8de43ce 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.50.2"
+val grpcVersion = "1.51.0"
 val protobufVersion = "3.21.9"
 
 dependencies {

From c0ed1e227f2284f036095b884e3639101027d1d9 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 14 Dec 2022 08:38:12 +0300
Subject: [PATCH 279/486] remove cucumber-jvm 1 (via #861)

---
 allure-cucumber-jvm/build.gradle.kts          |  30 --
 .../allure/cucumberjvm/AllureCucumberJvm.java | 318 ------------
 .../allure/cucumberjvm/LabelBuilder.java      | 159 ------
 .../qameta/allure/cucumberjvm/StepUtils.java  | 127 -----
 .../qameta/allure/cucumberjvm/TagParser.java  |  72 ---
 .../src/main/resources/META-INF/aop-ajc.xml   |   7 -
 .../cucumberjvm/AllureCucumberJvmTest.java    | 452 ------------------
 .../cucumberjvm/samples/AttachmentSteps.java  |  43 --
 .../samples/BackgroundFeatureSteps.java       |  43 --
 .../samples/BrokenFeatureSteps.java           |  30 --
 .../samples/DatatableFeatureSteps.java        |  31 --
 .../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 -
 .../test/resources/features/simple.feature    |   7 -
 .../src/test/resources/features/tags.feature  |  13 -
 .../test/resources/features/undefined.feature |   4 -
 settings.gradle.kts                           |   1 -
 24 files changed, 1456 deletions(-)
 delete mode 100644 allure-cucumber-jvm/build.gradle.kts
 delete mode 100644 allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/AllureCucumberJvm.java
 delete mode 100644 allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java
 delete mode 100644 allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/StepUtils.java
 delete mode 100644 allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/TagParser.java
 delete mode 100644 allure-cucumber-jvm/src/main/resources/META-INF/aop-ajc.xml
 delete mode 100644 allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java
 delete mode 100644 allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/AttachmentSteps.java
 delete mode 100644 allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/BackgroundFeatureSteps.java
 delete mode 100644 allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/BrokenFeatureSteps.java
 delete mode 100644 allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/DatatableFeatureSteps.java
 delete mode 100644 allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/SimpleFeatureSteps.java
 delete mode 100644 allure-cucumber-jvm/src/test/resources/allure.properties
 delete mode 100644 allure-cucumber-jvm/src/test/resources/features/attachments.feature
 delete mode 100644 allure-cucumber-jvm/src/test/resources/features/background.feature
 delete mode 100644 allure-cucumber-jvm/src/test/resources/features/broken.feature
 delete mode 100644 allure-cucumber-jvm/src/test/resources/features/datatable.feature
 delete mode 100644 allure-cucumber-jvm/src/test/resources/features/description.feature
 delete mode 100644 allure-cucumber-jvm/src/test/resources/features/examples.feature
 delete mode 100644 allure-cucumber-jvm/src/test/resources/features/failed.feature
 delete mode 100644 allure-cucumber-jvm/src/test/resources/features/simple.feature
 delete mode 100644 allure-cucumber-jvm/src/test/resources/features/tags.feature
 delete mode 100644 allure-cucumber-jvm/src/test/resources/features/undefined.feature

diff --git a/allure-cucumber-jvm/build.gradle.kts b/allure-cucumber-jvm/build.gradle.kts
deleted file mode 100644
index e8922f691..000000000
--- a/allure-cucumber-jvm/build.gradle.kts
+++ /dev/null
@@ -1,30 +0,0 @@
-description = "Allure CucumberJVM Integration"
-
-val cucumberVersion = "1.2.6"
-
-dependencies {
-    api(project(":allure-java-commons"))
-    implementation("info.cukes:cucumber-core:$cucumberVersion")
-    implementation("info.cukes:cucumber-java:$cucumberVersion")
-    implementation("info.cukes:gherkin:2.12.2")
-    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.cucumberjvm"
-        ))
-    }
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
diff --git a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/AllureCucumberJvm.java b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/AllureCucumberJvm.java
deleted file mode 100644
index 311802432..000000000
--- a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/AllureCucumberJvm.java
+++ /dev/null
@@ -1,318 +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.cucumberjvm;
-
-import cucumber.runtime.StepDefinitionMatch;
-import gherkin.I18n;
-import gherkin.formatter.Formatter;
-import gherkin.formatter.Reporter;
-import gherkin.formatter.model.Background;
-import gherkin.formatter.model.DataTableRow;
-import gherkin.formatter.model.Examples;
-import gherkin.formatter.model.Feature;
-import gherkin.formatter.model.Match;
-import gherkin.formatter.model.Result;
-import gherkin.formatter.model.Scenario;
-import gherkin.formatter.model.ScenarioOutline;
-import gherkin.formatter.model.Step;
-import gherkin.formatter.model.Tag;
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-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.util.ResultsUtils;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-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.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Allure plugin for Cucumber-JVM.
- */
-@SuppressWarnings({
-        "PMD.ExcessiveImports",
-        "ClassFanOutComplexity",
-        "ClassDataAbstractionCoupling",
-        "unused"
-})
-public class AllureCucumberJvm implements Reporter, Formatter {
-
-    private static final List<String> SCENARIO_OUTLINE_KEYWORDS = Collections.synchronizedList(new ArrayList<String>());
-
-    private static final String FAILED = "failed";
-    private static final String PASSED = "passed";
-    private static final String SKIPPED = "skipped";
-    private static final String PENDING = "pending";
-
-    private static final String TXT_EXTENSION = ".txt";
-    private static final String TEXT_PLAIN = "text/plain";
-
-    private final Map<Scenario, String> scenarioUuids = new ConcurrentHashMap<>();
-    private final Deque<Step> gherkinSteps = new LinkedList<>();
-    private final AllureLifecycle lifecycle;
-    private Feature currentFeature;
-    private boolean isNullMatch = true;
-    private Scenario currentScenario;
-
-
-    @SuppressWarnings("unused")
-    public AllureCucumberJvm() {
-        this(Allure.getLifecycle());
-    }
-
-    public AllureCucumberJvm(final AllureLifecycle lifecycle) {
-        this.lifecycle = lifecycle;
-        final List<I18n> i18nList = I18n.getAll();
-        i18nList.forEach(i18n -> SCENARIO_OUTLINE_KEYWORDS.addAll(i18n.keywords("scenario_outline")));
-    }
-
-    @Override
-    public void feature(final Feature feature) {
-        this.currentFeature = feature;
-    }
-
-    @Override
-    public void before(final Match match, final Result result) {
-        new StepUtils(currentFeature, currentScenario).fireFixtureStep(match, result, true);
-    }
-
-    @Override
-    public void after(final Match match, final Result result) {
-        new StepUtils(currentFeature, currentScenario).fireFixtureStep(match, result, false);
-    }
-
-    @Override
-    public void startOfScenarioLifeCycle(final Scenario scenario) {
-        this.currentScenario = scenario;
-
-        final Deque<Tag> tags = new LinkedList<>(scenario.getTags());
-
-        if (SCENARIO_OUTLINE_KEYWORDS.contains(scenario.getKeyword())) {
-            synchronized (gherkinSteps) {
-                gherkinSteps.clear();
-            }
-        } else {
-            tags.addAll(currentFeature.getTags());
-        }
-
-        final LabelBuilder labelBuilder = new LabelBuilder(currentFeature, scenario, tags);
-
-        final String uuid = UUID.randomUUID().toString();
-        scenarioUuids.put(scenario, uuid);
-
-        final TestResult result = new TestResult()
-                .setUuid(uuid)
-                .setHistoryId(StepUtils.getHistoryId(scenario.getId()))
-                .setFullName(String.format("%s: %s", currentFeature.getName(), scenario.getName()))
-                .setName(scenario.getName())
-                .setLabels(labelBuilder.getScenarioLabels())
-                .setLinks(labelBuilder.getScenarioLinks());
-
-        if (!currentFeature.getDescription().isEmpty()) {
-            result.setDescription(currentFeature.getDescription());
-        }
-
-        lifecycle.scheduleTestCase(result);
-        lifecycle.startTestCase(uuid);
-
-    }
-
-    @Override
-    public void step(final Step step) {
-        synchronized (gherkinSteps) {
-            gherkinSteps.add(step);
-        }
-    }
-
-    @Override
-    public void match(final Match match) {
-        final StepUtils stepUtils = new StepUtils(currentFeature, currentScenario);
-        if (match instanceof StepDefinitionMatch) {
-            isNullMatch = false;
-            final Step step = stepUtils.extractStep((StepDefinitionMatch) match);
-            synchronized (gherkinSteps) {
-                while (gherkinSteps.peek() != null && !stepUtils.isEqualSteps(step, gherkinSteps.peek())) {
-                    stepUtils.fireCanceledStep(gherkinSteps.remove());
-                }
-                if (stepUtils.isEqualSteps(step, gherkinSteps.peek())) {
-                    gherkinSteps.remove();
-                }
-            }
-            final StepResult stepResult = new StepResult();
-            stepResult.setName(String.format("%s %s", step.getKeyword(), getStepName(step)))
-                    .setStart(System.currentTimeMillis());
-
-            final String scenarioUuid = scenarioUuids.get(currentScenario);
-            lifecycle.startStep(scenarioUuid, stepUtils.getStepUuid(step), stepResult);
-            createDataTableAttachment(step.getRows());
-        }
-    }
-
-    @SuppressWarnings("PMD.NcssCount")
-    @Override
-    public void result(final Result result) {
-        if (!isNullMatch) {
-            final StatusDetails statusDetails =
-                    ResultsUtils.getStatusDetails(result.getError()).orElse(new StatusDetails());
-            final TagParser tagParser = new TagParser(currentFeature, currentScenario);
-            statusDetails
-                    .setFlaky(tagParser.isFlaky())
-                    .setMuted(tagParser.isMuted())
-                    .setKnown(tagParser.isKnown());
-
-            final String scenarioUuid = scenarioUuids.get(currentScenario);
-            switch (result.getStatus()) {
-                case FAILED:
-                    final Status status = ResultsUtils.getStatus(result.getError())
-                            .orElse(Status.FAILED);
-                    lifecycle.updateStep(stepResult -> stepResult.setStatus(Status.FAILED));
-                    lifecycle.updateTestCase(scenarioUuid, scenarioResult ->
-                            scenarioResult.setStatus(status)
-                                    .setStatusDetails(statusDetails));
-                    lifecycle.stopStep();
-                    break;
-                case PENDING:
-                    lifecycle.updateStep(stepResult -> stepResult.setStatus(Status.SKIPPED));
-                    lifecycle.updateTestCase(scenarioUuid, scenarioResult ->
-                            scenarioResult.setStatus(Status.SKIPPED)
-                                    .setStatusDetails(statusDetails));
-                    lifecycle.stopStep();
-                    break;
-                case SKIPPED:
-                    lifecycle.updateStep(stepResult -> stepResult.setStatus(Status.SKIPPED));
-                    lifecycle.stopStep();
-                    break;
-                case PASSED:
-                    lifecycle.updateStep(stepResult -> stepResult.setStatus(Status.PASSED));
-                    lifecycle.stopStep();
-                    lifecycle.updateTestCase(scenarioUuid, scenarioResult ->
-                            scenarioResult.setStatus(Status.PASSED)
-                                    .setStatusDetails(statusDetails));
-                    break;
-                default:
-                    break;
-            }
-            isNullMatch = true;
-        }
-    }
-
-    @Override
-    public void endOfScenarioLifeCycle(final Scenario scenario) {
-        final StepUtils stepUtils = new StepUtils(currentFeature, currentScenario);
-        synchronized (gherkinSteps) {
-            while (gherkinSteps.peek() != null) {
-                stepUtils.fireCanceledStep(gherkinSteps.remove());
-            }
-        }
-        final String scenarioUuid = scenarioUuids.remove(scenario);
-        lifecycle.stopTestCase(scenarioUuid);
-        lifecycle.writeTestCase(scenarioUuid);
-    }
-
-    public String getStepName(final Step step) {
-        return step.getName();
-    }
-
-    private void createDataTableAttachment(final List<DataTableRow> dataTableRows) {
-        final StringBuilder dataTableCsv = new StringBuilder();
-
-        if (dataTableRows != null && !dataTableRows.isEmpty()) {
-            dataTableRows.forEach(dataTableRow -> {
-                dataTableCsv.append(String.join("\t", dataTableRow.getCells()));
-                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)));
-        }
-    }
-
-    @Override
-    public void embedding(final String string, final byte[] bytes) {
-        lifecycle.addAttachment("Screenshot", null, null, new ByteArrayInputStream(bytes));
-    }
-
-    @Override
-    public void write(final String string) {
-        lifecycle.addAttachment(
-                "Text output",
-                TEXT_PLAIN,
-                TXT_EXTENSION,
-                Objects.toString(string).getBytes(StandardCharsets.UTF_8)
-        );
-    }
-
-    @Override
-    public void syntaxError(final String state, final String event,
-                            final List<String> legalEvents, final String uri, final Integer line) {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void uri(final String uri) {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void scenarioOutline(final ScenarioOutline so) {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void examples(final Examples exmpls) {
-        //Nothing to do with Allure
-    }
-
-
-    @Override
-    public void background(final Background b) {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void scenario(final Scenario scnr) {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void done() {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void close() {
-        //Nothing to do with Allure
-    }
-
-    @Override
-    public void eof() {
-        //Nothing to do with Allure
-
-    }
-
-}
diff --git a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java
deleted file mode 100644
index c022b8531..000000000
--- a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java
+++ /dev/null
@@ -1,159 +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.cucumberjvm;
-
-import gherkin.formatter.model.Feature;
-import gherkin.formatter.model.Scenario;
-import gherkin.formatter.model.Tag;
-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.createLanguageLabel;
-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;
-
-/**
- * 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 Scenario scenario, final Deque<Tag> tags) {
-        final TagParser tagParser = new TagParser(feature, scenario);
-
-        getScenarioLabels().add(createFeatureLabel(feature.getName()));
-        getScenarioLabels().add(createStoryLabel(scenario.getName()));
-
-        while (tags.peek() != null) {
-            final Tag 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(ResultsUtils.createTmsLink(tagValue));
-                        break;
-                    case ISSUE_LINK:
-                        getScenarioLinks().add(ResultsUtils.createIssueLink(tagValue));
-                        break;
-                    case PLAIN_LINK:
-                        getScenarioLinks().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));
-                        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("cucumberjvm"),
-                createLanguageLabel("java")
-        ));
-
-    }
-
-    public List<Label> getScenarioLabels() {
-        return scenarioLabels;
-    }
-
-    public List<Link> getScenarioLinks() {
-        return scenarioLinks;
-    }
-
-    private Label getTagLabel(final Tag 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(ResultsUtils.createLink(null, name, null, type));
-        } else {
-            LOGGER.warn("Composite named tag {} is not matches regex {}. skipping", tagString,
-                    namedLinkPatternString);
-        }
-    }
-
-}
diff --git a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/StepUtils.java b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/StepUtils.java
deleted file mode 100644
index 99c262b38..000000000
--- a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/StepUtils.java
+++ /dev/null
@@ -1,127 +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.cucumberjvm;
-
-import cucumber.runtime.CucumberException;
-import cucumber.runtime.StepDefinitionMatch;
-import gherkin.formatter.model.Feature;
-import gherkin.formatter.model.Match;
-import gherkin.formatter.model.Result;
-import gherkin.formatter.model.Scenario;
-import gherkin.formatter.model.Step;
-import io.qameta.allure.Allure;
-import io.qameta.allure.AllureLifecycle;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
-import io.qameta.allure.util.ResultsUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-import java.util.Objects;
-
-import static io.qameta.allure.util.ResultsUtils.md5;
-
-/**
- * Step utils.
- */
-class StepUtils {
-    private static final Logger LOG = LoggerFactory.getLogger(StepUtils.class);
-    private static final String FAILED = "failed";
-
-    private final AllureLifecycle lifecycle;
-    private final Feature feature;
-    private final Scenario scenario;
-
-    StepUtils(final Feature feature, final Scenario scenario) {
-        this.lifecycle = Allure.getLifecycle();
-        this.feature = feature;
-        this.scenario = scenario;
-    }
-
-    protected Step extractStep(final StepDefinitionMatch match) {
-        try {
-            final Field step = match.getClass().getDeclaredField("step");
-            step.setAccessible(true);
-            return (Step) step.get(match);
-        } catch (ReflectiveOperationException e) {
-            //shouldn't ever happen
-            LOG.error(e.getMessage(), e);
-            throw new CucumberException(e);
-        }
-    }
-
-    protected boolean isEqualSteps(final Step step, final Step gherkinStep) {
-        return Objects.equals(step.getLine(), gherkinStep.getLine());
-    }
-
-    protected void fireCanceledStep(final Step unimplementedStep) {
-        final StepResult stepResult = new StepResult();
-        stepResult.setName(unimplementedStep.getName())
-                .setStart(System.currentTimeMillis())
-                .setStop(System.currentTimeMillis())
-                .setStatus(Status.SKIPPED)
-                .setStatusDetails(new StatusDetails().setMessage("Unimplemented step"));
-        lifecycle.startStep(scenario.getId(), getStepUuid(unimplementedStep), stepResult);
-        lifecycle.stopStep(getStepUuid(unimplementedStep));
-
-        final StatusDetails statusDetails = new StatusDetails();
-        final TagParser tagParser = new TagParser(feature, scenario);
-        statusDetails
-                .setFlaky(tagParser.isFlaky())
-                .setMuted(tagParser.isMuted())
-                .setKnown(tagParser.isKnown());
-        lifecycle.updateTestCase(scenario.getId(), scenarioResult ->
-                scenarioResult.setStatus(Status.SKIPPED)
-                        .setStatusDetails(statusDetails
-                                .setMessage("Unimplemented steps were found")));
-    }
-
-    protected String getStepUuid(final Step step) {
-        return feature.getId() + scenario.getId() + step.getName() + step.getLine();
-    }
-
-    protected static String getHistoryId(final String id) {
-        return md5(id);
-    }
-
-    protected void fireFixtureStep(final Match match, final Result result, final boolean isBefore) {
-        final String uuid = md5(match.getLocation());
-        final StepResult stepResult = new StepResult()
-                .setName(match.getLocation())
-                .setStatus(Status.fromValue(result.getStatus()))
-                .setStart(System.currentTimeMillis() - result.getDuration())
-                .setStop(System.currentTimeMillis());
-        if (FAILED.equals(result.getStatus())) {
-            final StatusDetails statusDetails = ResultsUtils.getStatusDetails(result.getError()).get();
-            stepResult.setStatusDetails(statusDetails);
-            if (isBefore) {
-                final TagParser tagParser = new TagParser(feature, scenario);
-                statusDetails
-                        .setMessage("Before is failed: " + result.getError().getLocalizedMessage())
-                        .setFlaky(tagParser.isFlaky())
-                        .setMuted(tagParser.isMuted())
-                        .setKnown(tagParser.isKnown());
-                lifecycle.updateTestCase(scenario.getId(), scenarioResult ->
-                        scenarioResult.setStatus(Status.SKIPPED)
-                                .setStatusDetails(statusDetails));
-            }
-        }
-        lifecycle.startStep(scenario.getId(), uuid, stepResult);
-        lifecycle.stopStep(uuid);
-    }
-}
diff --git a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/TagParser.java b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/TagParser.java
deleted file mode 100644
index 670aad996..000000000
--- a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/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.cucumberjvm;
-
-import gherkin.formatter.model.Feature;
-import gherkin.formatter.model.Scenario;
-import gherkin.formatter.model.Tag;
-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 Scenario scenario;
-
-    TagParser(final Feature feature, final Scenario 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 Tag tag) {
-        return Arrays.asList(new String[]{FLAKY, KNOWN, MUTED})
-                .contains(tag.getName().toUpperCase());
-    }
-
-    protected boolean isPureSeverityTag(final Tag tag) {
-        return Arrays.stream(SeverityLevel.values())
-                .map(SeverityLevel::value)
-                .map(value -> "@" + value)
-                .anyMatch(value -> value.equalsIgnoreCase(tag.getName()));
-    }
-
-}
diff --git a/allure-cucumber-jvm/src/main/resources/META-INF/aop-ajc.xml b/allure-cucumber-jvm/src/main/resources/META-INF/aop-ajc.xml
deleted file mode 100644
index 09e38300c..000000000
--- a/allure-cucumber-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-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java
deleted file mode 100644
index e5274cbef..000000000
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java
+++ /dev/null
@@ -1,452 +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.cucumberjvm;
-
-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 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.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.parallel.ResourceLock;
-
-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 AllureCucumberJvmTest {
-
-    @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.Timings
-    @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 = "\nThis 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
-    @Disabled("unsupported")
-    @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
-    @Disabled("unsupported")
-    @Test
-    void shouldAddParametersFromExamples() {
-        final AllureResults results = runFeature("features/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.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) null);
-    }
-
-    @AllureFeatures.Base
-    @Disabled("unsupported")
-    @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");
-    }
-
-    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
-    @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm1-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", "cucumberjvm1-test-provided")
-                );
-    }
-
-    private AllureResults runFeature(final String featureResource,
-                                     final String... moreOptions) {
-        final AllureResultsWriterStub writer = new AllureResultsWriterStub();
-        final AllureLifecycle lifecycle = new AllureLifecycle(writer);
-        final AllureCucumberJvm cucumberJvm = new AllureCucumberJvm(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.cucumberjvm.samples",
-                "--plugin", "null",
-                "src/test/resources/" + featureResource
-        ));
-        opts.addAll(Arrays.asList(moreOptions));
-        final RuntimeOptions options = new RuntimeOptions(opts);
-        final Runtime runtime = new Runtime(resourceLoader, classFinder, classLoader, options);
-
-        options.addPlugin(cucumberJvm);
-        final List<CucumberFeature> features = options.cucumberFeatures(resourceLoader);
-        features.forEach(cucumberFeature -> cucumberFeature.run(
-                options.formatter(classLoader),
-                options.reporter(classLoader),
-                runtime
-        ));
-        return writer;
-    }
-}
diff --git a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/AttachmentSteps.java b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/AttachmentSteps.java
deleted file mode 100644
index b6d92c5b5..000000000
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/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.cucumberjvm.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-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/BackgroundFeatureSteps.java b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/BackgroundFeatureSteps.java
deleted file mode 100644
index 4597729c8..000000000
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/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.cucumberjvm.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-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/BrokenFeatureSteps.java b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/BrokenFeatureSteps.java
deleted file mode 100644
index 6fab5b44e..000000000
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/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.cucumberjvm.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-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/DatatableFeatureSteps.java b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/DatatableFeatureSteps.java
deleted file mode 100644
index 1a98bdce3..000000000
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/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.cucumberjvm.samples;
-
-import cucumber.api.DataTable;
-import cucumber.api.java.en.Given;
-
-/**
- * @author charlie (Dmitry Baev).
- */
-@SuppressWarnings("unused")
-public class DatatableFeatureSteps {
-
-    @Given("^users are:$")
-    public void usersAre(DataTable table) {
-    }
-
-}
diff --git a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/SimpleFeatureSteps.java b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/samples/SimpleFeatureSteps.java
deleted file mode 100644
index 418102391..000000000
--- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/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.cucumberjvm.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-cucumber-jvm/src/test/resources/allure.properties b/allure-cucumber-jvm/src/test/resources/allure.properties
deleted file mode 100644
index 9c0b0a2d7..000000000
--- a/allure-cucumber-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-cucumber-jvm/src/test/resources/features/attachments.feature b/allure-cucumber-jvm/src/test/resources/features/attachments.feature
deleted file mode 100644
index 1585fbe81..000000000
--- a/allure-cucumber-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-cucumber-jvm/src/test/resources/features/background.feature b/allure-cucumber-jvm/src/test/resources/features/background.feature
deleted file mode 100644
index 307f10267..000000000
--- a/allure-cucumber-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-cucumber-jvm/src/test/resources/features/broken.feature b/allure-cucumber-jvm/src/test/resources/features/broken.feature
deleted file mode 100644
index 42bd7ba4f..000000000
--- a/allure-cucumber-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-cucumber-jvm/src/test/resources/features/datatable.feature b/allure-cucumber-jvm/src/test/resources/features/datatable.feature
deleted file mode 100644
index ea5e94d3b..000000000
--- a/allure-cucumber-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-cucumber-jvm/src/test/resources/features/description.feature b/allure-cucumber-jvm/src/test/resources/features/description.feature
deleted file mode 100644
index 935b6731a..000000000
--- a/allure-cucumber-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-cucumber-jvm/src/test/resources/features/examples.feature b/allure-cucumber-jvm/src/test/resources/features/examples.feature
deleted file mode 100644
index ecba7b79e..000000000
--- a/allure-cucumber-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-cucumber-jvm/src/test/resources/features/failed.feature b/allure-cucumber-jvm/src/test/resources/features/failed.feature
deleted file mode 100644
index a70f8ec79..000000000
--- a/allure-cucumber-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-cucumber-jvm/src/test/resources/features/simple.feature b/allure-cucumber-jvm/src/test/resources/features/simple.feature
deleted file mode 100644
index c5b5f2b5f..000000000
--- a/allure-cucumber-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-cucumber-jvm/src/test/resources/features/tags.feature b/allure-cucumber-jvm/src/test/resources/features/tags.feature
deleted file mode 100644
index 2632623ee..000000000
--- a/allure-cucumber-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-cucumber-jvm/src/test/resources/features/undefined.feature b/allure-cucumber-jvm/src/test/resources/features/undefined.feature
deleted file mode 100644
index caa0b507b..000000000
--- a/allure-cucumber-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/settings.gradle.kts b/settings.gradle.kts
index 515a5f77b..45f8d4d16 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,6 @@ include("allure-attachments")
 include("allure-awaitility")
 include("allure-bom")
 include("allure-citrus")
-include("allure-cucumber-jvm")
 include("allure-cucumber2-jvm")
 include("allure-cucumber3-jvm")
 include("allure-cucumber4-jvm")

From bbd7da41857d4f7d161825fdc3daf55d3d5dca3c Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev.dm@gmail.com>
Date: Wed, 14 Dec 2022 09:06:13 +0300
Subject: [PATCH 280/486] use java 17 for build with release target 8 (via
 #845)

---
 .github/release.yml                           |   3 +
 .github/workflows/build.yml                   |   2 +-
 .github/workflows/labels-verify.yml           |  17 ++-
 .github/workflows/publish.yml                 |   4 +-
 .../awaitility/AllureAwaitilityListener.java  |  19 ++-
 .../ConditionListenersPositiveTest.java       | 114 +++++++++--------
 .../GlobalSettingsNegativeTest.java           |  52 ++++----
 .../GlobalSettingsPositiveTest.java           | 120 +++++++++++-------
 .../allure/reader/AllureEnumDeserializer.java |   4 +-
 .../reader/ParameterModeDeserializer.java     |   4 +-
 .../allure/reader/StageDeserializer.java      |   4 +-
 .../allure/reader/StatusDeserializer.java     |   4 +-
 build.gradle.kts                              |  48 +++++--
 gradle.properties                             |   2 +-
 14 files changed, 233 insertions(+), 164 deletions(-)

diff --git a/.github/release.yml b/.github/release.yml
index c382d697b..7c30a5979 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -14,6 +14,9 @@ changelog:
     - title: '⬆️ Dependency Updates'
       labels:
         - 'type:dependencies'
+    - title: '📖 Documentation improvements'
+      labels:
+        - 'type:documentation'
     - title: '⛔️ Security'
       labels:
         - 'type:security'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1393bc49b..a0be430e7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ '8.0.x', '11.0.x' ]
+        java-version: [ '17.0.x' ]
     steps:
       - uses: actions/checkout@v3.2.0
 
diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml
index c9980ead9..0c18ecb77 100644
--- a/.github/workflows/labels-verify.yml
+++ b/.github/workflows/labels-verify.yml
@@ -1,13 +1,22 @@
 name: "Verify type labels"
 
 on:
-  pull_request:
-    types: [ labeled, unlabeled ]
+  pull_request_target:
+    types: [opened, labeled, unlabeled, synchronize]
 
 jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: baev/match-label-action@master
+      - uses: baev/action-label-verify@main
         with:
-          allowed: 'type:bug,type:new feature,type:improvement,type:dependencies,type:internal,type:invalid'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          allowed: |
+            type:bug
+            type:dependencies
+            type:improvement
+            type:internal
+            type:invalid
+            type:new feature
+            type:security
+            type:documentation
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index d0d9cdff6..a02def86b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -10,11 +10,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3.2.0
 
-      - name: Set up JDK 1.8
+      - name: "Set up JDK 17.0.x"
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 8.0.x
+          java-version: '17.0.x'
 
       - name: Set up GPG
         run: echo -n "${GPG_PRIVATE_KEY}" | base64 --decode > ${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg
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 86f1b1ae5..8a3f468b2 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
@@ -177,16 +177,15 @@ public void conditionEvaluated(final EvaluatedCondition<Object> condition) {
         final long remainingTime = unit.convert(condition.getRemainingTimeInMS(), MILLISECONDS);
         final String unitAsString = unit.toString().toLowerCase();
 
-        final String message;
-        if (condition.isSatisfied()) {
-            message =
-                    String.format(onSatisfiedStepTextPattern, description, elapsedTime, unitAsString, remainingTime,
-                            unitAsString, new TemporalDuration(condition.getPollInterval()));
-        } else {
-            message =
-                    String.format(onAwaitStepTextPattern, description, elapsedTime, unitAsString, remainingTime,
-                            unitAsString, new TemporalDuration(condition.getPollInterval()));
-        }
+        final String message = String.format(
+                condition.isSatisfied() ? onSatisfiedStepTextPattern : onAwaitStepTextPattern,
+                description,
+                elapsedTime,
+                unitAsString,
+                remainingTime,
+                unitAsString,
+                new TemporalDuration(condition.getPollInterval())
+        );
 
         getLifecycle().updateStep(awaitilityCondition -> {
             final String lastAwaitStepUUID = UUID.randomUUID().toString();
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 0ff23ee28..e62e0314f 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
@@ -16,23 +16,26 @@
 package io.qameta.allure.awaitility;
 
 import io.qameta.allure.model.Status;
+import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestFactory;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+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;
 import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
-@TestInstance(TestInstance.Lifecycle.PER_METHOD)
 class ConditionListenersPositiveTest {
 
     /**
@@ -45,8 +48,8 @@ class ConditionListenersPositiveTest {
      * <li>2. Top level step has passed status</li>
      * <li>3. Top level step has default name</li>
      */
-    @Test
-    void globalSettingsAwaitWoAliasCheckTopLevelPassedStep() {
+    @TestFactory
+    Stream<DynamicNode> globalSettingsAwaitWoAliasCheckTopLevelPassedStep() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
                     final AtomicInteger atomicInteger = new AtomicInteger(0);
                     await().with()
@@ -57,19 +60,20 @@ void globalSettingsAwaitWoAliasCheckTopLevelPassedStep() {
                 },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
-        assertAll(
-                () -> assertEquals(
-                        1, testResult.get(0).getSteps().size(),
-                        "Exactly 1 top level step for 1 awaitility condition"
+
+        return Stream.of(
+                DynamicTest.dynamicTest("Exactly 1 top level step for 1 awaitility condition", () ->
+                        assertThat(testResult.get(0).getSteps())
+                                .hasSize(1)
                 ),
-                () -> assertEquals(
-                        Status.PASSED, testResult.get(0).getSteps().get(0).getStatus(),
-                        "Top level step has passed status"
+                DynamicTest.dynamicTest("Top level step has passed status", () ->
+                        assertThat(testResult.get(0).getSteps())
+                                .allMatch(step -> Status.PASSED.equals(step.getStatus()))
                 ),
-                () -> assertEquals(
-                        "Awaitility: Starting evaluation",
-                        testResult.get(0).getSteps().get(0).getName(),
-                        "Top level step has default name because await() wo alias"
+                DynamicTest.dynamicTest("Top level step has default name because await() wo alias", () ->
+                        assertThat(testResult.get(0).getSteps())
+                                .extracting(StepResult::getName)
+                                .containsExactly("Awaitility: Starting evaluation")
                 )
         );
     }
@@ -111,8 +115,8 @@ void globalSettingsAwaitWithAliasCheckTopLevelPassedStep() {
      * <li>2. All second-level steps should have passed status for successful condition evaluation</li>
      * <li>3. All second-level steps should have information about polling intervals and evaluation</li>
      */
-    @Test
-    void globalSettingsCheckAwaitWoAliasSecondLevelPassedSteps() {
+    @TestFactory
+    Stream<DynamicNode> globalSettingsCheckAwaitWoAliasSecondLevelPassedSteps() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
                     final AtomicInteger atomicInteger = new AtomicInteger(0);
                     await().with()
@@ -123,43 +127,47 @@ void globalSettingsCheckAwaitWoAliasSecondLevelPassedSteps() {
                 },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
-        assertAll(
-                () -> assertEquals(
-                        4, testResult.get(0).getSteps().get(0).getSteps().size(),
-                        "Exactly 4 second level steps for 4 polling iterations"
+
+        return Stream.of(
+                dynamicTest("Exactly 4 second level steps for 4 polling iterations", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps())
+                                .hasSize(4)
                 ),
-                () -> assertEquals(
-                        4, (int) testResult.get(0).getSteps().get(0).getSteps().stream()
-                                .filter(x -> x.getStatus().equals(Status.PASSED)).count(),
-                        "All second level steps has passed statuses"
+                dynamicTest("All second level steps has passed statuses", () ->
+                        assertThat(testResult.get(0).getSteps().get(0).getSteps())
+                                .allMatch(x -> x.getStatus().equals(Status.PASSED))
                 ),
-                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
-                        .contains("Lambda expression in io.qameta.allure.awaitility.ConditionListenersPositiveTest")
-                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
-                        .contains("expected <3> but was <0>")
-                        .contains("elapsed time")
-                        .contains("remaining time")
-                        .contains("last poll interval was"),
-                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
-                        .contains("Lambda expression in io.qameta.allure.awaitility.ConditionListenersPositiveTest")
-                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
-                        .contains("expected <3> but was <1>")
-                        .contains("elapsed time")
-                        .contains("remaining time")
-                        .contains("last poll interval was"),
-                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(2).getName())
-                        .contains("Lambda expression in io.qameta.allure.awaitility.ConditionListenersPositiveTest")
-                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
-                        .contains("expected <3> but was <2>")
-                        .contains("elapsed time")
-                        .contains("remaining time")
-                        .contains("last poll interval was"),
-                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(3).getName())
-                        .contains("Lambda expression in io.qameta.allure.awaitility.ConditionListenersPositiveTest")
-                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
-                        .contains("reached its end value of <3> after")
-                        .contains("remaining time")
-                        .contains("last poll interval was")
+                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())
+                                .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())
+                                .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())
+                                .contains("io.qameta.allure.awaitility.ConditionListenersPositiveTest")
+                                .contains("reached its end value of <3> after")
+                                .contains("remaining time")
+                                .contains("last poll interval was")
+                )
         );
     }
 
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 6561331cc..4b27b17e6 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
@@ -20,20 +20,23 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DynamicNode;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.TestInstance;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+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;
 import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
 @TestInstance(TestInstance.Lifecycle.PER_METHOD)
 class GlobalSettingsNegativeTest {
@@ -83,8 +86,8 @@ void globalSettingsAwaitWoAliasCheckTopLevelBrokenStep() {
      * <li>2. All second-level steps should have passed or broken status for successful and timeout evaluations</li>
      * <li>3. All second-level steps should have information about polling intervals and evaluation</li>
      */
-    @Test
-    void globalSettingsCheckAwaitWoAliasSecondLevelTimeoutStep() {
+    @TestFactory
+    Stream<DynamicNode> globalSettingsCheckAwaitWoAliasSecondLevelTimeoutStep() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
                     final AtomicInteger atomicInteger = new AtomicInteger(0);
                     await().with()
@@ -94,26 +97,29 @@ void globalSettingsCheckAwaitWoAliasSecondLevelTimeoutStep() {
                 },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
-        assertAll(
-                () -> assertEquals(
-                        2, testResult.get(0).getSteps().get(0).getSteps().size(),
-                        "Exactly 2 second level steps for 2 polling iterations"
-                ),
-                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
-                        .contains("Lambda expression in io.qameta.allure.awaitility.GlobalSettingsNegativeTest")
-                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
-                        .contains("expected <3> but was <0>")
-                        .contains("elapsed time")
-                        .contains("remaining time")
-                        .contains("last poll interval was"),
-                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getStatus())
-                        .isEqualTo(Status.PASSED),
-                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
-                        .contains("Condition timeout.")
-                        .contains("Lambda expression in io.qameta.allure.awaitility.GlobalSettingsNegativeTest")
-                        .contains("expected <3> but was <0> within 1 seconds"),
-                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getStatus())
-                        .isEqualTo(Status.BROKEN)
+
+        return Stream.of(
+                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())
+                                .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("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))
         );
     }
 
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 d4e3fd666..da5f84137 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
@@ -16,10 +16,12 @@
 package io.qameta.allure.awaitility;
 
 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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DynamicNode;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -27,13 +29,14 @@
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+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;
 import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
 @TestInstance(TestInstance.Lifecycle.PER_METHOD)
 class GlobalSettingsPositiveTest {
@@ -59,7 +62,7 @@ void setup() {
      * <li>3. Top level step has default name</li>
      */
     @Test
-    void globalSettingsAwaitWoAliasCheckTopLevelPassedStep() {
+    Stream<DynamicNode> globalSettingsAwaitWoAliasCheckTopLevelPassedStep() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
                     final AtomicInteger atomicInteger = new AtomicInteger(0);
                     await().with()
@@ -69,19 +72,25 @@ void globalSettingsAwaitWoAliasCheckTopLevelPassedStep() {
                 },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
-        assertAll(
-                () -> assertEquals(
-                        1, testResult.get(0).getSteps().size(),
-                        "Exactly 1 top level step for 1 awaitility condition"
+
+        return Stream.of(
+                dynamicTest("Steps count", () ->
+                        assertThat(testResult.get(0).getSteps())
+                                .as("Exactly 1 top level step for 1 awaitility condition")
+                                .hasSize(1)
                 ),
-                () -> assertEquals(
-                        Status.PASSED, testResult.get(0).getSteps().get(0).getStatus(),
-                        "Top level step has passed status"
+                dynamicTest("Top level step status", () ->
+                        assertEquals(
+                                Status.PASSED, testResult.get(0).getSteps().get(0).getStatus(),
+                                "Top level step has passed status"
+                        )
                 ),
-                () -> assertEquals(
-                        "Awaitility: Starting evaluation",
-                        testResult.get(0).getSteps().get(0).getName(),
-                        "Top level step has default name because await() wo alias"
+                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"
+                        )
                 )
         );
     }
@@ -123,7 +132,7 @@ void globalSettingsAwaitWithAliasCheckTopLevelPassedStep() {
      * <li>3. All second-level steps should have information about polling intervals and evaluation</li>
      */
     @Test
-    void globalSettingsCheckAwaitWoAliasSecondLevelPassedSteps() {
+    Stream<DynamicNode> globalSettingsCheckAwaitWoAliasSecondLevelPassedSteps() {
         final List<TestResult> testResult = runWithinTestContext(() -> {
                     final AtomicInteger atomicInteger = new AtomicInteger(0);
                     await().with()
@@ -133,43 +142,56 @@ void globalSettingsCheckAwaitWoAliasSecondLevelPassedSteps() {
                 },
                 AllureAwaitilityListener::setLifecycle
         ).getTestResults();
-        assertAll(
-                () -> assertEquals(
-                        4, testResult.get(0).getSteps().get(0).getSteps().size(),
-                        "Exactly 4 second level steps for 4 polling iterations"
+
+        return Stream.of(
+                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())
+                                .extracting(StepResult::getStatus)
+                                .containsExactlyInAnyOrder(
+                                        Status.PASSED,
+                                        Status.PASSED,
+                                        Status.PASSED,
+                                        Status.PASSED
+                                )
                 ),
-                () -> assertEquals(
-                        4, (int) testResult.get(0).getSteps().get(0).getSteps().stream()
-                                .filter(x -> x.getStatus().equals(Status.PASSED)).count(),
-                        "All second level steps has passed statuses"
+                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")
                 ),
-                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(0).getName())
-                        .contains("Lambda expression in io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
-                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
-                        .contains("expected <3> but was <0>")
-                        .contains("elapsed time")
-                        .contains("remaining time")
-                        .contains("last poll interval was"),
-                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(1).getName())
-                        .contains("Lambda expression in io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
-                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
-                        .contains("expected <3> but was <1>")
-                        .contains("elapsed time")
-                        .contains("remaining time")
-                        .contains("last poll interval was"),
-                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(2).getName())
-                        .contains("Lambda expression in io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
-                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
-                        .contains("expected <3> but was <2>")
-                        .contains("elapsed time")
-                        .contains("remaining time")
-                        .contains("last poll interval was"),
-                () -> assertThat(testResult.get(0).getSteps().get(0).getSteps().get(3).getName())
-                        .contains("Lambda expression in io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
-                        .contains("that uses java.util.concurrent.atomic.AtomicInteger:")
-                        .contains("reached its end value of <3> after")
-                        .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())
+                                .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())
+                                .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())
+                                .contains("io.qameta.allure.awaitility.GlobalSettingsPositiveTest")
+                                .contains("java.util.concurrent.atomic.AtomicInteger:")
+                                .contains("reached its end value of <3> after")
+                                .contains("remaining time")
+                                .contains("last poll interval was")
+                )
         );
     }
 
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 6508d198e..f7ed171cb 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
@@ -26,8 +26,8 @@
 /**
  * @param <T> the enum's type
  * @author charlie (Dmitry Baev).
- * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
- * and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
+ * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature#ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link com.fasterxml.jackson.databind.DeserializationFeature#READ_UNKNOWN_ENUM_VALUES_AS_NULL}
  */
 @Deprecated
 /* package-private */ abstract class AllureEnumDeserializer<T extends Enum<T>> extends StdDeserializer<T> {
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 197a6c6d1..a83ba7c65 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
@@ -19,8 +19,8 @@
 
 /**
  * @author charlie (Dmitry Baev).
- * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
- * and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
+ * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature#ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link com.fasterxml.jackson.databind.DeserializationFeature#READ_UNKNOWN_ENUM_VALUES_AS_NULL}
  */
 @Deprecated
 public class ParameterModeDeserializer extends AllureEnumDeserializer<Parameter.Mode> {
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 0bea2076c..47858a16c 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
@@ -19,8 +19,8 @@
 
 /**
  * @author charlie (Dmitry Baev).
- * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
- * and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
+ * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature#ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link com.fasterxml.jackson.databind.DeserializationFeature#READ_UNKNOWN_ENUM_VALUES_AS_NULL}
  */
 @Deprecated
 public class StageDeserializer extends AllureEnumDeserializer<Stage> {
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 eb499add8..2500e65ca 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
@@ -19,8 +19,8 @@
 
 /**
  * @author charlie (Dmitry Baev).
- * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS}
- * and {@link com.fasterxml.jackson.databind.DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL}
+ * @deprecated in favor of {@link com.fasterxml.jackson.databind.MapperFeature#ACCEPT_CASE_INSENSITIVE_ENUMS}
+ * and {@link com.fasterxml.jackson.databind.DeserializationFeature#READ_UNKNOWN_ENUM_VALUES_AS_NULL}
  */
 @Deprecated
 public class StatusDeserializer extends AllureEnumDeserializer<Status> {
diff --git a/build.gradle.kts b/build.gradle.kts
index 28e57bf1e..d5439ce7d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -28,8 +28,9 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
 }
 
 
@@ -181,21 +182,26 @@ configure(libs) {
 
     tasks {
         compileJava {
-            options.encoding = "UTF-8"
+            if (JavaVersion.current().isJava8) {
+                java.targetCompatibility = JavaVersion.VERSION_1_8
+            } else {
+                options.release.set(8)
+            }
         }
 
         compileTestJava {
-            options.encoding = "UTF-8"
             options.compilerArgs.add("-parameters")
         }
 
         jar {
             manifest {
-                attributes(mapOf(
+                attributes(
+                    mapOf(
                         "Specification-Title" to project.name,
                         "Implementation-Title" to project.name,
                         "Implementation-Version" to project.version
-                ))
+                    )
+                )
             }
         }
 
@@ -209,6 +215,20 @@ configure(libs) {
             }
             maxHeapSize = project.property("test.maxHeapSize").toString()
             maxParallelForks = Integer.parseInt(project.property("test.maxParallelForks") as String)
+            jvmArgs = listOf(
+                "--add-opens",
+                "java.base/java.lang=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.lang.invoke=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.util=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.text=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.lang.reflect=ALL-UNNAMED",
+                "--add-opens",
+                "java.desktop/java.awt.font=ALL-UNNAMED"
+            )
         }
 
         processTestResources {
@@ -284,12 +304,12 @@ configure(libs) {
         }
         format("misc") {
             target(
-                    "*.gradle",
-                    "*.gitignore",
-                    "README.md",
-                    "CONTRIBUTING.md",
-                    "config/**/*.xml",
-                    "src/**/*.xml"
+                "*.gradle",
+                "*.gitignore",
+                "README.md",
+                "CONTRIBUTING.md",
+                "config/**/*.xml",
+                "src/**/*.xml"
             )
             trimTrailingWhitespace()
             endWithNewline()
@@ -303,7 +323,9 @@ configure(libs) {
     }
 
     tasks.withType(Javadoc::class) {
-        (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
+        (options as StandardJavadocDocletOptions).apply {
+            addStringOption("Xdoclint:none", "-quiet")
+        }
     }
 
     publishing.publications.named<MavenPublication>("maven") {
diff --git a/gradle.properties b/gradle.properties
index 1aa563c4c..ce0935d94 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ version=2.21-SNAPSHOT
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.warning.mode=none
-org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=512m
+org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m
 
 test.maxHeapSize=512m
 test.maxParallelForks=4

From ed8f7bfdee2d75b7ddd26627a591c1a47f493365 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Jan 2023 12:15:18 +0700
Subject: [PATCH 281/486] bump actions/checkout from 3.2.0 to 3.3.0 (via #869)

---
 .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 a0be430e7..984646994 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.2.0
+      - uses: actions/checkout@v3.3.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 a02def86b..3ccdaa8ea 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.2.0
+      - uses: actions/checkout@v3.3.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 acb68508f..c76e6c1c3 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.2.0
+      - uses: actions/checkout@v3.3.0
         with:
           token: ${{ secrets.QAMETA_CI }}
 

From dda6876ebea82ff7123495b73b42a5bf0ceef3b4 Mon Sep 17 00:00:00 2001
From: Pavel Novikov <prafair@yandex.ru>
Date: Tue, 7 Feb 2023 14:28:39 +0300
Subject: [PATCH 282/486] fix(junit-plaftform): fix missed steps in case of
 beforeall failure (fixes #443, via #878)

---
 README.md                                     |  2 +-
 .../junitplatform/AllureJunitPlatform.java    |  4 +-
 .../allure/junit5/AllureJunit5Test.java       | 36 +++++++++++++---
 ...ava => AfterEachFixtureBrokenSupport.java} |  2 +-
 .../BeforeAllFixtureFailureSupport.java       | 41 +++++++++++++++++++
 ...va => BeforeEachFixtureBrokenSupport.java} |  2 +-
 6 files changed, 75 insertions(+), 12 deletions(-)
 rename allure-junit5/src/test/java/io/qameta/allure/junit5/features/{AfterEachFixtureFailureSupport.java => AfterEachFixtureBrokenSupport.java} (95%)
 create mode 100644 allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
 rename allure-junit5/src/test/java/io/qameta/allure/junit5/features/{BeforeEachFixtureFailureSupport.java => BeforeEachFixtureBrokenSupport.java} (95%)

diff --git a/README.md b/README.md
index 169bc835f..567df89e6 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 # Allure Java Integrations 
 
-[![Build](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml/badge.svg)](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml) 
+[![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.
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 90b505280..5ff3384df 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
@@ -400,9 +400,7 @@ private void stopTestContainer(final TestIdentifier testIdentifier) {
                 .distinct()
                 .collect(Collectors.toCollection(ArrayList::new));
 
-        if (testIdentifier.isTest()) {
-            getTest(testIdentifier).ifPresent(children::add);
-        }
+        getTest(testIdentifier).ifPresent(children::add);
 
         getLifecycle().updateTestContainer(uuid, container -> container.setChildren(children));
         getLifecycle().stopTestContainer(uuid);
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 b1f457957..2ae6ecb78 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
@@ -21,9 +21,10 @@
 import io.qameta.allure.Step;
 import io.qameta.allure.aspects.AttachmentsAspects;
 import io.qameta.allure.aspects.StepsAspects;
-import io.qameta.allure.junit5.features.AfterEachFixtureFailureSupport;
+import io.qameta.allure.junit5.features.AfterEachFixtureBrokenSupport;
 import io.qameta.allure.junit5.features.AllFixtureSupport;
-import io.qameta.allure.junit5.features.BeforeEachFixtureFailureSupport;
+import io.qameta.allure.junit5.features.BeforeAllFixtureFailureSupport;
+import io.qameta.allure.junit5.features.BeforeEachFixtureBrokenSupport;
 import io.qameta.allure.junit5.features.EachFixtureSupport;
 import io.qameta.allure.junit5.features.ParameterisedBlankParameterValueTests;
 import io.qameta.allure.junit5.features.ParameterisedPrimitivesTests;
@@ -344,8 +345,8 @@ void shouldSupportStepsInAfterAllFixture() {
     }
 
     @Test
-    void shouldSupportFailureInBeforeEachFixture() {
-        final AllureResults results = runClasses(BeforeEachFixtureFailureSupport.class);
+    void shouldSupportBrokenInBeforeEachFixture() {
+        final AllureResults results = runClasses(BeforeEachFixtureBrokenSupport.class);
 
         assertThat(results.getTestResults())
                 .hasSize(1);
@@ -367,8 +368,8 @@ void shouldSupportFailureInBeforeEachFixture() {
     }
 
     @Test
-    void shouldSupportFailureInAfterEachFixture() {
-        final AllureResults results = runClasses(AfterEachFixtureFailureSupport.class);
+    void shouldSupportBrokenInAfterEachFixture() {
+        final AllureResults results = runClasses(AfterEachFixtureBrokenSupport.class);
 
         assertThat(results.getTestResults())
                 .hasSize(1);
@@ -389,6 +390,29 @@ void shouldSupportFailureInAfterEachFixture() {
                 );
     }
 
+    @Test
+    void shouldSupportFailureInBeforeAllFixture() {
+        final AllureResults results = runClasses(BeforeAllFixtureFailureSupport.class);
+
+        assertThat(results.getTestResults())
+                .hasSize(1);
+
+        final TestResult testResult = results.getTestResults().get(0);
+
+        assertThat(results.getTestResultContainers())
+                .filteredOn("name", testResult.getName())
+                .flatExtracting(TestResultContainer::getChildren)
+                .contains(testResult.getUuid());
+
+        assertThat(results.getTestResultContainers())
+                .filteredOn("name", testResult.getName())
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus, f -> f.getStatusDetails().getMessage())
+                .containsExactly(
+                        tuple("setUpAll", Status.FAILED, "Make the setUpAll failed")
+                );
+    }
+
     @Step("Run classes {classes}")
     private AllureResults runClasses(final Class<?>... classes) {
         final AllureResultsWriterStub writerStub = new AllureResultsWriterStub();
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureFailureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
similarity index 95%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureFailureSupport.java
rename to allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
index b70b1f919..eacb46a00 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureFailureSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java
@@ -22,7 +22,7 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-public class AfterEachFixtureFailureSupport {
+public class AfterEachFixtureBrokenSupport {
 
     @AfterEach
     void tearDown() {
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
new file mode 100644
index 000000000..d34b07973
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java
@@ -0,0 +1,41 @@
+/*
+ *  Copyright 2020 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.junit5.features;
+
+import io.qameta.allure.Allure;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.fail;
+
+/**
+ * @author prafair (Pavel Novikov).
+ */
+public class BeforeAllFixtureFailureSupport {
+
+    @BeforeAll
+    static void setUpAll() {
+        Allure.step("setUpAll 1");
+        Allure.step("setUpAll 2");
+        fail("Make the setUpAll failed");
+    }
+
+    @Test
+    void test1() {
+        Allure.step("test1 1");
+        Allure.step("test1 2");
+    }
+}
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureFailureSupport.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
similarity index 95%
rename from allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureFailureSupport.java
rename to allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
index 6d7e960cb..9bd91d4c4 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureFailureSupport.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java
@@ -22,7 +22,7 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-public class BeforeEachFixtureFailureSupport {
+public class BeforeEachFixtureBrokenSupport {
 
     @BeforeEach
     void setUp() {

From 04278aeceb1cd156a2c949b936d40c97af5861d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 18:31:53 +0700
Subject: [PATCH 283/486] bump protobuf from 3.21.9 to 3.21.11 (via #863)

---
 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 2c8de43ce..909425d92 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.51.0"
-val protobufVersion = "3.21.9"
+val protobufVersion = "3.21.11"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")

From b7de5400e96f235b9f55e6e4f35a1a559b2a9008 Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Tue, 7 Feb 2023 11:38:00 +0000
Subject: [PATCH 284/486] release 2.21.0

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

diff --git a/gradle.properties b/gradle.properties
index ce0935d94..5ec8479dc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.21-SNAPSHOT
+version=2.21.0
 
 org.gradle.daemon=true
 org.gradle.parallel=true

From 91c20cb8dd0f6e51265f087b0b1ff61c6f6d0baf Mon Sep 17 00:00:00 2001
From: qameta-ci <qameta-ci@qameta.io>
Date: Tue, 7 Feb 2023 11:38:01 +0000
Subject: [PATCH 285/486] set next development version 2.22

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

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

From 7bf5c2a5ee1caa4aafa38e972c6987650ba63a20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Feb 2023 16:45:18 +0700
Subject: [PATCH 286/486] bump com.codeborne:selenide from 6.10.2 to 6.11.2
 (via #880)

---
 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 a22ee1d0d..641605ec6 100644
--- a/allure-selenide/build.gradle.kts
+++ b/allure-selenide/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Selenide Integration"
 
-val selenideVersion = "6.10.2"
+val selenideVersion = "6.11.2"
 
 dependencies {
     api(project(":allure-java-commons"))

From e84881da70cd0ce76a0faea400d2dd09bceb7891 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:02:54 +0700
Subject: [PATCH 287/486] bump org.mockito:mockito-core from 4.6.1 to 5.1.1
 (via #881)

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

diff --git a/build.gradle.kts b/build.gradle.kts
index d5439ce7d..a1acd27c6 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:4.6.1")
+            dependency("org.mockito:mockito-core:5.1.1")
             dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")
             dependency("org.slf4j:slf4j-nop:${orgSlf4jVersion}")
             dependency("org.slf4j:slf4j-simple:${orgSlf4jVersion}")

From 679ac070573a917c87e7cc8eeaf1923f2afc1abe Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Thu, 23 Feb 2023 13:02:20 +0700
Subject: [PATCH 288/486] update idea project icon

---
 .idea/icon.png | Bin 8689 -> 5367 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/.idea/icon.png b/.idea/icon.png
index 621c0930b2d6455a9e6822a898d5d586c2accb90..2529946575bf8d5cf9009230b091f89af54a317a 100644
GIT binary patch
literal 5367
zcmV<T6bS2yP)<h;3K|Lk000e1NJLTq002w?002w~1^@s6$Cptn00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH6pTqkK~#7F)m(jW
zT-9|y=f2ghuw=6~Ha5oKr(mZkGr-CLV)Ic;4NX!L3QRNUFdb||()`hMYI)j{NoeXd
zorcMz8DajYJDDjKG?}(DX)&cUowg}jw=~c+wWTC5e8ko|*qHEPufMP??YlSU+^=`v
z?n;&|SttkA_r3e>zIX3$f9K<#d!G<K0Eq`T7jro%Ng;1QP$h{_M1>`H8I%G*glm5G
zJ}f#uR=xANpVw{~uGOTJ!)-#0)DeesqoYGz)oKl9SrBGPR{i(p9*OmP0L6MbEh$0;
z85I@_P)kv!m!Ek49k_q@8*1r$V}vn%f!ibQp{v6Rarf$1Ua7z=$VCNg_4Auc3Cg=^
z(0%lzqJ1J^1?L8;g)Dn_48HO8m#93ebcGQ5%ZLm;R_Sm6q<pgLl~<~8k>sKP#%xkT
zZId9^n}?*RphfJwMA`Oq8v+Y<Zu_z7Jd+?AmMJudIpBCu14$HZ?;0Aa!VJrd0%m|p
zwh@7PG7mwcMNMKE#+_&hVaUMX`2J@O!Nz9}^L>>ANnazzaSIeep?U6;5y18<W)Qd;
z0gR2f$S3`DyUk&}vedu^z026I3y{wD6ZrO*hE(UMLJJJrG$f$(^{}+p2Sk$02yg<X
zDc8KPag%71BN?#J5XPv70Y*VevGWGYebpAH=0&jo>Q1x<3^HIbc=p-u+jO#7wY5EW
z<mQ_<!8GN90b^Eu==+=cm4pF>>QYF%2dPnq&~{~k3sp1(q?K;+SG7u}Rr{}==hRtc
z@JB=kmj1z5O-;L)s&>6~(@p&_4Y?q|2&@?Mavu$%Pj}3R2l^yrleh0mTQQ{s3O5=+
zhkzR}!o)_Rft1WLZTm3g5;_30?KPmz*r_P$du!dgkt1u@#&7|0-hdHUB~rnC{EK;D
z*rxOU=x!>|b(`3iQBSF)N=Gs^Z)vEhn(OGE!l<C~hClF_{@gx4@T9SbqQSRsxupc>
zDdz<kdqDzg(8W~zXbqGyU2*L+5S}!ieU?)VRB5G}4We3HzvhiIt|nDM2F`-#_-n4A
z?MeD*1`WjdgEnQrbfhjUSmC%7qBHWQ)0s|X?vY_s5L@~4$$Wuh3`ytdI+R{NWzCgQ
zH|HrGd@6W82CD9v#}zy!%jE{&?&+B_Xj1}=)sQ0gr_;_u;0eJPchvuCx;a%<6H&%}
zF}$1sYhvK|%B?>-4xMMDc|@vy2&o!^HkBTjjEaKey=7l<T+SQ(&b7Oy1ll<PV*@Yp
z@@W*%+7qUA=;}~ekJtjQ(C%f}m1&y|BSKmF-dWi6FK>B}eBcUxiezu^yrfl5OjXoc
zHGkYL-Y+hnci^AO@xB<&A(H}T0#Z^#ok0k7Ef{?253^u^R|(}jWOl-x(cLV=RQ5R@
zESeVefAe*<?7cDnJ?9mzhfM1+7#gNdLKhsfHK^!EI`?)-0Z;eE`-(7$ObVFDD~?&>
zOr`gKzJyE}oGIrZ{cj(5EJ#C*CMIFC{VTn8iokkJXDeLzAdE_)15E|S-9H&HYqx?9
zhxG+93QO{bOY;S6gGppUV-Y`p|7LR8yF54zD(KjvOVefa?Hb$bsiXpq!E{uC0Oy>9
zQ~QoH39NeKefaJFd>d{ZJ^{i7sTO<TrbOA0!86R+F|-sDb~X^&G=akZK>z;k@4!nZ
zZv+a)d;Yw-X3vxXvv!L;;!2RtKbt|DASVlmpEEk(OeJs(7Do6kmq1wz-<~=*OarT+
z#9<nKwVoTTy88}(?nlMCl*N25cLP1UL|-V;pl^UQ*3y$~u+e-oXxU@^Gl}$AL|Fj;
z?VZoU%LEuzjGU0L=CNvbQ-U(r3NV^T6D={e2$?}EkCbvo-9oNFTD?#j6#bv15Y>YV
zsUy&EDy*S|$7OD8pnBWiS78F_N)IdUV5C%vX_(CZO&m*M%DN0dp~_(ZnCrBgaDeSE
z_wvN}LR%-h<_p29xwWxRO$@W_8fnNVm>g$dC|R{yF{ts_eA}`O#X%xPdH=eno`e~Y
zLu=M-roL<g1`e~~gH}ldpSj3d(#E!?tA91}h&rp<oy!H0Kv%iiT@9bvWb~uF+7%Ae
z&&)6wyz+J^bxbM?R%Y77U`c#jUV_~-1s2PSy?Y17lBAm+{8%#}ka}KY?^2ev0E=xG
zgT?1UL<(75+jCDeJ~P8GAI+y%m7|ukU!FbonrViOJ~Fg%Ra(4wpnChaD{v9z@Xa^h
zL!k5%qhfEX_yXs|5Ce}1-XWM=fdTh#-uN<{l$QZ$8z+=TSgWn*E&t?KEABZNhEZC1
ziw`!nZ8E=sKJ_LjJAZ5fOW!B}ONic!4HnClKls6J>Pjy^)AtCofvjPj@rof>FV;Q@
zCt)#Qjxrz-<!Gq{Vi>bb<i(coIexItc1_r$&`a8LT{cJjhF-KNA;$=;-hnF2qHx-V
zGZA`n?N}uy@|pnud-9X;;>k~ecO2YSvn(Q(u`3lycAQ*Pt{9K$8HR1L+_DEQbz?(B
zKTp)tnP#V9j5``;%`#XlSG@RQb?@m<_wGG)$FY=E=%+=_E1sw?f`5GX58%a98<b&F
zq(qxx7c&iV)LI`4%#9U2%lv@5{%7L|oy4v3?LL&i;2eCo9(rpHrbxuE|Md2O3VeX_
z)p+mvOY=u7R~Gie<%Kt4asEwhqsG)cbztmzJT$h7I!eY}XbNgJxha!2_!+ig_2K_o
z*#%&S>WqCDT!vA2<6=h3C_k0*fm@&24s$@Zt=iX5-R#qY7HQ;9D3KR51kfu?!kS_Y
zkTBGs5^TxWrBJ<J{oYj-t&$Se-CPEMm?x@cu)<>>(59EFa|J9GtiyI}i;hvwi;Otg
zB>NF<ga8|Ks;3gQN@{~Iv<f;^<Wl4!qz^U8ujhN(r54p=N@$S>20tANbM-bQZL$z9
zybw@^IV5GC+T_IJG<ZlsNCBd2)+0tL1Wngd9R}CPTlVlhkyALBPmb!7lsRy&e7kRx
z#$3#<E|_CdF6}D{(RqNVvC!G1)IM38<<!+B9etZrjj66SilU2IS#l0H$dp3MY-zwU
zsZ=&VRcZ&!K`9Rr%Y@j0Il~-uOiEQyf0#wYrtI}xrfqRv8^k$@Ny+KngmXbB3cRbd
z4SjoBzS<3QRH8OfQBgL|%CO93Fnk#>PNcD$ibRhfml2=Gvu#XfCz*O)NwaXNhO6sl
zKjxaMJp4k}9%4&1Wlq2zwojgEblzsJL2x~_Z^SUt?dzRtHF-qmEYs-{@N~(A_;x9h
z6I^>>jtdQZ4>2bWY?4h?yJJk}o$Lxjra5IJa^+~;3$+G<O+bJH$VB%LE($6)`PQH@
zv+PC&7=gJix!e#9ep9MqU;z;xAk3(zfW~<YRj<sEM#V1q=Qj3nLQt=XW*O!pR7_Wm
zl*^_M!yFgP7e-LkQ)YP<ncSIY83v4Mx(O7CVX7!4Pkl@?Wmo*uj0E^4h7=!Va)J&#
z300WmA|p7MBO?SE<8F<=oeHtIR8~t-1ei)>YQI#dk~WA4cxkppD4Wt%wk<V0i!j%P
zAgSrFK{R_y2&aM0p+U<r5yKJ{ESxod5g@Y_$qH{M;YUf2>^RJMY1f-%tZl*o50@Y{
z$2Psul4*tfNuXp8hXoS2REc61QR&Z>Uf|L7l92*cmwb-gR)d`=_+^mIA733a!wjp!
zE9iE#KzM<|rKWo<n17fcPv9Vf1a%rb1Cp2$6X3l`8W;u;Tq!kp24og$Ux!=_zXY;k
z`42;*3|Uod1gKdhmn?df0b|w>Fq%;ejO25|!!S-WNIK>@u(%!^^SFK`%yAj3)l1i|
z-t8mJW@)Tz)||C#c7l+J9MS+t!z|CBx=}Z$icpu#I0g#&noJT6FcQPCo^-<;7kM@z
z!2TJQT=ptVxOu}%v(aa;7j(YK43jl&v$V=NMv>QKVc_UovL_|n0^7!Ij4d<eZ^0ZF
zSx?q;dDk6VwDE3M%YacC&#B0E9U^x9wLTNH0zC|&>gi)bp|0&$YTW%bWx@?>*E9>2
zjN@JR#4tx?<SQK|3L|1ZW|n+r!{-QuBlapbl#s!W8TpwFpV!}G5yY2$nl=7ofsxM0
zXAQowU(Wb@;K=aTH^Us2BuchWG~r<|AUsHF_KdA*wpWG1DOlUR(|~KiVnJd?v0hL|
z!S5e5cR(HdgOB!A5bZZU!!D8>KaHolY7bOq{SC8o$^P;sBT+tzuUxmR>Dt+``EcmS
zP4LdqU(x4<{0Z`guMw!PSk=vn=HZIJy=#yF=>fOVG@NkDH0K4uj(C+ub#89Sb$v&^
z@UL?!kvQ@f9h=EfJwYjET>i18FkLY@{kqztV=?xCLCodjuGEgHPz_z+>e>+{%f($i
zMVKQp@@SFLIj~Jc80^-Wo>;)3VuDobEp6m)yr436%m%g2lR8`HJf;P>SU6qS26IHB
zHYn37I7Rpr$IlR8{w~YEwc(h41x7lj>eKsPMNR%tsdgy9<+vC>99;topcC>c52I=n
zUQZ6dA^9d8A3xsv*4FP;-~*H+JBphUeyzt$?G)0|+S1Zun67xhmhJphnNAElQX7_L
zUG3`k&G{1CR#>Y+O3d^~e<ZU|JJ1AvGX8SybaJ|T_tvjh;RBE(JBzWZ3-bP|=rn=W
zBH{AuFN5id-&-*{I{KIkCDH&@hZ)M*tlucChdT;A8Z6dWw_V)sv+(7$(MO6O&2<l!
z`~NP6S(al2mcVFG<giE|rMEprynqcek|pqf)wWh@l!>V5^)nv1Hu8WjK>fACI=HdW
zZ7=gTOsUWH^it{xtOJccF?Eta+ZDqs$+2C_;(8%ZV2PDzGOMV;ih#EUz)VPX2clHl
zouSu>MQh-fiY0LSCF?Ak3@}of670JlpnZc?PYWD@83W`8|MV}Px(6<@9Q)4FyHx~x
z$s?}Rn-?@-ywu1n699-af>_f{mVWc&gEZRp0Dk!!H!ivluF75MZIudMRY;@(P09c$
z?PXP_J)J(*R!?@6zx+TIW>AhjT`Wdp9oy*neVXacgF7#7GcCNKWYLGGAMrHpamBG@
zyD}*sy()AmEKpast+3|GAgCNb4h*R>#$N^Ju07Rlp-lGRLtlGh6U=}ddpa(je)j5Z
zIhcO{a<B#MB8H2(?6Fow28+rWv0*J~y5!NGe&j!$KqFmQxEk+Ya-Rl5S|jhhqcke&
z?U-kiOhNQ@sV9{xsgixHj3=<;vGNy&;5_8af2^X_XSqHZSABHDqR$eOy_G(WG<DJj
z+gvhm#jXV~U1^=^FZUGlk=jS2TX|i_b$HjJ4e7ueRjnbkXe?QhjEd?sEgFZR!LHIk
zD^xjDAFmJ7m}}qKutU#B$DyrA;KUNdN-9fqw;uW-S9%~Aq`Ec<O4d!PN%vEGcVP9j
zfw$S&d}%x%E(%~Qi_5q55SgF5zVkZ#^rGMNEO8#Ok!jj~g<t|$^_1T6nsYro%-B0B
zZ(p$wu3NGnRxLaX=M=`k0cCS?43d<dQO<^;V;~!!1y{|Vw&9N^y6}GGXVrN<G5x}7
zZK<Oa82SbqC9`o@>kofTV$cSiO<dmj4s5ycA7IVW*I>~lC*AbFNit3@U9Z6OdU%#D
zZUcbZX^4ddd6=$D`Zik~#P%a&KOY*EXHuhYb3Un2SDt+=8AI=nrBy-Y*~L^_-ti9n
ze)o4_QTvHtq}e|BH{a~NTrMSR)YFw~eQtK@Af^rgITnK%kVyfnl`FLz<nI0P>6fZL
z<_dsvjB(CDdbLf}&@j+OYdXiKr>Ck|H~|k__bgnJI}42fsW8_ToY=e^h7|@hFrF~|
zWI)qxW;9zdiM&;=R1cm$c<-5Hw5GyokW2ybKsuXdclH=trVPWR3wrsx34WsM1z6aA
zyy<zyKEo8nY`FJqGi*{KO4-L{@ZQX{WlHaSfB)fup?2BcOJlD2NFKt{G7F5C3g?y5
zUP$enB%n^fP0L<x`7CTYpLm?1dTMZZ?iiU3zb+OFV=|Zlnety1c<77w4oR8x(!gtJ
zcmYAsYCIx~0T3KgDD52HdB!Wr&`(v=B&Nrxr`1{enuiefeWHL}T0Lh=B|~}mi=Q1D
zA5Xez<W=hh0=ou5=%MW$ruI&vStc-TuIPB%-*YksolDGqt6)34-e6+w8iN-Fk^gL}
zWGLmW_f-iGW?I$6P@o#a2oq?_rtm`A6nAL5CS%Z4)Um0a(>U5IdUh$H_vFvAN`}Iq
zmAC$G7j<oiW>4x3t*x@`l0LLhcB_>3l1I;^Q<RB7F&U!PW3=xcYI;HFQ;kJ4>1eiP
zmRX#&P}8BZf3B)t@LzXgdE}4p@8fqNd3vKGEFEWMLk|<!s~~m*b@;^MV2n0?YwBEU
zNrA)$En|!3?1bIXB+O<xZS;j0p|4GA36LHzJ-}GL_Rs?ZMn&Oq$1JH*&*)PvY1o0U
z9=!t2)Y~&4O$HFOY-ioFw_({5(RoLZB2xYBqiPLxV_HjqDAd5rxDG2{dUR)8uZuDP
zw8`emln0Gpn-4M?8&>@v+`0OPFg<bV=(jnCPJn;1N)D0-vA0^~iZg?8Oo8}bI$Q|n
zDWr}gx!(OBno+=<^p$tU)Y)>9$c<*+C~cO)PLT*Sj_|*7+jrrzc_(4|;(;<MiTDg1
zJ>J&)(@JB@vB6b+)bPCj=o$fbF9Ejuq5$TkuiQ_J%iT>YNt_LhRgfnmQ3Mul{n)e9
z0u9Y>4|XP1Qo<*5P~Sm}n$%W}53VXx@n-;2as=GjM+p2fOz{gdBER=1{Us1;y-JdM
z2(a~Rv6*v=J5J%9tN$O?t#~!l9`*YY<}Km|Z|P2I#Hk^|eh(e*X~m|=gqcRS`a^n7
z46SkCZAw+5>x1FFXAQ7M`TQS!qlY?k1Hl&4Y3ZX^?1!~0UX7P^952qxpDoU7)06TV
z4X8$d@$1Ocd3BH=<aYvw+F-nTE+(Bz*rr7gao%qu_klh|%hVwya8H{Yf3oozzW|Ud
V1`go#r&$01002ovPDHLkV1nt%AA$e?

literal 8689
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
P00000NkvXXu0mjf-tvaF


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 289/486] 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 290/486] 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 291/486] 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 292/486] 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 293/486] 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 294/486] 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 295/486] 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 296/486] 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 297/486] 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 298/486] 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 299/486] 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 300/486] 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 301/486] 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 302/486] 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 303/486] 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 304/486] 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 305/486] 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 306/486] 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 307/486] 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 308/486] 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 309/486] 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 310/486] 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 311/486] 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 312/486] 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 313/486] 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 314/486] 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 315/486] 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 316/486] 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 317/486] 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 318/486] 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 319/486] 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 320/486] 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 321/486] 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 322/486] 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 323/486] 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 324/486] 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 325/486] 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 326/486] 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 327/486] 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 328/486] 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 329/486] 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 330/486] 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 331/486] 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 332/486] 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 333/486] 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 334/486] 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 335/486] 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 336/486] 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 337/486] 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 338/486] 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 339/486] 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 340/486] 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 341/486] 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 342/486] 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 343/486] 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 344/486] 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 345/486] 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 346/486] 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 347/486] 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 348/486] 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 349/486] 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 350/486] 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 351/486] 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 352/486] 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 353/486] 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 354/486] 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 355/486] 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 356/486] 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
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
Py&qIq5D-Lb|5*PA>zeod

delta 9041
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

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 357/486] 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 358/486] 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 359/486] 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 360/486] 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 361/486] 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 362/486] 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 363/486] 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 364/486] 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 365/486] 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 366/486] 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 367/486] 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 368/486] 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 369/486] 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 370/486] 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 371/486] 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 372/486] 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 373/486] 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 374/486] 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 375/486] 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 376/486] 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 377/486] 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 378/486] 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 379/486] 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 380/486] 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 381/486] 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 382/486] 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 383/486] 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 384/486] 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 385/486] 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 386/486] 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 387/486] 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 388/486] 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 389/486] 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 390/486] 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 391/486] 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 392/486] 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 393/486] 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 394/486] 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 395/486] 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 396/486] 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 397/486] 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 398/486] 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 399/486] 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 400/486] 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 401/486] 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 402/486] 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 403/486] 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 404/486] 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 405/486] 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 406/486] 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 407/486] 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 408/486] 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 409/486] 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 410/486] 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 411/486] 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 412/486] 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 413/486] 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 414/486] 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 415/486] 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 416/486] 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 417/486] 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 418/486] 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 419/486] 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 420/486] 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 421/486] 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 422/486] 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 423/486] 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 424/486] 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 425/486] 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 426/486] 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 427/486] 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 428/486] 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 429/486] 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 430/486] 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 431/486] 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 432/486] 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 433/486] 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 434/486] 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 435/486] 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 436/486] =?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 437/486] 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 438/486] 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 439/486] 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 440/486] 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 441/486] 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 442/486] 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 443/486] 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 444/486] 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 445/486] 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 446/486] 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 447/486] 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 448/486] 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 449/486] 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 450/486] 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 451/486] 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 452/486] 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 453/486] 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 454/486] 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 455/486] 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 456/486] 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 457/486] 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 458/486] 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 459/486] 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 460/486] 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 461/486] 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 462/486] 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 463/486] 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 464/486] 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 465/486] 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 466/486] 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 467/486] 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 468/486] 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 469/486] 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 470/486] 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 471/486] 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 472/486] 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 473/486] 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 474/486] 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 475/486] 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 476/486] 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 477/486] 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 478/486] 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 479/486] 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 480/486] 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 481/486] 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 482/486] 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 483/486] 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 484/486] 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 485/486] 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 486/486] 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")