From 188566f5c77b4f09f6cd9511f1203581ec94432d Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Wed, 12 Apr 2023 15:33:38 +0200 Subject: [PATCH 1/6] use kotlin dsl kotlin dsl --- .../{build.gradle => build.gradle.kts} | 10 +++++++--- .../{build.gradle => build.gradle.kts} | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) rename elasticsearch/{build.gradle => build.gradle.kts} (73%) rename test-suite-groovy/{build.gradle => build.gradle.kts} (50%) diff --git a/elasticsearch/build.gradle b/elasticsearch/build.gradle.kts similarity index 73% rename from elasticsearch/build.gradle rename to elasticsearch/build.gradle.kts index 27a6b29d..c899b62a 100644 --- a/elasticsearch/build.gradle +++ b/elasticsearch/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id 'io.micronaut.build.internal.elasticsearch-module' + id("io.micronaut.build.internal.elasticsearch-module") } dependencies { @@ -20,6 +20,10 @@ dependencies { testImplementation(mn.reactor) } -tasks.named('test') { - systemProperty 'elasticsearch.version', libs.versions.managed.elasticsearch.get() + +tasks { + named("test") { + systemProperty("elasticsearch.version", libs.versions.managed.elasticsearch.get()) + } } + diff --git a/test-suite-groovy/build.gradle b/test-suite-groovy/build.gradle.kts similarity index 50% rename from test-suite-groovy/build.gradle rename to test-suite-groovy/build.gradle.kts index 61adac30..a86f6854 100644 --- a/test-suite-groovy/build.gradle +++ b/test-suite-groovy/build.gradle.kts @@ -1,10 +1,10 @@ plugins { - id 'groovy' - id 'io.micronaut.build.internal.elasticsearch-tests' + id("groovy") + id("io.micronaut.build.internal.elasticsearch-tests") } dependencies { - testCompileOnly mn.micronaut.inject.groovy + testCompileOnly(mn.micronaut.inject.groovy) testImplementation(platform(mn.micronaut.core.bom)) testImplementation(mnTest.micronaut.test.spock) @@ -17,12 +17,14 @@ dependencies { testRuntimeOnly(mn.logback.classic) } -tasks.named('test') { - useJUnitPlatform() - systemProperty 'elasticsearch.version', libs.versions.managed.elasticsearch.get() +tasks { + named("test") { + useJUnitPlatform() + systemProperty("elasticsearch.version", libs.versions.managed.elasticsearch.get()) + } } java { - sourceCompatibility = JavaVersion.toVersion('17') - targetCompatibility = JavaVersion.toVersion('17') + sourceCompatibility = JavaVersion.toVersion("17") + targetCompatibility = JavaVersion.toVersion("17") } From 9075a3c2d2f3be503dbe26aab29d548318983982 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Wed, 12 Apr 2023 15:33:50 +0200 Subject: [PATCH 2/6] build: Micronaut Security M1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a97d82e8..f5702bf1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,8 +2,8 @@ micronaut-docs = "2.0.0" micronaut = "4.0.0-M1" -micronaut-security = "4.0.0-SNAPSHOT" micronaut-test = "4.0.0-SNAPSHOT" +micronaut-security = "4.0.0-M1" managed-elasticsearch = "7.16.3" From 15fd39c8bfe740bf99525ea767e119ad55b36641 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Wed, 12 Apr 2023 15:33:58 +0200 Subject: [PATCH 3/6] build: Micronaut Test M1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f5702bf1..46a66709 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,8 +2,8 @@ micronaut-docs = "2.0.0" micronaut = "4.0.0-M1" -micronaut-test = "4.0.0-SNAPSHOT" micronaut-security = "4.0.0-M1" +micronaut-test = "4.0.0-M1" managed-elasticsearch = "7.16.3" From 2ac504541c457541573320205c456fc575f22f35 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Wed, 12 Apr 2023 15:34:09 +0200 Subject: [PATCH 4/6] Apache Groovy 4.0.11 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 46a66709..42e92a68 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ micronaut-test = "4.0.0-M1" managed-elasticsearch = "7.16.3" graal-svm = "22.3.1" -groovy = "4.0.9" +groovy = "4.0.11" spock = "2.3-groovy-4.0" testcontainers = "1.17.6" From 88e884bd9eb6ffb08ef8fa3cec188c69851d0ee0 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Wed, 12 Apr 2023 15:34:24 +0200 Subject: [PATCH 5/6] testcontainers 1.18.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 42e92a68..59e64c48 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ managed-elasticsearch = "7.16.3" graal-svm = "22.3.1" groovy = "4.0.11" spock = "2.3-groovy-4.0" -testcontainers = "1.17.6" +testcontainers = "1.18.0" [libraries] micronaut-security = { module = "io.micronaut.security:micronaut-security-bom", version.ref = "micronaut-security" } From c81c6aaf3b25fd6c05149659b69d621b96c448a3 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Wed, 12 Apr 2023 15:41:21 +0200 Subject: [PATCH 6/6] enable binary compatibility --- elasticsearch-bom/build.gradle | 9 --------- elasticsearch-bom/build.gradle.kts | 3 +++ 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 elasticsearch-bom/build.gradle create mode 100644 elasticsearch-bom/build.gradle.kts diff --git a/elasticsearch-bom/build.gradle b/elasticsearch-bom/build.gradle deleted file mode 100644 index 656ec5a7..00000000 --- a/elasticsearch-bom/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -plugins { - id "io.micronaut.build.internal.bom" -} - -// First BOM release, this can be removed after a BOM is out -micronautBuild { - // Required as a workaround to https://github.com/micronaut-projects/micronaut-build/pull/376 - tasks.named("checkVersionCatalogCompatibility") { onlyIf { false } } -} diff --git a/elasticsearch-bom/build.gradle.kts b/elasticsearch-bom/build.gradle.kts new file mode 100644 index 00000000..1f39ff0d --- /dev/null +++ b/elasticsearch-bom/build.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("io.micronaut.build.internal.bom") +}