matrei opened a new pull request, #16372:
URL: https://github.com/apache/grails-core/pull/16372

   Merge `7.2.x` into `8.0.x` so the 7.0.17 dependency updates (#16358), the 
`spring-boot-starter-sitemesh` revert (#16363) and the MongoDB TCK 
file-descriptor churn fix (#16357, issue #16354) land on this line.
   
   ## Conflict resolution
   
   - `dependencies.gradle` / `gradle.properties`: kept the 8.0.x side. Every 
bump from 7.2.x is already present or superseded here (ant, asciidoctorj, 
greenmail, maven, picocli merged cleanly; asset-pipeline and jnr-posix are 
newer on 8.0.x; byte-buddy, junit and the micronaut properties are no longer 
managed by 8.0.x). The unused `slf4jVersion` property that 7.2.x dropped is 
dropped here as well.
   - `GrailsDataMongoTckManager`: kept the 8.0.x import layout and added the 
`Ulimit` and `MongoDatabase` imports the fd-churn fix needs.
   - `GrailsDataMongoTckManagerSpec`: the two new cleanup features register 
`Book` with `registerDomainClasses` first, since the 8.0.x TCK manager has no 
default domain class list.
   - The MongoDB Map criterion fix from 7.2.x (#16362) is deliberately **not** 
carried by this merge: its files are kept at the 8.0.x state so the 8.0.x port 
can land as its own commit in a follow-up PR.
   
   ## Tests
   
   `:grails-data-mongodb-bson:test` and `:grails-data-mongodb-core:test` pass 
on the merged tree.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to