This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a change to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
from 164063b256 Merge pull request #15468 from apache/7.0.x
add 5ef6e7bfbc Fix basic collection type 'in' query (#14610)
add 150f6ebcc8 Fix checkstyle import order, prevent duplicate alias, and
preserve original property name
add 9b5991c63d Merge branch '7.0.x' into fix/basic-collection-in-14610
add 2ad24be2cf Fix createAlias to populate aliasMap, preventing duplicate
alias on basic collections
add e30b8c5d9b Merge pull request #15463 from
apache/fix/basic-collection-in-14610
add 87782246bd fix: resolve three where-query bugs (#14344, #14480, #14569)
add 04a15b4e19 Merge branch '7.0.x' into fix/where-query-bugs
add 08bee01c94 Remove unused imports from
WhereQueryOldIssueVerificationSpec
add 1858c235b2 Remove section grouping comment from test spec
add e01dd23e09 Add log.warn() for DetachedCriteria.count() projection
fallback
add 791b6250cb Merge branch '7.0.x' into fix/where-query-bugs
add 0f33370ac3 Merge pull request #15460 from
jamesfredley/fix/where-query-bugs
add dd16c5e09b fix: remove @PendingFeature from basic collection test now
that #14610 is fixed
add a06aa3ddef Merge pull request #15471 from
apache/fix/remove-pending-feature-basic-collection
add a6eec2ac73 Initial work for TestFramework->DevelopmentReloading
add 3dbd335dbf Merge remote-tracking branch 'upstream/7.0.x' into
forgeReloadingChanges
add 811fadb311 Test coverage & handle converting testFramework to
reloading defaults
add 4cc3579d84 fix reloading defaults
add 051b8c0c2f Update spring boot dev tools test
add 335091564d Merge pull request #15437 from apache/forgeReloadingChanges
new 84bdc3a8e2 Merge branch '7.0.x' into 7.1.x
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../grails/orm/HibernateCriteriaBuilder.java | 1 +
.../query/AbstractHibernateCriteriaBuilder.java | 61 +++-
.../gorm/tests/BasicCollectionInQuerySpec.groovy | 167 ++++++++++
.../WhereQueryOldIssueVerificationSpec.groovy | 371 +++++++++++++++++++++
.../groovy/grails/gorm/DetachedCriteria.groovy | 22 +-
.../datastore/gorm/finders/CountByFinder.java | 1 +
.../mapping/query/jpa/JpaQueryBuilder.java | 53 +++
grails-doc/src/en/guide/commandLine.adoc | 2 +-
.../analytics/postgres/AnalyticsController.java | 8 +-
.../forge/analytics/postgres/Application.java | 14 +-
.../analytics/postgres/FeatureRepository.java | 4 +-
.../postgres/StoreGeneratedProjectStatsSpec.groovy | 10 +-
.../grails/forge/api/ApplicationController.java | 2 +-
...estFramework.java => DevelopmentReloading.java} | 23 +-
...meworkDTO.java => DevelopmentReloadingDTO.java} | 64 ++--
.../org/grails/forge/api/SelectOptionsDTO.java | 28 +-
.../forge/api/analytics/GenerationListener.java | 2 +-
.../forge/api/create/AbstractCreateController.java | 6 +-
.../api/create/github/GitHubCreateController.java | 12 +-
.../api/create/github/GitHubCreateOperation.java | 6 +-
.../api/create/github/GitHubCreateService.java | 6 +-
.../forge/api/create/zip/ZipCreateController.java | 22 +-
.../forge/api/create/zip/ZipCreateOperation.java | 6 +-
.../org/grails/forge/api/diff/DiffController.java | 12 +-
.../org/grails/forge/api/diff/DiffOperations.java | 8 +-
...java => DevelopmentReloadingSelectOptions.java} | 14 +-
.../api/options/TestFrameworkSelectOptions.java | 42 ---
.../forge/api/preview/PreviewController.java | 10 +-
.../forge/api/preview/PreviewOperations.java | 6 +-
.../src/main/resources/select_options.properties | 2 +-
.../org/grails/forge/api/CreateClient.groovy | 12 +-
.../groovy/org/grails/forge/api/DiffClient.groovy | 8 +-
.../grails/forge/api/FeatureControllerSpec.groovy | 22 +-
.../org/grails/forge/api/PreviewClient.groovy | 4 +-
.../forge/api/ZipCreateControllerSpec.groovy | 4 +-
.../java/org/grails/forge/cli/Application.java | 4 +-
.../java/org/grails/forge/cli/CodeGenConfig.java | 19 +-
.../grails/forge/cli/command/CreateCommand.java | 8 +-
...es.java => DevelopmentReloadingCandidates.java} | 8 +-
...ter.java => DevelopmentReloadingConverter.java} | 14 +-
.../CodeGenConfigDevelopmentReloadingSpec.groovy | 288 ++++++++++++++++
.../org/grails/forge/cli/CommandFixture.groovy | 5 +-
.../java/org/grails/forge/analytics/Generated.java | 10 +-
.../grails/forge/application/ContextFactory.java | 10 +-
.../generator/DefaultProjectGenerator.java | 2 +-
.../application/generator/GeneratorContext.java | 15 +-
.../forge/build/gradle/GradleConfiguration.java | 6 +-
.../forge/build/gradle/GradleDependency.java | 10 +-
...st.java => HasDefaultDevelopmentReloading.java} | 6 +-
.../grails/forge/defaults/LanguageDefaults.java | 14 +-
.../java/org/grails/forge/diff/FeatureDiffer.java | 2 +-
.../org/grails/forge/feature/FeatureContext.java | 32 +-
.../java/org/grails/forge/feature/Features.java | 12 +-
.../build/gradle/templates/buildGradle.rocker.raw | 1 -
.../java/org/grails/forge/feature/cli.rocker.raw | 6 +-
.../forge/feature/database/TestContainers.java | 27 +-
.../org/grails/forge/feature/reloading/Jrebel.java | 16 +
.../forge/feature/reloading/ReloadingFeature.java | 11 +-
.../feature/reloading/SpringBootDevTools.java | 19 +-
.../org/grails/forge/feature/test/AssertJ.java | 68 ----
.../forge/feature/test/AssertJValidator.java | 44 ---
.../forge/feature/test/GebWithTestcontainers.java | 8 +-
.../feature/test/GebWithWebDriverBinaries.java | 6 +-
.../org/grails/forge/feature/test/Hamcrest.java | 68 ----
.../forge/feature/test/HamcrestValidator.java | 44 ---
.../java/org/grails/forge/feature/test/Junit.java | 70 ----
.../org/grails/forge/feature/test/Mockito.java | 2 +-
.../forge/feature/test/MockitoValidator.java | 2 +-
.../java/org/grails/forge/feature/test/Spock.java | 17 +-
.../org/grails/forge/feature/test/TestFeature.java | 71 ----
.../feature/test/template/javaJunit.rocker.raw | 49 ---
.../options/AbstractJunitRockerModelProvider.java | 38 ---
.../options/AbstractTestRockerModelProvider.java | 33 --
.../options/DefaultTestRockerModelProvider.java | 10 +-
.../forge/options/DevelopmentReloading.java} | 27 +-
.../org/grails/forge/options/FeatureFilter.java | 12 +-
.../forge/options/JunitRockerModelProvider.java | 45 ---
.../java/org/grails/forge/options/Language.java | 2 +-
.../java/org/grails/forge/options/Options.java | 48 +--
.../org/grails/forge/options/TestFramework.java | 46 +--
.../forge/options/TestRockerModelProvider.java | 9 +-
.../groovy/org/grails/forge/BuildBuilder.groovy | 14 +-
.../dependencies/GradleConfigurationSpec.groovy | 3 +-
.../GradleDependencyComparatorSpec.groovy | 3 +-
.../grails/forge/build/gradle/GradleSpec.groovy | 13 +-
.../feature/asciidoctor/AsciidoctorSpec.groovy | 5 +-
.../feature/assetPipeline/AssetPipelineSpec.groovy | 5 +-
.../feature/database/HibernateGormSpec.groovy | 5 +-
.../feature/database/TestContainersSpec.groovy | 22 +-
.../workflows/PlainGithubWorkflowSpec.groovy | 5 +-
.../forge/feature/grails/GrailsBaseSpec.groovy | 11 +-
.../feature/grails/GrailsDefaultPluginsSpec.groovy | 5 +-
.../feature/grails/GrailsGradlePluginSpec.groovy | 5 +-
.../grailsProfiles/GrailsProfilesSpec.groovy | 5 +-
.../feature/grailsWrapper/GrailsWrapperSpec.groovy | 3 +-
.../feature/lang/GrailsApplicationSpec.groovy | 7 +-
.../forge/feature/logging/LogbackSpec.groovy | 4 +-
.../migration/DatabaseMigrationPluginSpec.groovy | 5 +-
.../forge/feature/other/ShadePluginSpec.groovy | 3 +-
.../reloading/SpringBootDevToolsSpec.groovy | 24 +-
.../forge/feature/spring/SpringBootSpec.groovy | 5 +-
.../spring/SpringBootVirtualThreadsSpec.groovy | 5 +-
.../feature/spring/SpringResourcesSpec.groovy | 3 +-
.../feature/test/GebWithTestcontainersSpec.groovy | 5 +-
.../test/GebWithWebDriverBinariesSpec.groovy | 11 +-
.../org/grails/forge/feature/test/JUnitSpec.groovy | 39 ---
.../grails/forge/feature/view/GrailsGspSpec.groovy | 9 +-
.../forge/feature/view/json/ViewJsonSpec.groovy | 7 +-
.../forge/feature/view/json/ViewMarkupSpec.groovy | 4 +-
.../grails/forge/feature/web/GrailsWebSpec.groovy | 5 +-
.../org/grails/forge/fixture/ContextFixture.groovy | 3 +-
.../grails/forge/options/TestFrameworkSpec.groovy | 13 +-
.../options/TestRockerModelProviderSpec.groovy | 12 +-
.../org/grails/forge/utils/CommandSpec.groovy | 7 +-
grails-test-examples/geb/grails-cli.yml | 2 +-
.../gsp-layout/grails-forge-cli.yml | 2 +-
.../gsp-sitemesh3/grails-forge-cli.yml | 2 +-
117 files changed, 1432 insertions(+), 1148 deletions(-)
create mode 100644
grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/BasicCollectionInQuerySpec.groovy
create mode 100644
grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/WhereQueryOldIssueVerificationSpec.groovy
copy
grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/{TestFramework.java
=> DevelopmentReloading.java} (69%)
rename
grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/{TestFrameworkDTO.java
=> DevelopmentReloadingDTO.java} (52%)
copy
grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/{LanguageSelectOptions.java
=> DevelopmentReloadingSelectOptions.java} (72%)
delete mode 100644
grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/TestFrameworkSelectOptions.java
rename
grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/{TestFrameworkCandidates.java
=> DevelopmentReloadingCandidates.java} (75%)
rename
grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/{TestFrameworkConverter.java
=> DevelopmentReloadingConverter.java} (69%)
create mode 100644
grails-forge/grails-forge-cli/src/test/groovy/org/grails/forge/cli/CodeGenConfigDevelopmentReloadingSpec.groovy
rename
grails-forge/grails-forge-core/src/main/java/org/grails/forge/defaults/{HasDefaultTest.java
=> HasDefaultDevelopmentReloading.java} (85%)
delete mode 100644
grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/AssertJ.java
delete mode 100644
grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/AssertJValidator.java
delete mode 100644
grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/Hamcrest.java
delete mode 100644
grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/HamcrestValidator.java
delete mode 100644
grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/Junit.java
delete mode 100644
grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/TestFeature.java
delete mode 100644
grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/template/javaJunit.rocker.raw
delete mode 100644
grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/AbstractJunitRockerModelProvider.java
delete mode 100644
grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/AbstractTestRockerModelProvider.java
rename
grails-forge/{grails-forge-api/src/main/java/org/grails/forge/api/TestFramework.java
=>
grails-forge-core/src/main/java/org/grails/forge/options/DevelopmentReloading.java}
(71%)
delete mode 100644
grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/JunitRockerModelProvider.java
delete mode 100644
grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/test/JUnitSpec.groovy
