Skip to content

Commit

Permalink
Merge branch 'main' into 09984-fix-nft-tests
Browse files Browse the repository at this point in the history
Signed-off-by: Kristiyan Selveliev <[email protected]>
  • Loading branch information
kselveliev committed Jan 21, 2025
2 parents a863351 + af391af commit 233f3c0
Show file tree
Hide file tree
Showing 40 changed files with 750 additions and 460 deletions.
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ plugins {

// Can't use typed variable syntax due to Dependabot limitations
extra.apply {
set("grpcVersion", "1.69.0")
set("grpcVersion", "1.69.1")
set("mapStructVersion", "1.6.3")
set("nodeJsVersion", "18.20.5")
set("protobufVersion", "3.25.5")
Expand All @@ -54,7 +54,7 @@ dependencies {
api("com.esaulpaugh:headlong:10.0.2")
api("com.github.meanbeanlib:meanbean:3.0.0-M9")
api("com.github.vertical-blank:sql-formatter:2.0.5")
api("org.bouncycastle:bcprov-jdk18on:1.79")
api("org.bouncycastle:bcprov-jdk18on:1.80")
api("com.bucket4j:bucket4j-core:8.10.1")
api("com.google.cloud:spring-cloud-gcp-dependencies:5.8.0")
api("com.google.guava:guava:33.4.0-jre")
Expand All @@ -75,7 +75,7 @@ dependencies {
api("io.github.mweirauch:micrometer-jvm-extras:0.2.2")
api("io.grpc:grpc-bom:$grpcVersion")
api("io.hypersistence:hypersistence-utils-hibernate-63:3.9.0")
api("io.projectreactor:reactor-core-micrometer:1.2.1")
api("io.projectreactor:reactor-core-micrometer:1.2.2")
api("io.swagger:swagger-annotations:1.6.14")
api("io.vertx:vertx-pg-client:$vertxVersion")
api("io.vertx:vertx-codegen:$vertxVersion")
Expand All @@ -101,7 +101,7 @@ dependencies {
api("org.springframework.cloud:spring-cloud-dependencies:2024.0.0")
api("org.testcontainers:junit-jupiter:1.20.4")
api("org.mockito:mockito-inline:5.2.0")
api("software.amazon.awssdk:bom:2.29.50")
api("software.amazon.awssdk:bom:2.30.2")
api("uk.org.webcompere:system-stubs-jupiter:2.1.7")
api("org.web3j:core:4.12.2")
api("tech.pegasys:jc-kzg-4844:1.0.0")
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ repositories {

dependencies {
val dockerJavaVersion = "3.4.1"
val flywayVersion = "11.1.1"
val jooqVersion = "3.19.17"
val flywayVersion = "11.2.0"
val jooqVersion = "3.19.18"

// Add docker-java dependencies before gradle-docker-plugin to avoid the docker-java jars
// embedded in the plugin being used by testcontainers-postgresql
Expand All @@ -48,7 +48,7 @@ dependencies {
implementation("org.jooq:jooq-codegen-gradle:$jooqVersion")
implementation("org.jooq:jooq-meta:$jooqVersion")
implementation("org.openapitools:openapi-generator-gradle-plugin:7.10.0")
implementation("org.owasp:dependency-check-gradle:12.0.0")
implementation("org.owasp:dependency-check-gradle:12.0.1")
implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:6.0.1.5171")
implementation("org.springframework.boot:spring-boot-gradle-plugin:3.4.1")
implementation("org.testcontainers:postgresql:1.20.4")
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ org.gradle.configureondemand=true
org.gradle.jvmargs=-Xms1024m -Xmx4096m -XX:+UseParallelGC -Dfile.encoding=UTF-8
org.gradle.kotlin.dsl.allWarningsAsErrors=true
org.gradle.parallel=true
systemProp.gradle.enterprise.testretry.enabled=false
systemProp.develocity.testretry.enabled=false
# Kotlin Settings
kotlin.code.style=official
kotlin.incremental=true
kotlin.incremental=true
Loading

0 comments on commit 233f3c0

Please sign in to comment.