This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch grails-geb in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 719801d93e697a8776c86fe8a2cdc12b823cc2b2 Author: James Daugherty <[email protected]> AuthorDate: Sun Apr 20 14:30:04 2025 -0400 Remove customizations where possible and match project names to coordinates --- gradle/publish-root-config.gradle | 10 +++++----- grails-async/plugin/build.gradle | 4 ---- grails-data-hibernate5/boot-plugin/build.gradle | 3 +-- grails-data-hibernate5/core/build.gradle | 3 +-- .../{database-migration => dbmigration}/README.md | 0 .../{database-migration => dbmigration}/build.gradle | 3 +-- .../command/DbmChangelogSyncCommand.groovy | 0 .../command/DbmChangelogSyncSqlCommand.groovy | 0 .../command/DbmClearChecksumsCommand.groovy | 0 .../databasemigration/command/DbmDbDocCommand.groovy | 0 .../databasemigration/command/DbmDiffCommand.groovy | 0 .../command/DbmDropAllCommand.groovy | 0 .../command/DbmFutureRollbackCountSqlCommand.groovy | 0 .../command/DbmFutureRollbackSqlCommand.groovy | 0 .../command/DbmGenerateChangelogCommand.groovy | 0 .../command/DbmGenerateGormChangelogCommand.groovy | 0 .../command/DbmGormDiffCommand.groovy | 0 .../command/DbmListLocksCommand.groovy | 0 .../command/DbmMarkNextChangesetRanCommand.groovy | 0 .../command/DbmMarkNextChangesetRanSqlCommand.groovy | 0 .../command/DbmPreviousChangesetSqlCommand.groovy | 0 .../command/DbmReleaseLocksCommand.groovy | 0 .../command/DbmRollbackCommand.groovy | 0 .../command/DbmRollbackCountCommand.groovy | 0 .../command/DbmRollbackCountSqlCommand.groovy | 0 .../command/DbmRollbackSqlCommand.groovy | 0 .../command/DbmRollbackToDateCommand.groovy | 0 .../command/DbmRollbackToDateSqlCommand.groovy | 0 .../command/DbmStatusCommand.groovy | 0 .../databasemigration/command/DbmTagCommand.groovy | 0 .../command/DbmUpdateCommand.groovy | 0 .../command/DbmUpdateCountCommand.groovy | 0 .../command/DbmUpdateCountSqlCommand.groovy | 0 .../command/DbmUpdateSqlCommand.groovy | 0 .../command/DbmValidateCommand.groovy | 0 .../grails-app/conf/application.yml | 0 .../grails-app/conf/logback.groovy | 0 .../grails-app/domain/testapp/Account.groovy | 0 .../grails-app/domain/testapp/Person.groovy | 0 .../init/databasemigration/Application.groovy | 0 .../AutoRunWithMultipleDataSourceSpec.groovy | 0 .../AutoRunWithSingleDataSourceSpec.groovy | 0 .../databasemigration/DbUpdateCommandSpec.groovy | 0 .../resources/application-multiple-datasource.yml | 0 .../resources/application-single-datasource.yml | 0 .../resources/application-transaction-datasource.yml | 0 .../resources/changelog-account-person-init.groovy | 0 .../resources/changelog-account-sql.groovy | 0 .../resources/changelog-person-grails.groovy | 0 .../resources/changelog-second.groovy | 0 .../resources/changelog-transaction.groovy | 0 .../src/integration-test/resources/changelog.groovy | 0 .../src/integration-test/resources/logback-test.xml | 0 .../DatabaseMigrationException.groovy | 0 .../DatabaseMigrationGrailsPlugin.groovy | 0 .../DatabaseMigrationTransactionManager.groovy | 0 .../EnvironmentAwareCodeGenConfig.groovy | 0 .../plugins/databasemigration/NoopVisitor.groovy | 0 .../plugins/databasemigration/PluginConstants.groovy | 0 ...ApplicationContextDatabaseMigrationCommand.groovy | 0 .../command/DatabaseMigrationCommand.groovy | 0 .../command/DbmChangelogToGroovy.groovy | 0 .../command/DbmCreateChangelog.groovy | 0 .../command/ScriptDatabaseMigrationCommand.groovy | 0 .../liquibase/ChangelogXml2Groovy.groovy | 0 .../liquibase/DatabaseChangeLogBuilder.groovy | 0 .../liquibase/EmbeddedJarPathHandler.groovy | 0 .../databasemigration/liquibase/GormDatabase.groovy | 0 .../liquibase/GrailsLiquibase.groovy | 0 .../liquibase/GrailsLiquibaseFactory.groovy | 0 .../databasemigration/liquibase/GroovyChange.groovy | 0 .../liquibase/GroovyChangeLogParser.groovy | 0 .../liquibase/GroovyChangeLogSerializer.groovy | 0 .../GroovyDiffToChangeLogCommandStep.groovy | 0 .../GroovyGenerateChangeLogCommandStep.groovy | 0 .../liquibase/GroovyPrecondition.groovy | 0 .../META-INF/services/liquibase.change.Change | 0 .../META-INF/services/liquibase.command.CommandStep | 0 .../META-INF/services/liquibase.database.Database | 0 .../services/liquibase.parser.ChangeLogParser | 0 .../services/liquibase.precondition.Precondition | 0 .../META-INF/services/liquibase.resource.PathHandler | 0 .../liquibase.serializer.ChangeLogSerializer | 0 .../src/main/resources/migration.gdsl | 0 .../src/main/scripts/dbm-changelog-to-groovy.groovy | 0 .../src/main/scripts/dbm-create-changelog.groovy | 0 ...icationContextDatabaseMigrationCommandSpec.groovy | 0 .../DatabaseMigrationCommandConfigSpec.groovy | 0 .../command/DatabaseMigrationCommandSpec.groovy | 0 .../command/DbmChangelogSyncCommandSpec.groovy | 0 .../command/DbmChangelogSyncCommandSqlSpec.groovy | 0 .../command/DbmClearChecksumsCommandSpec.groovy | 0 .../command/DbmDiffCommandSpec.groovy | 0 .../command/DbmDropAllCommandSpec.groovy | 0 .../DbmFutureRollbackCountSqlCommandSpec.groovy | 0 .../command/DbmFutureRollbackSqlCommandSpec.groovy | 0 .../command/DbmGenerateChangelogCommandSpec.groovy | 0 .../DbmGenerateGormChangelogCommandSpec.groovy | 0 .../command/DbmGormDiffCommandSpec.groovy | 0 .../command/DbmListLocksCommandSpec.groovy | 0 .../DbmMarkNextChangesetRanCommandSpec.groovy | 0 .../DbmMarkNextChangesetRanSqlCommandSpec.groovy | 0 .../DbmPreviousChangesetSqlCommandSpec.groovy | 0 .../command/DbmReleaseLocksCommandSpec.groovy | 0 .../command/DbmRollbackCommandSpec.groovy | 0 .../command/DbmRollbackCountCommandSpec.groovy | 0 .../command/DbmRollbackCountSqlCommandSpec.groovy | 0 .../command/DbmRollbackSqlCommandSpec.groovy | 0 .../command/DbmRollbackToDateCommandSpec.groovy | 0 .../command/DbmRollbackToDateSqlCommandSpec.groovy | 0 .../command/DbmStatusCommandSpec.groovy | 0 .../command/DbmUpdateCommandSpec.groovy | 0 .../command/DbmUpdateCountCommandSpec.groovy | 0 .../command/DbmUpdateCountSqlCommandSpec.groovy | 0 .../command/DbmUpdateSqlCommandSpec.groovy | 0 .../command/DbmValidateCommandSpec.groovy | 0 .../ScriptDatabaseMigrationCommandSpec.groovy | 0 .../liquibase/GroovyChangeLogSpec.groovy | 0 .../liquibase/GroovyPreconditionSpec.groovy | 0 .../testing/OutputCaptureExtension.groovy | 0 .../testing/annotation/OutputCapture.groovy | 0 .../src/test/resources/logback.groovy | 0 grails-data-hibernate5/docs/build.gradle | 12 ++++++------ grails-data-hibernate5/grails-plugin/build.gradle | 3 +-- grails-data-mongodb/boot-plugin/build.gradle | 3 +-- grails-data-mongodb/bson/build.gradle | 3 +-- grails-data-mongodb/core/build.gradle | 3 +-- grails-data-mongodb/docs/build.gradle | 6 +++--- grails-data-mongodb/ext/build.gradle | 3 +-- grails-data-mongodb/grails-plugin/build.gradle | 3 +-- grails-data-mongodb/gson-templates/build.gradle | 1 - grails-dependencies/build.gradle | 4 ++-- grails-events/plugin/build.gradle | 4 ---- .../publishing/GrailsPublishGradlePlugin.groovy | 4 ++-- grails-gsp/plugin/build.gradle | 3 +-- grails-test-suite-persistence/build.gradle | 2 +- grails-test-suite-uber/build.gradle | 2 +- settings.gradle | 20 ++++++++++---------- 138 files changed, 40 insertions(+), 59 deletions(-) diff --git a/gradle/publish-root-config.gradle b/gradle/publish-root-config.gradle index 1b1588ef66..68679cf73c 100644 --- a/gradle/publish-root-config.gradle +++ b/gradle/publish-root-config.gradle @@ -7,7 +7,7 @@ group = 'this.will.be.overridden' def publishedProjects = [ 'grails-async-core', 'grails-async-gpars', - 'grails-async-plugin', + 'grails-async', 'grails-async-rxjava', 'grails-async-rxjava2', 'grails-async-rxjava3', @@ -29,7 +29,7 @@ def publishedProjects = [ 'grails-events-compat', 'grails-events-core', 'grails-events-gpars', - 'grails-events-plugin', + 'grails-events', 'grails-events-rxjava', 'grails-events-rxjava2', 'grails-events-rxjava3', @@ -87,12 +87,12 @@ def publishedProjects = [ // simple 'grails-data-simple', // hibernate5 - 'grails-data-hibernate5-boot-plugin', - 'grails-data-hibernate5-database-migration', + 'grails-data-hibernate5-spring-boot', + 'grails-data-hibernate5-dbmigration', 'grails-data-hibernate5-core', 'grails-data-hibernate5', // mongodb - 'grails-data-mongodb-boot-plugin', + 'grails-data-mongodb-spring-boot', 'grails-data-mongodb-core', 'grails-data-mongodb-bson', 'grails-data-mongodb-ext', diff --git a/grails-async/plugin/build.gradle b/grails-async/plugin/build.gradle index 1aea37451b..caff4ae32b 100644 --- a/grails-async/plugin/build.gradle +++ b/grails-async/plugin/build.gradle @@ -7,10 +7,6 @@ plugins { version = projectVersion group = 'org.apache.grails' -ext { - pomArtifactId = 'grails-async' -} - dependencies { implementation platform(project(':grails-bom')) diff --git a/grails-data-hibernate5/boot-plugin/build.gradle b/grails-data-hibernate5/boot-plugin/build.gradle index c88497c2f0..aacf91c480 100644 --- a/grails-data-hibernate5/boot-plugin/build.gradle +++ b/grails-data-hibernate5/boot-plugin/build.gradle @@ -7,8 +7,7 @@ version = projectVersion group = 'org.apache.grails' ext { - apiDocs = true - pomArtifactId = 'grails-data-hibernate5-spring-boot' + gormApiDocs = true pomTitle = 'Grails GORM' pomDescription = 'GORM - Grails Data Access Framework' pomDevelopers = [ diff --git a/grails-data-hibernate5/core/build.gradle b/grails-data-hibernate5/core/build.gradle index 27c03f8310..1e0734779f 100644 --- a/grails-data-hibernate5/core/build.gradle +++ b/grails-data-hibernate5/core/build.gradle @@ -7,8 +7,7 @@ version = projectVersion group = 'org.apache.grails.data' ext { - apiDocs = true - pomArtifactId = 'grails-data-hibernate5-core' + gormApiDocs = true pomTitle = 'Grails GORM' pomDescription = 'GORM - Grails Data Access Framework' pomDevelopers = [ diff --git a/grails-data-hibernate5/database-migration/README.md b/grails-data-hibernate5/dbmigration/README.md similarity index 100% rename from grails-data-hibernate5/database-migration/README.md rename to grails-data-hibernate5/dbmigration/README.md diff --git a/grails-data-hibernate5/database-migration/build.gradle b/grails-data-hibernate5/dbmigration/build.gradle similarity index 97% rename from grails-data-hibernate5/database-migration/build.gradle rename to grails-data-hibernate5/dbmigration/build.gradle index 69f43ba490..f2f8556e9e 100644 --- a/grails-data-hibernate5/database-migration/build.gradle +++ b/grails-data-hibernate5/dbmigration/build.gradle @@ -7,8 +7,7 @@ version = projectVersion group = 'org.apache.grails' ext { - apiDocs = true - pomArtifactId = 'grails-data-hibernate5-dbmigration' + gormApiDocs = true pomTitle = 'Grails Database Migration Plugin' pomDescription = 'The Database Migration plugin helps you manage database changes, via Liquibase, while developing Grails applications' pomDevelopers = [ diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmChangelogSyncCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmChangelogSyncCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmChangelogSyncCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmChangelogSyncCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmChangelogSyncSqlCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmChangelogSyncSqlCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmChangelogSyncSqlCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmChangelogSyncSqlCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmClearChecksumsCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmClearChecksumsCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmClearChecksumsCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmClearChecksumsCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmDbDocCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmDbDocCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmDbDocCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmDbDocCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmDiffCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmDiffCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmDiffCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmDiffCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmDropAllCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmDropAllCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmDropAllCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmDropAllCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmFutureRollbackCountSqlCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmFutureRollbackCountSqlCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmFutureRollbackCountSqlCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmFutureRollbackCountSqlCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmFutureRollbackSqlCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmFutureRollbackSqlCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmFutureRollbackSqlCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmFutureRollbackSqlCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmGenerateChangelogCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmGenerateChangelogCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmGenerateChangelogCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmGenerateChangelogCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmGenerateGormChangelogCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmGenerateGormChangelogCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmGenerateGormChangelogCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmGenerateGormChangelogCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmGormDiffCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmGormDiffCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmGormDiffCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmGormDiffCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmListLocksCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmListLocksCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmListLocksCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmListLocksCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanSqlCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanSqlCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanSqlCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanSqlCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmPreviousChangesetSqlCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmPreviousChangesetSqlCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmPreviousChangesetSqlCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmPreviousChangesetSqlCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmReleaseLocksCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmReleaseLocksCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmReleaseLocksCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmReleaseLocksCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackCountCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackCountCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackCountCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackCountCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackCountSqlCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackCountSqlCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackCountSqlCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackCountSqlCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackSqlCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackSqlCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackSqlCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackSqlCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackToDateCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackToDateCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackToDateCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackToDateCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackToDateSqlCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackToDateSqlCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackToDateSqlCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmRollbackToDateSqlCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmStatusCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmStatusCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmStatusCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmStatusCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmTagCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmTagCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmTagCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmTagCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateCountCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateCountCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateCountCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateCountCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateCountSqlCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateCountSqlCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateCountSqlCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateCountSqlCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateSqlCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateSqlCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateSqlCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmUpdateSqlCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmValidateCommand.groovy b/grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmValidateCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmValidateCommand.groovy rename to grails-data-hibernate5/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmValidateCommand.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/conf/application.yml b/grails-data-hibernate5/dbmigration/grails-app/conf/application.yml similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/conf/application.yml rename to grails-data-hibernate5/dbmigration/grails-app/conf/application.yml diff --git a/grails-data-hibernate5/database-migration/grails-app/conf/logback.groovy b/grails-data-hibernate5/dbmigration/grails-app/conf/logback.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/conf/logback.groovy rename to grails-data-hibernate5/dbmigration/grails-app/conf/logback.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/domain/testapp/Account.groovy b/grails-data-hibernate5/dbmigration/grails-app/domain/testapp/Account.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/domain/testapp/Account.groovy rename to grails-data-hibernate5/dbmigration/grails-app/domain/testapp/Account.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/domain/testapp/Person.groovy b/grails-data-hibernate5/dbmigration/grails-app/domain/testapp/Person.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/domain/testapp/Person.groovy rename to grails-data-hibernate5/dbmigration/grails-app/domain/testapp/Person.groovy diff --git a/grails-data-hibernate5/database-migration/grails-app/init/databasemigration/Application.groovy b/grails-data-hibernate5/dbmigration/grails-app/init/databasemigration/Application.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/grails-app/init/databasemigration/Application.groovy rename to grails-data-hibernate5/dbmigration/grails-app/init/databasemigration/Application.groovy diff --git a/grails-data-hibernate5/database-migration/src/integration-test/groovy/org/grails/plugins/databasemigration/AutoRunWithMultipleDataSourceSpec.groovy b/grails-data-hibernate5/dbmigration/src/integration-test/groovy/org/grails/plugins/databasemigration/AutoRunWithMultipleDataSourceSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/groovy/org/grails/plugins/databasemigration/AutoRunWithMultipleDataSourceSpec.groovy rename to grails-data-hibernate5/dbmigration/src/integration-test/groovy/org/grails/plugins/databasemigration/AutoRunWithMultipleDataSourceSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/integration-test/groovy/org/grails/plugins/databasemigration/AutoRunWithSingleDataSourceSpec.groovy b/grails-data-hibernate5/dbmigration/src/integration-test/groovy/org/grails/plugins/databasemigration/AutoRunWithSingleDataSourceSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/groovy/org/grails/plugins/databasemigration/AutoRunWithSingleDataSourceSpec.groovy rename to grails-data-hibernate5/dbmigration/src/integration-test/groovy/org/grails/plugins/databasemigration/AutoRunWithSingleDataSourceSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/integration-test/groovy/org/grails/plugins/databasemigration/DbUpdateCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/integration-test/groovy/org/grails/plugins/databasemigration/DbUpdateCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/groovy/org/grails/plugins/databasemigration/DbUpdateCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/integration-test/groovy/org/grails/plugins/databasemigration/DbUpdateCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/integration-test/resources/application-multiple-datasource.yml b/grails-data-hibernate5/dbmigration/src/integration-test/resources/application-multiple-datasource.yml similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/resources/application-multiple-datasource.yml rename to grails-data-hibernate5/dbmigration/src/integration-test/resources/application-multiple-datasource.yml diff --git a/grails-data-hibernate5/database-migration/src/integration-test/resources/application-single-datasource.yml b/grails-data-hibernate5/dbmigration/src/integration-test/resources/application-single-datasource.yml similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/resources/application-single-datasource.yml rename to grails-data-hibernate5/dbmigration/src/integration-test/resources/application-single-datasource.yml diff --git a/grails-data-hibernate5/database-migration/src/integration-test/resources/application-transaction-datasource.yml b/grails-data-hibernate5/dbmigration/src/integration-test/resources/application-transaction-datasource.yml similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/resources/application-transaction-datasource.yml rename to grails-data-hibernate5/dbmigration/src/integration-test/resources/application-transaction-datasource.yml diff --git a/grails-data-hibernate5/database-migration/src/integration-test/resources/changelog-account-person-init.groovy b/grails-data-hibernate5/dbmigration/src/integration-test/resources/changelog-account-person-init.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/resources/changelog-account-person-init.groovy rename to grails-data-hibernate5/dbmigration/src/integration-test/resources/changelog-account-person-init.groovy diff --git a/grails-data-hibernate5/database-migration/src/integration-test/resources/changelog-account-sql.groovy b/grails-data-hibernate5/dbmigration/src/integration-test/resources/changelog-account-sql.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/resources/changelog-account-sql.groovy rename to grails-data-hibernate5/dbmigration/src/integration-test/resources/changelog-account-sql.groovy diff --git a/grails-data-hibernate5/database-migration/src/integration-test/resources/changelog-person-grails.groovy b/grails-data-hibernate5/dbmigration/src/integration-test/resources/changelog-person-grails.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/resources/changelog-person-grails.groovy rename to grails-data-hibernate5/dbmigration/src/integration-test/resources/changelog-person-grails.groovy diff --git a/grails-data-hibernate5/database-migration/src/integration-test/resources/changelog-second.groovy b/grails-data-hibernate5/dbmigration/src/integration-test/resources/changelog-second.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/resources/changelog-second.groovy rename to grails-data-hibernate5/dbmigration/src/integration-test/resources/changelog-second.groovy diff --git a/grails-data-hibernate5/database-migration/src/integration-test/resources/changelog-transaction.groovy b/grails-data-hibernate5/dbmigration/src/integration-test/resources/changelog-transaction.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/resources/changelog-transaction.groovy rename to grails-data-hibernate5/dbmigration/src/integration-test/resources/changelog-transaction.groovy diff --git a/grails-data-hibernate5/database-migration/src/integration-test/resources/changelog.groovy b/grails-data-hibernate5/dbmigration/src/integration-test/resources/changelog.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/resources/changelog.groovy rename to grails-data-hibernate5/dbmigration/src/integration-test/resources/changelog.groovy diff --git a/grails-data-hibernate5/database-migration/src/integration-test/resources/logback-test.xml b/grails-data-hibernate5/dbmigration/src/integration-test/resources/logback-test.xml similarity index 100% rename from grails-data-hibernate5/database-migration/src/integration-test/resources/logback-test.xml rename to grails-data-hibernate5/dbmigration/src/integration-test/resources/logback-test.xml diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/DatabaseMigrationException.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/DatabaseMigrationException.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/DatabaseMigrationException.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/DatabaseMigrationException.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/DatabaseMigrationGrailsPlugin.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/DatabaseMigrationGrailsPlugin.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/DatabaseMigrationGrailsPlugin.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/DatabaseMigrationGrailsPlugin.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/DatabaseMigrationTransactionManager.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/DatabaseMigrationTransactionManager.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/DatabaseMigrationTransactionManager.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/DatabaseMigrationTransactionManager.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/EnvironmentAwareCodeGenConfig.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/EnvironmentAwareCodeGenConfig.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/EnvironmentAwareCodeGenConfig.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/EnvironmentAwareCodeGenConfig.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/NoopVisitor.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/NoopVisitor.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/NoopVisitor.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/NoopVisitor.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/PluginConstants.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/PluginConstants.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/PluginConstants.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/PluginConstants.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommand.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommand.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommand.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/command/DbmChangelogToGroovy.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/DbmChangelogToGroovy.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/command/DbmChangelogToGroovy.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/DbmChangelogToGroovy.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/command/DbmCreateChangelog.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/DbmCreateChangelog.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/command/DbmCreateChangelog.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/DbmCreateChangelog.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/command/ScriptDatabaseMigrationCommand.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/ScriptDatabaseMigrationCommand.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/command/ScriptDatabaseMigrationCommand.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/ScriptDatabaseMigrationCommand.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/ChangelogXml2Groovy.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/ChangelogXml2Groovy.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/ChangelogXml2Groovy.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/ChangelogXml2Groovy.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/DatabaseChangeLogBuilder.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/DatabaseChangeLogBuilder.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/DatabaseChangeLogBuilder.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/DatabaseChangeLogBuilder.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/EmbeddedJarPathHandler.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/EmbeddedJarPathHandler.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/EmbeddedJarPathHandler.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/EmbeddedJarPathHandler.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GormDatabase.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GormDatabase.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GormDatabase.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GormDatabase.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GrailsLiquibase.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GrailsLiquibase.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GrailsLiquibase.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GrailsLiquibase.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GrailsLiquibaseFactory.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GrailsLiquibaseFactory.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GrailsLiquibaseFactory.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GrailsLiquibaseFactory.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChange.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChange.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChange.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChange.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogParser.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogParser.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogParser.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogParser.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSerializer.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSerializer.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSerializer.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSerializer.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyDiffToChangeLogCommandStep.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyDiffToChangeLogCommandStep.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyDiffToChangeLogCommandStep.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyDiffToChangeLogCommandStep.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyGenerateChangeLogCommandStep.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyGenerateChangeLogCommandStep.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyGenerateChangeLogCommandStep.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyGenerateChangeLogCommandStep.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyPrecondition.groovy b/grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyPrecondition.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyPrecondition.groovy rename to grails-data-hibernate5/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyPrecondition.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.change.Change b/grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.change.Change similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.change.Change rename to grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.change.Change diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.command.CommandStep b/grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.command.CommandStep similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.command.CommandStep rename to grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.command.CommandStep diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.database.Database b/grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.database.Database similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.database.Database rename to grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.database.Database diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.parser.ChangeLogParser b/grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.parser.ChangeLogParser similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.parser.ChangeLogParser rename to grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.parser.ChangeLogParser diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.precondition.Precondition b/grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.precondition.Precondition similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.precondition.Precondition rename to grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.precondition.Precondition diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.resource.PathHandler b/grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.resource.PathHandler similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.resource.PathHandler rename to grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.resource.PathHandler diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.serializer.ChangeLogSerializer b/grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.serializer.ChangeLogSerializer similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.serializer.ChangeLogSerializer rename to grails-data-hibernate5/dbmigration/src/main/resources/META-INF/services/liquibase.serializer.ChangeLogSerializer diff --git a/grails-data-hibernate5/database-migration/src/main/resources/migration.gdsl b/grails-data-hibernate5/dbmigration/src/main/resources/migration.gdsl similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/resources/migration.gdsl rename to grails-data-hibernate5/dbmigration/src/main/resources/migration.gdsl diff --git a/grails-data-hibernate5/database-migration/src/main/scripts/dbm-changelog-to-groovy.groovy b/grails-data-hibernate5/dbmigration/src/main/scripts/dbm-changelog-to-groovy.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/scripts/dbm-changelog-to-groovy.groovy rename to grails-data-hibernate5/dbmigration/src/main/scripts/dbm-changelog-to-groovy.groovy diff --git a/grails-data-hibernate5/database-migration/src/main/scripts/dbm-create-changelog.groovy b/grails-data-hibernate5/dbmigration/src/main/scripts/dbm-create-changelog.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/main/scripts/dbm-create-changelog.groovy rename to grails-data-hibernate5/dbmigration/src/main/scripts/dbm-create-changelog.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommandConfigSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommandConfigSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommandConfigSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommandConfigSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmChangelogSyncCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmChangelogSyncCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmChangelogSyncCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmChangelogSyncCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmChangelogSyncCommandSqlSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmChangelogSyncCommandSqlSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmChangelogSyncCommandSqlSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmChangelogSyncCommandSqlSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmClearChecksumsCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmClearChecksumsCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmClearChecksumsCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmClearChecksumsCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmDiffCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmDiffCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmDiffCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmDiffCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmDropAllCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmDropAllCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmDropAllCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmDropAllCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmFutureRollbackCountSqlCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmFutureRollbackCountSqlCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmFutureRollbackCountSqlCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmFutureRollbackCountSqlCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmFutureRollbackSqlCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmFutureRollbackSqlCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmFutureRollbackSqlCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmFutureRollbackSqlCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGenerateChangelogCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGenerateChangelogCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGenerateChangelogCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGenerateChangelogCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGenerateGormChangelogCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGenerateGormChangelogCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGenerateGormChangelogCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGenerateGormChangelogCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGormDiffCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGormDiffCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGormDiffCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGormDiffCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmListLocksCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmListLocksCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmListLocksCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmListLocksCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanSqlCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanSqlCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanSqlCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmMarkNextChangesetRanSqlCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmPreviousChangesetSqlCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmPreviousChangesetSqlCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmPreviousChangesetSqlCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmPreviousChangesetSqlCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmReleaseLocksCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmReleaseLocksCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmReleaseLocksCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmReleaseLocksCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackCountCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackCountCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackCountCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackCountCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackCountSqlCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackCountSqlCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackCountSqlCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackCountSqlCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackSqlCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackSqlCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackSqlCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackSqlCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackToDateCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackToDateCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackToDateCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackToDateCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackToDateSqlCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackToDateSqlCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackToDateSqlCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmRollbackToDateSqlCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmStatusCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmStatusCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmStatusCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmStatusCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateCountCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateCountCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateCountCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateCountCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateCountSqlCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateCountSqlCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateCountSqlCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateCountSqlCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateSqlCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateSqlCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateSqlCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmUpdateSqlCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmValidateCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmValidateCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmValidateCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmValidateCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/ScriptDatabaseMigrationCommandSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/ScriptDatabaseMigrationCommandSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/ScriptDatabaseMigrationCommandSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/ScriptDatabaseMigrationCommandSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/liquibase/GroovyPreconditionSpec.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/liquibase/GroovyPreconditionSpec.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/liquibase/GroovyPreconditionSpec.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/liquibase/GroovyPreconditionSpec.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/testing/OutputCaptureExtension.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/testing/OutputCaptureExtension.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/testing/OutputCaptureExtension.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/testing/OutputCaptureExtension.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/testing/annotation/OutputCapture.groovy b/grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/testing/annotation/OutputCapture.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/testing/annotation/OutputCapture.groovy rename to grails-data-hibernate5/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/testing/annotation/OutputCapture.groovy diff --git a/grails-data-hibernate5/database-migration/src/test/resources/logback.groovy b/grails-data-hibernate5/dbmigration/src/test/resources/logback.groovy similarity index 100% rename from grails-data-hibernate5/database-migration/src/test/resources/logback.groovy rename to grails-data-hibernate5/dbmigration/src/test/resources/logback.groovy diff --git a/grails-data-hibernate5/docs/build.gradle b/grails-data-hibernate5/docs/build.gradle index 1f4e5b7ca8..d2b9b89943 100644 --- a/grails-data-hibernate5/docs/build.gradle +++ b/grails-data-hibernate5/docs/build.gradle @@ -34,7 +34,7 @@ dependencies { documentation "org.apache.grails.data:$it" } rootProject.subprojects - .findAll { it.findProperty('apiDocs') } + .findAll { it.findProperty('gormApiDocs') } .each { documentation project(":$it.name") } } @@ -58,9 +58,9 @@ tasks.named('asciidoctor', AsciidoctorTask) { 'groupId': project.group, 'artifactId': project.name, 'sourcedir': "$project.rootDir", - 'migrationPluginExamplesDir': rootProject.layout.projectDirectory.dir('grails-database-migration/src/integration-test/resources').asFile.absolutePath, - 'migrationPluginGroupId': rootProject.findProject(':grails-data-hibernate5-database-migration').group, - 'migrationPluginArtifactId': rootProject.findProject(':grails-data-hibernate5-database-migration').name, + 'migrationPluginExamplesDir': rootProject.findProject(':grails-data-hibernate5-dbmigration').layout.projectDirectory.dir('src/integration-test/resources').asFile.absolutePath, + 'migrationPluginGroupId': rootProject.findProject(':grails-data-hibernate5-dbmigration').group, + 'migrationPluginArtifactId': rootProject.findProject(':grails-data-hibernate5-dbmigration').name, 'liquibaseHibernate5Version': liquibaseHibernate5Version ) jvm { @@ -90,7 +90,7 @@ tasks.withType(Groovydoc).configureEach { }.sum() rootProject.subprojects - .findAll { it.findProperty('apiDocs') } + .findAll { it.findProperty('gormApiDocs') } .each { sourceFiles += it.files('src/main/groovy') } source = sourceFiles @@ -113,7 +113,7 @@ tasks.register('docs').configure { Task docTask -> docTask.group = 'documentation' docTask.dependsOn('asciidoctor', 'copyDocs', 'cleanAsciidoc', 'groovydoc', 'copyResources', rootProject.subprojects - .findAll { it.findProperty('apiDocs') } + .findAll { it.findProperty('gormApiDocs') } .collect { ":${it.name}:groovydoc" } ) docTask.finalizedBy('assembleDocsDist') diff --git a/grails-data-hibernate5/grails-plugin/build.gradle b/grails-data-hibernate5/grails-plugin/build.gradle index c73b28b589..86d7fc1326 100644 --- a/grails-data-hibernate5/grails-plugin/build.gradle +++ b/grails-data-hibernate5/grails-plugin/build.gradle @@ -7,8 +7,7 @@ version = projectVersion group = 'org.apache.grails' ext { - apiDocs = true - pomArtifactId = 'grails-data-hibernate5' + gormApiDocs = true pomTitle = 'Grails GORM' pomDescription = 'GORM - Grails Data Access Framework' pomDevelopers = [ diff --git a/grails-data-mongodb/boot-plugin/build.gradle b/grails-data-mongodb/boot-plugin/build.gradle index fde2c7374b..04292535d4 100644 --- a/grails-data-mongodb/boot-plugin/build.gradle +++ b/grails-data-mongodb/boot-plugin/build.gradle @@ -7,8 +7,7 @@ version = projectVersion group = 'org.apache.grails' ext { - apiDocs = true - pomArtifactId = 'grails-data-mongodb-spring-boot' + gormApiDocs = true pomTitle = 'GORM for MongoDB' pomDescription = 'Provides a GORM Object Mapping implementations for the MongoDB Document Database' pomDevelopers = [ diff --git a/grails-data-mongodb/bson/build.gradle b/grails-data-mongodb/bson/build.gradle index 3bb828c7b8..8bba1f0818 100644 --- a/grails-data-mongodb/bson/build.gradle +++ b/grails-data-mongodb/bson/build.gradle @@ -7,8 +7,7 @@ version = projectVersion group = 'org.apache.grails.data' ext { - apiDocs = true - pomArtifactId = 'grails-data-mongodb-bson' + gormApiDocs = true pomTitle = 'GORM for MongoDB' pomDescription = 'Provides a GORM Object Mapping implementations for the MongoDB Document Database' pomDevelopers = [ diff --git a/grails-data-mongodb/core/build.gradle b/grails-data-mongodb/core/build.gradle index df76b86b50..ec6cc22471 100644 --- a/grails-data-mongodb/core/build.gradle +++ b/grails-data-mongodb/core/build.gradle @@ -7,8 +7,7 @@ version = projectVersion group = 'org.apache.grails.data' ext { - apiDocs = true - pomArtifactId = 'grails-data-mongodb-core' + gormApiDocs = true pomTitle = 'GORM for MongoDB' pomDescription = 'Provides a GORM Object Mapping implementations for the MongoDB Document Database' pomDevelopers = [ diff --git a/grails-data-mongodb/docs/build.gradle b/grails-data-mongodb/docs/build.gradle index 0b999c16b8..666eeff3e3 100644 --- a/grails-data-mongodb/docs/build.gradle +++ b/grails-data-mongodb/docs/build.gradle @@ -45,7 +45,7 @@ dependencies { documentation "org.apache.grails.data:$it" } rootProject.subprojects - .findAll { it.findProperty('apiDocs') } + .findAll { it.findProperty('gormApiDocs') } .each { documentation project(":$it.name") } // These are added to be able to resolve the mongo version from grails-bom @@ -99,7 +99,7 @@ tasks.withType(Groovydoc).configureEach { Groovydoc groovydoc -> }.sum() rootProject.subprojects - .findAll { it.findProperty('apiDocs') } + .findAll { it.findProperty('gormApiDocs') } .each { sourceFiles += it.files('src/main/groovy') } groovydoc.source = sourceFiles @@ -120,7 +120,7 @@ tasks.register('copyResources', Copy).configure { Copy it -> tasks.register('docs').configure { Task doc -> doc.dependsOn('asciidoctor', 'copyDocs', 'cleanAsciidoc', 'groovydoc', 'copyResources', rootProject.subprojects - .findAll { it.findProperty('apiDocs') } + .findAll { it.findProperty('gormApiDocs') } .collect { ":${it.name}:groovydoc" } ) doc.finalizedBy('assembleDocsDist') diff --git a/grails-data-mongodb/ext/build.gradle b/grails-data-mongodb/ext/build.gradle index 4ca513386e..29c1f545d0 100644 --- a/grails-data-mongodb/ext/build.gradle +++ b/grails-data-mongodb/ext/build.gradle @@ -7,8 +7,7 @@ version = projectVersion group = 'org.apache.grails.data' ext { - apiDocs = true - pomArtifactId = 'grails-data-mongodb-ext' + gormApiDocs = true pomTitle = 'GORM for MongoDB' pomDescription = 'Provides a GORM Object Mapping implementations for the MongoDB Document Database' pomDevelopers = [ diff --git a/grails-data-mongodb/grails-plugin/build.gradle b/grails-data-mongodb/grails-plugin/build.gradle index f10f90d525..891067665d 100644 --- a/grails-data-mongodb/grails-plugin/build.gradle +++ b/grails-data-mongodb/grails-plugin/build.gradle @@ -10,8 +10,7 @@ group = 'org.apache.grails' apply plugin: 'org.apache.grails.gradle.grails-plugin' ext { - apiDocs = true - pomArtifactId = 'grails-data-mongodb' + gormApiDocs = true pomTitle = 'GORM for MongoDB' pomDescription = 'Provides a GORM Object Mapping implementations for the MongoDB Document Database' pomDevelopers = [ diff --git a/grails-data-mongodb/gson-templates/build.gradle b/grails-data-mongodb/gson-templates/build.gradle index d05b24869b..bb3ee45bf6 100644 --- a/grails-data-mongodb/gson-templates/build.gradle +++ b/grails-data-mongodb/gson-templates/build.gradle @@ -7,7 +7,6 @@ version = projectVersion group = 'org.apache.grails' ext { - pomArtifactId = 'grails-data-mongodb-gson-templates' pomTitle = 'Grails MongoDB JSON Views' pomDescription = 'Provides JSON Views for MongoDB to the Grails framework.' pomDevelopers = ['puneetbehl': 'Puneet Behl'] diff --git a/grails-dependencies/build.gradle b/grails-dependencies/build.gradle index d48a621f20..0a65843122 100644 --- a/grails-dependencies/build.gradle +++ b/grails-dependencies/build.gradle @@ -19,8 +19,8 @@ def configurations = [ ':grails-services', ':grails-url-mappings', ':grails-interceptors', - ':grails-async-plugin', - ':grails-events-plugin', + ':grails-async', + ':grails-events', ':grails-gsp', ], 'runtimeOnly': [ diff --git a/grails-events/plugin/build.gradle b/grails-events/plugin/build.gradle index 275195b34e..395dc8b314 100644 --- a/grails-events/plugin/build.gradle +++ b/grails-events/plugin/build.gradle @@ -7,10 +7,6 @@ plugins { version = projectVersion group = 'org.apache.grails' -ext { - pomArtifactId = 'grails-events' -} - dependencies { implementation platform(project(':grails-bom')) diff --git a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy index 09d1c3cdef..741e30fb3a 100644 --- a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy +++ b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy @@ -249,8 +249,8 @@ Note: if project properties are used, the properties must be defined prior to ap final GrailsPublishExtension gpe = extensionContainer.findByType(GrailsPublishExtension) publications { maven(MavenPublication) { - artifactId gpe.artifactId ?: project.name - groupId gpe.groupId ?: project.group + delegate.artifactId = gpe.artifactId ?: project.name + delegate.groupId = gpe.groupId ?: project.group doAddArtefact(project, delegate) def extraArtefact = getDefaultExtraArtifact(project) diff --git a/grails-gsp/plugin/build.gradle b/grails-gsp/plugin/build.gradle index c6cdbdeed8..572d36a806 100644 --- a/grails-gsp/plugin/build.gradle +++ b/grails-gsp/plugin/build.gradle @@ -14,7 +14,6 @@ ext { testForkEvery = isCiBuild ? 10 : 20 testJvmArgs = ['-Xmx1536M'] - pomArtifactId = 'grails-gsp' pomTitle = 'Groovy Server Pages (GSP)' pomDescription = 'Groovy Server Pages (GSP) - A server-side view rendering technology based on Groovy' pomDevelopers = ['graemerocher': 'Graeme Rocher'] @@ -158,7 +157,7 @@ dependencies { testRuntimeOnly 'org.glassfish.web:jakarta.servlet.jsp.jstl' testRuntimeOnly project(':grails-url-mappings') - testRuntimeOnly project(':grails-async-plugin') + testRuntimeOnly project(':grails-async') } apply { diff --git a/grails-test-suite-persistence/build.gradle b/grails-test-suite-persistence/build.gradle index 852346ddc2..bf228a5bd9 100644 --- a/grails-test-suite-persistence/build.gradle +++ b/grails-test-suite-persistence/build.gradle @@ -35,7 +35,7 @@ dependencies { testRuntimeOnly 'org.springframework:spring-aspects' testRuntimeOnly 'org.aspectj:aspectjrt', 'org.aspectj:aspectjweaver' - testImplementation project(':grails-async-plugin') + testImplementation project(':grails-async') testImplementation project(':grails-testing-support-datamapping'), { exclude module:'grails-testing-support-core' } diff --git a/grails-test-suite-uber/build.gradle b/grails-test-suite-uber/build.gradle index dca03fcf70..8e348f2ec8 100644 --- a/grails-test-suite-uber/build.gradle +++ b/grails-test-suite-uber/build.gradle @@ -9,7 +9,7 @@ group = 'org.apache.grails.testing' dependencies { implementation platform(project(':grails-bom')) - testImplementation project(':grails-async-plugin') + testImplementation project(':grails-async') testImplementation project(':grails-codecs') testImplementation project(':grails-controllers') testImplementation project(':grails-databinding') diff --git a/settings.gradle b/settings.gradle index dc528f0153..78964476a6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -93,7 +93,7 @@ include ( 'grails-events-rxjava', 'grails-events-rxjava2', 'grails-events-rxjava3', - 'grails-events-plugin', + 'grails-events', // async 'grails-async-core', @@ -101,7 +101,7 @@ include ( 'grails-async-rxjava', 'grails-async-rxjava2', 'grails-async-rxjava3', - 'grails-async-plugin', + 'grails-async', // gsp 'grails-gsp-core', @@ -149,14 +149,14 @@ project(':grails-events-spring').projectDir = file('grails-events/spring') project(':grails-events-rxjava').projectDir = file('grails-events/rxjava') project(':grails-events-rxjava2').projectDir = file('grails-events/rxjava2') project(':grails-events-rxjava3').projectDir = file('grails-events/rxjava3') -project(':grails-events-plugin').projectDir = file('grails-events/plugin') +project(':grails-events').projectDir = file('grails-events/plugin') project(':grails-async-core').projectDir = file('grails-async/core') project(':grails-async-gpars').projectDir = file('grails-async/gpars') project(':grails-async-rxjava').projectDir = file('grails-async/rxjava') project(':grails-async-rxjava2').projectDir = file('grails-async/rxjava2') project(':grails-async-rxjava3').projectDir = file('grails-async/rxjava3') -project(':grails-async-plugin').projectDir = file('grails-async/plugin') +project(':grails-async').projectDir = file('grails-async/plugin') project(':grails-gsp-core').projectDir = file('grails-gsp/core') project(':grails-gsp').projectDir = file('grails-gsp/plugin') @@ -195,11 +195,11 @@ findProject(':grails-data-hibernate5-docs').projectDir = new File(settingsDir, ' include ':grails-data-hibernate5' findProject(':grails-data-hibernate5').projectDir = new File(settingsDir, 'grails-data-hibernate5/grails-plugin') -include 'grails-data-hibernate5-database-migration' -findProject(':grails-data-hibernate5-database-migration').projectDir = new File(settingsDir, 'grails-data-hibernate5/database-migration') +include 'grails-data-hibernate5-dbmigration' +findProject(':grails-data-hibernate5-dbmigration').projectDir = new File(settingsDir, 'grails-data-hibernate5/dbmigration') -include 'grails-data-hibernate5-boot-plugin' -findProject(':grails-data-hibernate5-boot-plugin').projectDir = new File(settingsDir, 'grails-data-hibernate5/boot-plugin') +include 'grails-data-hibernate5-spring-boot' +findProject(':grails-data-hibernate5-spring-boot').projectDir = new File(settingsDir, 'grails-data-hibernate5/boot-plugin') // functional tests - Hibernate5 examples include 'grails-test-examples-hibernate5-grails-hibernate' @@ -248,8 +248,8 @@ include 'grails-data-mongodb-docs' project(':grails-data-mongodb-docs').projectDir = new File(settingsDir, 'grails-data-mongodb/docs') // plugins -include 'grails-data-mongodb-boot-plugin' -project(':grails-data-mongodb-boot-plugin').projectDir = new File(settingsDir, 'grails-data-mongodb/boot-plugin') +include 'grails-data-mongodb-spring-boot' +project(':grails-data-mongodb-spring-boot').projectDir = new File(settingsDir, 'grails-data-mongodb/boot-plugin') include 'grails-data-mongodb' project(':grails-data-mongodb').projectDir = new File(settingsDir, 'grails-data-mongodb/grails-plugin')
