diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index debdd63..8438984 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,10 +35,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 1.8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '8' @@ -47,4 +47,6 @@ jobs: run: ./gradlew build - name: Codecov upload - run: bash <(curl -s https://codecov.io/bash) + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af89118..36c2502 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate versions uses: HardNorth/github-version-generate@v1 @@ -50,7 +50,7 @@ jobs: version-file-extraction-pattern: ${{ env.VERSION_EXTRACT_PATTERN }} - name: Set up JDK 1.8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '8' @@ -108,7 +108,7 @@ jobs: - name: Checkout develop branch if: ${{ github.ref }} == 'master' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: 'develop' fetch-depth: 0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 19dbe43..d927ea7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## [Unreleased] +### Changed +- Client version updated on [5.2.11](https://github.com/reportportal/client-java/releases/tag/5.2.11), by @HardNorth ## [5.2.1] ### Changed diff --git a/README.md b/README.md index 077bfca..84be345 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,8 @@ [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-java-junit.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-java-junit) [![CI Build](https://github.com/reportportal/agent-java-junit/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/agent-java-junit/actions/workflows/ci.yml) -[![Join Slack chat!](https://reportportal-slack-auto.herokuapp.com/badge.svg)](https://reportportal-slack-auto.herokuapp.com) +[![codecov](https://codecov.io/github/reportportal/agent-java-junit/graph/badge.svg?token=1vmfBqayVL)](https://codecov.io/github/reportportal/agent-java-junit) +[![Join Slack chat!](https://img.shields.io/badge/slack-join-brightgreen.svg)](https://slack.epmrpp.reportportal.io/) [![stackoverflow](https://img.shields.io/badge/reportportal-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/reportportal) [![Build with Love](https://img.shields.io/badge/build%20with-❤%EF%B8%8F%E2%80%8D-lightgrey.svg)](http://reportportal.io?style=flat) @@ -105,7 +106,7 @@ In your project, create or update a file named logback.xml in the src/main/resou com.epam.reportportal logger-java-logback - 5.2.1 + 5.2.2 @@ -199,7 +200,7 @@ In your project, create or update a file named logback.xml in the src/main/resou com.epam.reportportal logger-java-log4j - 5.2.1 + 5.2.2 @@ -275,7 +276,7 @@ repositories { } dependencies { - compile 'com.epam.reportportal:logger-java-log4j:5.2.1' + compile 'com.epam.reportportal:logger-java-log4j:5.2.2' compile 'com.epam.reportportal:agent-java-junit:5.2.1' } @@ -416,7 +417,7 @@ If you prefer using **Logback** logging library, add following dependencies: com.epam.reportportal logger-java-logback - 5.2.1 + 5.2.2 ``` > Up to date version could be found [here](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22logger-java-logback%22) @@ -437,7 +438,7 @@ If you prefer using **Log4j** logging library, add following dependencies: com.epam.reportportal logger-java-log4j - 5.1.4 + 5.2.2 ``` > Up to date version could be found [here](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22logger-java-log4j%22) @@ -685,7 +686,7 @@ in this case - add a `maven dependency plugin` dependency explicitly, like this: com.epam.reportportal logger-java-log4j - 5.2.1 + 5.2.2 @@ -813,7 +814,7 @@ repositories { } dependencies { - compile 'com.epam.reportportal:logger-java-log4j:5.2.1' + compile 'com.epam.reportportal:logger-java-log4j:5.2.2' compile 'com.epam.reportportal:agent-java-junit:5.2.1' compile 'org.apache.logging.log4j:log4j-api:2.17.2' compile 'org.apache.logging.log4j:log4j-core:2.17.2' diff --git a/README_TEMPLATE.md b/README_TEMPLATE.md index efb9e53..b4b9101 100644 --- a/README_TEMPLATE.md +++ b/README_TEMPLATE.md @@ -6,7 +6,8 @@ [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-java-junit.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-java-junit) [![CI Build](https://github.com/reportportal/agent-java-junit/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/agent-java-junit/actions/workflows/ci.yml) -[![Join Slack chat!](https://reportportal-slack-auto.herokuapp.com/badge.svg)](https://reportportal-slack-auto.herokuapp.com) +[![codecov](https://codecov.io/github/reportportal/agent-java-junit/graph/badge.svg?token=1vmfBqayVL)](https://codecov.io/github/reportportal/agent-java-junit) +[![Join Slack chat!](https://img.shields.io/badge/slack-join-brightgreen.svg)](https://slack.epmrpp.reportportal.io/) [![stackoverflow](https://img.shields.io/badge/reportportal-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/reportportal) [![Build with Love](https://img.shields.io/badge/build%20with-❤%EF%B8%8F%E2%80%8D-lightgrey.svg)](http://reportportal.io?style=flat) @@ -105,7 +106,7 @@ In your project, create or update a file named logback.xml in the src/main/resou com.epam.reportportal logger-java-logback - 5.2.1 + 5.2.2 @@ -199,7 +200,7 @@ In your project, create or update a file named logback.xml in the src/main/resou com.epam.reportportal logger-java-log4j - 5.2.1 + 5.2.2 @@ -275,7 +276,7 @@ repositories { } dependencies { - compile 'com.epam.reportportal:logger-java-log4j:5.2.1' + compile 'com.epam.reportportal:logger-java-log4j:5.2.2' compile 'com.epam.reportportal:agent-java-junit:$LATEST_VERSION' } @@ -416,7 +417,7 @@ If you prefer using **Logback** logging library, add following dependencies: com.epam.reportportal logger-java-logback - 5.2.1 + 5.2.2 ``` > Up to date version could be found [here](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22logger-java-logback%22) @@ -437,7 +438,7 @@ If you prefer using **Log4j** logging library, add following dependencies: com.epam.reportportal logger-java-log4j - 5.1.4 + 5.2.2 ``` > Up to date version could be found [here](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22logger-java-log4j%22) @@ -685,7 +686,7 @@ in this case - add a `maven dependency plugin` dependency explicitly, like this: com.epam.reportportal logger-java-log4j - 5.2.1 + 5.2.2 @@ -813,7 +814,7 @@ repositories { } dependencies { - compile 'com.epam.reportportal:logger-java-log4j:5.2.1' + compile 'com.epam.reportportal:logger-java-log4j:5.2.2' compile 'com.epam.reportportal:agent-java-junit:$LATEST_VERSION' compile 'org.apache.logging.log4j:log4j-api:2.17.2' compile 'org.apache.logging.log4j:log4j-core:2.17.2' diff --git a/build.gradle b/build.gradle index df7f938..25c97b8 100644 --- a/build.gradle +++ b/build.gradle @@ -18,29 +18,40 @@ apply plugin: 'java-library' apply from: "${project.scripts_url}/${project.scripts_branch}/build-quality.gradle" apply from: "${project.scripts_url}/${project.scripts_branch}/release-commons.gradle" apply from: "${project.scripts_url}/${project.scripts_branch}/signing.gradle" +apply from: "${project.scripts_url}/${project.scripts_branch}/jacoco.gradle" + +project.ext.limits = [ + 'instruction': 70, + 'branch' : 53, + 'line' : 70, + 'complexity' : 60, + 'method' : 65, + 'class' : 90 +] sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 +compileJava.options.encoding = 'UTF-8' +compileTestJava.options.encoding = 'UTF-8' repositories { mavenCentral() } dependencies { - api 'com.epam.reportportal:client-java:5.2.4' - api 'com.google.code.findbugs:jsr305:3.0.2' + api 'com.epam.reportportal:client-java:5.2.11' api 'com.nordstrom.tools:junit-foundation:17.0.3' implementation 'org.slf4j:slf4j-api:2.0.7' - testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' + testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.6' 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.0' + testImplementation 'com.epam.reportportal:logger-java-logback:5.2.2' testImplementation ("org.junit.platform:junit-platform-runner:${project.junit5_runner_version}") { exclude module: 'junit' } @@ -81,3 +92,5 @@ processResources { expand(project.properties) } } + +build.dependsOn jacocoTestReport diff --git a/gradle.properties b/gradle.properties index 71fca99..a0f04b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,3 +6,4 @@ mockito_version=3.3.3 powermock_version=2.0.9 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts/ scripts_branch=master +excludeTests= diff --git a/src/main/resources/META-INF/aop-ajc.xml b/src/main/resources/META-INF/aop-ajc.xml index 73e40af..9d39ffd 100644 --- a/src/main/resources/META-INF/aop-ajc.xml +++ b/src/main/resources/META-INF/aop-ajc.xml @@ -15,6 +15,7 @@ --> +