Skip to content

Commit 32b6df5

Browse files
jdaughertyjdaugherty
authored
Merge pull request #2078 from jdaugherty/9.0.x
missed renames for datastore -> datamapping
2 parents 9678bce + 55168dd commit 32b6df5

File tree

419 files changed

+47
-47
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

419 files changed

+47
-47
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ def publishedProjects = [
5454
// datastore
5555
'grails-datastore-async',
5656
'grails-datastore-core',
57-
'grails-datastore-gorm',
57+
'grails-datamapping-core',
5858
'grails-datamapping-async',
59-
//'grails-datastore-gorm-rx',
59+
//'grails-datamapping-rx',
6060
'grails-datamapping-support',
6161
'grails-datamapping-tck-tests',
6262
'grails-datamapping-tck-base',

‎gradle/documentation-config.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ tasks.register('data-mapping-groovydoc', Groovydoc) {
2121
it.name in [
2222
'grails-datastore-async',
2323
'grails-datastore-core',
24-
'grails-datastore-gorm',
24+
'grails-datamapping-core',
2525
'grails-datamapping-async',
2626
'grails-datamapping-support',
2727
'grails-datamapping-validation',
2828
'grails-datastore-web',
2929

3030
// These are test api docs that aren't typically included in the runtime classpath of applications.
3131
// for now include them in the groovy doc unless we want to call out that documentation separately later.
32-
'grails-datastore-gorm-test',
32+
'grails-datamapping-core-test',
3333
'grails-testing-support-datamapping'
3434
]
3535
}

‎grails-data-hibernate5/core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
api "org.slf4j:slf4j-api"
2525

2626
api "org.apache.groovy:groovy"
27-
api project(":grails-datastore-gorm")
27+
api project(":grails-datamapping-core")
2828
api "org.springframework:spring-orm"
2929
api "org.hibernate:hibernate-core-jakarta:$hibernateVersion", {
3030
exclude group:'commons-logging', module:'commons-logging'

‎grails-data-hibernate5/docs/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version = projectVersion
99

1010
ext {
1111
isReleaseVersion = !projectVersion.endsWith('-SNAPSHOT')
12-
coreProjects = ['grails-datastore-core', 'grails-datastore-gorm']
12+
coreProjects = ['grails-datastore-core', 'grails-datamapping-core']
1313
}
1414

1515
configurations {

‎grails-data-mongodb/boot-plugin/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ dependencies {
5555
// impl: Needed for Java Spring Boot apps
5656
// comp: @CompileStatic(source)
5757
}
58-
// Provided by grails-datastore-gorm
58+
// Provided by grails-datamapping-core
5959
// implementation project(':grails-datastore-core'), {
6060
// // impl: Service
6161
// }
62-
implementation project(':grails-datastore-gorm'), {
62+
implementation project(':grails-datamapping-core'), {
6363
// impl: ConfigurableApplicationContextEventPublisher
6464
}
6565
implementation 'org.springframework:spring-core', {

‎grails-data-mongodb/bson/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ dependencies {
4949
exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
5050
}
5151
}
52-
api project(':grails-datastore-gorm'), {
52+
api project(':grails-datamapping-core'), {
5353
// api: DetachedCriteria
5454
if (excludeUnusedTransDeps) {
55-
// API dependencies in grails-datastore-gorm
55+
// API dependencies in grails-datamapping-core
5656
exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
5757
//exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity
5858
exclude group: 'org.apache.grails.data', module: 'grails-datastore-core'

‎grails-data-mongodb/core/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies {
2929
// API dependencies in grails-data-mongodb-bson
3030
exclude group: 'org.mongodb', module: 'bson'
3131
exclude group: 'org.apache.grails.data', module: 'grails-datastore-core'
32-
exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm'
32+
exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core'
3333
}
3434
}
3535
api project(':grails-datastore-core'), {
@@ -53,7 +53,7 @@ dependencies {
5353
exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
5454
}
5555
}
56-
api project(':grails-datastore-gorm'), {
56+
api project(':grails-datamapping-core'), {
5757
// api: CriteriaBuilder, AbstractResultList
5858
if (excludeUnusedTransDeps) {
5959
// API dependencies in grails-datastore-gorm
@@ -73,7 +73,7 @@ dependencies {
7373
// API dependencies in grails-datamapping-support
7474
exclude group: 'org.apache.grails', module: 'grails-core'
7575
exclude group: 'org.apache.grails.data', module: 'grails-datastore-core'
76-
exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm'
76+
exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core'
7777
exclude group: 'org.springframework', module: 'spring-context'
7878
exclude group: 'org.springframework', module: 'spring-core'
7979
}

‎grails-data-mongodb/docs/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version = projectVersion
99

1010
ext {
1111
isReleaseVersion = !version.endsWith('SNAPSHOT')
12-
coreProjects = ['grails-datastore-core', 'grails-datastore-gorm']
12+
coreProjects = ['grails-datastore-core', 'grails-datamapping-core']
1313
}
1414

1515
configurations {

‎grails-data-mongodb/ext/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies {
3737
if (excludeUnusedTransDeps) {
3838
// API dependencies in grails-datastore-gorm-mongodb
3939
//exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' // NativeEntryEntityPersister
40-
exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm'
40+
exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core'
4141
exclude group: 'org.apache.grails.data', module: 'grails-data-mongodb-bson'
4242
exclude group: 'org.apache.grails.data', module: 'grails-datamapping-support'
4343
//exclude group: 'org.mongodb', module: 'bson' // Document
@@ -46,10 +46,10 @@ dependencies {
4646
exclude group: 'org.springframework', module: 'spring-context'
4747
}
4848
}
49-
implementation project(':grails-datastore-gorm'), {
49+
implementation project(':grails-datamapping-core'), {
5050
// impl: GormEnhancer
5151
if (excludeUnusedTransDeps) {
52-
// API dependencies in grails-datastore-gorm
52+
// API dependencies in grails-datamapping-core
5353
exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
5454
//exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity
5555
exclude group: 'org.apache.grails', module: 'grails-core'

‎grails-data-mongodb/grails-plugin/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ dependencies {
3030
// api: needed as classes should also be available when compiling apps. eg. MongoEntity
3131
// impl: MongoDatastore, MongoDbDataStoreSpringInitializer
3232
if (excludeUnusedTransDeps) {
33-
// API dependencies in grails-datastore-gorm-mongodb
33+
// API dependencies in grails-data-mongodb
3434
//exclude group: 'org.apache.grails.data', module: 'grails-data-mongodb-bson' // Needed at runtime downstream (BsonPersistentEntityCodec)
3535
exclude group: 'org.apache.grails.data', module: 'grails-datastore-core'
36-
exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm'
36+
exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core'
3737
exclude group: 'org.apache.grails.data', module: 'grails-datamapping-support'
3838
//exclude group: 'org.mongodb', module: 'bson' // Needed downstream for compiling MongoEntity
3939
//exclude group: 'org.mongodb', module: 'mongodb-driver-core' // MongoClientSettings
@@ -47,7 +47,7 @@ dependencies {
4747
if (excludeUnusedTransDeps) {
4848
// API dependencies in grails-datamapping-support
4949
exclude group: 'org.apache.grails.data', module: 'grails-datastore-core'
50-
//exclude group: 'org.apache.grails.data, module: 'grails-datastore-gorm' // AbstractDatastorePersistenceContextInterceptor
50+
//exclude group: 'org.apache.grails.data, module: 'grails-datamapping-core' // AbstractDatastorePersistenceContextInterceptor
5151
exclude group: 'org.apache.grails', module: 'grails-core'
5252
exclude group: 'org.springframework', module: 'spring-context'
5353
exclude group: 'org.springframework', module: 'spring-core'

0 commit comments

Comments
 (0)