diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index c17d77dbe..000000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,25 +0,0 @@ -name-template: '$NEXT_MINOR_VERSION' -tag-template: '$NEXT_MINOR_VERSION' -categories: - - title: '🚀 New Features' - labels: - - 'type:new feature' - - title: '🔬 Improvements' - labels: - - 'type:improvement' - - title: '🐞 Bug Fixes' - labels: - - 'type:bug' - - title: '⬆️ Dependency Updates' - labels: - - 'type:dependencies' - -change-template: '* $TITLE (via #$NUMBER) - @$AUTHOR' -exclude-labels: - - 'type:internal' -template: | - $CHANGES - - ## 👀 Links - - [Commits since $PREVIOUS_TAG](https://github.com/allure-framework/allure-java/compare/$PREVIOUS_TAG...master) diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 000000000..c382d697b --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,22 @@ +# release.yml + +changelog: + categories: + - title: '🚀 New Features' + labels: + - 'type:new feature' + - title: '🔬 Improvements' + labels: + - 'type:improvement' + - title: '🐞 Bug Fixes' + labels: + - 'type:bug' + - title: '⬆️ Dependency Updates' + labels: + - 'type:dependencies' + - title: '⛔️ Security' + labels: + - 'type:security' + - title: '👻 Internal changes' + labels: + - 'type:internal' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 085003dbe..fc3e01626 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: matrix: java-version: [ '8.0.x', '11.0.x' ] steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.3.5 - name: Set up JDK ${{ matrix.java-version }} uses: actions/setup-java@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 02bf97606..1ffdb053c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,7 +8,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.3.5 - name: Set up JDK 1.8 uses: actions/setup-java@v2 diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml deleted file mode 100644 index ea9ee55ca..000000000 --- a/.github/workflows/release-draft.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Release Draft - -on: - push: - branches: - - master - -jobs: - update_draft_release: - runs-on: ubuntu-latest - steps: - - uses: toolmantim/release-drafter@v5.15.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5afc8430b..52a66524b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,12 +17,10 @@ jobs: - name: "Check release version" run: | expr "${{ github.event.inputs.releaseVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$' - - name: "Check next version" run: | expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$' - - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.3.5 with: token: ${{ secrets.QAMETA_CI }} @@ -30,34 +28,29 @@ jobs: run: | git config --global user.name qameta-ci git config --global user.email qameta-ci@qameta.io - - - name: "Set release version in gradle.properties file" + - name: "Set release version" run: | sed -i -e '/version=/s/.*/version=${{ github.event.inputs.releaseVersion }}/g' gradle.properties cat gradle.properties - - name: "Commit release version and create tag" run: | git commit -am "release ${{ github.event.inputs.releaseVersion }}" git tag ${{ github.event.inputs.releaseVersion }} git push origin ${{ github.event.inputs.releaseVersion }} - - - name: "Set next development version in gradle.properties file" + - name: "Set next development version" run: | sed -i -e '/version=/s/.*/version=${{ github.event.inputs.nextVersion }}-SNAPSHOT/g' gradle.properties cat gradle.properties - - name: "Commit next development version and push it" run: | git commit -am "set next development version ${{ github.event.inputs.nextVersion }}" - git push origin ${GITHUB_REF} - + git push origin ${{ github.ref }} - name: "Publish Github Release" - uses: toolmantim/release-drafter@v5.15.0 + uses: octokit/request-action@v2.x with: - tag: ${{ github.event.inputs.releaseVersion }} - publish: "true" - version: ${{ github.event.inputs.releaseVersion }} + route: POST /repos/${{ github.repository }}/releases + tag_name: ${{ github.event.inputs.releaseVersion }} + generate_release_notes: true + target_commitish: ${{ github.ref }} env: GITHUB_TOKEN: ${{ secrets.QAMETA_CI }} - diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts index 3163b2202..c7e05cf52 100644 --- a/allure-selenide/build.gradle.kts +++ b/allure-selenide/build.gradle.kts @@ -2,12 +2,13 @@ description = "Allure Selenide Integration" val agent: Configuration by configurations.creating -val selenideVersion = "5.24.2" +val selenideVersion = "6.0.3" dependencies { agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) - implementation("com.codeborne:selenide:$selenideVersion") + compileOnly("com.codeborne:selenide:$selenideVersion") + testImplementation("com.codeborne:selenide:$selenideVersion") testImplementation("org.mockito:mockito-core") testImplementation("org.assertj:assertj-core") testImplementation("org.junit.jupiter:junit-jupiter-api") diff --git a/allure-spring-web/build.gradle.kts b/allure-spring-web/build.gradle.kts index eeb135979..a2a23e9f3 100644 --- a/allure-spring-web/build.gradle.kts +++ b/allure-spring-web/build.gradle.kts @@ -2,7 +2,7 @@ description = "Allure Spring Web Integration" val agent: Configuration by configurations.creating -val springWebVersion = "5.3.9" +val springWebVersion = "5.3.12" dependencies { agent("org.aspectj:aspectjweaver") diff --git a/build.gradle.kts b/build.gradle.kts index 01a525b29..f397ba00b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -130,8 +130,8 @@ configure(libs) { dependencyManagement { imports { - mavenBom("com.fasterxml.jackson:jackson-bom:2.12.5") - mavenBom("org.junit:junit-bom:5.8.0") + mavenBom("com.fasterxml.jackson:jackson-bom:2.13.0") + mavenBom("org.junit:junit-bom:5.8.1") } dependencies { dependency("com.github.tomakehurst:wiremock:2.27.2") @@ -146,12 +146,12 @@ configure(libs) { dependency("org.apache.httpcomponents:httpclient:4.5.13") dependency("org.aspectj:aspectjrt:1.9.7") dependency("org.aspectj:aspectjweaver:1.9.7") - dependency("org.assertj:assertj-core:3.20.2") + dependency("org.assertj:assertj-core:3.21.0") dependency("org.codehaus.groovy:groovy-all:2.5.13") dependency("org.freemarker:freemarker:2.3.31") - dependency("org.jboss.resteasy:resteasy-client:4.7.1.Final") + dependency("org.jboss.resteasy:resteasy-client:4.7.2.Final") dependency("org.mock-server:mockserver-netty:5.11.2") - dependency("org.mockito:mockito-core:3.12.4") + dependency("org.mockito:mockito-core:4.0.0") dependencySet("org.slf4j:1.7.30") { entry("slf4j-api") entry("slf4j-nop") diff --git a/gradle.properties b/gradle.properties index bcdaff6df..10e8f71af 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.15.0 +version=2.16.0 org.gradle.daemon=true org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c02..7454180f2 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew b/gradlew index 4f906e0c8..744e882ed 100755 --- a/gradlew +++ b/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* )