From 2189f836ea2ad256c9a801845f4a78ba9496e807 Mon Sep 17 00:00:00 2001 From: radovanradic Date: Mon, 19 Jun 2023 19:34:26 +0200 Subject: [PATCH] Set useStandardizedProjectNames to true, update project and tests dependencies (#2311) * Change builds to use declared dependencies from catalog * More changes and cleanup * Further cleanup * Reset accepted api changes, set useStandardizedProjectNames to true * Use latest micronaut-sql and update ongres scram client dependency * Fix build * Checkstyle suppressions. Remove mustRunAfter configs --- .../build.gradle | 8 +-- .../benchmark-micronaut-data-jpa/build.gradle | 8 +-- .../build.gradle | 4 +- .../benchmark-spring-data-jdbc/build.gradle | 6 +-- benchmarks/benchmark-spring-data/build.gradle | 4 +- ...onaut.build.internal.data-benchmark.gradle | 22 +------- ...ut.build.internal.data-dependencies.gradle | 4 -- ...cronaut.build.internal.data-example.gradle | 31 ----------- ...d.internal.data-micronaut-benchmark.gradle | 12 ++--- ...icronaut.build.internal.data-module.gradle | 2 +- config/accepted-api-changes.json | 51 +------------------ config/checkstyle/suppressions.xml | 2 + data-azure-cosmos/build.gradle | 12 ++--- data-connection-hibernate/build.gradle | 14 ++--- data-connection-jdbc/build.gradle | 15 ++---- data-document-model/build.gradle | 2 +- data-document-processor/build.gradle | 9 ++-- data-document-tck/build.gradle | 6 +-- data-hibernate-jpa/build.gradle | 14 ++--- data-hibernate-reactive/build.gradle | 10 ++-- data-jdbc/build.gradle | 32 +++--------- data-jpa/build.gradle | 4 +- data-mongodb/build.gradle | 17 +++---- data-processor/build.gradle | 8 +-- data-r2dbc/build.gradle | 16 ++---- data-runtime/build.gradle | 14 ++--- data-spring-jdbc/build.gradle | 14 ++--- data-spring-jpa/build.gradle | 12 ++--- data-spring/build.gradle | 2 +- data-tck/build.gradle | 6 +-- data-tx-hibernate/build.gradle | 16 +++--- data-tx-jdbc/build.gradle | 8 +-- data-tx/build.gradle | 10 ++-- .../azure-cosmos-example-groovy/build.gradle | 11 ++-- .../azure-cosmos-example-java/build.gradle | 10 ++-- .../azure-cosmos-example-kotlin/build.gradle | 10 ++-- .../example-hibernate-and-jdbc/build.gradle | 15 +++--- .../hibernate-example-groovy/build.gradle | 19 ++++--- .../hibernate-example-java/build.gradle | 19 ++++--- .../hibernate-example-kotlin-ksp/build.gradle | 22 ++++---- .../hibernate-example-kotlin/build.gradle | 21 ++++---- .../build.gradle | 7 ++- .../build.gradle | 11 ++-- .../build.gradle | 7 ++- .../build.gradle | 19 ++++--- .../build.gradle | 5 +- .../jdbc-and-r2dbc-example-java/build.gradle | 19 +++---- doc-examples/jdbc-example-groovy/build.gradle | 18 +++---- doc-examples/jdbc-example-java/build.gradle | 19 +++---- doc-examples/jdbc-example-kotlin/build.gradle | 19 ++++--- .../jdbc-example-records-java/build.gradle | 18 ++++--- .../build.gradle | 21 +++----- .../build.gradle | 21 +++----- .../jdbc-spring-tx-example-java/build.gradle | 17 ++++--- doc-examples/jooq-r2dbc-postgres/build.gradle | 11 ++-- .../mongo-example-groovy/build.gradle | 6 +-- doc-examples/mongo-example-java/build.gradle | 4 +- .../mongo-example-kotlin-ksp/build.gradle | 8 +-- .../mongo-example-kotlin/build.gradle | 6 +-- .../mongo-example-records-java/build.gradle | 4 +- .../mongo-jackson-example-java/build.gradle | 5 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 6 +-- .../r2dbc-example-groovy/build.gradle | 11 ++-- doc-examples/r2dbc-example-java/build.gradle | 13 +++-- .../r2dbc-example-kotlin/build.gradle | 13 +++-- .../src/test/resources/application-test.yml | 5 -- .../build.gradle | 17 ++++--- .../build.gradle | 4 +- gradle/libs.versions.toml | 5 +- settings.gradle | 1 + 72 files changed, 349 insertions(+), 501 deletions(-) diff --git a/benchmarks/benchmark-micronaut-data-jdbc/build.gradle b/benchmarks/benchmark-micronaut-data-jdbc/build.gradle index ac424847f48..4a6c38f2368 100644 --- a/benchmarks/benchmark-micronaut-data-jdbc/build.gradle +++ b/benchmarks/benchmark-micronaut-data-jdbc/build.gradle @@ -3,10 +3,10 @@ plugins { } dependencies { - annotationProcessor project(":data-processor") - implementation project(":data-jdbc") + annotationProcessor projects.micronautDataProcessor + implementation projects.micronautDataJdbc implementation libs.jakarta.persistence.api - implementation "io.micronaut.sql:micronaut-jdbc-hikari" - runtimeOnly "com.h2database:h2" + runtimeOnly mnSql.micronaut.jdbc.hikari + runtimeOnly mnSql.h2 runtimeOnly mn.snakeyaml } diff --git a/benchmarks/benchmark-micronaut-data-jpa/build.gradle b/benchmarks/benchmark-micronaut-data-jpa/build.gradle index 1ebe5fb2490..60ff23b34b2 100644 --- a/benchmarks/benchmark-micronaut-data-jpa/build.gradle +++ b/benchmarks/benchmark-micronaut-data-jpa/build.gradle @@ -3,9 +3,9 @@ plugins { } dependencies { - annotationProcessor project(":data-processor") - implementation project(":data-hibernate-jpa") - implementation "io.micronaut.sql:micronaut-jdbc-hikari" - runtimeOnly "com.h2database:h2" + annotationProcessor projects.micronautDataProcessor + implementation projects.micronautDataHibernateJpa + runtimeOnly mnSql.micronaut.jdbc.hikari + runtimeOnly mnSql.h2 runtimeOnly mn.snakeyaml } diff --git a/benchmarks/benchmark-micronaut-data-mongodb/build.gradle b/benchmarks/benchmark-micronaut-data-mongodb/build.gradle index 1ecafdbd641..ff5f888cff1 100644 --- a/benchmarks/benchmark-micronaut-data-mongodb/build.gradle +++ b/benchmarks/benchmark-micronaut-data-mongodb/build.gradle @@ -3,8 +3,8 @@ plugins { } dependencies { - annotationProcessor projects.dataDocumentProcessor - implementation projects.dataMongodb + annotationProcessor projects.micronautDataDocumentProcessor + implementation projects.micronautDataMongodb implementation mnMongo.mongo.driver testImplementation platform(libs.testcontainers.bom) testImplementation libs.testcontainers.mongodb diff --git a/benchmarks/benchmark-spring-data-jdbc/build.gradle b/benchmarks/benchmark-spring-data-jdbc/build.gradle index 382f83d2d66..1fd9aafc619 100644 --- a/benchmarks/benchmark-spring-data-jdbc/build.gradle +++ b/benchmarks/benchmark-spring-data-jdbc/build.gradle @@ -4,6 +4,6 @@ plugins { dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' - runtimeOnly "com.zaxxer:HikariCP" - runtimeOnly "com.h2database:h2" -} \ No newline at end of file + runtimeOnly mnSql.micronaut.jdbc.hikari + runtimeOnly mnSql.h2 +} diff --git a/benchmarks/benchmark-spring-data/build.gradle b/benchmarks/benchmark-spring-data/build.gradle index dbfd64d5d19..9218d049eb1 100644 --- a/benchmarks/benchmark-spring-data/build.gradle +++ b/benchmarks/benchmark-spring-data/build.gradle @@ -4,6 +4,6 @@ plugins { dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - runtimeOnly "com.zaxxer:HikariCP" - runtimeOnly "com.h2database:h2" + runtimeOnly mnSql.micronaut.jdbc.hikari + runtimeOnly mnSql.h2 } diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.data-benchmark.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.data-benchmark.gradle index faf2a90c9be..bbff900af1d 100644 --- a/buildSrc/src/main/groovy/io.micronaut.build.internal.data-benchmark.gradle +++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.data-benchmark.gradle @@ -10,8 +10,8 @@ version "0.1" group "example" dependencies { - testImplementation "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testImplementation libs.jupiter.api + testRuntimeOnly libs.jupiter.engine jmh libs.jmh.core jmh libs.jmh.annprocess @@ -36,21 +36,3 @@ jmh { jmhJar { mergeServiceFiles() } - - -if (micronautBuild.environment.githubAction.get()) { - def waitForTasks = [ - ":data-hibernate-jpa:test", - ":data-jdbc:test", - ":data-r2dbc:test", - ":data-mongodb:test" - ] as Object[] - tasks.named("classes") { - // Postpone examples processing - mustRunAfter waitForTasks - } - tasks.named("test") { - // Let core modules tests pass first so the test containers don't eat all the memory - mustRunAfter waitForTasks - } -} diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.data-dependencies.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.data-dependencies.gradle index e5d295ce440..b965e9bb6ea 100644 --- a/buildSrc/src/main/groovy/io.micronaut.build.internal.data-dependencies.gradle +++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.data-dependencies.gradle @@ -1,7 +1,3 @@ repositories { mavenCentral() } - -//configurations.configureEach { -// resolutionStrategy.cacheChangingModulesFor 0, 'seconds' -//} diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.data-example.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.data-example.gradle index 4cc244c1621..450026251ee 100644 --- a/buildSrc/src/main/groovy/io.micronaut.build.internal.data-example.gradle +++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.data-example.gradle @@ -17,37 +17,6 @@ tasks.withType(JavaCompile).configureEach { options.fork = true } -if (micronautBuild.environment.githubAction.get()) { - def waitForTasks = [ - ":data-hibernate-jpa:test", - ":data-jdbc:test", - ":data-r2dbc:test", - ":data-mongodb:test" - ] as Object[] - // Let core modules tests pass first so the test containers don't eat all the memory - tasks.named("compileJava") { - mustRunAfter waitForTasks - } - tasks.named("processResources") { - mustRunAfter waitForTasks - } - def compileKotlinTask = tasks.findByName("compileKotlin") - if (compileKotlinTask) { - compileKotlinTask.mustRunAfter waitForTasks - } - def internalStartTestResourcesServiceTask = tasks.findByName("internalStartTestResourcesService") - if (internalStartTestResourcesServiceTask) { - internalStartTestResourcesServiceTask.mustRunAfter waitForTasks - } - def kaptGenerateStubsKotlinTask = tasks.findByName("kaptGenerateStubsKotlin") - if (kaptGenerateStubsKotlinTask) { - kaptGenerateStubsKotlinTask.mustRunAfter waitForTasks - } - tasks.named("test") { - mustRunAfter waitForTasks - } -} - tasks.register("testExamples") { dependsOn "test" } diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.data-micronaut-benchmark.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.data-micronaut-benchmark.gradle index 356ef276f62..14e56023851 100644 --- a/buildSrc/src/main/groovy/io.micronaut.build.internal.data-micronaut-benchmark.gradle +++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.data-micronaut-benchmark.gradle @@ -9,14 +9,14 @@ micronaut { } dependencies { - annotationProcessor projects.dataProcessor - annotationProcessor "io.micronaut:micronaut-inject-java" - runtimeOnly "ch.qos.logback:logback-classic" + annotationProcessor projects.micronautDataProcessor + annotationProcessor mn.micronaut.inject.java + runtimeOnly mnLogging.logback.classic - implementation "io.micronaut:micronaut-runtime" + implementation mn.micronaut.runtime - testAnnotationProcessor "io.micronaut:micronaut-inject-java" - testImplementation "io.micronaut.test:micronaut-test-junit5" + testAnnotationProcessor mn.micronaut.inject.java + testImplementation mnTest.micronaut.test.junit5 jmh libs.jmh.core jmh libs.jmh.annprocess diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.data-module.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.data-module.gradle index ec8c8e60d7b..4cae2f202db 100644 --- a/buildSrc/src/main/groovy/io.micronaut.build.internal.data-module.gradle +++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.data-module.gradle @@ -5,7 +5,7 @@ plugins { micronautBuild { binaryCompatibility { - baselineVersion = "4.0.0-M9" + baselineVersion = "4.0.0-M10" enabled = true } } diff --git a/config/accepted-api-changes.json b/config/accepted-api-changes.json index 6604be1349f..41b42e677b9 100644 --- a/config/accepted-api-changes.json +++ b/config/accepted-api-changes.json @@ -1,52 +1,3 @@ [ - { - "type": "io.micronaut.transaction.impl.AbstractInternalTransaction", - "member": "Implemented interface io.micronaut.transaction.SavepointManager", - "reason": "No longer implements io.micronaut.transaction.SavepointManager" - }, - { - "type": "io.micronaut.transaction.impl.AbstractInternalTransaction", - "member": "Implemented interface java.io.Flushable", - "reason": "No longer implements java.io.Flushable" - }, - { - "type": "io.micronaut.transaction.impl.InternalTransaction", - "member": "Implemented interface io.micronaut.transaction.SavepointManager", - "reason": "No longer implements io.micronaut.transaction.SavepointManager" - }, - { - "type": "io.micronaut.transaction.impl.InternalTransaction", - "member": "Implemented interface java.io.Flushable", - "reason": "No longer implements java.io.Flushable" - }, - { - "type": "io.micronaut.transaction.support.TransactionSynchronization", - "member": "Implemented interface java.io.Flushable", - "reason": "No longer implements java.io.Flushable" - }, - { - "type": "io.micronaut.transaction.TransactionStatus", - "member": "Implemented interface io.micronaut.transaction.SavepointManager", - "reason": "No longer implements io.micronaut.transaction.SavepointManager" - }, - { - "type": "io.micronaut.transaction.TransactionStatus", - "member": "Implemented interface java.io.Flushable", - "reason": "No longer implements java.io.Flushable" - }, - { - "type": "io.micronaut.data.mongodb.transaction.MongoSynchronousTransactionManager", - "member": "Implemented interface io.micronaut.transaction.TransactionOperations", - "reason": "Interface has been removed" - }, - { - "type": "io.micronaut.data.mongodb.transaction.MongoSynchronousTransactionManager", - "member": "Implemented interface io.micronaut.transaction.SynchronousTransactionManager", - "reason": "Interface has been removed" - }, - { - "type": "io.micronaut.data.mongodb.transaction.MongoSynchronousTransactionManager", - "member": "Implemented interface io.micronaut.transaction.TransactionManager", - "reason": "Interface has been removed" - } + ] diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml index 73f71b3a499..1382b740027 100644 --- a/config/checkstyle/suppressions.xml +++ b/config/checkstyle/suppressions.xml @@ -9,4 +9,6 @@ + + diff --git a/data-azure-cosmos/build.gradle b/data-azure-cosmos/build.gradle index 86ee6127eaa..27a4190eacf 100644 --- a/data-azure-cosmos/build.gradle +++ b/data-azure-cosmos/build.gradle @@ -13,13 +13,13 @@ micronaut { } dependencies { - annotationProcessor projects.dataDocumentProcessor + annotationProcessor projects.micronautDataDocumentProcessor annotationProcessor mn.micronaut.inject.java annotationProcessor mn.micronaut.graal annotationProcessor libs.micronaut.docs - api projects.dataRuntime - api projects.dataDocumentModel + api projects.micronautDataRuntime + api projects.micronautDataDocumentModel api mnSerde.micronaut.serde.jackson api mnSerde.micronaut.serde.support api libs.micronaut.azure.cosmos @@ -29,12 +29,12 @@ dependencies { } compileOnly mnReactor.micronaut.reactor - testAnnotationProcessor projects.dataDocumentProcessor + testAnnotationProcessor projects.micronautDataDocumentProcessor testAnnotationProcessor mn.micronaut.inject.java testAnnotationProcessor libs.jakarta.persistence.api - testImplementation projects.dataDocumentProcessor - testImplementation projects.dataDocumentTck + testImplementation projects.micronautDataDocumentProcessor + testImplementation projects.micronautDataDocumentTck testImplementation libs.jakarta.persistence.api testImplementation mnRxjava2.micronaut.rxjava2 testImplementation mnReactor.micronaut.reactor diff --git a/data-connection-hibernate/build.gradle b/data-connection-hibernate/build.gradle index e08196f402d..5e6af6c044c 100644 --- a/data-connection-hibernate/build.gradle +++ b/data-connection-hibernate/build.gradle @@ -10,16 +10,16 @@ dependencies { annotationProcessor mn.micronaut.graal api mnSql.hibernate.core - api projects.dataConnection - compileOnly projects.dataConnectionJdbc + api projects.micronautDataConnection + compileOnly projects.micronautDataConnectionJdbc testAnnotationProcessor mn.micronaut.inject.java - testAnnotationProcessor projects.dataProcessor + testAnnotationProcessor projects.micronautDataProcessor - testImplementation projects.dataProcessor - testImplementation projects.dataTck - testImplementation projects.dataRuntime - testImplementation projects.dataHibernateJpa + testImplementation projects.micronautDataProcessor + testImplementation projects.micronautDataTck + testImplementation projects.micronautDataRuntime + testImplementation projects.micronautDataHibernateJpa testRuntimeOnly mnSql.h2 testRuntimeOnly mnSql.micronaut.jdbc.tomcat diff --git a/data-connection-jdbc/build.gradle b/data-connection-jdbc/build.gradle index 88ee095dc12..5f51a8ff9d7 100644 --- a/data-connection-jdbc/build.gradle +++ b/data-connection-jdbc/build.gradle @@ -10,14 +10,14 @@ dependencies { annotationProcessor mn.micronaut.graal annotationProcessor libs.micronaut.docs - api projects.dataConnection + api projects.micronautDataConnection implementation mnSql.micronaut.jdbc implementation mn.micronaut.aop testAnnotationProcessor mn.micronaut.inject.java - testImplementation projects.dataRuntime - testImplementation projects.dataTck + testImplementation projects.micronautDataRuntime + testImplementation projects.micronautDataTck testImplementation mnReactor.micronaut.reactor @@ -58,10 +58,6 @@ micronaut { enabled = true inferClasspath = false additionalModules.add(KnownModules.JDBC_POSTGRESQL) - additionalModules.add(KnownModules.JDBC_MYSQL) - additionalModules.add(KnownModules.JDBC_MARIADB) - additionalModules.add(KnownModules.JDBC_ORACLE_XE) - additionalModules.add(KnownModules.JDBC_MSSQL) clientTimeout = 300 version = libs.versions.micronaut.testresources.get() } @@ -77,9 +73,4 @@ micronautBuild { tasks.withType(Test).configureEach { jvmArgs '-Xmx1024m' systemProperty "oracle.jdbc.timezoneAsRegion", "false" - - if (micronautBuild.environment.githubAction.get()) { - // Let some of the checks tests first so the test containers don't eat all the memory - mustRunAfter ":data-jdbc:test" - } } diff --git a/data-document-model/build.gradle b/data-document-model/build.gradle index c5f86b57d93..5a7c28416b0 100644 --- a/data-document-model/build.gradle +++ b/data-document-model/build.gradle @@ -7,6 +7,6 @@ dependencies { annotationProcessor mn.micronaut.graal api mn.micronaut.inject api mn.micronaut.aop - api projects.dataModel + api projects.micronautDataModel api mnSerde.micronaut.serde.api } diff --git a/data-document-processor/build.gradle b/data-document-processor/build.gradle index 97ef3124564..ded5709ac88 100644 --- a/data-document-processor/build.gradle +++ b/data-document-processor/build.gradle @@ -3,10 +3,10 @@ plugins { } dependencies { - api projects.dataProcessor + api projects.micronautDataProcessor api mnSerde.micronaut.serde.processor api mnSerde.micronaut.serde.api - api projects.dataDocumentModel + api projects.micronautDataDocumentModel compileOnly mn.micronaut.inject.java @@ -14,7 +14,6 @@ dependencies { testImplementation mn.micronaut.inject.groovy testImplementation mn.micronaut.inject.java.test - testImplementation projects.dataDocumentTck - testImplementation projects.dataMongodb - + testImplementation projects.micronautDataDocumentTck + testImplementation projects.micronautDataMongodb } diff --git a/data-document-tck/build.gradle b/data-document-tck/build.gradle index 6c29adeff7d..ae4863be766 100644 --- a/data-document-tck/build.gradle +++ b/data-document-tck/build.gradle @@ -4,12 +4,12 @@ plugins { dependencies { annotationProcessor mn.micronaut.inject.java - annotationProcessor projects.dataDocumentProcessor + annotationProcessor projects.micronautDataDocumentProcessor annotationProcessor mnValidation.micronaut.validation.processor - implementation projects.dataModel + implementation projects.micronautDataModel implementation mnValidation.micronaut.validation - implementation projects.dataTx + implementation projects.micronautDataTx implementation mnTest.micronaut.test.spock implementation mnTest.micronaut.test.core implementation libs.jakarta.persistence.api diff --git a/data-hibernate-jpa/build.gradle b/data-hibernate-jpa/build.gradle index 9f4aa5ce041..7311cffa0ac 100644 --- a/data-hibernate-jpa/build.gradle +++ b/data-hibernate-jpa/build.gradle @@ -6,10 +6,10 @@ dependencies { annotationProcessor mn.micronaut.inject.java annotationProcessor mn.micronaut.graal - api projects.dataRuntime - api projects.dataModel - api projects.dataTxHibernate - api projects.dataJpa + api projects.micronautDataRuntime + api projects.micronautDataModel + api projects.micronautDataTxHibernate + api projects.micronautDataJpa api mnSql.hibernate.core implementation (mnSql.micronaut.hibernate.jpa) { @@ -20,15 +20,15 @@ dependencies { testAnnotationProcessor mn.micronaut.inject.java testAnnotationProcessor mnValidation.micronaut.validation.processor - testAnnotationProcessor projects.dataProcessor + testAnnotationProcessor projects.micronautDataProcessor testImplementation mnValidation.micronaut.validation testImplementation mnValidation.micronaut.validation.processor testImplementation mn.micronaut.inject.groovy - testImplementation projects.dataProcessor + testImplementation projects.micronautDataProcessor testImplementation mnRxjava2.micronaut.rxjava2 testImplementation mnReactor.micronaut.reactor - testImplementation projects.dataTck + testImplementation projects.micronautDataTck testImplementation libs.groovy.sql testRuntimeOnly mnSql.h2 diff --git a/data-hibernate-reactive/build.gradle b/data-hibernate-reactive/build.gradle index 8671fce54ef..606eb8c6e6d 100644 --- a/data-hibernate-reactive/build.gradle +++ b/data-hibernate-reactive/build.gradle @@ -9,7 +9,7 @@ dependencies { annotationProcessor mn.micronaut.inject.java annotationProcessor mn.micronaut.graal - api projects.dataHibernateJpa + api projects.micronautDataHibernateJpa api (mnSql.micronaut.hibernate.reactive) { exclude group: 'io.smallrye.reactive', module: 'mutiny' } @@ -17,13 +17,13 @@ dependencies { implementation mnReactor.micronaut.reactor testAnnotationProcessor mn.micronaut.inject.java - testAnnotationProcessor projects.dataProcessor + testAnnotationProcessor projects.micronautDataProcessor testImplementation mn.micronaut.inject.groovy - testImplementation projects.dataProcessor + testImplementation projects.micronautDataProcessor testImplementation mnRxjava2.micronaut.rxjava2 testImplementation mnReactor.micronaut.reactor - testImplementation projects.dataTck + testImplementation projects.micronautDataTck testImplementation libs.groovy.sql testRuntimeOnly mnSql.vertx.pg.client @@ -34,7 +34,7 @@ dependencies { testResourcesService mnSql.postgresql // See https://github.com/eclipse-vertx/vertx-sql-client/issues/1059 - testRuntimeOnly "com.ongres.scram:client:2.1" + testRuntimeOnly mnSql.ongres.scram.client } micronaut { diff --git a/data-jdbc/build.gradle b/data-jdbc/build.gradle index 787d585b90e..b224a80f477 100644 --- a/data-jdbc/build.gradle +++ b/data-jdbc/build.gradle @@ -10,24 +10,24 @@ dependencies { annotationProcessor mn.micronaut.graal annotationProcessor libs.micronaut.docs - api projects.dataRuntime - api projects.dataTxJdbc - api projects.dataConnectionJdbc + api projects.micronautDataRuntime + api projects.micronautDataTxJdbc + api projects.micronautDataConnectionJdbc implementation mn.micronaut.json.core compileOnly mnSerde.micronaut.serde.oracle.jdbc.json implementation mnSql.micronaut.jdbc compileOnly mnRxjava2.micronaut.rxjava2 - compileOnly projects.dataHibernateJpa + compileOnly projects.micronautDataHibernateJpa compileOnly libs.drivers.jdbc.oracle testAnnotationProcessor mn.micronaut.inject.java - testAnnotationProcessor projects.dataProcessor + testAnnotationProcessor projects.micronautDataProcessor testAnnotationProcessor mnValidation.micronaut.validation.processor - testImplementation projects.dataTck - testImplementation projects.dataProcessor + testImplementation projects.micronautDataTck + testImplementation projects.micronautDataProcessor testImplementation mnRxjava2.micronaut.rxjava2 testImplementation mnReactor.micronaut.reactor testImplementation libs.jackson.databind @@ -65,14 +65,10 @@ dependencies { testResourcesService mnSql.postgresql testResourcesService mnSql.mssql.jdbc - // Needed for H2EagerContextSpec - testImplementation("org.jetbrains.kotlin:kotlin-reflect:1.8.22") testImplementation mnSerde.micronaut.serde.support - testImplementation mnTestResources.micronaut.test.resources.extensions.junit.platform testRuntimeOnly mnSerde.micronaut.serde.oracle.jdbc.json - testRuntimeOnly mnFlyway.micronaut.flyway testRuntimeOnly mnFlyway.flyway.oracle } @@ -95,20 +91,6 @@ micronaut { tasks.withType(Test).configureEach { jvmArgs '-Xmx1024m' systemProperty "oracle.jdbc.timezoneAsRegion", "false" - - if (micronautBuild.environment.githubAction.get()) { - // Let some of the checks tests first so the test containers don't eat all the memory - mustRunAfter ":data-processor:test" - mustRunAfter ":data-document-processor:test" - mustRunAfter ":data-hibernate-jpa:test" - mustRunAfter ":data-hibernate-reactive:test" - mustRunAfter ":data-mongodb:test" - mustRunAfter ":data-azure-cosmos:test" - } -} - -tasks.named("internalStartTestResourcesService") { - //debugServer = true } micronautBuild { diff --git a/data-jpa/build.gradle b/data-jpa/build.gradle index cdc2b063e82..d3363c406bd 100644 --- a/data-jpa/build.gradle +++ b/data-jpa/build.gradle @@ -6,8 +6,8 @@ dependencies { annotationProcessor mn.micronaut.inject.java annotationProcessor mn.micronaut.graal - api projects.dataRuntime - api projects.dataModel + api projects.micronautDataRuntime + api projects.micronautDataModel api libs.jakarta.persistence.api } diff --git a/data-mongodb/build.gradle b/data-mongodb/build.gradle index 436470f73ee..5a9a9d4422e 100644 --- a/data-mongodb/build.gradle +++ b/data-mongodb/build.gradle @@ -12,14 +12,14 @@ micronaut { } dependencies { - annotationProcessor projects.dataDocumentProcessor + annotationProcessor projects.micronautDataDocumentProcessor annotationProcessor mn.micronaut.inject.java annotationProcessor mn.micronaut.graal annotationProcessor libs.micronaut.docs - api projects.dataRuntime - api projects.dataDocumentModel - api projects.dataConnection + api projects.micronautDataRuntime + api projects.micronautDataDocumentModel + api projects.micronautDataConnection api mnSerde.micronaut.serde.bson api mnSerde.micronaut.serde.support @@ -36,14 +36,14 @@ dependencies { compileOnly mnMongo.mongo.reactive compileOnly mnReactor.micronaut.reactor - testAnnotationProcessor projects.dataDocumentProcessor + testAnnotationProcessor projects.micronautDataDocumentProcessor testAnnotationProcessor mn.micronaut.inject.java testAnnotationProcessor libs.jakarta.persistence.api testImplementation mnMongo.mongo.driver testImplementation mnMongo.mongo.reactive - testImplementation projects.dataDocumentProcessor - testImplementation projects.dataDocumentTck + testImplementation projects.micronautDataDocumentProcessor + testImplementation projects.micronautDataDocumentTck testImplementation libs.jakarta.persistence.api testImplementation mnRxjava2.micronaut.rxjava2 testImplementation mnReactor.micronaut.reactor @@ -51,6 +51,5 @@ dependencies { testImplementation mnValidation.micronaut.validation testCompileOnly mn.micronaut.inject.groovy - - testImplementation "com.fasterxml.jackson.core:jackson-annotations" + testCompileOnly mn.jackson.annotations } diff --git a/data-processor/build.gradle b/data-processor/build.gradle index 081b9773527..1ee4edd1de6 100644 --- a/data-processor/build.gradle +++ b/data-processor/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - api projects.dataModel + api projects.micronautDataModel api libs.jakarta.persistence.api compileOnly mn.micronaut.core.processor @@ -17,7 +17,7 @@ dependencies { testImplementation libs.javax.persistence.api testImplementation libs.jakarta.transaction.api testImplementation libs.spring.data.jpa - testImplementation projects.dataTck - testImplementation projects.dataTx - testImplementation projects.dataJdbc + testImplementation projects.micronautDataTck + testImplementation projects.micronautDataTx + testImplementation projects.micronautDataJdbc } diff --git a/data-r2dbc/build.gradle b/data-r2dbc/build.gradle index e7aa7726adf..e8498605ea7 100644 --- a/data-r2dbc/build.gradle +++ b/data-r2dbc/build.gradle @@ -12,8 +12,8 @@ dependencies { api mn.micronaut.runtime api mnReactor.micronaut.reactor - api projects.dataModel - api projects.dataRuntime + api projects.micronautDataModel + api projects.micronautDataRuntime api mnR2dbc.micronaut.r2dbc.core api mnR2dbc.r2dbc.spi @@ -24,14 +24,14 @@ dependencies { compileOnly mnR2dbc.r2dbc.oracle - testImplementation projects.dataTck + testImplementation projects.micronautDataTck testImplementation mnTest.micronaut.test.spock testImplementation mnR2dbc.r2dbc.pool testImplementation mnRxjava2.micronaut.rxjava2 testAnnotationProcessor mn.micronaut.inject.java testAnnotationProcessor mnValidation.micronaut.validation.processor - testAnnotationProcessor projects.dataProcessor + testAnnotationProcessor projects.micronautDataProcessor testImplementation mn.jackson.databind testImplementation libs.javax.persistence.api @@ -75,7 +75,7 @@ dependencies { testImplementation mn.micronaut.http.netty testCompileOnly mn.micronaut.inject.groovy - testCompileOnly projects.dataProcessor + testCompileOnly projects.micronautDataProcessor testResourcesService mnSql.mariadb.java.client testResourcesService libs.drivers.jdbc.oracle @@ -110,15 +110,9 @@ micronaut { tasks.withType(Test).configureEach { jvmArgs '-Xmx3072m' -// systemProperty "oracle.jdbc.timezoneAsRegion", "false" systemProperty "java.net.preferIPv4Stack", "true" systemProperty "java.util.concurrent.ForkJoinPool.common.parallelism", "2" - - if (micronautBuild.environment.githubAction.get()) { - // Let JDBC checks tests first so the test containers don't eat all the memory - mustRunAfter ":data-jdbc:test" - } } micronautBuild { diff --git a/data-runtime/build.gradle b/data-runtime/build.gradle index a5422000b36..097bb7597d4 100644 --- a/data-runtime/build.gradle +++ b/data-runtime/build.gradle @@ -10,8 +10,8 @@ dependencies { annotationProcessor mn.micronaut.inject.java annotationProcessor libs.micronaut.docs - api projects.dataModel - api projects.dataTx + api projects.micronautDataModel + api projects.micronautDataTx compileOnly mn.micronaut.json.core @@ -23,21 +23,21 @@ dependencies { compileOnly mnMultitenancy.micronaut.multitenancy testAnnotationProcessor mn.micronaut.inject.java - testAnnotationProcessor projects.dataProcessor + testAnnotationProcessor projects.micronautDataProcessor testImplementation libs.jakarta.persistence.api testImplementation libs.javax.persistence.api - testImplementation projects.dataProcessor + testImplementation projects.micronautDataProcessor testImplementation mn.micronaut.inject.groovy testImplementation mn.micronaut.http testImplementation mnTest.micronaut.test.junit5 - testImplementation projects.dataTck + testImplementation projects.micronautDataTck testRuntimeOnly libs.jupiter.engine kaptTest mn.micronaut.inject.java - kaptTest projects.dataProcessor + kaptTest projects.micronautDataProcessor testAnnotationProcessor mn.micronaut.inject.java - testAnnotationProcessor projects.dataProcessor + testAnnotationProcessor projects.micronautDataProcessor } test { diff --git a/data-spring-jdbc/build.gradle b/data-spring-jdbc/build.gradle index 5b3135f2302..0bad5cd1348 100644 --- a/data-spring-jdbc/build.gradle +++ b/data-spring-jdbc/build.gradle @@ -10,23 +10,23 @@ dependencies { annotationProcessor libs.micronaut.docs api libs.spring.data.commons - api projects.dataSpring + api projects.micronautDataSpring api mnSpring.spring.jdbc - implementation projects.dataConnectionJdbc - implementation projects.dataRuntime + implementation projects.micronautDataConnectionJdbc + implementation projects.micronautDataRuntime implementation mnSpring.micronaut.spring implementation mnSql.micronaut.jdbc compileOnly mn.micronaut.http testAnnotationProcessor mn.micronaut.inject.java - testAnnotationProcessor projects.dataProcessor + testAnnotationProcessor projects.micronautDataProcessor testImplementation mn.micronaut.inject.groovy - testImplementation projects.dataProcessor - testImplementation projects.dataJdbc - testImplementation projects.dataTck + testImplementation projects.micronautDataProcessor + testImplementation projects.micronautDataJdbc + testImplementation projects.micronautDataTck testRuntimeOnly mnSql.h2 testRuntimeOnly mnSql.micronaut.jdbc.tomcat diff --git a/data-spring-jpa/build.gradle b/data-spring-jpa/build.gradle index ea99054c4df..68acd56124b 100644 --- a/data-spring-jpa/build.gradle +++ b/data-spring-jpa/build.gradle @@ -9,21 +9,21 @@ dependencies { annotationProcessor mn.micronaut.inject.java annotationProcessor libs.micronaut.docs - api projects.dataHibernateJpa + api projects.micronautDataHibernateJpa api libs.spring.data.jpa api (mnSql.micronaut.hibernate.jpa) { exclude group: 'io.micronaut.data' } - implementation projects.dataSpringJdbc + implementation projects.micronautDataSpringJdbc testAnnotationProcessor mn.micronaut.inject.java - testAnnotationProcessor projects.dataProcessor + testAnnotationProcessor projects.micronautDataProcessor testImplementation mn.micronaut.inject.groovy - testImplementation projects.dataProcessor - testImplementation projects.dataHibernateJpa - testImplementation projects.dataTck + testImplementation projects.micronautDataProcessor + testImplementation projects.micronautDataHibernateJpa + testImplementation projects.micronautDataTck testRuntimeOnly mnSql.h2 testRuntimeOnly mnSql.micronaut.jdbc.tomcat diff --git a/data-spring/build.gradle b/data-spring/build.gradle index 08fa702cdbb..59d930f5be6 100644 --- a/data-spring/build.gradle +++ b/data-spring/build.gradle @@ -9,7 +9,7 @@ dependencies { api libs.spring.data.commons - implementation projects.dataRuntime + implementation projects.micronautDataRuntime implementation mnSpring.micronaut.spring compileOnly mn.micronaut.http diff --git a/data-tck/build.gradle b/data-tck/build.gradle index 59ff6e61618..b0d868625f6 100644 --- a/data-tck/build.gradle +++ b/data-tck/build.gradle @@ -7,12 +7,12 @@ dependencies { annotationProcessor mn.micronaut.inject.java annotationProcessor mnValidation.micronaut.validation.processor - annotationProcessor projects.dataProcessor + annotationProcessor projects.micronautDataProcessor implementation mnValidation.micronaut.validation implementation mn.micronaut.http.client implementation mn.micronaut.http.server.netty - implementation projects.dataModel + implementation projects.micronautDataModel implementation mnRxjava2.rxjava2 implementation mn.reactor implementation mnTest.micronaut.test.spock @@ -22,6 +22,6 @@ dependencies { implementation libs.javax.persistence.api implementation libs.jakarta.persistence.api - compileOnly projects.dataJdbc + compileOnly projects.micronautDataJdbc compileOnly mn.micronaut.inject.groovy } diff --git a/data-tx-hibernate/build.gradle b/data-tx-hibernate/build.gradle index 0810516ce75..5d93d8acbe3 100644 --- a/data-tx-hibernate/build.gradle +++ b/data-tx-hibernate/build.gradle @@ -9,19 +9,19 @@ dependencies { annotationProcessor mn.micronaut.inject.java annotationProcessor mn.micronaut.graal - api projects.dataTx - api projects.dataTxJdbc - api projects.dataConnectionHibernate + api projects.micronautDataTx + api projects.micronautDataTxJdbc + api projects.micronautDataConnectionHibernate compileOnly mnSql.micronaut.hibernate.jpa testAnnotationProcessor mn.micronaut.inject.java - testAnnotationProcessor projects.dataProcessor + testAnnotationProcessor projects.micronautDataProcessor - testImplementation projects.dataProcessor - testImplementation projects.dataTck - testImplementation projects.dataRuntime - testImplementation projects.dataHibernateJpa + testImplementation projects.micronautDataProcessor + testImplementation projects.micronautDataTck + testImplementation projects.micronautDataRuntime + testImplementation projects.micronautDataHibernateJpa testRuntimeOnly mnSql.h2 testRuntimeOnly mnSql.micronaut.jdbc.tomcat diff --git a/data-tx-jdbc/build.gradle b/data-tx-jdbc/build.gradle index eacd25139b3..feef1109d22 100644 --- a/data-tx-jdbc/build.gradle +++ b/data-tx-jdbc/build.gradle @@ -6,8 +6,8 @@ dependencies { annotationProcessor mn.micronaut.inject.java api libs.jakarta.transaction.api - api projects.dataTx - api projects.dataConnectionJdbc + api projects.micronautDataTx + api projects.micronautDataConnectionJdbc implementation mn.micronaut.inject implementation mn.micronaut.aop @@ -15,9 +15,9 @@ dependencies { compileOnly mnSql.micronaut.jdbc testAnnotationProcessor mn.micronaut.inject.java - testAnnotationProcessor projects.dataProcessor + testAnnotationProcessor projects.micronautDataProcessor - testImplementation projects.dataProcessor + testImplementation projects.micronautDataProcessor testImplementation mn.micronaut.inject.java.test testImplementation mn.jackson.databind testImplementation mnSql.micronaut.jdbc diff --git a/data-tx/build.gradle b/data-tx/build.gradle index d84d31d8366..06540b71497 100644 --- a/data-tx/build.gradle +++ b/data-tx/build.gradle @@ -6,7 +6,7 @@ dependencies { annotationProcessor mn.micronaut.inject.java api libs.jakarta.transaction.api - api projects.dataConnection + api projects.micronautDataConnection implementation mn.micronaut.inject implementation mn.micronaut.aop @@ -22,9 +22,9 @@ dependencies { compileOnly libs.kotlin.coroutines.reactor testAnnotationProcessor mn.micronaut.inject.java - testAnnotationProcessor projects.dataProcessor + testAnnotationProcessor projects.micronautDataProcessor - testImplementation projects.dataProcessor + testImplementation projects.micronautDataProcessor testImplementation mn.jackson.databind testImplementation mnSql.micronaut.jdbc testImplementation mnReactor.micronaut.reactor @@ -33,8 +33,8 @@ dependencies { testRuntimeOnly mnSql.h2 testRuntimeOnly mnSql.micronaut.jdbc.tomcat - testImplementation("org.junit.jupiter:junit-jupiter-api") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + testImplementation(libs.jupiter.api) + testRuntimeOnly(libs.jupiter.engine) testImplementation "javax.transaction:javax.transaction-api:1.3" } diff --git a/doc-examples/azure-cosmos-example-groovy/build.gradle b/doc-examples/azure-cosmos-example-groovy/build.gradle index 0a08e3b0168..1c1eef90aac 100644 --- a/doc-examples/azure-cosmos-example-groovy/build.gradle +++ b/doc-examples/azure-cosmos-example-groovy/build.gradle @@ -14,14 +14,13 @@ micronaut { } dependencies { - compileOnly projects.dataDocumentProcessor - - implementation projects.dataAzureCosmos - + compileOnly projects.micronautDataDocumentProcessor compileOnly libs.javax.persistence.api + + implementation projects.micronautDataAzureCosmos implementation libs.jakarta.persistence.api - runtimeOnly "ch.qos.logback:logback-classic" + runtimeOnly mnLogging.logback.classic - testImplementation "org.testcontainers:azure" + testImplementation libs.testcontainers.azure } diff --git a/doc-examples/azure-cosmos-example-java/build.gradle b/doc-examples/azure-cosmos-example-java/build.gradle index eb58736eb3d..2279a2dee58 100644 --- a/doc-examples/azure-cosmos-example-java/build.gradle +++ b/doc-examples/azure-cosmos-example-java/build.gradle @@ -14,14 +14,14 @@ micronaut { } dependencies { - annotationProcessor projects.dataDocumentProcessor - - implementation projects.dataAzureCosmos + annotationProcessor projects.micronautDataDocumentProcessor compileOnly libs.javax.persistence.api + + implementation projects.micronautDataAzureCosmos implementation libs.jakarta.persistence.api - runtimeOnly "ch.qos.logback:logback-classic" + runtimeOnly mnLogging.logback.classic - testImplementation "org.testcontainers:azure" + testImplementation libs.testcontainers.azure } diff --git a/doc-examples/azure-cosmos-example-kotlin/build.gradle b/doc-examples/azure-cosmos-example-kotlin/build.gradle index 2a2c224f1f4..f6b780feef9 100644 --- a/doc-examples/azure-cosmos-example-kotlin/build.gradle +++ b/doc-examples/azure-cosmos-example-kotlin/build.gradle @@ -16,17 +16,17 @@ micronaut { } dependencies { - kapt projects.dataDocumentProcessor - - implementation projects.dataAzureCosmos + kapt projects.micronautDataDocumentProcessor compileOnly libs.javax.persistence.api + + implementation projects.micronautDataAzureCosmos implementation libs.jakarta.persistence.api implementation libs.kotlin.coroutines implementation libs.kotlin.coroutines.reactive implementation mnKotlin.micronaut.kotlin.runtime - runtimeOnly "ch.qos.logback:logback-classic" + runtimeOnly mnLogging.logback.classic - testImplementation "org.testcontainers:azure" + testImplementation libs.testcontainers.azure } diff --git a/doc-examples/example-hibernate-and-jdbc/build.gradle b/doc-examples/example-hibernate-and-jdbc/build.gradle index 02823c21a34..2bc9109ddf3 100644 --- a/doc-examples/example-hibernate-and-jdbc/build.gradle +++ b/doc-examples/example-hibernate-and-jdbc/build.gradle @@ -1,5 +1,4 @@ plugins { - id "io.micronaut.build.internal.data-native-example" } @@ -14,12 +13,12 @@ micronaut { } dependencies { - annotationProcessor project(":data-processor") - annotationProcessor "io.micronaut.validation:micronaut-validation" - implementation project(":data-hibernate-jpa") - implementation project(":data-jdbc") + annotationProcessor projects.micronautDataProcessor + annotationProcessor mnValidation.micronaut.validation + implementation projects.micronautDataHibernateJpa + implementation projects.micronautDataJdbc - implementation "io.micronaut.sql:micronaut-jdbc-tomcat" - runtimeOnly "ch.qos.logback:logback-classic" - runtimeOnly "com.h2database:h2" + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnLogging.logback.classic + runtimeOnly mnSql.h2 } diff --git a/doc-examples/hibernate-example-groovy/build.gradle b/doc-examples/hibernate-example-groovy/build.gradle index 19ab17ce5d8..3279c33a12d 100644 --- a/doc-examples/hibernate-example-groovy/build.gradle +++ b/doc-examples/hibernate-example-groovy/build.gradle @@ -14,17 +14,16 @@ micronaut { } dependencies { - compileOnly project(":data-processor") - compileOnly 'io.micronaut.validation:micronaut-validation-processor' + compileOnly projects.micronautDataProcessor + compileOnly mnValidation.micronaut.validation.processor - implementation projects.dataModel + implementation projects.micronautDataModel implementation mnValidation.micronaut.validation - implementation project(":data-hibernate-jpa") - implementation "io.micronaut:micronaut-http-client" - implementation 'io.micronaut.rxjava2:micronaut-rxjava2' - implementation "io.micronaut.sql:micronaut-jdbc-tomcat" - implementation 'io.micronaut.validation:micronaut-validation' + implementation projects.micronautDataHibernateJpa + implementation mn.micronaut.http.client + implementation mnRxjava2.micronaut.rxjava2 - runtimeOnly "ch.qos.logback:logback-classic" - runtimeOnly "com.h2database:h2" + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnLogging.logback.classic + runtimeOnly mnSql.h2 } diff --git a/doc-examples/hibernate-example-java/build.gradle b/doc-examples/hibernate-example-java/build.gradle index d322a4a8902..f47a9b23c9d 100644 --- a/doc-examples/hibernate-example-java/build.gradle +++ b/doc-examples/hibernate-example-java/build.gradle @@ -13,18 +13,17 @@ micronaut { } dependencies { - annotationProcessor project(":data-processor") - annotationProcessor "io.micronaut.validation:micronaut-validation" + annotationProcessor projects.micronautDataProcessor + annotationProcessor mnValidation.micronaut.validation annotationProcessor mnSql.hibernate.jpamodelgen compileOnly mnSerde.micronaut.serde.api - implementation "io.micronaut:micronaut-http-client" - implementation 'io.micronaut.rxjava2:micronaut-rxjava2' - implementation mnSql.tomcat.jdbc + implementation mn.micronaut.http.client + implementation mnRxjava2.micronaut.rxjava2 implementation mnSql.micronaut.hibernate.jpa - implementation project(":data-hibernate-jpa") + implementation projects.micronautDataHibernateJpa - implementation "io.micronaut.sql:micronaut-jdbc-tomcat" - runtimeOnly "ch.qos.logback:logback-classic" - runtimeOnly "com.h2database:h2" - runtimeOnly 'io.micronaut.validation:micronaut-validation' + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnLogging.logback.classic + runtimeOnly mnSql.h2 + runtimeOnly mnValidation.micronaut.validation } diff --git a/doc-examples/hibernate-example-kotlin-ksp/build.gradle b/doc-examples/hibernate-example-kotlin-ksp/build.gradle index 7b2f5ce5340..ece5a1dbe0d 100644 --- a/doc-examples/hibernate-example-kotlin-ksp/build.gradle +++ b/doc-examples/hibernate-example-kotlin-ksp/build.gradle @@ -8,21 +8,19 @@ application { } dependencies { - ksp projects.dataProcessor - implementation 'io.micronaut.rxjava2:micronaut-rxjava2' - implementation 'io.micronaut.reactor:micronaut-reactor' + ksp projects.micronautDataProcessor - implementation "io.micronaut:micronaut-http-client" + implementation mnRxjava2.micronaut.rxjava2 + implementation mnReactor.micronaut.reactor + implementation mn.micronaut.http.client + implementation projects.micronautDataHibernateJpa implementation mnKotlin.micronaut.kotlin.runtime - - implementation projects.dataHibernateJpa - implementation "io.micronaut.sql:micronaut-jdbc-tomcat" - implementation libs.jakarta.persistence.api implementation libs.jakarta.transaction.api - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive" + implementation libs.kotlin.coroutines + implementation libs.kotlin.coroutines.reactive - runtimeOnly "com.h2database:h2" - runtimeOnly "ch.qos.logback:logback-classic" + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnSql.h2 + runtimeOnly mnLogging.logback.classic } diff --git a/doc-examples/hibernate-example-kotlin/build.gradle b/doc-examples/hibernate-example-kotlin/build.gradle index 2c0d7aee1e1..0e9950be52d 100644 --- a/doc-examples/hibernate-example-kotlin/build.gradle +++ b/doc-examples/hibernate-example-kotlin/build.gradle @@ -14,17 +14,18 @@ micronaut { } dependencies { - implementation 'io.micronaut.rxjava2:micronaut-rxjava2' - implementation "io.micronaut:micronaut-http-client" - implementation projects.dataHibernateJpa - implementation projects.dataTx - implementation "io.micronaut.sql:micronaut-jdbc-tomcat" + implementation mnRxjava2.micronaut.rxjava2 + implementation mn.micronaut.http.client + implementation projects.micronautDataHibernateJpa + implementation projects.micronautDataTx implementation mnKotlin.micronaut.kotlin.runtime - implementation 'io.micronaut.validation:micronaut-validation' + implementation mnValidation.micronaut.validation implementation libs.kotlin.coroutines - kapt "io.micronaut.validation:micronaut-validation" - kapt projects.dataProcessor - runtimeOnly "ch.qos.logback:logback-classic" - runtimeOnly "com.h2database:h2" + kapt mnValidation.micronaut.validation + kapt projects.micronautDataProcessor + + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnLogging.logback.classic + runtimeOnly mnSql.h2 } diff --git a/doc-examples/hibernate-reactive-example-groovy/build.gradle b/doc-examples/hibernate-reactive-example-groovy/build.gradle index 5e99ffc2237..8bcc06153dc 100644 --- a/doc-examples/hibernate-reactive-example-groovy/build.gradle +++ b/doc-examples/hibernate-reactive-example-groovy/build.gradle @@ -24,14 +24,13 @@ micronaut { } dependencies { - compileOnly projects.dataProcessor // because it's Groovy + compileOnly projects.micronautDataProcessor // because it's Groovy implementation mn.micronaut.http.validation - implementation projects.dataHibernateReactive + implementation projects.micronautDataHibernateReactive implementation mnReactor.micronaut.reactor runtimeOnly mnLogging.logback.classic runtimeOnly mnSql.vertx.pg.client testResourcesService mnSql.postgresql - // See https://github.com/eclipse-vertx/vertx-sql-client/issues/1059 - testRuntimeOnly "com.ongres.scram:client:2.1" + testRuntimeOnly mnSql.ongres.scram.client } diff --git a/doc-examples/hibernate-reactive-example-java/build.gradle b/doc-examples/hibernate-reactive-example-java/build.gradle index 47fed9256e8..5aff80e8770 100644 --- a/doc-examples/hibernate-reactive-example-java/build.gradle +++ b/doc-examples/hibernate-reactive-example-java/build.gradle @@ -13,14 +13,13 @@ micronaut { } dependencies { - annotationProcessor projects.dataProcessor - implementation "io.micronaut:micronaut-http-client" - implementation projects.dataHibernateReactive - implementation "io.micronaut.reactor:micronaut-reactor" + annotationProcessor projects.micronautDataProcessor + implementation mn.micronaut.http.client + implementation projects.micronautDataHibernateReactive + implementation mnReactor.micronaut.reactor compileOnly mnSerde.micronaut.serde.api - runtimeOnly "ch.qos.logback:logback-classic" + runtimeOnly mnLogging.logback.classic runtimeOnly mnSql.vertx.mysql.client - // Testcontainers wait function needs the driver runtimeOnly mnSql.mysql.connector.java } diff --git a/doc-examples/hibernate-reactive-example-kotlin/build.gradle b/doc-examples/hibernate-reactive-example-kotlin/build.gradle index 14dc0bc97af..9d609f6ae84 100644 --- a/doc-examples/hibernate-reactive-example-kotlin/build.gradle +++ b/doc-examples/hibernate-reactive-example-kotlin/build.gradle @@ -25,13 +25,13 @@ micronaut { dependencies { kapt mnValidation.micronaut.validation - kapt projects.dataProcessor + kapt projects.micronautDataProcessor implementation libs.kotlin.coroutines implementation libs.kotlin.coroutines.reactive implementation libs.kotlin.coroutines.reactor implementation mn.micronaut.http.client - implementation projects.dataHibernateReactive + implementation projects.micronautDataHibernateReactive implementation mnReactor.micronaut.reactor implementation mnKotlin.micronaut.kotlin.runtime @@ -39,6 +39,5 @@ dependencies { runtimeOnly mnSql.vertx.pg.client testResourcesService mnSql.postgresql - // See https://github.com/eclipse-vertx/vertx-sql-client/issues/1059 - testRuntimeOnly "com.ongres.scram:client:2.1" + testRuntimeOnly mnSql.ongres.scram.client } diff --git a/doc-examples/hibernate-spring-tx-example-java/build.gradle b/doc-examples/hibernate-spring-tx-example-java/build.gradle index 97d404b6a48..8f03aa3ec95 100644 --- a/doc-examples/hibernate-spring-tx-example-java/build.gradle +++ b/doc-examples/hibernate-spring-tx-example-java/build.gradle @@ -13,16 +13,15 @@ micronaut { } dependencies { - annotationProcessor projects.dataProcessor - implementation "io.micronaut:micronaut-http-client" - implementation 'io.micronaut.rxjava2:micronaut-rxjava2' - implementation mnSql.tomcat.jdbc + annotationProcessor projects.micronautDataProcessor + implementation mn.micronaut.http.client + implementation mnRxjava2.micronaut.rxjava2 implementation mnSql.micronaut.hibernate.jpa - implementation projects.dataHibernateJpa - implementation projects.dataSpringJpa + implementation projects.micronautDataHibernateJpa + implementation projects.micronautDataSpringJpa - implementation "io.micronaut.sql:micronaut-jdbc-tomcat" - runtimeOnly "ch.qos.logback:logback-classic" - runtimeOnly "com.h2database:h2" - runtimeOnly 'io.micronaut.validation:micronaut-validation' + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnLogging.logback.classic + runtimeOnly mnSql.h2 + runtimeOnly mnValidation.micronaut.validation } diff --git a/doc-examples/hibernate-sync-and-reactive-example-java/build.gradle b/doc-examples/hibernate-sync-and-reactive-example-java/build.gradle index ce8661fbd75..ed6946acfe2 100644 --- a/doc-examples/hibernate-sync-and-reactive-example-java/build.gradle +++ b/doc-examples/hibernate-sync-and-reactive-example-java/build.gradle @@ -24,14 +24,13 @@ micronaut { } dependencies { - annotationProcessor projects.dataProcessor + annotationProcessor projects.micronautDataProcessor implementation mnReactor.micronaut.reactor implementation mn.micronaut.http.client - implementation projects.dataHibernateReactive + implementation projects.micronautDataHibernateReactive runtimeOnly mnLogging.logback.classic runtimeOnly mnSql.micronaut.jdbc.tomcat runtimeOnly mnSql.mysql.connector.java - runtimeOnly mnSql.vertx.mysql.client testResourcesService mnSql.mysql.connector.java } diff --git a/doc-examples/jdbc-and-r2dbc-example-java/build.gradle b/doc-examples/jdbc-and-r2dbc-example-java/build.gradle index 875190764ef..1c0fe69be6e 100644 --- a/doc-examples/jdbc-and-r2dbc-example-java/build.gradle +++ b/doc-examples/jdbc-and-r2dbc-example-java/build.gradle @@ -13,16 +13,17 @@ micronaut { } dependencies { - annotationProcessor projects.dataProcessor - annotationProcessor "io.micronaut.validation:micronaut-validation" - implementation projects.dataJdbc - implementation projects.dataR2dbc - implementation 'io.micronaut.rxjava2:micronaut-rxjava2' - implementation "io.micronaut:micronaut-http-client" - implementation "io.micronaut.validation:micronaut-validation" - implementation "io.micronaut.sql:micronaut-jdbc-tomcat" + annotationProcessor projects.micronautDataProcessor + annotationProcessor mnValidation.micronaut.validation + implementation projects.micronautDataJdbc + implementation projects.micronautDataR2dbc + implementation mnRxjava2.micronaut.rxjava2 + implementation mn.micronaut.http.client + implementation mnValidation.micronaut.validation implementation libs.jakarta.persistence.api - runtimeOnly "ch.qos.logback:logback-classic" + + runtimeOnly mnLogging.logback.classic + runtimeOnly mnSql.micronaut.jdbc.tomcat runtimeOnly mnSql.h2 runtimeOnly mnR2dbc.r2dbc.h2 } diff --git a/doc-examples/jdbc-example-groovy/build.gradle b/doc-examples/jdbc-example-groovy/build.gradle index 6c6a569b017..dbcfa696408 100644 --- a/doc-examples/jdbc-example-groovy/build.gradle +++ b/doc-examples/jdbc-example-groovy/build.gradle @@ -14,14 +14,14 @@ micronaut { } dependencies { - compileOnly project(":data-processor") - compileOnly "io.micronaut.validation:micronaut-validation" - implementation 'io.micronaut.rxjava2:micronaut-rxjava2' - implementation project(":data-jdbc") - implementation "io.micronaut:micronaut-http-client" - implementation "io.micronaut.validation:micronaut-validation" - implementation "io.micronaut.sql:micronaut-jdbc-tomcat" + compileOnly projects.micronautDataProcessor + implementation mnRxjava2.micronaut.rxjava2 + implementation projects.micronautDataJdbc + implementation mn.micronaut.http.client + implementation mnValidation.micronaut.validation implementation libs.jakarta.persistence.api - runtimeOnly "ch.qos.logback:logback-classic" - runtimeOnly "com.h2database:h2" + + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnLogging.logback.classic + runtimeOnly mnSql.h2 } diff --git a/doc-examples/jdbc-example-java/build.gradle b/doc-examples/jdbc-example-java/build.gradle index 71850116bc6..d3cee064da1 100644 --- a/doc-examples/jdbc-example-java/build.gradle +++ b/doc-examples/jdbc-example-java/build.gradle @@ -13,17 +13,18 @@ micronaut { } dependencies { - annotationProcessor projects.dataProcessor + annotationProcessor projects.micronautDataProcessor annotationProcessor mnSql.hibernate.jpamodelgen - annotationProcessor "io.micronaut.validation:micronaut-validation" - implementation project(":data-jdbc") - implementation 'io.micronaut.rxjava2:micronaut-rxjava2' - implementation "io.micronaut:micronaut-http-client" - implementation "io.micronaut.validation:micronaut-validation" - implementation "io.micronaut.sql:micronaut-jdbc-tomcat" + annotationProcessor mnValidation.micronaut.validation + implementation projects.micronautDataJdbc + implementation mnRxjava2.micronaut.rxjava2 + implementation mn.micronaut.http.client + implementation mnValidation.micronaut.validation implementation libs.jakarta.persistence.api - runtimeOnly "ch.qos.logback:logback-classic" - runtimeOnly "com.h2database:h2" + + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnLogging.logback.classic + runtimeOnly mnSql.h2 } sourceSets { diff --git a/doc-examples/jdbc-example-kotlin/build.gradle b/doc-examples/jdbc-example-kotlin/build.gradle index c940d644493..739326f4f1e 100644 --- a/doc-examples/jdbc-example-kotlin/build.gradle +++ b/doc-examples/jdbc-example-kotlin/build.gradle @@ -16,23 +16,22 @@ micronaut { } dependencies { - kapt project(":data-processor") + kapt projects.micronautDataProcessor - implementation 'io.micronaut.rxjava2:micronaut-rxjava2' - implementation 'io.micronaut.reactor:micronaut-reactor' + implementation mnRxjava2.micronaut.rxjava2 + implementation mnReactor.micronaut.reactor implementation mnSerde.micronaut.serde.support implementation mnKotlin.micronaut.kotlin.runtime - implementation "io.micronaut:micronaut-http-client" - implementation project(":data-jdbc") - implementation "io.micronaut.sql:micronaut-jdbc-tomcat" + implementation mn.micronaut.http.client + implementation projects.micronautDataJdbc implementation libs.jakarta.persistence.api implementation libs.kotlin.coroutines implementation libs.kotlin.coroutines.reactive - runtimeOnly "ch.qos.logback:logback-classic" - runtimeOnly "com.h2database:h2" - - testImplementation "io.micronaut.test:micronaut-test-kotest5" + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnLogging.logback.classic + runtimeOnly mnSql.h2 + testImplementation mnTest.micronaut.test.kotest5 } diff --git a/doc-examples/jdbc-example-records-java/build.gradle b/doc-examples/jdbc-example-records-java/build.gradle index cd1b65ce7e6..a549bed63e4 100644 --- a/doc-examples/jdbc-example-records-java/build.gradle +++ b/doc-examples/jdbc-example-records-java/build.gradle @@ -13,13 +13,15 @@ micronaut { } dependencies { - annotationProcessor project(":data-processor") - annotationProcessor "io.micronaut.validation:micronaut-validation" - implementation project(":data-jdbc") - implementation "io.micronaut:micronaut-http-client" - implementation "io.micronaut.validation:micronaut-validation" - implementation "io.micronaut.sql:micronaut-jdbc-tomcat" + annotationProcessor projects.micronautDataProcessor + annotationProcessor mnValidation.micronaut.validation + + implementation projects.micronautDataJdbc + implementation mn.micronaut.http.client + implementation mnValidation.micronaut.validation implementation libs.jakarta.persistence.api - runtimeOnly "ch.qos.logback:logback-classic" - runtimeOnly "com.h2database:h2" + + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnLogging.logback.classic + runtimeOnly mnSql.h2 } diff --git a/doc-examples/jdbc-multitenancy-datasource-example-java/build.gradle b/doc-examples/jdbc-multitenancy-datasource-example-java/build.gradle index 2f64b79f5bd..c986c1cadb2 100644 --- a/doc-examples/jdbc-multitenancy-datasource-example-java/build.gradle +++ b/doc-examples/jdbc-multitenancy-datasource-example-java/build.gradle @@ -17,22 +17,17 @@ micronaut { } dependencies { - implementation mnMultitenancy.micronaut.multitenancy - annotationProcessor projects.dataDocumentProcessor + annotationProcessor projects.micronautDataDocumentProcessor - implementation 'io.micronaut.reactor:micronaut-reactor' - implementation 'io.micronaut:micronaut-http-client' -// implementation 'io.micronaut.data:micronaut-data-jdbc' - implementation projects.dataJdbc + implementation mnMultitenancy.micronaut.multitenancy + implementation mnReactor.micronaut.reactor + implementation mn.micronaut.http.client + implementation projects.micronautDataJdbc implementation mnSerde.micronaut.serde.jackson - implementation libs.jakarta.persistence.api implementation libs.jakarta.transaction.api - runtimeOnly "io.micronaut.sql:micronaut-jdbc-tomcat" - runtimeOnly "com.h2database:h2" - - testImplementation "io.micronaut:micronaut-http-client" - - runtimeOnly "ch.qos.logback:logback-classic" + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnSql.h2 + runtimeOnly mnLogging.logback.classic } diff --git a/doc-examples/jdbc-multitenancy-schema-example-java/build.gradle b/doc-examples/jdbc-multitenancy-schema-example-java/build.gradle index 2f64b79f5bd..c986c1cadb2 100644 --- a/doc-examples/jdbc-multitenancy-schema-example-java/build.gradle +++ b/doc-examples/jdbc-multitenancy-schema-example-java/build.gradle @@ -17,22 +17,17 @@ micronaut { } dependencies { - implementation mnMultitenancy.micronaut.multitenancy - annotationProcessor projects.dataDocumentProcessor + annotationProcessor projects.micronautDataDocumentProcessor - implementation 'io.micronaut.reactor:micronaut-reactor' - implementation 'io.micronaut:micronaut-http-client' -// implementation 'io.micronaut.data:micronaut-data-jdbc' - implementation projects.dataJdbc + implementation mnMultitenancy.micronaut.multitenancy + implementation mnReactor.micronaut.reactor + implementation mn.micronaut.http.client + implementation projects.micronautDataJdbc implementation mnSerde.micronaut.serde.jackson - implementation libs.jakarta.persistence.api implementation libs.jakarta.transaction.api - runtimeOnly "io.micronaut.sql:micronaut-jdbc-tomcat" - runtimeOnly "com.h2database:h2" - - testImplementation "io.micronaut:micronaut-http-client" - - runtimeOnly "ch.qos.logback:logback-classic" + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnSql.h2 + runtimeOnly mnLogging.logback.classic } diff --git a/doc-examples/jdbc-spring-tx-example-java/build.gradle b/doc-examples/jdbc-spring-tx-example-java/build.gradle index b405238fe36..5dc9319b5fb 100644 --- a/doc-examples/jdbc-spring-tx-example-java/build.gradle +++ b/doc-examples/jdbc-spring-tx-example-java/build.gradle @@ -13,13 +13,14 @@ micronaut { } dependencies { - annotationProcessor projects.dataProcessor - implementation projects.dataJdbc - implementation projects.dataSpringJdbc - implementation "io.micronaut:micronaut-http-client" - implementation "io.micronaut.validation:micronaut-validation" - implementation "io.micronaut.sql:micronaut-jdbc-tomcat" + annotationProcessor projects.micronautDataProcessor + implementation projects.micronautDataJdbc + implementation projects.micronautDataSpringJdbc + implementation mn.micronaut.http.client + implementation mnValidation.micronaut.validation implementation libs.jakarta.persistence.api - runtimeOnly "ch.qos.logback:logback-classic" - runtimeOnly "com.h2database:h2" + + runtimeOnly mnSql.micronaut.jdbc.tomcat + runtimeOnly mnLogging.logback.classic + runtimeOnly mnSql.h2 } diff --git a/doc-examples/jooq-r2dbc-postgres/build.gradle b/doc-examples/jooq-r2dbc-postgres/build.gradle index 11901069aa4..2ecacc27071 100644 --- a/doc-examples/jooq-r2dbc-postgres/build.gradle +++ b/doc-examples/jooq-r2dbc-postgres/build.gradle @@ -16,21 +16,18 @@ dependencies { implementation mnSql.micronaut.jooq implementation mnR2dbc.r2dbc.postgresql implementation mnR2dbc.r2dbc.pool - implementation mnReactor.micronaut.reactor implementation mn.micronaut.http implementation mn.micronaut.runtime - - implementation projects.dataTx - implementation projects.dataR2dbc - + implementation projects.micronautDataTx + implementation projects.micronautDataR2dbc implementation mnSerde.micronaut.serde.jackson testImplementation mn.micronaut.http.client testImplementation mnSerde.micronaut.serde.jackson - implementation mn.snakeyaml - implementation mnLogging.logback.classic + runtimeOnly mn.snakeyaml + runtimeOnly mnLogging.logback.classic } micronaut { diff --git a/doc-examples/mongo-example-groovy/build.gradle b/doc-examples/mongo-example-groovy/build.gradle index eeb47597090..6f06489dd55 100644 --- a/doc-examples/mongo-example-groovy/build.gradle +++ b/doc-examples/mongo-example-groovy/build.gradle @@ -24,12 +24,12 @@ micronaut { } dependencies { - compileOnly projects.dataProcessor // Override app plugin version - compileOnly projects.dataDocumentProcessor + compileOnly projects.micronautDataProcessor // Override app plugin version + compileOnly projects.micronautDataDocumentProcessor implementation mnReactor.micronaut.reactor implementation mn.micronaut.http.client - implementation projects.dataMongodb + implementation projects.micronautDataMongodb implementation mnMongo.mongo.driver implementation libs.jakarta.persistence.api diff --git a/doc-examples/mongo-example-java/build.gradle b/doc-examples/mongo-example-java/build.gradle index df75cc43658..6d053978a71 100644 --- a/doc-examples/mongo-example-java/build.gradle +++ b/doc-examples/mongo-example-java/build.gradle @@ -22,13 +22,13 @@ micronaut { } dependencies { - annotationProcessor projects.dataDocumentProcessor + annotationProcessor projects.micronautDataDocumentProcessor implementation mnRxjava2.micronaut.rxjava2 implementation mnReactor.micronaut.reactor implementation mn.micronaut.http.client - implementation projects.dataMongodb + implementation projects.micronautDataMongodb implementation mnMongo.mongo.driver implementation libs.jakarta.persistence.api diff --git a/doc-examples/mongo-example-kotlin-ksp/build.gradle b/doc-examples/mongo-example-kotlin-ksp/build.gradle index 5951cb3a175..0dd9f123f37 100644 --- a/doc-examples/mongo-example-kotlin-ksp/build.gradle +++ b/doc-examples/mongo-example-kotlin-ksp/build.gradle @@ -23,20 +23,20 @@ micronaut { } dependencies { - ksp projects.dataDocumentProcessor + ksp projects.micronautDataDocumentProcessor implementation mnRxjava2.micronaut.rxjava2 implementation mnReactor.micronaut.reactor implementation mn.micronaut.http.client - implementation projects.dataMongodb + implementation projects.micronautDataMongodb implementation mnMongo.mongo.driver implementation mnKotlin.micronaut.kotlin.runtime compileOnly libs.javax.persistence.api implementation libs.jakarta.persistence.api implementation libs.jakarta.transaction.api - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive" + implementation libs.kotlin.coroutines + implementation libs.kotlin.coroutines.reactive runtimeOnly mnLogging.logback.classic } diff --git a/doc-examples/mongo-example-kotlin/build.gradle b/doc-examples/mongo-example-kotlin/build.gradle index 1ad2fe0a999..025254673aa 100644 --- a/doc-examples/mongo-example-kotlin/build.gradle +++ b/doc-examples/mongo-example-kotlin/build.gradle @@ -26,14 +26,14 @@ micronaut { } dependencies { - kapt projects.dataDocumentProcessor + kapt projects.micronautDataDocumentProcessor implementation mnRxjava2.micronaut.rxjava2 implementation mnReactor.micronaut.reactor implementation mn.micronaut.http.client - implementation projects.dataMongodb - implementation projects.dataTx + implementation projects.micronautDataMongodb + implementation projects.micronautDataTx implementation mnMongo.mongo.driver implementation mnKotlin.micronaut.kotlin.runtime diff --git a/doc-examples/mongo-example-records-java/build.gradle b/doc-examples/mongo-example-records-java/build.gradle index 859816aadd8..65ed01563bc 100644 --- a/doc-examples/mongo-example-records-java/build.gradle +++ b/doc-examples/mongo-example-records-java/build.gradle @@ -22,13 +22,13 @@ micronaut { } dependencies { - annotationProcessor projects.dataDocumentProcessor + annotationProcessor projects.micronautDataDocumentProcessor implementation mnRxjava2.micronaut.rxjava2 implementation mnReactor.micronaut.reactor implementation mn.micronaut.http.client - implementation projects.dataMongodb + implementation projects.micronautDataMongodb implementation mnMongo.mongo.driver compileOnly libs.javax.persistence.api diff --git a/doc-examples/mongo-jackson-example-java/build.gradle b/doc-examples/mongo-jackson-example-java/build.gradle index 7edb15b2091..b878121797c 100644 --- a/doc-examples/mongo-jackson-example-java/build.gradle +++ b/doc-examples/mongo-jackson-example-java/build.gradle @@ -22,7 +22,7 @@ micronaut { } dependencies { - annotationProcessor projects.dataDocumentProcessor + annotationProcessor projects.micronautDataDocumentProcessor implementation mnRxjava2.micronaut.rxjava2 implementation mnReactor.micronaut.reactor @@ -31,9 +31,8 @@ dependencies { implementation mnSerde.micronaut.serde.jackson implementation mn.micronaut.http.client - implementation projects.dataMongodb + implementation projects.micronautDataMongodb implementation mnMongo.mongo.driver runtimeOnly mnLogging.logback.classic - } diff --git a/doc-examples/mongo-multitenancy-database-example-java/build.gradle b/doc-examples/mongo-multitenancy-database-example-java/build.gradle index 712bf2bebee..c4c12607d44 100644 --- a/doc-examples/mongo-multitenancy-database-example-java/build.gradle +++ b/doc-examples/mongo-multitenancy-database-example-java/build.gradle @@ -23,12 +23,12 @@ micronaut { dependencies { implementation mnMultitenancy.micronaut.multitenancy - annotationProcessor projects.dataDocumentProcessor + annotationProcessor projects.micronautDataDocumentProcessor implementation mnRxjava2.micronaut.rxjava2 implementation mnReactor.micronaut.reactor implementation mn.micronaut.http.client - implementation projects.dataMongodb + implementation projects.micronautDataMongodb implementation mnSerde.micronaut.serde.jackson implementation mnMongo.mongo.driver diff --git a/doc-examples/mongo-multitenancy-datasource-example-java/build.gradle b/doc-examples/mongo-multitenancy-datasource-example-java/build.gradle index 712bf2bebee..c4c12607d44 100644 --- a/doc-examples/mongo-multitenancy-datasource-example-java/build.gradle +++ b/doc-examples/mongo-multitenancy-datasource-example-java/build.gradle @@ -23,12 +23,12 @@ micronaut { dependencies { implementation mnMultitenancy.micronaut.multitenancy - annotationProcessor projects.dataDocumentProcessor + annotationProcessor projects.micronautDataDocumentProcessor implementation mnRxjava2.micronaut.rxjava2 implementation mnReactor.micronaut.reactor implementation mn.micronaut.http.client - implementation projects.dataMongodb + implementation projects.micronautDataMongodb implementation mnSerde.micronaut.serde.jackson implementation mnMongo.mongo.driver diff --git a/doc-examples/mongo-reactive-example-kotlin/build.gradle b/doc-examples/mongo-reactive-example-kotlin/build.gradle index 4ed75423068..5d0859a883c 100644 --- a/doc-examples/mongo-reactive-example-kotlin/build.gradle +++ b/doc-examples/mongo-reactive-example-kotlin/build.gradle @@ -26,12 +26,12 @@ micronaut { } dependencies { - kapt projects.dataDocumentProcessor + kapt projects.micronautDataDocumentProcessor implementation mnReactor.micronaut.reactor implementation mn.micronaut.http.client - implementation projects.dataMongodb - implementation projects.dataTx + implementation projects.micronautDataMongodb + implementation projects.micronautDataTx implementation mnMongo.mongo.reactive implementation mnKotlin.micronaut.kotlin.runtime diff --git a/doc-examples/r2dbc-example-groovy/build.gradle b/doc-examples/r2dbc-example-groovy/build.gradle index c2fc88c38c9..159775a650c 100644 --- a/doc-examples/r2dbc-example-groovy/build.gradle +++ b/doc-examples/r2dbc-example-groovy/build.gradle @@ -1,3 +1,5 @@ +import io.micronaut.testresources.buildtools.KnownModules + plugins { id "groovy" id "io.micronaut.test-resources" @@ -15,18 +17,19 @@ micronaut { testResources { clientTimeout = 300 version = libs.versions.micronaut.testresources.get() + additionalModules.add(KnownModules.R2DBC_POSTGRESQL) } } dependencies { - compileOnly project(":data-processor") - implementation('io.micronaut.data:micronaut-data-r2dbc') - implementation("io.micronaut.sql:micronaut-jdbc-hikari") + compileOnly projects.micronautDataProcessor + implementation projects.micronautDataR2dbc + implementation mnSql.micronaut.jdbc.hikari implementation libs.jakarta.transaction.api runtimeOnly mnR2dbc.r2dbc.postgresql runtimeOnly mnSql.postgresql - testImplementation "io.micronaut:micronaut-http-client" + testImplementation mn.micronaut.http.client compileOnly mnSerde.micronaut.serde.api } diff --git a/doc-examples/r2dbc-example-java/build.gradle b/doc-examples/r2dbc-example-java/build.gradle index 1b6da91711a..0c616ae98ec 100644 --- a/doc-examples/r2dbc-example-java/build.gradle +++ b/doc-examples/r2dbc-example-java/build.gradle @@ -1,3 +1,5 @@ +import io.micronaut.testresources.buildtools.KnownModules + plugins { id "io.micronaut.build.internal.data-native-example" } @@ -13,14 +15,15 @@ micronaut { testResources { clientTimeout = 300 version = libs.versions.micronaut.testresources.get() + additionalModules.add(KnownModules.R2DBC_POSTGRESQL) } } dependencies { - annotationProcessor("io.micronaut:micronaut-graal") - annotationProcessor project(":data-processor") - implementation("io.micronaut.data:micronaut-data-r2dbc") - implementation("io.micronaut.sql:micronaut-jdbc-hikari") + annotationProcessor mn.micronaut.graal + annotationProcessor projects.micronautDataProcessor + implementation projects.micronautDataR2dbc + implementation mnSql.micronaut.jdbc.hikari implementation libs.jakarta.transaction.api implementation mnSerde.micronaut.serde.jackson @@ -29,5 +32,5 @@ dependencies { runtimeOnly mn.snakeyaml testRuntimeOnly mnSerde.micronaut.serde.jackson - testImplementation "io.micronaut:micronaut-http-client" + testImplementation mn.micronaut.http.client } diff --git a/doc-examples/r2dbc-example-kotlin/build.gradle b/doc-examples/r2dbc-example-kotlin/build.gradle index 887c4b8fafe..69259e7644c 100644 --- a/doc-examples/r2dbc-example-kotlin/build.gradle +++ b/doc-examples/r2dbc-example-kotlin/build.gradle @@ -24,24 +24,23 @@ micronaut { } dependencies { - kapt projects.dataProcessor - implementation projects.dataR2dbc - implementation "io.micronaut.flyway:micronaut-flyway" - implementation "io.micronaut.sql:micronaut-jdbc-hikari" + kapt projects.micronautDataProcessor + implementation projects.micronautDataR2dbc + implementation mnSql.micronaut.jdbc.hikari implementation libs.kotlin.coroutines implementation libs.kotlin.coroutines.reactive implementation libs.kotlin.coroutines.reactor implementation mnSerde.micronaut.serde.support implementation mnKotlin.micronaut.kotlin.runtime - implementation "org.flywaydb:flyway-mysql" implementation libs.jakarta.persistence.api runtimeOnly mnR2dbc.r2dbc.mariadb runtimeOnly mnSql.mariadb.java.client + runtimeOnly mnFlyway.micronaut.flyway + runtimeOnly mnFlyway.flyway.mysql - testImplementation "io.micronaut:micronaut-http-client" + testImplementation mn.micronaut.http.client compileOnly mnSerde.micronaut.serde.api testResourcesService mnSql.mariadb.java.client } - diff --git a/doc-examples/r2dbc-example-kotlin/src/test/resources/application-test.yml b/doc-examples/r2dbc-example-kotlin/src/test/resources/application-test.yml index 09a67d6f40e..a719fd97ed7 100644 --- a/doc-examples/r2dbc-example-kotlin/src/test/resources/application-test.yml +++ b/doc-examples/r2dbc-example-kotlin/src/test/resources/application-test.yml @@ -1,8 +1,3 @@ -test-resources: - containers: - mariadb: - image-name: mariadb:10.6 #Latest supported by Flyway - micronaut: http: client: diff --git a/doc-examples/r2dbc-multitenancy-datasource-example-java/build.gradle b/doc-examples/r2dbc-multitenancy-datasource-example-java/build.gradle index aec1c00f303..fbcbd877462 100644 --- a/doc-examples/r2dbc-multitenancy-datasource-example-java/build.gradle +++ b/doc-examples/r2dbc-multitenancy-datasource-example-java/build.gradle @@ -1,3 +1,5 @@ +import io.micronaut.testresources.buildtools.KnownModules + plugins { id "io.micronaut.build.internal.data-native-example" } @@ -13,26 +15,25 @@ micronaut { testResources { clientTimeout = 300 version = libs.versions.micronaut.testresources.get() + additionalModules.add(KnownModules.R2DBC_MARIADB) } } dependencies { - annotationProcessor projects.dataDocumentProcessor + annotationProcessor projects.micronautDataDocumentProcessor implementation mnMultitenancy.micronaut.multitenancy - implementation 'io.micronaut.reactor:micronaut-reactor' - implementation 'io.micronaut:micronaut-http-client' - implementation 'io.micronaut.data:micronaut-data-r2dbc' + implementation mnReactor.micronaut.reactor + implementation mn.micronaut.http.client + implementation projects.micronautDataR2dbc implementation mnSerde.micronaut.serde.jackson - implementation libs.jakarta.persistence.api implementation libs.jakarta.transaction.api runtimeOnly mnR2dbc.r2dbc.mariadb + runtimeOnly mnLogging.logback.classic - testImplementation "io.micronaut:micronaut-http-client" - - runtimeOnly "ch.qos.logback:logback-classic" + testImplementation mn.micronaut.http.client testResourcesService mnSql.mariadb.java.client } diff --git a/doc-examples/r2dbc-multitenancy-schema-example-java/build.gradle b/doc-examples/r2dbc-multitenancy-schema-example-java/build.gradle index 0fd1e522f76..c97e7824ed5 100644 --- a/doc-examples/r2dbc-multitenancy-schema-example-java/build.gradle +++ b/doc-examples/r2dbc-multitenancy-schema-example-java/build.gradle @@ -20,12 +20,12 @@ micronaut { } dependencies { - annotationProcessor projects.dataDocumentProcessor + annotationProcessor projects.micronautDataDocumentProcessor implementation mnMultitenancy.micronaut.multitenancy implementation mnReactor.micronaut.reactor implementation mn.micronaut.http.client - implementation projects.dataR2dbc + implementation projects.micronautDataR2dbc implementation mnSerde.micronaut.serde.jackson implementation libs.jakarta.persistence.api diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4b21459f13e..6c01b9a7bc8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] micronaut = "4.0.0-RC1" -micronaut-platform = "4.0.0-M3" +micronaut-platform = "4.0.0-M4" micronaut-docs = "2.0.0" micronaut-gradle-plugin = "4.0.0-M4" micronaut-testresources = "2.0.0-M10" @@ -10,7 +10,7 @@ micronaut-reactor = "3.0.0-M8" micronaut-rxjava2 = "2.0.0-M6" micronaut-r2dbc = "5.0.0-M11" micronaut-serde = "2.0.0-M12" -micronaut-sql = "5.0.0-M11" +micronaut-sql = "5.0.0-M12" micronaut-spring = "5.0.0-M6" micronaut-test = "4.0.0-M7" micronaut-mongo = "5.0.0-M5" @@ -109,6 +109,7 @@ micronaut-azure-cosmos = { module = "io.micronaut.azure:micronaut-azure-cosmos", # Test jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine' } +jupiter-api = { module = 'org.junit.jupiter:junit-jupiter-api' } groovy-sql = { module = "org.apache.groovy:groovy-sql" } groovy-dateutil = { module = "org.apache.groovy:groovy-dateutil", version.ref = "groovy" } diff --git a/settings.gradle b/settings.gradle index edb162b42bf..f77e8ca4116 100644 --- a/settings.gradle +++ b/settings.gradle @@ -20,6 +20,7 @@ dependencyResolutionManagement { rootProject.name = 'data-parent' micronautBuild { + useStandardizedProjectNames = true importMicronautCatalog() importMicronautCatalog("micronaut-reactor") importMicronautCatalog("micronaut-rxjava2")