Merge pull request #28 from reportportal/develop

Release
reportportal · Jan 24, 2024 · 36f4741 · 36f4741
2 parents 84fa742 + 33d1051
commit 36f4741
Show file tree

Hide file tree

Showing 36 changed files with 70 additions and 23 deletions.
diff --git a/agent-allure-cucumber/CHANGELOG.md b/agent-allure-cucumber/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Agent version updated on [5.2.0](https://github.com/reportportal/agent-java-cucumber/releases/tag/5.2.0), by @HardNorth
 
 ## [5.1.1]
 ### Changed

diff --git a/agent-allure-cucumber/build.gradle b/agent-allure-cucumber/build.gradle
@@ -18,8 +18,9 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-cucumber:5.1.4'
+    api 'com.epam.reportportal:agent-java-cucumber:5.2.0'
 
+    testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
     testImplementation "io.cucumber:cucumber-java:${project.cucumber_version}"
     testImplementation "io.cucumber:cucumber-testng:${project.cucumber_version}"
     testImplementation 'org.testng:testng:7.1.0'

diff --git a/agent-allure-cucumber/gradle.properties b/agent-allure-cucumber/gradle.properties
@@ -1,4 +1,4 @@
 name=agent-allure-cucumber
-version=5.1.2-SNAPSHOT
+version=5.2.0-SNAPSHOT
 description=Report Portal - Allure integrations for Cucumber
 cucumber_version=1.2.6
diff --git a/...allure-cucumber/src/main/java/com/epam/reportportal/cucumber/AllureAwareStepReporter.java b/...allure-cucumber/src/main/java/com/epam/reportportal/cucumber/AllureAwareStepReporter.java
@@ -30,6 +30,10 @@
 
 import static com.epam.reportportal.cucumber.AllureAwareReporter.*;
 
+/**
+ * @deprecated Use {@link AllureAwareScenarioReporter}, since the semantic of this class is completely broken and will be removed
+ */
+@Deprecated
 public class AllureAwareStepReporter extends StepReporter {
 
 	private static final Map<Maybe<String>, String> DESCRIPTION_TRACKER = new ConcurrentHashMap<>();

diff --git a/agent-allure-cucumber2/CHANGELOG.md b/agent-allure-cucumber2/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Agent version updated on [5.2.0](https://github.com/reportportal/agent-java-cucumber2/releases/tag/5.2.0), by @HardNorth
 
 ## [5.1.1]
 ### Changed

diff --git a/agent-allure-cucumber2/build.gradle b/agent-allure-cucumber2/build.gradle
@@ -18,7 +18,7 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-cucumber2:5.1.5'
+    api 'com.epam.reportportal:agent-java-cucumber2:5.2.0'
 
     testImplementation "io.cucumber:cucumber-java:${project.cucumber_version}"
     testImplementation "io.cucumber:cucumber-testng:${project.cucumber_version}"

diff --git a/agent-allure-cucumber2/gradle.properties b/agent-allure-cucumber2/gradle.properties
@@ -1,4 +1,4 @@
 name=agent-allure-cucumber2
-version=5.1.2-SNAPSHOT
+version=5.2.0-SNAPSHOT
 description=Report Portal - Allure integrations for Cucumber 2
 cucumber_version=2.4.0
diff --git a/...llure-cucumber2/src/main/java/com/epam/reportportal/cucumber/AllureAwareStepReporter.java b/...llure-cucumber2/src/main/java/com/epam/reportportal/cucumber/AllureAwareStepReporter.java
@@ -31,6 +31,10 @@
 
 import static com.epam.reportportal.cucumber.AllureAwareReporter.*;
 
+/**
+ * @deprecated Use {@link AllureAwareScenarioReporter}, since the semantic of this class is completely broken and will be removed
+ */
+@Deprecated
 public class AllureAwareStepReporter extends StepReporter {
 
 	private static final Map<Maybe<String>, String> DESCRIPTION_TRACKER = new ConcurrentHashMap<>();

diff --git a/agent-allure-cucumber4/CHANGELOG.md b/agent-allure-cucumber4/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Agent version updated on [5.2.0](https://github.com/reportportal/agent-java-cucumber4/releases/tag/5.2.0), by @HardNorth
 
 ## [5.1.1]
 ### Changed

diff --git a/agent-allure-cucumber4/build.gradle b/agent-allure-cucumber4/build.gradle
@@ -18,7 +18,7 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-cucumber4:5.1.4'
+    api 'com.epam.reportportal:agent-java-cucumber4:5.2.0'
 
     testImplementation "io.cucumber:cucumber-java:${project.cucumber_version}"
     testImplementation "io.cucumber:cucumber-testng:${project.cucumber_version}"

diff --git a/agent-allure-cucumber4/gradle.properties b/agent-allure-cucumber4/gradle.properties
@@ -1,4 +1,4 @@
 name=agent-allure-cucumber4
-version=5.1.2-SNAPSHOT
+version=5.2.0-SNAPSHOT
 description=Report Portal - Allure integrations for Cucumber 4
 cucumber_version=4.8.1
diff --git a/...llure-cucumber4/src/main/java/com/epam/reportportal/cucumber/AllureAwareStepReporter.java b/...llure-cucumber4/src/main/java/com/epam/reportportal/cucumber/AllureAwareStepReporter.java
@@ -31,6 +31,10 @@
 
 import static com.epam.reportportal.cucumber.AllureAwareReporter.*;
 
+/**
+ * @deprecated Use {@link AllureAwareScenarioReporter}, since the semantic of this class is completely broken and will be removed
+ */
+@Deprecated
 public class AllureAwareStepReporter extends StepReporter {
 
 	private static final Map<Maybe<String>, String> DESCRIPTION_TRACKER = new ConcurrentHashMap<>();

diff --git a/agent-allure-cucumber5/CHANGELOG.md b/agent-allure-cucumber5/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Agent version updated on [5.2.0](https://github.com/reportportal/agent-java-cucumber5/releases/tag/5.2.0), by @HardNorth
 
 ## [5.1.1]
 ### Changed

diff --git a/agent-allure-cucumber5/build.gradle b/agent-allure-cucumber5/build.gradle
@@ -18,7 +18,7 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-cucumber5:5.1.4'
+    api 'com.epam.reportportal:agent-java-cucumber5:5.2.0'
 
     testImplementation "io.cucumber:cucumber-java:${project.cucumber_version}"
     testImplementation "io.cucumber:cucumber-testng:${project.cucumber_version}"

diff --git a/agent-allure-cucumber5/gradle.properties b/agent-allure-cucumber5/gradle.properties
@@ -1,4 +1,4 @@
 name=agent-allure-cucumber5
-version=5.1.2-SNAPSHOT
+version=5.2.0-SNAPSHOT
 description=Report Portal - Allure integrations for Cucumber 5
 cucumber_version=5.7.0
diff --git a/...llure-cucumber5/src/main/java/com/epam/reportportal/cucumber/AllureAwareStepReporter.java b/...llure-cucumber5/src/main/java/com/epam/reportportal/cucumber/AllureAwareStepReporter.java
@@ -32,6 +32,10 @@
 
 import static com.epam.reportportal.cucumber.AllureAwareReporter.*;
 
+/**
+ * @deprecated Use {@link AllureAwareScenarioReporter}, since the semantic of this class is completely broken and will be removed
+ */
+@Deprecated
 public class AllureAwareStepReporter extends StepReporter {
 
 	private static final Map<Maybe<String>, String> DESCRIPTION_TRACKER = new ConcurrentHashMap<>();

diff --git a/agent-allure-cucumber6/CHANGELOG.md b/agent-allure-cucumber6/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Agent version updated on [5.3.0](https://github.com/reportportal/agent-java-cucumber6/releases/tag/5.3.0), by @HardNorth
 
 ## [5.1.1]
 ### Changed

diff --git a/agent-allure-cucumber6/build.gradle b/agent-allure-cucumber6/build.gradle
@@ -18,7 +18,7 @@ sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-cucumber6:5.2.0'
+    api 'com.epam.reportportal:agent-java-cucumber6:5.3.0'
 
     implementation "io.cucumber:cucumber-gherkin:${project.cucumber_version}"
 

diff --git a/agent-allure-cucumber6/gradle.properties b/agent-allure-cucumber6/gradle.properties
@@ -1,4 +1,4 @@
 name=agent-allure-cucumber6
-version=5.1.2-SNAPSHOT
+version=5.2.0-SNAPSHOT
 description=Report Portal - Allure integrations for Cucumber 6
 cucumber_version=7.13.0
diff --git a/...llure-cucumber6/src/main/java/com/epam/reportportal/cucumber/AllureAwareStepReporter.java b/...llure-cucumber6/src/main/java/com/epam/reportportal/cucumber/AllureAwareStepReporter.java
@@ -33,6 +33,10 @@
 
 import static com.epam.reportportal.cucumber.AllureAwareReporter.*;
 
+/**
+ * @deprecated Use {@link AllureAwareScenarioReporter}, since the semantic of this class is completely broken and will be removed
+ */
+@Deprecated(forRemoval = true, since = "5.2.0")
 public class AllureAwareStepReporter extends StepReporter {
 
 	private static final Map<Maybe<String>, String> DESCRIPTION_TRACKER = new ConcurrentHashMap<>();

diff --git a/agent-allure-jbehave/gradle.properties b/agent-allure-jbehave/gradle.properties
@@ -1,3 +1,3 @@
 name=agent-allure-jbehave
-version=5.1.2-SNAPSHOT
+version=5.2.0-SNAPSHOT
 description=Report Portal - Allure integrations for JBehave
diff --git a/agent-allure-junit/CHANGELOG.md b/agent-allure-junit/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Agent version updated on [5.2.0](https://github.com/reportportal/agent-java-junit/releases/tag/5.2.0), by @HardNorth
 
 ## [5.1.1]
 ### Changed

diff --git a/agent-allure-junit/build.gradle b/agent-allure-junit/build.gradle
@@ -18,7 +18,7 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-junit:5.1.3'
+    api 'com.epam.reportportal:agent-java-junit:5.2.0'
 }
 
 jar {

diff --git a/agent-allure-junit/gradle.properties b/agent-allure-junit/gradle.properties
@@ -1,3 +1,3 @@
 name=agent-allure-junit
-version=5.1.2-SNAPSHOT
+version=5.2.0-SNAPSHOT
 description=Report Portal - Allure integrations for JUnit 4
diff --git a/agent-allure-junit5/CHANGELOG.md b/agent-allure-junit5/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Agent version updated on [5.2.0](https://github.com/reportportal/agent-java-junit5/releases/tag/5.2.0), by @HardNorth
 
 ## [5.1.1]
 ### Changed

diff --git a/agent-allure-junit5/build.gradle b/agent-allure-junit5/build.gradle
@@ -18,7 +18,9 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-junit5:5.1.10'
+    api 'com.epam.reportportal:agent-java-junit5:5.2.0'
+
+    implementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
 }
 
 jar {

diff --git a/agent-allure-junit5/gradle.properties b/agent-allure-junit5/gradle.properties
@@ -1,3 +1,3 @@
 name=agent-allure-junit5
-version=5.1.2-SNAPSHOT
+version=5.2.0-SNAPSHOT
 description=Report Portal - Allure integrations for JUnit 5
diff --git a/agent-allure-spock/CHANGELOG.md b/agent-allure-spock/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Agent version updated on [5.2.0](https://github.com/reportportal/agent-java-spock/releases/tag/5.2.0), by @HardNorth
 
 ## [5.1.1]
 ### Changed

diff --git a/agent-allure-spock/build.gradle b/agent-allure-spock/build.gradle
@@ -18,7 +18,9 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-spock:5.1.3'
+    api 'com.epam.reportportal:agent-java-spock:5.2.0'
+
+    implementation 'org.spockframework:spock-core:2.3-groovy-2.5'
 
     testImplementation 'org.codehaus.groovy:groovy:2.5.14'
 }

diff --git a/agent-allure-spock/gradle.properties b/agent-allure-spock/gradle.properties
@@ -1,3 +1,3 @@
 name=agent-allure-spock
-version=5.1.2-SNAPSHOT
+version=5.2.0-SNAPSHOT
 description=Report Portal - Allure integrations for Spock
diff --git a/agent-allure-testng/CHANGELOG.md b/agent-allure-testng/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Agent version updated on [5.4.0](https://github.com/reportportal/agent-java-testng/releases/tag/5.4.0), by @HardNorth
 
 ## [5.1.1]
 ### Changed

diff --git a/agent-allure-testng/build.gradle b/agent-allure-testng/build.gradle
@@ -18,7 +18,10 @@ sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-testng:5.3.1'
+    api 'com.epam.reportportal:agent-java-testng:5.4.0'
+    implementation 'org.testng:testng:7.9.0'
+
+    testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
 }
 
 jar {

diff --git a/agent-allure-testng/gradle.properties b/agent-allure-testng/gradle.properties
@@ -1,3 +1,3 @@
 name=agent-allure-testng
-version=5.1.2-SNAPSHOT
+version=5.2.0-SNAPSHOT
 description=Report Portal - Allure integrations for TestNG
diff --git a/agent-allure-testng/src/test/java/com/epam/reportportal/testng/util/TestUtils.java b/agent-allure-testng/src/test/java/com/epam/reportportal/testng/util/TestUtils.java
@@ -175,7 +175,7 @@ public static List<SaveLogRQ> extractJsonParts(List<MultipartBody.Part> parts) {
 				})
 				.map(b -> {
 					try {
-						return HttpRequestUtils.MAPPER.readValue(b, new TypeReference<List<SaveLogRQ>>() {
+						return HttpRequestUtils.MAPPER.readValue(b, new TypeReference<>() {
 						});
 					} catch (IOException e) {
 						return Collections.<SaveLogRQ>emptyList();

diff --git a/allure-common/src/main/java/com/epam/reportportal/allure/AnnotationUtils.java b/allure-common/src/main/java/com/epam/reportportal/allure/AnnotationUtils.java
@@ -40,6 +40,7 @@
 import static java.util.Optional.of;
 import static java.util.Optional.ofNullable;
 
+@SuppressWarnings("unused")
 public class AnnotationUtils {
 	public static final String MARKDOWN_DELIMITER = "\n\n---\n\n";
 

diff --git a/build.gradle b/build.gradle
@@ -46,13 +46,13 @@ configure(allprojects - project('allure-common')) {
     compileTestJava.options.encoding = 'UTF-8'
 
     dependencies {
-        implementation 'com.epam.reportportal:allure-common:5.1.1'
+        implementation 'com.epam.reportportal:allure-common:5.2.0'
 
         testImplementation ("io.qameta.allure:allure-java-commons:${allure_version}") {
             exclude group: 'org.slf4j'
         }
-        testImplementation 'ch.qos.logback:logback-classic:1.3.8'
-        testImplementation 'com.epam.reportportal:logger-java-logback:5.1.6'
+        testImplementation 'ch.qos.logback:logback-classic:1.3.12'
+        testImplementation 'com.epam.reportportal:logger-java-logback:5.2.0'
         testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2'
         testImplementation("org.junit.platform:junit-platform-runner:${junit5_runner_version}") {
             exclude module: 'junit'