Skip to content

Commit

Permalink
Merge pull request #258 from healenium/feature/EPM-HLM-ER
Browse files Browse the repository at this point in the history
Feature/epm hlm er
  • Loading branch information
Alex-Reif authored Nov 29, 2023
2 parents 2276446 + 9a07edc commit 4a232b5
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 68 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.11
- name: Set up JDK 1.17
uses: actions/setup-java@v1 # Setup JAVA
with:
java-version: 1.11
java-version: 1.17
- name: Install Google Chrome # Using shell script to install Google Chrome
run: |
chmod +x ./scripts/InstallChrome.sh
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.11
- name: Set up JDK 1.17
uses: actions/setup-java@v1
with:
java-version: 1.11
java-version: 1.17
- name: setup-chromedriver
run: |
CHROME_VERSION=$(google-chrome --version | cut -f 3 -d ' ' | cut -d '.' -f 1) \
Expand All @@ -38,10 +38,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.11
- name: Set up JDK 1.17
uses: actions/setup-java@v1
with:
java-version: 1.11
java-version: 1.17
- name: Set output
id: vars
run: echo ::set-output name=tag::$(echo ${GITHUB_REF:10})
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Self-healing library for Selenium Web-based tests
for Gradle projects:
```
dependencies {
compile group: 'com.epam.healenium', name: 'healenium-web', version: '3.4.6'
compile group: 'com.epam.healenium', name: 'healenium-web', version: '3.4.8'
}
```

Expand All @@ -22,7 +22,7 @@ for Maven projects:
<dependency>
<groupId>com.epam.healenium</groupId>
<artifactId>healenium-web</artifactId>
<version>3.4.6</version>
<version>3.4.8</version>
</dependency>
```
### 1. Init driver instance of SelfHealingDriver
Expand Down
70 changes: 13 additions & 57 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.epam.healenium</groupId>
<artifactId>healenium-web</artifactId>
<version>3.4.6</version>
<version>3.4.8</version>
<packaging>jar</packaging>
<name>healenium-web</name>
<description>healenium web client</description>
Expand Down Expand Up @@ -52,7 +52,7 @@
<maven.apache>3.8.4</maven.apache>
<typesafe.version>1.4.2</typesafe.version>
<treecomparing.version>0.4.12</treecomparing.version>
<selenium.version>4.13.0</selenium.version>
<selenium.version>4.14.0</selenium.version>
<jacksondatabind.version>2.15.2</jacksondatabind.version>
<commonslang3.version>3.12.0</commonslang3.version>
<commonscodec.version>1.15</commonscodec.version>
Expand All @@ -61,12 +61,14 @@
<mapstruct.version>1.4.2.Final</mapstruct.version>
<lombok.version>1.18.22</lombok.version>
<streamex.version>0.8.1</streamex.version>
<jettyserver.version>11.0.15 </jettyserver.version>
<jettyserver.version>11.0.15</jettyserver.version>
<hamcrestcore.version>2.2</hamcrestcore.version>
<selenide.version>6.1.1</selenide.version>
<selenide.version>7.0.0</selenide.version>
<testcontainersjunit.version>1.16.3</testcontainersjunit.version>
<junit.version>5.8.2</junit.version>
<webdrivermanager.version>5.5.3</webdrivermanager.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>

<profiles>
Expand Down Expand Up @@ -151,7 +153,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<version>1.6.13</version>
<extensions>true</extensions>
<executions>
<execution>
Expand All @@ -176,71 +178,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.0</version>
<version>3.8.1</version>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.6</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>jacoco-report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>PACKAGE</element>
<limits>
<limit>
<counter>LINE</counter>
<value>COVEREDRATIO</value>
<minimum>0.0</minimum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<type>maven-plugin</type>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${maven.apache}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${maven.apache}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
Expand Down Expand Up @@ -302,6 +253,11 @@
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.9</version>
</dependency>
<dependency>
<groupId>one.util</groupId>
<artifactId>streamex</artifactId>
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/epam/healenium/client/RestClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,7 @@ public List<Locator> imitate(SelectorImitatorDto selectorImitatorDto) {
public void initReport(String sessionId) {
try {
HttpRequest request = new HttpRequest(HttpMethod.POST, "/report/init/" + sessionId);
request.setHeader("Content-Length", String.valueOf(0));
request.setHeader("Content-Type", JSON_UTF_8);
request.setContent(Contents.bytes(new byte[0]));
log.debug("[Init Report] Request: {}", request);
serverHttpClient.execute(request);
} catch (Exception e) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/simplelogger.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.slf4j.simpleLogger.defaultLogLevel=debug
org.slf4j.simpleLogger.defaultLogLevel=info
org.slf4j.simpleLogger.log.healenium=info

0 comments on commit 4a232b5

Please sign in to comment.