From f63a4a2961aeb1c1099087e8566eb2090bd2e578 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jun 2025 11:01:27 +0000
Subject: [PATCH 1/2] build(deps): bump net.sourceforge.pmd:pmd-java from 7.4.0
 to 7.15.0

---
updated-dependencies:
- dependency-name: net.sourceforge.pmd:pmd-java
  dependency-version: 7.15.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c910c789..5487fa1a 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}")

From c25a5e1697e802c7712254a5d7af3d6cbb40d44c Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Thu, 10 Jul 2025 14:05:44 +0100
Subject: [PATCH 2/2] fix pmd

---
 .../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 +--
 gradle/quality-configs/pmd/pmd.xml            | 64 ++++++-------------
 49 files changed, 111 insertions(+), 167 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 e097b881..5c6d09f3 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 46726113..99129f89 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 355f6d78..2b6f5b1a 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 75cda2e9..a51052cf 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 2369e10f..d606af57 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 8998226d..b5a5d429 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 a0ed3c28..fbcbb3f1 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 f7fc242e..7b7a0f0e 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 64548762..95d11ab5 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 6dd1dacf..19e1fbb1 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 94247a99..0ac417ea 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 9d7c89b3..cbb3e724 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 a5ffd094..03585b09 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 caf8612d..35fc4977 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 39eeb721..4d05ead6 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 ffd2a9b3..15d4629e 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 f4e53c93..eb515ea3 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 43297a28..de2cdd03 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 9ea66a2f..d059716f 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 4cd1ce35..ba96ddd3 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 445d8b2c..14148899 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 8b3b8cdc..f436de66 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 bea1d4dc..b6b6c4fb 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 b3e490bf..765aa142 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 5ae89b1e..3f1c7239 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 d74a3107..d082a4bc 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 d241a468..efc96605 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 ba129a46..5b68c1d0 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 f20f935e..e38c7f36 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 8d8acd47..3c9a2cfb 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 137e24df..352cf2a4 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 166933c1..348f7c97 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 b652feb0..e2eee439 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 7413d70a..8b785649 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 f6eb0f1f..ac5688a4 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 b8350002..b4645051 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 77222821..6b773b11 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 63d64078..05051833 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 4b043d41..92f0be89 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 8fdd9523..645e03fc 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 c225a6c2..52caf387 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 4826eb0e..b8f72ad7 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 bb784fb0..6cdfcc22 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 5822a102..a6434ea2 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 6ef5a51d..f29578dd 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 c0ae1667..8798e1f4 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 c282ce88..2ccd7b41 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 ebbc0a63..41b7c362 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/gradle/quality-configs/pmd/pmd.xml b/gradle/quality-configs/pmd/pmd.xml
index adc57b64..a3c7ca8b 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"/>