Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/#319_update_Allure_Cucumber_jvm'…
Browse files Browse the repository at this point in the history
… into #330-improvement-stabilize-unit-tests
  • Loading branch information
oomelianchuk committed Dec 17, 2024
2 parents 19c6a57 + e759fb7 commit 77e0cb2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 15 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ temp-*.properties
embeddedLocalProxySelfSignedRootCertificate.p12
/bin/
/allure-results/

# intellij project directory
.idea
30 changes: 15 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.xceptance</groupId>
<artifactId>neodymium-library</artifactId>
<version>5.1.1</version>
<version>5.1.2</version>

<name>neodymium-library</name>
<url>https://github.com/Xceptance/neodymium-library</url>
Expand Down Expand Up @@ -252,19 +252,19 @@

<dependencies>
<dependency>
<groupId>com.assertthat</groupId>
<artifactId>selenium-shutterbug</artifactId>
<version>1.6</version>
<exclusions>
<exclusion>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<groupId>com.assertthat</groupId>
<artifactId>selenium-shutterbug</artifactId>
<version>1.6</version>
<exclusions>
<exclusion>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
</exclusion>
</exclusions>
<exclusion>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>xyz.rogfam</groupId>
Expand Down Expand Up @@ -339,8 +339,8 @@
</dependency>
<dependency>
<groupId>io.qameta.allure</groupId>
<artifactId>allure-cucumber6-jvm</artifactId>
<version>2.13.6</version>
<artifactId>allure-cucumber7-jvm</artifactId>
<version>2.29.1</version>
</dependency>
<dependency>
<groupId>io.qameta.allure</groupId>
Expand Down

0 comments on commit 77e0cb2

Please sign in to comment.