This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new f1fc1d37a6 apache coordinate changes - correcting bom for views and
updating test work arounds (#14118)
f1fc1d37a6 is described below
commit f1fc1d37a6eecd206091849eb0dd903a9dee5677
Author: James Daugherty <[email protected]>
AuthorDate: Fri Apr 4 03:27:29 2025 -0400
apache coordinate changes - correcting bom for views and updating test work
arounds (#14118)
* update bom for missed coordinates
* be consistent with markup vs gson
* updating mismatches on views & updating tests
---
RENAME.md | 2 +-
dependabot/build.gradle | 2 +-
gradle.properties | 24 +++++++++-------------
grails-bom/apache-plugins.properties | 12 +++++++----
grails-bom/plugins.properties | 7 +------
grails-databinding/build.gradle | 4 ----
.../async-events-pubsub-demo/build.gradle | 5 +----
grails-test-examples/demo33/build.gradle | 5 +----
grails-test-examples/issue-views-182/build.gradle | 5 +----
.../plugins/loadafter/build.gradle | 16 ++++++++++++++-
grails-test-suite-persistence/build.gradle | 3 ---
grails-test-suite-uber/build.gradle | 10 +--------
rename_gradle_artifacts.sh | 2 +-
settings.gradle | 6 +++---
14 files changed, 44 insertions(+), 59 deletions(-)
diff --git a/RENAME.md b/RENAME.md
index 905e42ab4d..22db96eb56 100644
--- a/RENAME.md
+++ b/RENAME.md
@@ -125,7 +125,7 @@ Below is a reference of all migrated artifacts - both their
old and new name.
| org.grails | grails-plugin-url-mappings
| org.apache.grails | grails-url-mappings
| |
| grails-core |
| org.grails | grails-plugin-validation
| org.apache.grails | grails-validation
| |
| grails-core |
| org.grails | views-core
| org.apache.grails.views | grails-views-core
| |
| grails-views |
-| org.grails.plugins | views-json
| org.apache.grails.views | grails-views-gson
| |
| grails-views |
+| org.grails.plugins | views-json
| org.apache.grails | grails-views-gson
| |
| grails-views |
| org.grails | views-json-testing-support
| org.apache.grails |
grails-testing-support-views-gson |
| | grails-views |
| org.grails | views-markup
| org.apache.grails | grails-views-markup
| |
| grails-views |
| org.grails | grails-web
| org.apache.grails.web | grails-web-core
| |
| grails-core |
diff --git a/dependabot/build.gradle b/dependabot/build.gradle
index d3f4868e86..c8dee603aa 100644
--- a/dependabot/build.gradle
+++ b/dependabot/build.gradle
@@ -63,7 +63,7 @@ dependencies {
api "org.grails.plugins:neo4j:${project['plugins-neo4j.version']}"
api
"org.apache.grails:grails-scaffolding:${project['plugins-scaffolding.version']}"
api
"org.apache.grails:grails-data-mongodb-gson-templates:${project['plugins-views-json-templates.version']}"
- api
"org.apache.grails.views:grails-views-gson:${project['plugins-views-json.version']}"
+ api
"org.apache.grails:grails-views-gson:${project['plugins-views-json.version']}"
api
"org.grails.plugins:views-markup:${project['plugins-views-markup.version']}"
api "org.grails.profiles:angular:${project['profiles.version']}"
api "org.grails.profiles:base:${project['profiles.version']}"
diff --git a/gradle.properties b/gradle.properties
index 844e6a4577..87274c566f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -38,7 +38,7 @@ preventSnapshotPublish=false
# https://github.com/apache/grails-gradle-plugin/issues/222
slf4jPreventExclusion=true
-# Generated on Fri Apr 04 01:08:08 EDT 2025 by: ./gradlew :grails-bom:syncProps
+# Generated on Fri Apr 04 03:18:33 EDT 2025 by: ./gradlew :grails-bom:syncProps
# Only version value modifications allowed after this point. Do not insert or
change version names.
ant.version=1.10.15
asciidoctorj.version=3.0.0
@@ -52,8 +52,6 @@ commons-text.version=1.12.0
directory-watcher.version=0.18.0
flying-saucer-pdf-openpdf.version=9.4.0
geb-spock.version=7.0
-grails-data-hibernate5-core.version= *** UNDEFINED **
-grails-datamapping-mongodb.version= *** UNDEFINED **
grails-datastore.version=9.0.0-SNAPSHOT
grails-gdoc-engine.version=1.0.1
grails-gradle-plugins.version=7.0.0-SNAPSHOT
@@ -71,22 +69,20 @@ liquibase.version=4.27.0
mongodb.version=5.3.1
objenesis.version=3.4
plugins-cache.version=8.0.0-SNAPSHOT
-plugins-fields.version=7.0.0-SNAPSHOT
+plugins-grails-data-hibernate5.version=9.0.0-SNAPSHOT
+plugins-grails-data-hibernate5-dbmigration.version=9.0.0-SNAPSHOT
+plugins-grails-data-mongodb.version=9.0.0-SNAPSHOT
+plugins-grails-data-mongodb-gson-templates.version=9.0.0-SNAPSHOT
+plugins-grails-fields.version=7.0.0-SNAPSHOT
plugins-grails-geb.version=5.0.0-SNAPSHOT
-plugins-hibernate5.version=9.0.0-SNAPSHOT
-plugins-hibernate5-dbmigration.version=9.0.0-SNAPSHOT
-plugins-mongodb.version=9.0.0-SNAPSHOT
+plugins-grails-scaffolding.version=7.0.0-SNAPSHOT
+plugins-grails-views-gson.version=7.0.0-SNAPSHOT
+plugins-grails-views-markup.version=7.0.0-SNAPSHOT
plugins-neo4j.version=8.1.0
-plugins-scaffolding.version=7.0.0-SNAPSHOT
-plugins-views-gradle.version=7.0.0-SNAPSHOT
-plugins-views-gson-templates.version=9.0.0-SNAPSHOT
-plugins-views-json.version=7.0.0-SNAPSHOT
-plugins-views-markup.version=7.0.0-SNAPSHOT
profiles.version=10.0.2
rxjava.version=1.3.8
rxjava2.version=2.2.21
rxjava3.version=3.1.10
spock.version=2.3-groovy-4.0
spring-boot.version=3.4.2
-springloaded.version=1.2.8.RELEASE
-views-json-testing-support.version=7.0.0-SNAPSHOT
\ No newline at end of file
+springloaded.version=1.2.8.RELEASE
\ No newline at end of file
diff --git a/grails-bom/apache-plugins.properties
b/grails-bom/apache-plugins.properties
index 58e3dee29f..e2474346ca 100644
--- a/grails-bom/apache-plugins.properties
+++ b/grails-bom/apache-plugins.properties
@@ -1,5 +1,9 @@
grails-geb=5.0.0-SNAPSHOT
-hibernate5-dbmigration=9.0.0-SNAPSHOT
-hibernate5=9.0.0-SNAPSHOT
-mongodb=9.0.0-SNAPSHOT
-views-gson-templates=9.0.0-SNAPSHOT
+grails-data-hibernate5-dbmigration=9.0.0-SNAPSHOT
+grails-data-hibernate5=9.0.0-SNAPSHOT
+grails-data-mongodb=9.0.0-SNAPSHOT
+grails-data-mongodb-gson-templates=9.0.0-SNAPSHOT
+grails-fields=7.0.0-SNAPSHOT
+grails-scaffolding=7.0.0-SNAPSHOT
+grails-views-gson=7.0.0-SNAPSHOT
+grails-views-markup=7.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/grails-bom/plugins.properties b/grails-bom/plugins.properties
index 0807a5ad9e..a99adfd40f 100644
--- a/grails-bom/plugins.properties
+++ b/grails-bom/plugins.properties
@@ -1,7 +1,2 @@
cache=8.0.0-SNAPSHOT
-fields=7.0.0-SNAPSHOT
-neo4j=8.1.0
-scaffolding=7.0.0-SNAPSHOT
-views-gradle=7.0.0-SNAPSHOT
-views-json=7.0.0-SNAPSHOT
-views-markup=7.0.0-SNAPSHOT
\ No newline at end of file
+neo4j=8.1.0
\ No newline at end of file
diff --git a/grails-databinding/build.gradle b/grails-databinding/build.gradle
index 90be83a8a3..fbcaddec9c 100644
--- a/grails-databinding/build.gradle
+++ b/grails-databinding/build.gradle
@@ -20,17 +20,13 @@ dependencies {
testImplementation project(':grails-test-suite-base')
testImplementation "org.apache.grails:grails-testing-support-web", {
- exclude module:'grails-plugin-rest' // TODO: Remove after gsp is built
exclude module:'grails-rest-transforms'
exclude module:'grails-interceptors'
- exclude module:'grails-plugin-interceptors' // TODO: Remove after gsp
is built
exclude module:'grails-test-core'
- exclude module:'grails-test' // TODO: Remove after gsp is built
exclude module:'grails-core'
exclude module:'grails-async'
exclude module:'grails-gsp-core'
exclude module:'grails-testing-support-core'
- exclude module:'grails-testing-support' //TODO: Remove after gsp is
built
}
testImplementation project(':grails-testing-support-core')
diff --git a/grails-test-examples/async-events-pubsub-demo/build.gradle
b/grails-test-examples/async-events-pubsub-demo/build.gradle
index 85a3285c29..e2c886b553 100644
--- a/grails-test-examples/async-events-pubsub-demo/build.gradle
+++ b/grails-test-examples/async-events-pubsub-demo/build.gradle
@@ -35,10 +35,7 @@ dependencies {
implementation "org.apache.grails:grails-url-mappings"
implementation "org.apache.grails.web:grails-web-boot"
- implementation 'org.apache.grails.views:grails-views-gson', {
- exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO:
remove when views published
- }
- implementation 'org.apache.grails:grails-rest-transforms' // TODO: Remove
when views published
+ implementation 'org.apache.grails:grails-views-gson'
implementation 'org.apache.grails:grails-data-hibernate5'
implementation 'org.springframework.boot:spring-boot-autoconfigure'
diff --git a/grails-test-examples/demo33/build.gradle
b/grails-test-examples/demo33/build.gradle
index 559e0f1a17..6d75e10ee9 100644
--- a/grails-test-examples/demo33/build.gradle
+++ b/grails-test-examples/demo33/build.gradle
@@ -36,10 +36,7 @@ dependencies {
implementation 'org.apache.grails.web:grails-web-boot'
implementation 'org.apache.grails:grails-gsp'
implementation 'org.apache.grails:grails-data-hibernate5'
- implementation 'org.apache.grails.views:grails-views-gson', {
- exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO:
remove when views published
- }
- implementation 'org.apache.grails:grails-rest-transforms' // TODO: Remove
when views published
+ implementation 'org.apache.grails:grails-views-gson'
runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
runtimeOnly 'com.h2database:h2'
diff --git a/grails-test-examples/issue-views-182/build.gradle
b/grails-test-examples/issue-views-182/build.gradle
index d560bfd3b5..97e371f952 100644
--- a/grails-test-examples/issue-views-182/build.gradle
+++ b/grails-test-examples/issue-views-182/build.gradle
@@ -40,10 +40,7 @@ dependencies {
implementation "org.apache.grails:grails-async"
implementation "org.apache.grails:grails-events"
implementation "org.apache.grails:grails-data-hibernate5"
- implementation "org.apache.grails.views:grails-views-gson", {
- exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO:
remove when views published
- }
- implementation 'org.apache.grails:grails-rest-transforms' // TODO: Remove
when views published
+ implementation "org.apache.grails:grails-views-gson"
console "org.apache.grails:grails-console"
profile "org.grails.profiles:rest-api"
runtimeOnly "com.h2database:h2"
diff --git a/grails-test-examples/plugins/loadafter/build.gradle
b/grails-test-examples/plugins/loadafter/build.gradle
index 2b9cd2f962..09a029a8d5 100644
--- a/grails-test-examples/plugins/loadafter/build.gradle
+++ b/grails-test-examples/plugins/loadafter/build.gradle
@@ -28,7 +28,21 @@ dependencies {
api "org.apache.grails:grails-dependencies"
api "jakarta.servlet:jakarta.servlet-api"
- implementation
"org.grails.plugins:spring-security-core:$springSecurityCoreVersion"
+ implementation
"org.grails.plugins:spring-security-core:$springSecurityCoreVersion", {
+ exclude group: 'org.grails', module: 'grails-datastore-core' // TODO:
remove when spring security is updated
+ exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO:
remove when spring security is updated
+ exclude group: 'org.grails.plugins', module: 'async' // TODO: remove
when spring security is updated
+ exclude group: 'org.grails', module: 'grails-web-common' // TODO:
remove when spring security is updated
+ exclude group: 'org.grails', module: 'grails-web-url-mappings' //
TODO: remove when spring security is updated
+ exclude group: 'org.grails', module: 'grails-events-transform' //
TODO: remove when spring security is updated
+ exclude group: 'org.grails', module: 'grails-plugin-mimetypes' //
TODO: remove when spring security is updated
+ }
+ implementation 'org.apache.grails.data:grails-datastore-core' // TODO:
Remove when spring security is updated
+ implementation 'org.apache.grails.data:grails-datamapping-core' // TODO:
Remove when spring security is updated
+ implementation 'org.apache.grails.events:grails-events-transforms' //
TODO: Remove when spring security is updated
+ implementation 'org.apache.grails:grails-async' // TODO: Remove when
spring security is updated
+ implementation 'org.apache.grails.web:grails-web-common' // TODO: Remove
when spring security is updated
+ implementation 'org.apache.grails.web:grails-web-url-mappings' // TODO:
Remove spring security is published published
console "org.apache.grails:grails-console"
}
diff --git a/grails-test-suite-persistence/build.gradle
b/grails-test-suite-persistence/build.gradle
index 8fea64bdaf..661fc3a38c 100644
--- a/grails-test-suite-persistence/build.gradle
+++ b/grails-test-suite-persistence/build.gradle
@@ -36,10 +36,7 @@ dependencies {
testImplementation project(':grails-async-plugin')
testImplementation "org.apache.grails:grails-testing-support-datamapping",
{
- exclude module:'grails-plugin-rest' // TODO: Remove after gorm is built
- exclude module:'grails-rest-transforms' // TODO: Remove after gorm is
built
exclude module:'grails-testing-support-core'
- exclude module:'grails-testing-support' // TODO: Remove after gorm is
built
}
testImplementation project(':grails-testing-support-core')
diff --git a/grails-test-suite-uber/build.gradle
b/grails-test-suite-uber/build.gradle
index 1756963801..fd604fc39b 100644
--- a/grails-test-suite-uber/build.gradle
+++ b/grails-test-suite-uber/build.gradle
@@ -27,23 +27,15 @@ dependencies {
testImplementation 'org.apache.groovy:groovy-test-junit5'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.apache.grails.data:grails-data-hibernate5-core'
- testImplementation "org.apache.grails:grails-gsp", {
- exclude module: 'grails-datastore-gorm-validation' // TODO: Remove
after views is built
- }
+ testImplementation "org.apache.grails:grails-gsp"
testImplementation 'org.apache.grails:grails-testing-support-datamapping',
{
// This is a local project dependency
exclude module: 'grails-testing-support-core'
- exclude module: 'grails-testing-support'// TODO: remove after gorm is
built
- exclude module: 'grails-plugin-rest' // TODO: remove after gorm is
built
exclude module: 'grails-rest-transforms'
}
testImplementation 'org.apache.grails:grails-testing-support-web', {
// This is a local project dependency
exclude module: 'grails-testing-support-core'
- exclude module: 'grails-datastore-gorm-validation' // TODO: Remove
after views is built
- exclude module: 'grails-plugin-interceptors' // TODO: remove after
views is built
- exclude module: 'grails-testing-support' // TODO: remove after views
is built
- exclude module: 'grails-plugin-rest' // TODO: remove after views is
built
exclude module: 'grails-rest-transforms'
}
testImplementation 'org.apache.grails.data:grails-datamapping-validation'
diff --git a/rename_gradle_artifacts.sh b/rename_gradle_artifacts.sh
index 78966b67cc..40e3e72301 100755
--- a/rename_gradle_artifacts.sh
+++ b/rename_gradle_artifacts.sh
@@ -126,7 +126,7 @@ while getopts "pdvsqrtcfgl:" flag; do
elif [ "${flag}" = "v" ]; then
echo "Mapping grails-views artifacts"
declare -a views_mappings=(
-
"org[.]grails[.]plugins:views-json|org.apache.grails.views:grails-views-gson"
+ "org[.]grails[.]plugins:views-json|org.apache.grails:grails-views-gson"
"org[.]grails[.]plugins:scaffolding|org.apache.grails:grails-scaffolding"
"org[.]grails[.]plugins:gsp|org.apache.grails:grails-gsp"
"org[.]grails[.]plugins:fields|org.apache.grails:grails-fields"
diff --git a/settings.gradle b/settings.gradle
index b2782e742a..a3cc68a8c9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -67,8 +67,8 @@ include (
// Test Suite
'grails-test-suite-base',
'grails-test-suite-persistence',
-// 'grails-test-suite-uber',
-// 'grails-test-suite-web',
+ 'grails-test-suite-uber',
+ 'grails-test-suite-web',
// Gradle Plugin
'grails-gradle-model',
@@ -112,7 +112,7 @@ 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')
-// Functional Tests
+//// Functional Tests
//include (
// 'grails-test-examples-async-events-pubsub-demo',
// 'grails-test-examples-app1',
