Upgrade to core 4.2.1 for patch release. (#2689)

* Upgrade to core 4.2.1 for patch release. Enabled some old tests * Don't upgrade platform minor version
micronaut-projects · Dec 13, 2023 · e779ddb · e779ddb
1 parent 6c31ee0
commit e779ddb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/data-processor/src/test/groovy/io/micronaut/data/processor/sql/BuildInsertSpec.groovy b/data-processor/src/test/groovy/io/micronaut/data/processor/sql/BuildInsertSpec.groovy
@@ -25,7 +25,6 @@ import io.micronaut.data.processor.visitors.AbstractDataSpec
 import io.micronaut.inject.BeanDefinition
 import io.micronaut.inject.ast.ClassElement
 import io.micronaut.inject.writer.BeanDefinitionVisitor
-import spock.lang.PendingFeature
 import spock.lang.Unroll
 
 import static io.micronaut.data.processor.visitors.TestUtils.getDataInterceptor
@@ -315,7 +314,6 @@ interface MyInterface extends CrudRepository<Person, Long> {
         getParameterPropertyPaths(method) == ['name', 'age', 'enabled', 'publicId', 'company.myId'] as String[]
     }
 
-    @PendingFeature(reason = "Bug in Micronaut core. Fixed by https://github.com/micronaut-projects/micronaut-core/commit/f6a488677d587be309d5b0abd8925c9a098cfdf9")
     void "test build SQL insert statement for repo with no super interface"() {
         given:
         BeanDefinition beanDefinition = buildBeanDefinition('test.TestBookPageRepository' + BeanDefinitionVisitor.PROXY_SUFFIX, """
@@ -330,7 +328,7 @@ import io.micronaut.data.tck.entities.ShelfBook;
 
 @Repository
 @RepositoryConfiguration(queryBuilder=SqlQueryBuilder.class, implicitQueries = false)
-interface TestBookPageRepository extends io.micronaut.data.tck.repositories.BookPageRepository {
+interface TestBookPageRepository extends io.micronaut.data.tck.repositories.ShelfBookRepository {
 
 }
 """)
@@ -339,7 +337,7 @@ interface TestBookPageRepository extends io.micronaut.data.tck.repositories.Book
         expect:
 
         getQuery(method) == 'INSERT INTO "shelf_book" ("shelf_id","book_id") VALUES (?,?)'
-        getParameterPropertyPaths(method) == ['name', 'age', 'enabled', 'publicId'] as String[]
+        getParameterPropertyPaths(method) == ['shelf.id', 'book.id'] as String[]
     }
 
     void "test build SQL update"() {

diff --git a/data-processor/src/test/groovy/io/micronaut/data/processor/sql/BuildTableSpec.groovy b/data-processor/src/test/groovy/io/micronaut/data/processor/sql/BuildTableSpec.groovy
@@ -131,7 +131,6 @@ class Test {
         sql == 'CREATE TABLE "test" ("id" BIGINT PRIMARY KEY AUTO_INCREMENT,"date_created" TIMESTAMP WITH TIME ZONE);'
     }
 
-//    @PendingFeature(reason = "Waiting for https://github.com/micronaut-projects/micronaut-core/pull/4343")
     void "test custom parent entity with generics"() {
         given:
         def entity = buildJpaEntity('test.Test', '''

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-micronaut = "4.2.0"
+micronaut = "4.2.1"
 micronaut-platform = "4.1.6"
 micronaut-docs = "2.0.0"
 micronaut-gradle-plugin = "4.2.0"