From 1fb3405e6ebc56bbb5f177ea4a647ffb0d27d8f7 Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Mon, 5 Feb 2024 19:01:59 -0800 Subject: [PATCH] fixes --- es7-persistence/build.gradle | 2 -- springboot-bom-overrides.gradle | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/es7-persistence/build.gradle b/es7-persistence/build.gradle index a8ed728ad..e4a33d343 100644 --- a/es7-persistence/build.gradle +++ b/es7-persistence/build.gradle @@ -49,6 +49,4 @@ shadowJar { include 'META-INF/maven/*' } } - -jar.enabled = false jar.dependsOn shadowJar diff --git a/springboot-bom-overrides.gradle b/springboot-bom-overrides.gradle index 8d726a6d9..aa5bd41ad 100644 --- a/springboot-bom-overrides.gradle +++ b/springboot-bom-overrides.gradle @@ -15,7 +15,7 @@ // Dependency version override properties can be found at https://docs.spring.io/spring-boot/docs/3.1.4/reference/htmlsingle/#appendix.dependency-versions.properties // Conductor's default is ES6, but SB brings in ES7 -ext['elasticsearch.version'] = revElasticSearch6 +ext['elasticsearch.version'] = revElasticSearch7 // SB brings groovy 3.0.x which is not compatible with Spock ext['groovy.version'] = revGroovy