-
-
Notifications
You must be signed in to change notification settings - Fork 955
PR #2 Merge grails-data-mapping & grails-geb into grails-core #14324
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: grails-data-merge
Are you sure you want to change the base?
Conversation
fix setup() methods being called
4.1.x - backport setup() methods being called
# Conflicts: # build.gradle # gradle.properties
Merge 4.1.x into 5.0.x
Use NEXUS_PUBLISH_* variables
Revert NEXUS_PUBLISH_URL to use sonatype value
Merge 4.1.x to 5.0.x & restore NEXUS variables
* fix: add setting to disable tracing Close gh-119 * docs: document `grails.geb.tracing.enabled` setting
# Conflicts: # gradle.properties
Merge 4.1.x into 5.0.x
This resolves an issue on Windows when using the file from `container.copyFileToContainer()` with the Geb FileInput module.
Due to github displaying a max of 3000 file changes for a PR, I am reviewing this in three chunks: a58aa14...grails-geb - all the rest of the changes. |
I reset the grails-data-merge branch to 71b0349 - if you want me to create a PR with just the imported data and then have this one be the changes, i can do that |
I've reopened the data-mapping PR, that branch was reset to the point where we ran import only. It contains no changes other than the existing commit history from grails-data-mapping. This branch will transform the repo to be functional. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jdaugherty GitHub is struggling with this PR, so I couldn't put these on the lines
3 instances with double colon
project('::grails-data-hibernate5')
elApiVersion
should be 5.0.1 based on https://projects.eclipse.org/releases/jakarta-10 and latest 5.0.x from https://mvnrepository.com/artifact/jakarta.el/jakarta.el-api
There are also a few versions set directly in build.gradle files:
Targets
Occurrences of ':[0-9]' in Project with mask '*.gradle'
Found occurrences in Project with mask '*.gradle' (47 usages found)
Usage in string constants (45 usages found)
grails-gradle (1 usage found)
grails-gradle\gradle (1 usage found)
e2eTest.gradle (1 usage found)
53 e2eTestImplementation 'commons-io:commons-io:2.18.0'
grails.core.ROOT.grails-fields (1 usage found)
grails-fields (1 usage found)
build.gradle (1 usage found)
32 testImplementation 'org.javassist:javassist:3.29.0-GA'
grails.core.ROOT.grails-shell-cli (1 usage found)
grails-shell-cli (1 usage found)
build.gradle (1 usage found)
105 testImplementation 'com.github.jnr:jnr-posix:3.1.20'
grails.core.ROOT.grails-test-examples-async-events-pubsub-demo (2 usages found)
grails-test-examples\async-events-pubsub-demo (2 usages found)
build.gradle (2 usages found)
51 testImplementation 'io.micronaut.serde:micronaut-serde-jackson:2.10.2'
52 testImplementation 'io.micronaut:micronaut-http-client:4.6.5'
grails.core.ROOT.grails-test-examples-gsp-spring-boot (1 usage found)
grails-test-examples\gsp-spring-boot\app (1 usage found)
build.gradle (1 usage found)
47 implementation 'org.hibernate.validator:hibernate-validator:8.0.0.Final' // validation
I am now jumping into the changes in the larger group of commits. a58aa14...grails-geb
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
assemble runs a number of asciidoctor tasks which are not needed, but this can be done in another ticket.
https://github.com/grails/ should be replaced with https://github.com/apache/ in
example grails-fields/src/test/groovy/grails/plugin/formfields/FormFieldsTemplateServiceSpec.groovy
Issue for new test failures: #14327
|
|
Per the decision[1], this merges the grails-data-mapping & grails-geb repositories into grails-core.
Please note that after having these repositories fully merged, clean up was done, including:
[1] https://lists.apache.org/thread/7trbthyv31tp2pkwpr3swn1pm80nd969