Merge pull request #390 from TikhomirovSergey/aspectj_to_bytebuddy2

0.25.0-ALPHA
Tinkoff · Feb 20, 2023 · 95e6063 · 95e6063
2 parents cc57357 + e1c7fff
commit 95e6063
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 ext {
-    globalVersion = '0.25.0-MIGRATION-ALPHA'
+    globalVersion = '0.25.0-ALPHA'
 }
 
 repositories {
@@ -42,7 +42,7 @@ subprojects {
         junit5Version = '5.8.2'
         junit5PlatformVersion = '1.8.2'
         hamcrestVersion = '2.2'
-        seleniumVersion = '4.8.0'
+        seleniumVersion = '4.8.1'
         allureVersion = '2.21.0'
         jacksonVersion = '2.13.3'
         mockitoVersion = '4.8.1'

diff --git a/...r.integration/src/main/java/ru/tinkoff/qa/neptune/jupiter/integration/BaseJunit5Test.java b/...r.integration/src/main/java/ru/tinkoff/qa/neptune/jupiter/integration/BaseJunit5Test.java
diff --git a/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/HttpProxy.java b/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/HttpProxy.java
@@ -2,9 +2,9 @@
 
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.devtools.DevTools;
-import org.openqa.selenium.devtools.v107.network.Network;
-import org.openqa.selenium.devtools.v107.network.model.RequestWillBeSent;
-import org.openqa.selenium.devtools.v107.network.model.ResponseReceived;
+import org.openqa.selenium.devtools.v110.network.Network;
+import org.openqa.selenium.devtools.v110.network.model.RequestWillBeSent;
+import org.openqa.selenium.devtools.v110.network.model.ResponseReceived;
 import ru.tinkoff.qa.neptune.selenium.functions.browser.proxy.HttpTraffic;
 
 import java.util.List;

diff --git a/...ain/java/ru/tinkoff/qa/neptune/selenium/functions/browser/proxy/BrowserProxyCriteria.java b/...ain/java/ru/tinkoff/qa/neptune/selenium/functions/browser/proxy/BrowserProxyCriteria.java
@@ -1,7 +1,7 @@
 package ru.tinkoff.qa.neptune.selenium.functions.browser.proxy;
 
 import io.netty.handler.codec.http.HttpMethod;
-import org.openqa.selenium.devtools.v107.network.Network;
+import org.openqa.selenium.devtools.v110.network.Network;
 import ru.tinkoff.qa.neptune.core.api.steps.Criteria;
 import ru.tinkoff.qa.neptune.core.api.steps.annotations.Description;
 import ru.tinkoff.qa.neptune.core.api.steps.annotations.DescriptionFragment;

diff --git a/...ium/src/main/java/ru/tinkoff/qa/neptune/selenium/functions/browser/proxy/HttpTraffic.java b/...ium/src/main/java/ru/tinkoff/qa/neptune/selenium/functions/browser/proxy/HttpTraffic.java
@@ -1,8 +1,8 @@
 package ru.tinkoff.qa.neptune.selenium.functions.browser.proxy;
 
-import org.openqa.selenium.devtools.v107.network.Network;
-import org.openqa.selenium.devtools.v107.network.model.RequestWillBeSent;
-import org.openqa.selenium.devtools.v107.network.model.ResponseReceived;
+import org.openqa.selenium.devtools.v110.network.Network;
+import org.openqa.selenium.devtools.v110.network.model.RequestWillBeSent;
+import org.openqa.selenium.devtools.v110.network.model.ResponseReceived;
 
 import static java.lang.String.valueOf;
 import static java.util.Optional.ofNullable;

diff --git a/...ava/ru/tinkoff/qa/neptune/selenium/hamcrest/matchers/browser/proxy/HasContentMatcher.java b/...ava/ru/tinkoff/qa/neptune/selenium/hamcrest/matchers/browser/proxy/HasContentMatcher.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.hamcrest.Matcher;
-import org.openqa.selenium.devtools.v107.network.Network;
+import org.openqa.selenium.devtools.v110.network.Network;
 import ru.tinkoff.qa.neptune.core.api.data.format.DataTransformer;
 import ru.tinkoff.qa.neptune.core.api.hamcrest.NeptuneFeatureMatcher;
 import ru.tinkoff.qa.neptune.core.api.hamcrest.NullValueMismatch;

diff --git a/...ng.integration/src/main/java/ru/tinkoff/qa/neptune/testng/integration/BaseTestNgTest.java b/...ng.integration/src/main/java/ru/tinkoff/qa/neptune/testng/integration/BaseTestNgTest.java