Set useStandardizedProjectNames to true, update project and tests dep…

…endencies (#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
micronaut-projects · Jun 19, 2023 · 2189f83 · 2189f83
1 parent f177c5f
commit 2189f83
Show file tree

Hide file tree

Showing 72 changed files with 349 additions and 501 deletions.
diff --git 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
@@ -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
@@ -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
@@ -4,6 +4,6 @@ plugins {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
-	runtimeOnly "com.zaxxer:HikariCP"
-	runtimeOnly "com.h2database:h2"
-}
+	runtimeOnly mnSql.micronaut.jdbc.hikari
+	runtimeOnly mnSql.h2
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -9,4 +9,6 @@
               <!-- files="DefaultBeanContext.java|BeanDefinitionWriter.java|DefaultHttpClient.java"/> -->
 
     <suppress checks="MissingJavadocType" files=".*doc-examples.*" />
+    <suppress checks="FileLength" files="SqlQueryBuilder.java" />
+    <suppress checks="FileLength" files="AbstractSqlLikeQueryBuilder.java" />
 </suppressions>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -3,18 +3,17 @@ 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
 
 	testAnnotationProcessor mn.micronaut.inject.java
 
 	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
@@ -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