Merge branch 'main' into inherited-test-annotation-support

allure-framework · May 14, 2024 · 62c3214 · 62c3214
2 parents 5af89f8 + 781ab09
commit 62c3214
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/allure-jooq/build.gradle.kts b/allure-jooq/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
     testImplementation(project(":allure-java-commons-test"))
     testImplementation(project(":allure-junit-platform"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testRuntimeOnly("org.postgresql:postgresql:42.7.1")
+    testRuntimeOnly("org.postgresql:postgresql:42.7.3")
 }
 
 java {

diff --git a/allure-rest-assured/build.gradle.kts b/allure-rest-assured/build.gradle.kts
@@ -1,6 +1,6 @@
 description = "Allure Rest-Assured Integration"
 
-val restAssuredVersion = "5.3.1"
+val restAssuredVersion = "5.4.0"
 
 dependencies {
     api(project(":allure-attachments"))

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -139,7 +139,7 @@ configure(libs) {
     apply(plugin = "java")
     apply(plugin = "java-library")
 
-    val orgSlf4jVersion = "2.0.7"
+    val orgSlf4jVersion = "2.0.13"
     val assertJVersion = "1.9.9.1"
 
     dependencyManagement {
@@ -160,7 +160,7 @@ configure(libs) {
             dependency("javax.annotation:javax.annotation-api:1.3.2")
             dependency("net.sourceforge.pmd:pmd-java:6.55.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")
-            dependency("org.apache.httpcomponents:httpclient:4.5.13")
+            dependency("org.apache.httpcomponents:httpclient:4.5.14")
             dependency("org.apache.httpcomponents.client5:httpclient5:5.2.1")
             dependency("org.aspectj:aspectjrt:${assertJVersion}")
             dependency("org.aspectj:aspectjweaver:${assertJVersion}")

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -55,8 +55,8 @@ pluginManagement {
         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.spring.dependency-management") version "1.1.0"
-        id("com.google.protobuf") version "0.9.1"
+        id("io.spring.dependency-management") version "1.1.5"
+        id("com.google.protobuf") version "0.9.4"
         id("com.github.spotbugs") version "6.0.6"
         kotlin("jvm") version "1.7.10"
     }