From 7a233239c82b28c82f2b5a74bd348f5578e1b433 Mon Sep 17 00:00:00 2001 From: DineshKumarRA Date: Mon, 7 Oct 2024 12:19:03 +0100 Subject: [PATCH 1/5] Updated dependencies --- allure-awaitility/build.gradle.kts | 2 +- allure-citrus/build.gradle.kts | 2 +- allure-cucumber7-jvm/build.gradle.kts | 4 ++-- allure-grpc/build.gradle.kts | 4 ++-- allure-httpclient5/build.gradle.kts | 2 +- allure-jbehave5/build.gradle.kts | 2 +- allure-jooq/build.gradle.kts | 6 ++--- allure-jsonunit/build.gradle.kts | 2 +- allure-selenide/build.gradle.kts | 2 +- allure-testng/build.gradle.kts | 2 +- build.gradle.kts | 28 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 14 ++++++------ 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/allure-awaitility/build.gradle.kts b/allure-awaitility/build.gradle.kts index e7afac938..f1ae3597b 100644 --- a/allure-awaitility/build.gradle.kts +++ b/allure-awaitility/build.gradle.kts @@ -2,7 +2,7 @@ description = "Allure Awaitlity Integration" val agent: Configuration by configurations.creating -val awaitilityVersion = "4.2.1" +val awaitilityVersion = "4.2.2" dependencies { agent("org.aspectj:aspectjweaver") diff --git a/allure-citrus/build.gradle.kts b/allure-citrus/build.gradle.kts index dbad67a9c..e94cdcd24 100644 --- a/allure-citrus/build.gradle.kts +++ b/allure-citrus/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure Citrus Integration" -val citrusVersion = "2.8.0" +val citrusVersion = "3.4.1" dependencies { api(project(":allure-java-commons")) diff --git a/allure-cucumber7-jvm/build.gradle.kts b/allure-cucumber7-jvm/build.gradle.kts index 55e1a88fc..54ad743e6 100644 --- a/allure-cucumber7-jvm/build.gradle.kts +++ b/allure-cucumber7-jvm/build.gradle.kts @@ -1,7 +1,7 @@ description = "Allure CucumberJVM 7.0" -val cucumberVersion = "7.18.1" -val cucumberGherkinVersion = "28.0.0" +val cucumberVersion = "7.20.0" +val cucumberGherkinVersion = "29.0.0" dependencies { api(project(":allure-java-commons")) diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts index 54ed3b5da..73a467468 100644 --- a/allure-grpc/build.gradle.kts +++ b/allure-grpc/build.gradle.kts @@ -8,8 +8,8 @@ description = "Allure gRPC Integration" val agent: Configuration by configurations.creating -val grpcVersion = "1.57.2" -val protobufVersion = "4.27.2" +val grpcVersion = "1.68.0" +val protobufVersion = "4.28.2" dependencies { agent("org.aspectj:aspectjweaver") diff --git a/allure-httpclient5/build.gradle.kts b/allure-httpclient5/build.gradle.kts index aa6d53179..af7d3bfe3 100644 --- a/allure-httpclient5/build.gradle.kts +++ b/allure-httpclient5/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure Apache HttpClient5 Integration" -val httpClient5Version = "5.3.1"; +val httpClient5Version = "5.4"; dependencies { api(project(":allure-attachments")) diff --git a/allure-jbehave5/build.gradle.kts b/allure-jbehave5/build.gradle.kts index bdd27f73d..b4a6f652d 100644 --- a/allure-jbehave5/build.gradle.kts +++ b/allure-jbehave5/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure JBehave 5 Integration" -val jbehaveVersion = "5.1.1" +val jbehaveVersion = "5.2.0" dependencies { api(project(":allure-java-commons")) diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts index 673e96cb2..a561d65e2 100644 --- a/allure-jooq/build.gradle.kts +++ b/allure-jooq/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure JOOQ Integration" -val jooqVersion = "3.19.10" +val jooqVersion = "3.19.13" dependencies { api(project(":allure-java-commons")) @@ -11,12 +11,12 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.mockito:mockito-core") testImplementation("org.slf4j:slf4j-simple") - testImplementation(platform("io.zonky.test.postgres:embedded-postgres-binaries-bom:16.2.0")) + testImplementation(platform("io.zonky.test.postgres:embedded-postgres-binaries-bom:17.0.0")) testImplementation(project(":allure-assertj")) testImplementation(project(":allure-java-commons-test")) testImplementation(project(":allure-junit-platform")) testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - testRuntimeOnly("org.postgresql:postgresql:42.7.3") + testRuntimeOnly("org.postgresql:postgresql:42.7.4") } tasks.compileJava { diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts index ab22c0f6e..89bed02da 100644 --- a/allure-jsonunit/build.gradle.kts +++ b/allure-jsonunit/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure JsonUnit Integration" -val jsonUnitVersion = "2.35.0" +val jsonUnitVersion = "3.4.1" dependencies { api(project(":allure-attachments")) diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts index 2ff19ced2..a883293a5 100644 --- a/allure-selenide/build.gradle.kts +++ b/allure-selenide/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure Selenide Integration" -val selenideVersion = "7.4.1" +val selenideVersion = "7.5.1" dependencies { api(project(":allure-java-commons")) diff --git a/allure-testng/build.gradle.kts b/allure-testng/build.gradle.kts index f471e9f7f..3b0f5309e 100644 --- a/allure-testng/build.gradle.kts +++ b/allure-testng/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure TestNG Integration" -val testNgVersion = "6.14.3" +val testNgVersion = "7.10.2" dependencies { api(project(":allure-java-commons")) diff --git a/build.gradle.kts b/build.gradle.kts index c910c789b..b96a1e86d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ val spotlessDtr by extra("$qualityConfigsDir/spotless") val libs = subprojects.filterNot { it.name in "allure-bom" } tasks.withType(Wrapper::class) { - gradleVersion = "8.5" + gradleVersion = "8.10.2" } plugins { @@ -141,36 +141,36 @@ configure(libs) { apply(plugin = "java") apply(plugin = "java-library") - val orgSlf4jVersion = "2.0.13" - val assertJVersion = "1.9.22.1" + val orgSlf4jVersion = "2.0.16" + val aspectJVersion = "1.9.22.1" dependencyManagement { imports { - mavenBom("com.fasterxml.jackson:jackson-bom:2.17.2") - mavenBom("org.junit:junit-bom:5.10.3") + mavenBom("com.fasterxml.jackson:jackson-bom:2.18.0") + mavenBom("org.junit:junit-bom:5.11.2") } dependencies { dependency("com.github.spotbugs:spotbugs:4.8.6") dependency("com.github.tomakehurst:wiremock:3.0.1") dependency("com.google.inject:guice:7.0.0") dependency("com.google.testing.compile:compile-testing:0.21.0") - dependency("com.puppycrawl.tools:checkstyle:10.17.0") + dependency("com.puppycrawl.tools:checkstyle:10.18.2") dependency("com.squareup.retrofit2:retrofit:2.11.0") - dependency("commons-io:commons-io:2.16.1") + dependency("commons-io:commons-io:2.17.0") dependency("io.github.benas:random-beans:3.9.0") dependency("io.github.glytching:junit-extensions:2.6.0") dependency("javax.annotation:javax.annotation-api:1.3.2") - dependency("net.sourceforge.pmd:pmd-java:7.4.0") - dependency("org.apache.commons:commons-lang3:3.15.0") - dependency("org.aspectj:aspectjrt:${assertJVersion}") - dependency("org.aspectj:aspectjweaver:${assertJVersion}") + dependency("net.sourceforge.pmd:pmd-java:7.6.0") + dependency("org.apache.commons:commons-lang3:3.17.0") + dependency("org.aspectj:aspectjrt:${aspectJVersion}") + dependency("org.aspectj:aspectjweaver:${aspectJVersion}") dependency("org.assertj:assertj-core:3.26.3") dependency("org.freemarker:freemarker:2.3.33") - dependency("org.grpcmock:grpcmock-junit5:0.8.0") + dependency("org.grpcmock:grpcmock-junit5:0.14.0") dependency("org.hamcrest:hamcrest:3.0") - dependency("org.jboss.resteasy:resteasy-client:6.2.9.Final") + dependency("org.jboss.resteasy:resteasy-client:6.2.10.Final") dependency("org.mock-server:mockserver-netty:5.15.0") - dependency("org.mockito:mockito-core:5.12.0") + dependency("org.mockito:mockito-core:5.14.1") dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}") dependency("org.slf4j:slf4j-nop:${orgSlf4jVersion}") dependency("org.slf4j:slf4j-simple:${orgSlf4jVersion}") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a59520664..1e2fbf0d4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 9eead326c..da5a8cee0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -48,21 +48,21 @@ pluginManagement { plugins { id("com.diffplug.spotless") version "6.25.0" id("io.github.goooler.shadow") version "8.1.8" - id("com.gradle.enterprise") version "3.17.5" + id("com.gradle.enterprise") version "3.18.1" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" - id("io.qameta.allure-adapter") version "2.11.2" - id("io.qameta.allure-aggregate-report") version "2.11.2" - id("io.qameta.allure-download") version "2.11.2" - id("io.qameta.allure-report") version "2.11.2" + id("io.qameta.allure-adapter") version "2.12.0" + id("io.qameta.allure-aggregate-report") version "2.12.0" + id("io.qameta.allure-download") version "2.12.0" + id("io.qameta.allure-report") version "2.12.0" id("io.spring.dependency-management") version "1.1.6" id("com.google.protobuf") version "0.9.4" - id("com.github.spotbugs") version "6.0.19" + id("com.github.spotbugs") version "6.0.24" kotlin("jvm") version "2.0.0" } } plugins { - id("com.gradle.develocity") version "3.17.5" apply false + id("com.gradle.develocity") version "3.18.1" apply false } val isCiServer = System.getenv().containsKey("CI") From cbeafd2ad5925951cd0b521c941b1694a9b8c88f Mon Sep 17 00:00:00 2001 From: DineshKumarRA Date: Mon, 7 Oct 2024 13:06:11 +0100 Subject: [PATCH 2/5] Reverted citrus dependency change --- allure-citrus/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/allure-citrus/build.gradle.kts b/allure-citrus/build.gradle.kts index e94cdcd24..dbad67a9c 100644 --- a/allure-citrus/build.gradle.kts +++ b/allure-citrus/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure Citrus Integration" -val citrusVersion = "3.4.1" +val citrusVersion = "2.8.0" dependencies { api(project(":allure-java-commons")) From 1ee4a9ae6cf1ef231aa93e31cf92f96c9d52cbdc Mon Sep 17 00:00:00 2001 From: DineshKumarRA Date: Mon, 7 Oct 2024 13:26:37 +0100 Subject: [PATCH 3/5] Reverted dependency changes --- allure-grpc/build.gradle.kts | 4 ++-- allure-httpclient5/build.gradle.kts | 2 +- allure-jbehave5/build.gradle.kts | 2 +- allure-jooq/build.gradle.kts | 2 +- allure-jsonunit/build.gradle.kts | 2 +- build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/allure-grpc/build.gradle.kts b/allure-grpc/build.gradle.kts index 73a467468..54ed3b5da 100644 --- a/allure-grpc/build.gradle.kts +++ b/allure-grpc/build.gradle.kts @@ -8,8 +8,8 @@ description = "Allure gRPC Integration" val agent: Configuration by configurations.creating -val grpcVersion = "1.68.0" -val protobufVersion = "4.28.2" +val grpcVersion = "1.57.2" +val protobufVersion = "4.27.2" dependencies { agent("org.aspectj:aspectjweaver") diff --git a/allure-httpclient5/build.gradle.kts b/allure-httpclient5/build.gradle.kts index af7d3bfe3..aa6d53179 100644 --- a/allure-httpclient5/build.gradle.kts +++ b/allure-httpclient5/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure Apache HttpClient5 Integration" -val httpClient5Version = "5.4"; +val httpClient5Version = "5.3.1"; dependencies { api(project(":allure-attachments")) diff --git a/allure-jbehave5/build.gradle.kts b/allure-jbehave5/build.gradle.kts index b4a6f652d..bdd27f73d 100644 --- a/allure-jbehave5/build.gradle.kts +++ b/allure-jbehave5/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure JBehave 5 Integration" -val jbehaveVersion = "5.2.0" +val jbehaveVersion = "5.1.1" dependencies { api(project(":allure-java-commons")) diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts index a561d65e2..9f0148689 100644 --- a/allure-jooq/build.gradle.kts +++ b/allure-jooq/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure JOOQ Integration" -val jooqVersion = "3.19.13" +val jooqVersion = "3.19.10" dependencies { api(project(":allure-java-commons")) diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts index 89bed02da..ab22c0f6e 100644 --- a/allure-jsonunit/build.gradle.kts +++ b/allure-jsonunit/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure JsonUnit Integration" -val jsonUnitVersion = "3.4.1" +val jsonUnitVersion = "2.35.0" dependencies { api(project(":allure-attachments")) diff --git a/build.gradle.kts b/build.gradle.kts index b96a1e86d..fb2fc705e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ val spotlessDtr by extra("$qualityConfigsDir/spotless") val libs = subprojects.filterNot { it.name in "allure-bom" } tasks.withType(Wrapper::class) { - gradleVersion = "8.10.2" + gradleVersion = "8.5" } plugins { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e2fbf0d4..a59520664 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From bdb34fbfd1b039f16181076e56e62bdefc764f08 Mon Sep 17 00:00:00 2001 From: DineshKumarRA Date: Mon, 7 Oct 2024 13:49:40 +0100 Subject: [PATCH 4/5] Reverted dependencies --- allure-awaitility/build.gradle.kts | 2 +- allure-jooq/build.gradle.kts | 4 ++-- allure-selenide/build.gradle.kts | 2 +- allure-testng/build.gradle.kts | 2 +- build.gradle.kts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/allure-awaitility/build.gradle.kts b/allure-awaitility/build.gradle.kts index f1ae3597b..e7afac938 100644 --- a/allure-awaitility/build.gradle.kts +++ b/allure-awaitility/build.gradle.kts @@ -2,7 +2,7 @@ description = "Allure Awaitlity Integration" val agent: Configuration by configurations.creating -val awaitilityVersion = "4.2.2" +val awaitilityVersion = "4.2.1" dependencies { agent("org.aspectj:aspectjweaver") diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts index 9f0148689..673e96cb2 100644 --- a/allure-jooq/build.gradle.kts +++ b/allure-jooq/build.gradle.kts @@ -11,12 +11,12 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.mockito:mockito-core") testImplementation("org.slf4j:slf4j-simple") - testImplementation(platform("io.zonky.test.postgres:embedded-postgres-binaries-bom:17.0.0")) + testImplementation(platform("io.zonky.test.postgres:embedded-postgres-binaries-bom:16.2.0")) testImplementation(project(":allure-assertj")) testImplementation(project(":allure-java-commons-test")) testImplementation(project(":allure-junit-platform")) testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - testRuntimeOnly("org.postgresql:postgresql:42.7.4") + testRuntimeOnly("org.postgresql:postgresql:42.7.3") } tasks.compileJava { diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts index a883293a5..2ff19ced2 100644 --- a/allure-selenide/build.gradle.kts +++ b/allure-selenide/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure Selenide Integration" -val selenideVersion = "7.5.1" +val selenideVersion = "7.4.1" dependencies { api(project(":allure-java-commons")) diff --git a/allure-testng/build.gradle.kts b/allure-testng/build.gradle.kts index 3b0f5309e..f471e9f7f 100644 --- a/allure-testng/build.gradle.kts +++ b/allure-testng/build.gradle.kts @@ -1,6 +1,6 @@ description = "Allure TestNG Integration" -val testNgVersion = "7.10.2" +val testNgVersion = "6.14.3" dependencies { api(project(":allure-java-commons")) diff --git a/build.gradle.kts b/build.gradle.kts index fb2fc705e..3dbc435d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -166,7 +166,7 @@ configure(libs) { dependency("org.aspectj:aspectjweaver:${aspectJVersion}") dependency("org.assertj:assertj-core:3.26.3") dependency("org.freemarker:freemarker:2.3.33") - dependency("org.grpcmock:grpcmock-junit5:0.14.0") + dependency("org.grpcmock:grpcmock-junit5:0.8.0") dependency("org.hamcrest:hamcrest:3.0") dependency("org.jboss.resteasy:resteasy-client:6.2.10.Final") dependency("org.mock-server:mockserver-netty:5.15.0") From c2a43eb0d78127a5566fdd9fd5385dec9e1141f1 Mon Sep 17 00:00:00 2001 From: DineshKumarRA Date: Mon, 7 Oct 2024 14:15:18 +0100 Subject: [PATCH 5/5] Reverted dependencies --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3dbc435d6..13bd0cb26 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -160,7 +160,7 @@ configure(libs) { dependency("io.github.benas:random-beans:3.9.0") dependency("io.github.glytching:junit-extensions:2.6.0") dependency("javax.annotation:javax.annotation-api:1.3.2") - dependency("net.sourceforge.pmd:pmd-java:7.6.0") + dependency("net.sourceforge.pmd:pmd-java:7.4.0") dependency("org.apache.commons:commons-lang3:3.17.0") dependency("org.aspectj:aspectjrt:${aspectJVersion}") dependency("org.aspectj:aspectjweaver:${aspectJVersion}")