Merge pull request #13820 from codeconsole/7.0.x-remove-circular-transitive-dependency

codeconsole · web-flow · commit 1e66d2d234cd · 2024-11-01T16:38:39.000-07:00
Remove circular transitive gsp dependency
diff --git a/grails-web-common/build.gradle b/grails-web-common/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     }
     api project(":grails-databinding")
     api project(":grails-encoder")
-    api "org.grails:grails-gsp"
+    compileOnly "org.grails:grails-gsp"
 
     api "org.apache.groovy:groovy-templates"
     compileOnly "jakarta.servlet:jakarta.servlet-api"
diff --git a/grails-web-databinding/build.gradle b/grails-web-databinding/build.gradle
@@ -1,4 +1,5 @@
 dependencies {
     api project(":grails-databinding")
     api project(":grails-web-common")
+    testRuntimeOnly "org.grails:grails-gsp"
 }
diff --git a/grails-web-url-mappings/build.gradle b/grails-web-url-mappings/build.gradle
@@ -1,5 +1,6 @@
 dependencies {
     api project(":grails-web-common")
+    compileOnly "org.grails:grails-gsp"
 
     api("org.grails:grails-datastore-gorm-validation")
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ dependencies {`
`4`	`4`	`}`
`5`	`5`	`api project(":grails-databinding")`
`6`	`6`	`api project(":grails-encoder")`
`7`		`- api "org.grails:grails-gsp"`
	`7`	`+ compileOnly "org.grails:grails-gsp"`
`8`	`8`
`9`	`9`	`api "org.apache.groovy:groovy-templates"`
`10`	`10`	`compileOnly "jakarta.servlet:jakarta.servlet-api"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`dependencies {`
`2`	`2`	`api project(":grails-databinding")`
`3`	`3`	`api project(":grails-web-common")`
	`4`	`+ testRuntimeOnly "org.grails:grails-gsp"`
`4`	`5`	`}`