Release

.github/workflows/release.yml

@@ -56,7 +56,7 @@ jobs:
           java-version: '8'
 
       - name: Setup git credentials
-        uses: oleksiyrudenko/gha-git-credentials@v2.1.1
+        uses: oleksiyrudenko/gha-git-credentials@v2-latest
         with:
           name: 'reportportal.io'
           email: '[email protected]'
@@ -107,15 +107,13 @@ jobs:
           body: ${{ steps.readChangelogEntry.outputs.changes }}
 
       - name: Checkout develop branch
-        if: ${{ github.ref }} == 'master'
         uses: actions/checkout@v4
         with:
           ref: 'develop'
           fetch-depth: 0
 
       - name: Merge release branch into develop
         id: mergeIntoDevelop
-        if: ${{ github.ref }} == 'master'
         run: |
           git merge -m 'Merge master branch into develop after a release' origin/master
           git status | (! grep -Fq 'both modified:') || git status | grep -F 'both modified:' \

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Client version updated on [5.2.25](https://github.com/reportportal/client-java/releases/tag/5.2.25), by @HardNorth
+- JUnit-Foundation updated on [17.1.1](https://github.com/sbabcoc/JUnit-Foundation/releases/tag/junit-foundation-17.1.1), by @HardNorth
 
 ## [5.2.3]
 ### Added

build.gradle

@@ -39,26 +39,26 @@ repositories {
 }
 
 dependencies {
-    api 'com.epam.reportportal:client-java:5.2.13'
-    api 'com.nordstrom.tools:junit-foundation:17.0.3'
+    api 'com.epam.reportportal:client-java:5.2.25'
+    api 'com.nordstrom.tools:junit-foundation:17.1.1'
 
     implementation 'org.slf4j:slf4j-api:2.0.7'
 
-    testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.6'
+    testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.7'
 
     testImplementation 'org.aspectj:aspectjweaver:1.9.19'
     testImplementation 'org.hamcrest:hamcrest-core:2.2'
     testImplementation "org.mockito:mockito-core:${project.mockito_version}"
     testImplementation "org.mockito:mockito-junit-jupiter:${project.mockito_version}"
-    testImplementation 'ch.qos.logback:logback-classic:1.3.12'
-    testImplementation 'com.epam.reportportal:logger-java-logback:5.2.2'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
+    testImplementation 'com.epam.reportportal:logger-java-logback:5.2.3'
     testImplementation ("org.junit.platform:junit-platform-runner:${project.junit5_runner_version}") {
         exclude module: 'junit'
     }
     testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit5_version}"
     testImplementation "org.junit.jupiter:junit-jupiter-params:${project.junit5_version}"
     testImplementation "org.junit.jupiter:junit-jupiter-engine:${project.junit5_version}"
-    testImplementation 'org.apache.commons:commons-io:1.3.2'
+    testImplementation 'commons-io:commons-io:2.18.0'
     testImplementation 'pl.pragmatists:JUnitParams:1.1.1'
     testImplementation "org.powermock:powermock-module-junit4:${project.powermock_version}"
     testImplementation "org.powermock:powermock-api-mockito2:${project.powermock_version}"

src/main/java/com/epam/reportportal/junit/ReportPortalListener.java

@@ -953,7 +953,7 @@ protected List<ParameterResource> getMethodParameters(@Nonnull final FrameworkMe
 			Object target = getTargetFor(runner, method);
 			if (target instanceof ArtifactParams) {
 				//noinspection Guava
-				com.google.common.base.Optional<Map<String, Object>> params = ((ArtifactParams) target).getParameters();
+				Optional<Map<String, Object>> params = ((ArtifactParams) target).getParameters();
 				if (params.isPresent()) {
 					for (Map.Entry<String, Object> param : params.get().entrySet()) {
 						ParameterResource parameter = new ParameterResource();

src/test/java/com/epam/reportportal/junit/features/callback/RetrieveByDescriptionFeatureTest.java

@@ -23,7 +23,6 @@
 import com.epam.reportportal.service.tree.TestItemTree;
 import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.google.common.collect.Sets;
 import org.junit.AfterClass;
 import org.junit.Rule;
 import org.junit.Test;
@@ -36,6 +35,7 @@
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.List;
 
 import static java.util.Optional.ofNullable;
@@ -51,7 +51,8 @@ public class RetrieveByDescriptionFeatureTest {
 	public TestRule rule = new TestWatcher() {
 		@Override
 		protected void finished(@Nonnull Description description) {
-			ofNullable(ItemTreeUtils.retrieveLeaf(description,
+			ofNullable(ItemTreeUtils.retrieveLeaf(
+					description,
 					ParallelRunningContext.getCurrent().getItemTree()
 			)).ifPresent(testItemLeaves::add);
 		}
@@ -71,8 +72,9 @@ private static void addSaucelabsAttribute() {
 		FinishTestItemRQ request = new FinishTestItemRQ();
 		request.setEndTime(Calendar.getInstance().getTime());
 		request.setStatus("PASSED");
-		request.setAttributes(Sets.newHashSet(new ItemAttributesRQ(SLID, SLID_VALUE)));
-		ItemTreeReporter.finishItem(ReportPortalListener.getReportPortal().getClient(),
+		request.setAttributes(Collections.singleton(new ItemAttributesRQ(SLID, SLID_VALUE)));
+		ItemTreeReporter.finishItem(
+				ReportPortalListener.getReportPortal().getClient(),
 				request,
 				ParallelRunningContext.getCurrent().getItemTree().getLaunchId(),
 				testItemLeaves.get(0)

src/test/java/com/epam/reportportal/junit/features/ignore/ParameterizedIgnoredTest.java

@@ -17,7 +17,6 @@
 package com.epam.reportportal.junit.features.ignore;
 
 import com.epam.reportportal.annotations.ParameterKey;
-import com.google.common.base.Optional;
 import com.nordstrom.automation.junit.ArtifactParams;
 import com.nordstrom.automation.junit.AtomIdentity;
 import org.junit.Ignore;
@@ -30,6 +29,7 @@
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.Optional;
 
 @RunWith(Parameterized.class)
 public class ParameterizedIgnoredTest implements ArtifactParams {

src/test/java/com/epam/reportportal/junit/features/parameters/JUnitParamsNullValueTest.java

@@ -16,7 +16,6 @@
 
 package com.epam.reportportal.junit.features.parameters;
 
-import com.google.common.base.Optional;
 import com.nordstrom.automation.junit.ArtifactParams;
 import com.nordstrom.automation.junit.AtomIdentity;
 import com.nordstrom.automation.junit.AtomicTest;
@@ -30,6 +29,7 @@
 import org.junit.runner.RunWith;
 
 import java.util.Map;
+import java.util.Optional;
 
 @RunWith(JUnitParamsRunner.class)
 public class JUnitParamsNullValueTest implements ArtifactParams {
@@ -66,7 +66,7 @@ public Optional<Map<String, Object>> getParameters() {
 			String param = (String) params[0];
 			return Param.mapOf(Param.param("param", param));
 		} catch (IllegalAccessException | NoSuchFieldException e) {
-			return Optional.absent();
+			return Optional.empty();
 		}
 	}
 }

src/test/java/com/epam/reportportal/junit/features/parameters/JUnitParamsSimpleTest.java

@@ -16,7 +16,6 @@
 
 package com.epam.reportportal.junit.features.parameters;
 
-import com.google.common.base.Optional;
 import com.nordstrom.automation.junit.ArtifactParams;
 import com.nordstrom.automation.junit.AtomIdentity;
 import com.nordstrom.automation.junit.AtomicTest;
@@ -30,6 +29,7 @@
 import org.junit.runner.RunWith;
 
 import java.util.Map;
+import java.util.Optional;
 
 @RunWith(JUnitParamsRunner.class)
 public class JUnitParamsSimpleTest implements ArtifactParams {
@@ -62,7 +62,7 @@ public Optional<Map<String, Object>> getParameters() {
 			String param = (String) params[0];
 			return Param.mapOf(Param.param("param", param));
 		} catch (IllegalAccessException | NoSuchFieldException e) {
-			return Optional.absent();
+			return Optional.empty();
 		}
 	}
 }

src/test/java/com/epam/reportportal/junit/features/parameters/JUnitParamsTwoParamsTest.java

@@ -16,7 +16,6 @@
 
 package com.epam.reportportal.junit.features.parameters;
 
-import com.google.common.base.Optional;
 import com.nordstrom.automation.junit.ArtifactParams;
 import com.nordstrom.automation.junit.AtomIdentity;
 import com.nordstrom.automation.junit.AtomicTest;
@@ -30,6 +29,7 @@
 import org.junit.runner.RunWith;
 
 import java.util.Map;
+import java.util.Optional;
 
 @RunWith(JUnitParamsRunner.class)
 public class JUnitParamsTwoParamsTest implements ArtifactParams {
@@ -61,7 +61,7 @@ public Optional<Map<String, Object>> getParameters() {
 			Object[] params = LifecycleHooks.getFieldValue(callable, "val$params");
 			return Param.mapOf(Param.param("param1", params[0]), Param.param("param2", params[1]));
 		} catch (IllegalAccessException | NoSuchFieldException e) {
-			return Optional.absent();
+			return Optional.empty();
 		}
 	}
 }

src/test/java/com/epam/reportportal/junit/features/parameters/StandardParametersNullValueTest.java

@@ -16,7 +16,6 @@
 
 package com.epam.reportportal.junit.features.parameters;
 
-import com.google.common.base.Optional;
 import com.nordstrom.automation.junit.ArtifactParams;
 import com.nordstrom.automation.junit.AtomIdentity;
 import org.junit.Rule;
@@ -28,6 +27,7 @@
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.Optional;
 
 @RunWith(Parameterized.class)
 public class StandardParametersNullValueTest implements ArtifactParams {

src/test/java/com/epam/reportportal/junit/features/parameters/StandardParametersSimpleTest.java

@@ -16,7 +16,6 @@
 
 package com.epam.reportportal.junit.features.parameters;
 
-import com.google.common.base.Optional;
 import com.nordstrom.automation.junit.ArtifactParams;
 import com.nordstrom.automation.junit.AtomIdentity;
 import org.junit.Rule;
@@ -28,6 +27,7 @@
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.Optional;
 
 @RunWith(Parameterized.class)
 public class StandardParametersSimpleTest implements ArtifactParams {

src/test/java/com/epam/reportportal/junit/features/parameters/StandardParametersTwoParamsTest.java

@@ -16,7 +16,6 @@
 
 package com.epam.reportportal.junit.features.parameters;
 
-import com.google.common.base.Optional;
 import com.nordstrom.automation.junit.ArtifactParams;
 import com.nordstrom.automation.junit.AtomIdentity;
 import org.junit.Rule;
@@ -28,6 +27,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 @RunWith(Parameterized.class)
 public class StandardParametersTwoParamsTest implements ArtifactParams {

src/test/java/com/epam/reportportal/junit/features/retry/StandardParametersRetryTest.java

@@ -16,7 +16,6 @@
 
 package com.epam.reportportal.junit.features.retry;
 
-import com.google.common.base.Optional;
 import com.nordstrom.automation.junit.ArtifactParams;
 import com.nordstrom.automation.junit.AtomIdentity;
 import org.junit.Rule;
@@ -28,6 +27,7 @@
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @RunWith(Parameterized.class)

src/test/java/com/epam/reportportal/junit/utils/SystemAttributesFetcherTest.java

@@ -17,11 +17,11 @@
 package com.epam.reportportal.junit.utils;
 
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
-import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -34,7 +34,7 @@
  */
 public class SystemAttributesFetcherTest {
 
-	private static List<String> expectedKeys = Lists.newArrayList("jvm", "os", "agent", "skippedIssue");
+	private static final List<String> expectedKeys = Arrays.asList("jvm", "os", "agent", "skippedIssue");
 
 	@Test
 	public void systemAttributesFetchingTest() {