Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ def publishedProjects = [
// datastore
'grails-datastore-async',
'grails-datastore-core',
'grails-datastore-gorm',
'grails-datamapping-core',
'grails-datamapping-async',
//'grails-datastore-gorm-rx',
//'grails-datamapping-rx',
'grails-datamapping-support',
'grails-datamapping-tck-tests',
'grails-datamapping-tck-base',
Expand Down
4 changes: 2 additions & 2 deletions gradle/documentation-config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ tasks.register('data-mapping-groovydoc', Groovydoc) {
it.name in [
'grails-datastore-async',
'grails-datastore-core',
'grails-datastore-gorm',
'grails-datamapping-core',
'grails-datamapping-async',
'grails-datamapping-support',
'grails-datamapping-validation',
'grails-datastore-web',

// These are test api docs that aren't typically included in the runtime classpath of applications.
// for now include them in the groovy doc unless we want to call out that documentation separately later.
'grails-datastore-gorm-test',
'grails-datamapping-core-test',
'grails-testing-support-datamapping'
]
}
Expand Down
2 changes: 1 addition & 1 deletion grails-data-hibernate5/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
api "org.slf4j:slf4j-api"

api "org.apache.groovy:groovy"
api project(":grails-datastore-gorm")
api project(":grails-datamapping-core")
api "org.springframework:spring-orm"
api "org.hibernate:hibernate-core-jakarta:$hibernateVersion", {
exclude group:'commons-logging', module:'commons-logging'
Expand Down
2 changes: 1 addition & 1 deletion grails-data-hibernate5/docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version = projectVersion

ext {
isReleaseVersion = !projectVersion.endsWith('-SNAPSHOT')
coreProjects = ['grails-datastore-core', 'grails-datastore-gorm']
coreProjects = ['grails-datastore-core', 'grails-datamapping-core']
}

configurations {
Expand Down
4 changes: 2 additions & 2 deletions grails-data-mongodb/boot-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ dependencies {
// impl: Needed for Java Spring Boot apps
// comp: @CompileStatic(source)
}
// Provided by grails-datastore-gorm
// Provided by grails-datamapping-core
// implementation project(':grails-datastore-core'), {
// // impl: Service
// }
implementation project(':grails-datastore-gorm'), {
implementation project(':grails-datamapping-core'), {
// impl: ConfigurableApplicationContextEventPublisher
}
implementation 'org.springframework:spring-core', {
Expand Down
4 changes: 2 additions & 2 deletions grails-data-mongodb/bson/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ dependencies {
exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
}
}
api project(':grails-datastore-gorm'), {
api project(':grails-datamapping-core'), {
// api: DetachedCriteria
if (excludeUnusedTransDeps) {
// API dependencies in grails-datastore-gorm
// API dependencies in grails-datamapping-core
exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
//exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity
exclude group: 'org.apache.grails.data', module: 'grails-datastore-core'
Expand Down
6 changes: 3 additions & 3 deletions grails-data-mongodb/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
// API dependencies in grails-data-mongodb-bson
exclude group: 'org.mongodb', module: 'bson'
exclude group: 'org.apache.grails.data', module: 'grails-datastore-core'
exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm'
exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core'
}
}
api project(':grails-datastore-core'), {
Expand All @@ -53,7 +53,7 @@ dependencies {
exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
}
}
api project(':grails-datastore-gorm'), {
api project(':grails-datamapping-core'), {
// api: CriteriaBuilder, AbstractResultList
if (excludeUnusedTransDeps) {
// API dependencies in grails-datastore-gorm
Expand All @@ -73,7 +73,7 @@ dependencies {
// API dependencies in grails-datamapping-support
exclude group: 'org.apache.grails', module: 'grails-core'
exclude group: 'org.apache.grails.data', module: 'grails-datastore-core'
exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm'
exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core'
exclude group: 'org.springframework', module: 'spring-context'
exclude group: 'org.springframework', module: 'spring-core'
}
Expand Down
2 changes: 1 addition & 1 deletion grails-data-mongodb/docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version = projectVersion

ext {
isReleaseVersion = !version.endsWith('SNAPSHOT')
coreProjects = ['grails-datastore-core', 'grails-datastore-gorm']
coreProjects = ['grails-datastore-core', 'grails-datamapping-core']
}

configurations {
Expand Down
6 changes: 3 additions & 3 deletions grails-data-mongodb/ext/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {
if (excludeUnusedTransDeps) {
// API dependencies in grails-datastore-gorm-mongodb
//exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' // NativeEntryEntityPersister
exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm'
exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core'
exclude group: 'org.apache.grails.data', module: 'grails-data-mongodb-bson'
exclude group: 'org.apache.grails.data', module: 'grails-datamapping-support'
//exclude group: 'org.mongodb', module: 'bson' // Document
Expand All @@ -46,10 +46,10 @@ dependencies {
exclude group: 'org.springframework', module: 'spring-context'
}
}
implementation project(':grails-datastore-gorm'), {
implementation project(':grails-datamapping-core'), {
// impl: GormEnhancer
if (excludeUnusedTransDeps) {
// API dependencies in grails-datastore-gorm
// API dependencies in grails-datamapping-core
exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
//exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity
exclude group: 'org.apache.grails', module: 'grails-core'
Expand Down
6 changes: 3 additions & 3 deletions grails-data-mongodb/grails-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ dependencies {
// api: needed as classes should also be available when compiling apps. eg. MongoEntity
// impl: MongoDatastore, MongoDbDataStoreSpringInitializer
if (excludeUnusedTransDeps) {
// API dependencies in grails-datastore-gorm-mongodb
// API dependencies in grails-data-mongodb
//exclude group: 'org.apache.grails.data', module: 'grails-data-mongodb-bson' // Needed at runtime downstream (BsonPersistentEntityCodec)
exclude group: 'org.apache.grails.data', module: 'grails-datastore-core'
exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm'
exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core'
exclude group: 'org.apache.grails.data', module: 'grails-datamapping-support'
//exclude group: 'org.mongodb', module: 'bson' // Needed downstream for compiling MongoEntity
//exclude group: 'org.mongodb', module: 'mongodb-driver-core' // MongoClientSettings
Expand All @@ -47,7 +47,7 @@ dependencies {
if (excludeUnusedTransDeps) {
// API dependencies in grails-datamapping-support
exclude group: 'org.apache.grails.data', module: 'grails-datastore-core'
//exclude group: 'org.apache.grails.data, module: 'grails-datastore-gorm' // AbstractDatastorePersistenceContextInterceptor
//exclude group: 'org.apache.grails.data, module: 'grails-datamapping-core' // AbstractDatastorePersistenceContextInterceptor
exclude group: 'org.apache.grails', module: 'grails-core'
exclude group: 'org.springframework', module: 'spring-context'
exclude group: 'org.springframework', module: 'spring-core'
Expand Down
6 changes: 3 additions & 3 deletions grails-data-neo4j/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,14 @@ subprojects { subproject ->
if (details.requested.group == 'org.grails' &&
details.requested.name in ['grails-datastore-core',
'grails-datastore-async',
'grails-datastore-gorm',
'grails-datamapping-core',
'grails-datamapping-async',
'grails-datastore-gorm-rx',
'grails-datamapping-rx',
'grails-datamapping-support',
'grails-datamapping-tck-tests',
'grails-datamapping-tck-base',
'grails-datamapping-tck-domains',
'grails-datastore-gorm-test',
'grails-datamapping-core-test',
'grails-datamapping-validation',
'grails-datastore-web']
) {
Expand Down
2 changes: 1 addition & 1 deletion grails-data-neo4j/grails-datastore-gorm-neo4j/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {

implementation "org.javassist:javassist:$javassistVersion"
testImplementation "org.neo4j.test:neo4j-harness:$neo4jVersion"
testImplementation "org.apache.grails.data:grails-datastore-gorm-test:$datastoreVersion"
testImplementation "org.apache.grails.data:grails-datamapping-core-test:$datastoreVersion"
testImplementation "org.apache.grails.data:grails-datamapping-tck-tests:$datastoreVersion"
testImplementation "org.hibernate:hibernate-validator:$hibernateValidatorVersion"
testImplementation "org.codehaus.gpars:gpars:$gparsVersion"
Expand Down
4 changes: 2 additions & 2 deletions grails-data-simple/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ dependencies {
exclude group: 'org.springframework', module: 'spring-tx'
}
}
api project(':grails-datastore-gorm'), {
api project(':grails-datamapping-core'), {
// api: ConfigurableApplicationEventPublisher, GormEnhancer, GormInstanceApi, GormStaticApi, GormValidationApi
// impl: MultiTenantEventListener, ClasspathEntityScanner
if (excludeUnusedTransDeps) {
// API dependencies in grails-datastore-gorm
// API dependencies in grails-datamapping-core
//exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' // PostConstruct
exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
exclude group: 'org.apache.grails.data', module: 'grails-datastore-core'
Expand Down
4 changes: 2 additions & 2 deletions grails-datamapping-async/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ dependencies {

implementation platform("org.apache.grails:grails-bom:$grailsVersion")

api project(':grails-datastore-gorm'), {
api project(':grails-datamapping-core'), {
// api: GormEntity, GormStaticApi, GormOperations, GormStaticOperations
// impl: GormEnhancer
if (excludeUnusedTransDeps) {
// API dependencies in grails-datastore-gorm
// API dependencies in grails-datamapping-core
exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
//exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity
//exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' // DirtyCheckable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
exclude group: 'org.springframework', module: 'spring-tx'
}
}
api project(':grails-datastore-gorm'), {
api project(':grails-datamapping-core'), {
// api: ConfigurableApplicationEventPublisher, GormEnhancer, GormInstanceApi, GormStaticApi, GormValidationApi
// impl: MultiTenantEventListener, ClasspathEntityScanner
if (excludeUnusedTransDeps) {
Expand Down Expand Up @@ -91,7 +91,7 @@ dependencies {
testImplementation 'org.spockframework:spock-core'

// Commented out since we aren't building / publishing
//testImplementation project(":grails-datastore-gorm-rx")
//testImplementation project(":grails-datamapping-rx")

// Use the simple datastore to ensure the base implementation works correctly
api project(':grails-data-simple')
Expand Down
Loading
Loading