Skip to content
This repository was archived by the owner on Oct 11, 2025. It is now read-only.

Commit 54e4a7e

Browse files
jdaughertyjdaugherty
authored
Merge pull request #563 from jdaugherty/7.0.x
Revert dependencies changes until test projects are added & fix gsp plugin artifact name
2 parents 8222bd1 + dd9e941 commit 54e4a7e

File tree

9 files changed

+459
-520
lines changed

9 files changed

+459
-520
lines changed

‎gradle/publish-config.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ publishing {
2424
publications {
2525
maven(MavenPublication) {
2626

27-
artifactId = project.name
27+
artifactId = project.findProperty('artifactId') ?: project.name
2828
groupId = project.group
2929
version = project.version
3030

‎grails-gsp/build.gradle‎

Lines changed: 44 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -9,56 +9,51 @@ group = 'org.grails'
99
dependencies {
1010

1111
implementation platform("org.grails:grails-bom:$grailsVersion")
12+
api "org.grails:grails-core"
13+
api project(":grails-taglib")
14+
api "org.apache.groovy:groovy-templates"
1215

13-
api 'org.grails:grails-bootstrap', { // ConfigMap
14-
/*
15-
// API dependencies in grails-bootstrap
16-
exclude group: 'org.yaml', module: 'snakeyaml'
17-
*/
18-
}
19-
api 'org.apache.groovy:groovy-templates' // Template, TemplateEngine
20-
21-
implementation project(':grails-taglib'), { // GrailsTagException, OutputEncodingSettings are used
22-
/*
23-
// API dependencies in grails-taglib
24-
exclude group: 'org.grails', module: 'grails-core'
25-
exclude group: 'org.grails', module: 'grails-encoder'
26-
*/
27-
}
28-
implementation 'org.grails:grails-core', { // GrailsStringUtils
29-
/*
30-
// API dependencies in grails-core
31-
exclude group: 'org.apache.groovy', module: 'groovy'
32-
exclude group: 'jakarta.inject', module: 'jakarta.inject-api'
33-
exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
34-
exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
35-
exclude group: 'org.grails', module: 'grails-bootstrap'
36-
//exclude group: 'org.grails', module: 'grails-datastore-core' // ClassPropertyFetcher
37-
//exclude group: 'org.grails', module: 'grails-spring' // RuntimeSpringConfiguration (somehow needed for groovydoc)
38-
exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
39-
exclude group: 'org.slf4j', module: 'slf4j-api'
40-
exclude group: 'org.yaml', module: 'snakeyaml'
41-
exclude group: 'org.springframework', module: 'spring-beans'
42-
exclude group: 'org.springframework', module: 'spring-core'
43-
exclude group: 'org.springframework', module: 'spring-context'
44-
exclude group: 'org.springframework', module: 'spring-tx'
45-
exclude group: 'org.springframework.boot', module: 'spring-boot'
46-
exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
47-
*/
48-
}
49-
implementation 'org.grails:grails-encoder', { // FastStringWriter, StreamByteBuffer, StreamCharBuffer are used
50-
/*
51-
// API dependencies in grails-encoder
52-
exclude group: 'org.apache.groovy', module: 'groovy'
53-
exclude group: 'org.apache.groovy', module: 'groovy-json'
54-
exclude group: 'org.grails', module: 'grails-core'
55-
exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
56-
exclude group: 'org.slf4j', module: 'slf4j-api'
57-
exclude group: 'org.springframework', module: 'spring-web'
58-
*/
59-
}
60-
implementation 'org.springframework:spring-context' // ApplicationContext
61-
16+
// api 'org.grails:grails-bootstrap', { // ConfigMap
17+
// // API dependencies in grails-bootstrap
18+
// exclude group: 'org.yaml', module: 'snakeyaml'
19+
// }
20+
// api 'org.apache.groovy:groovy-templates' // Template, TemplateEngine
21+
//
22+
// api project(':grails-taglib'), { // GrailsTagException, OutputEncodingSettings are used
23+
// // API dependencies in grails-taglib
24+
// exclude group: 'org.grails', module: 'grails-core'
25+
// exclude group: 'org.grails', module: 'grails-encoder'
26+
// }
27+
// api 'org.grails:grails-core', { // GrailsStringUtils
28+
// // API dependencies in grails-core
29+
// exclude group: 'org.apache.groovy', module: 'groovy'
30+
// exclude group: 'jakarta.inject', module: 'jakarta.inject-api'
31+
// exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
32+
// exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
33+
// exclude group: 'org.grails', module: 'grails-bootstrap'
34+
// //exclude group: 'org.grails', module: 'grails-datastore-core' // ClassPropertyFetcher
35+
// //exclude group: 'org.grails', module: 'grails-spring' // RuntimeSpringConfiguration (somehow needed for groovydoc)
36+
// exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
37+
// exclude group: 'org.slf4j', module: 'slf4j-api'
38+
// exclude group: 'org.yaml', module: 'snakeyaml'
39+
// exclude group: 'org.springframework', module: 'spring-beans'
40+
// exclude group: 'org.springframework', module: 'spring-core'
41+
// exclude group: 'org.springframework', module: 'spring-context'
42+
// exclude group: 'org.springframework', module: 'spring-tx'
43+
// exclude group: 'org.springframework.boot', module: 'spring-boot'
44+
// exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
45+
// }
46+
// implementation 'org.grails:grails-encoder', { // FastStringWriter, StreamByteBuffer, StreamCharBuffer are used
47+
// // API dependencies in grails-encoder
48+
// exclude group: 'org.apache.groovy', module: 'groovy'
49+
// exclude group: 'org.apache.groovy', module: 'groovy-json'
50+
// exclude group: 'org.grails', module: 'grails-core'
51+
// exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
52+
// exclude group: 'org.slf4j', module: 'slf4j-api'
53+
// exclude group: 'org.springframework', module: 'spring-web'
54+
// }
55+
// implementation 'org.springframework:spring-context' // ApplicationContext
56+
//
6257
testImplementation 'org.junit.jupiter:junit-jupiter-api'
6358
testImplementation 'org.spockframework:spock-core'
6459

‎grails-plugin-gsp/build.gradle‎

Lines changed: 122 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ apply plugin: 'java-library'
1616
apply plugin: 'org.grails.grails-plugin'
1717

1818
ext {
19+
artifactId = 'gsp'
1920
testMaxParallelFork = isCiBuild ? 1 : 4
2021
testForkEvery = isCiBuild ? 10 : 20
2122
testJvmArgs = ['-Xmx1536M']
@@ -24,156 +25,134 @@ ext {
2425
dependencies {
2526

2627
implementation platform("org.grails:grails-bom:$grailsVersion")
28+
api project(":grails-web-gsp-taglib")
29+
api project(":grails-plugin-sitemesh3")
2730

28-
api project(':grails-gsp'), { // GroovyPageResourceLoader, GroovyPagesTemplateEngine, CachingGroovyPageStaticResourceLocator
29-
/*
30-
// API dependencies in grails-gsp
31-
exclude group: 'org.grails', module: 'grails-bootstrap'
32-
//exclude group: 'org.apache.groovy', module: 'groovy-templates' // TemplateEngine
33-
*/
34-
}
35-
api project(':grails-web-gsp'), { // PageRenderer
36-
/*
37-
// API dependencies in grails-web-gsp
38-
exclude group: 'org.grails', module: 'grails-gsp'
39-
exclude group: 'org.grails', module: 'grails-web-common'
40-
exclude group: 'org.grails', module: 'grails-web-taglib'
41-
*/
42-
}
43-
api project(':grails-web-taglib'), { // TagLibraryInvoker, TagLib, TagLibrary
44-
/*
45-
// API dependencies in grails-web-taglib
46-
exclude group: 'org.grails', module: 'grails-taglib'
47-
exclude group: 'org.grails', module: 'grails-web-common'
48-
*/
49-
}
50-
api 'org.grails:grails-encoder', { // CodecLookup, Encoder
51-
/*
52-
// API dependencies in grails-encoder
53-
exclude group: 'org.apache.groovy', module: 'groovy'
54-
exclude group: 'org.apache.groovy', module: 'groovy-json'
55-
exclude group: 'org.grails', module: 'grails-core'
56-
exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
57-
exclude group: 'org.slf4j', module: 'slf4j-api'
58-
exclude group: 'org.springframework', module: 'spring-web'
59-
*/
60-
}
61-
api 'org.grails:grails-web-url-mappings', { // LinkGenerator
62-
/*
63-
// API dependencies in grails-web-url-mappings
64-
exclude group: 'org.grails', module: 'grails-web-common'
65-
//exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // Constrained
66-
*/
67-
}
68-
api 'org.springframework:spring-context' // MessageSource, Errors, MessageSourceResolvable, DefaultMessageSourceResolvable, NoSuchMessageException
69-
api 'org.springframework.boot:spring-boot' // ServletRegistrationBean
70-
71-
implementation project(':grails-taglib'), { // GroovyPageAttributes
72-
/*
73-
// API dependencies in grails-taglib
74-
exclude group: 'org.grails', module: 'grails-core'
75-
exclude group: 'org.grails', module: 'grails-encoder'
76-
exclude group: 'org.springframework', module: 'spring-core'
77-
*/
78-
}
79-
implementation project(':grails-web-gsp-taglib'), { // RenderTagLib
80-
/*
81-
// API dependencies in grails-web-gsp-taglib
82-
exclude group: 'org.grails', module: 'grails-taglib'
83-
exclude group: 'org.grails', module: 'grails-web-gsp'
84-
*/
85-
}
86-
implementation "org.apache.commons:commons-text:$commonsTextVersion" // StringEscapeUtils
87-
implementation 'org.apache.groovy:groovy-xml' // MarkupBuilder
88-
implementation 'org.grails:grails-core', { // Config
89-
/*
90-
// API dependencies in grails-core
91-
exclude group: 'org.apache.groovy', module: 'groovy'
92-
exclude group: 'jakarta.inject', module: 'jakarta.inject-api'
93-
exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
94-
exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
95-
exclude group: 'org.grails', module: 'grails-bootstrap'
96-
exclude group: 'org.grails', module: 'grails-datastore-core'
97-
exclude group: 'org.grails', module: 'grails-spring'
98-
exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
99-
exclude group: 'org.slf4j', module: 'slf4j-api'
100-
exclude group: 'org.yaml', module: 'snakeyaml'
101-
exclude group: 'org.springframework', module: 'spring-beans'
102-
exclude group: 'org.springframework', module: 'spring-core'
103-
exclude group: 'org.springframework', module: 'spring-context'
104-
exclude group: 'org.springframework', module: 'spring-tx'
105-
exclude group: 'org.springframework.boot', module: 'spring-boot'
106-
exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
107-
*/
108-
}
109-
implementation 'org.grails:grails-spring', { // RuntimeSpringConfiguration
110-
/*
111-
// API dependencies in grails-spring
112-
exclude group: 'org.springframework', module: 'spring-tx'
113-
exclude group: 'org.springframework', module: 'spring-web'
114-
exclude group: 'org.springframework', module: 'spring-context'
115-
exclude group: 'org.grails', module: 'grails-bootstrap'
116-
exclude group: 'org.apache.groovy', module: 'groovy-xml'
117-
*/
118-
}
119-
implementation 'org.grails:grails-web-common', {
120-
/*
121-
// API dependencies in grails-web-common
122-
exclude group: 'org.apache.groovy', module: 'groovy-templates'
123-
exclude group: 'org.grails', module: 'grails-core'
124-
exclude group: 'org.grails', module: 'grails-databinding'
125-
exclude group: 'org.grails', module: 'grails-encoder'
126-
exclude group: 'org.springframework', module: 'spring-webmvc'
127-
exclude group: 'org.springframework', module: 'spring-context-support'
128-
*/
129-
}
130-
implementation 'org.grails:grails-web-mvc', { // SynchronizerTokensHolder
131-
/*
132-
// API dependencies in grails-web-mvc
133-
exclude group: 'org.grails', module: 'grails-web-common'
134-
exclude group: 'org.grails', module: 'grails-web-url-mappings'
135-
*/
136-
}
137-
implementation 'org.springframework:spring-beans' // PropertyEditorRegistry
138-
139-
astImplementation 'org.grails:grails-web', {
140-
/*
141-
// API dependencies in grails-web
142-
exclude group: 'org.grails', module: 'grails-web-common'
143-
exclude group: 'org.grails', module: 'grails-web-databinding'
144-
exclude group: 'org.grails', module: 'grails-web-gsp'
145-
exclude group: 'org.grails', module: 'grails-web-mvc'
146-
exclude group: 'org.grails', module: 'grails-web-url-mappings'
147-
*/
148-
}
149-
astImplementation 'org.grails:grails-plugin-controllers', {
150-
/*
151-
// API dependencies in grails-plugin-controllers
152-
//exclude group: 'org.grails', module: 'grails-core' // TraitInjector
153-
exclude group: 'org.grails', module: 'grails-web'
154-
exclude group: 'org.grails', module: 'grails-plugin-mimetypes'
155-
exclude group: 'org.grails', module: 'grails-plugin-validation'
156-
exclude group: 'org.grails', module: 'grails-plugin-domain-class'
157-
exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
158-
*/
159-
}
160-
161-
compileOnly project(':grails-web-jsp'), { // Provided by Application for JSP support
162-
/*
163-
// API dependencies in grails-web-jsp
164-
exclude group: 'org.grails', module: 'grails-web-gsp'
165-
*/
166-
}
167-
168-
runtimeOnly "org.grails:grails-plugin-codecs:$grailsVersion" // Registers CodecLookup bean
31+
runtimeOnly(project(":grails-web-jsp"))
32+
api "org.apache.commons:commons-text:$commonsTextVersion"
33+
api "org.grails:grails-plugin-codecs"
34+
astImplementation "org.grails:grails-web"
35+
astImplementation "org.grails:grails-plugin-controllers"
16936

37+
// api project(':grails-gsp'), { // GroovyPageResourceLoader, GroovyPagesTemplateEngine, CachingGroovyPageStaticResourceLocator
38+
// // API dependencies in grails-gsp
39+
// exclude group: 'org.grails', module: 'grails-bootstrap'
40+
// //exclude group: 'org.apache.groovy', module: 'groovy-templates' // TemplateEngine
41+
// }
42+
// api project(':grails-web-gsp'), { // PageRenderer
43+
// // API dependencies in grails-web-gsp
44+
// exclude group: 'org.grails', module: 'grails-gsp'
45+
// exclude group: 'org.grails', module: 'grails-web-common'
46+
// exclude group: 'org.grails', module: 'grails-web-taglib'
47+
// }
48+
// api project(':grails-web-taglib'), { // TagLibraryInvoker, TagLib, TagLibrary
49+
// // API dependencies in grails-web-taglib
50+
// exclude group: 'org.grails', module: 'grails-taglib'
51+
// exclude group: 'org.grails', module: 'grails-web-common'
52+
// }
53+
// api 'org.grails:grails-encoder', { // CodecLookup, Encoder
54+
// // API dependencies in grails-encoder
55+
// exclude group: 'org.apache.groovy', module: 'groovy'
56+
// exclude group: 'org.apache.groovy', module: 'groovy-json'
57+
// exclude group: 'org.grails', module: 'grails-core'
58+
// exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
59+
// exclude group: 'org.slf4j', module: 'slf4j-api'
60+
// exclude group: 'org.springframework', module: 'spring-web'
61+
// }
62+
// api 'org.grails:grails-web-url-mappings', { // LinkGenerator
63+
// // API dependencies in grails-web-url-mappings
64+
// exclude group: 'org.grails', module: 'grails-web-common'
65+
// //exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // Constrained
66+
// }
67+
// api 'org.springframework:spring-context' // MessageSource, Errors, MessageSourceResolvable, DefaultMessageSourceResolvable, NoSuchMessageException
68+
// api 'org.springframework.boot:spring-boot' // ServletRegistrationBean
69+
//
70+
// implementation project(':grails-taglib'), { // GroovyPageAttributes
71+
// // API dependencies in grails-taglib
72+
// exclude group: 'org.grails', module: 'grails-core'
73+
// exclude group: 'org.grails', module: 'grails-encoder'
74+
// exclude group: 'org.springframework', module: 'spring-core'
75+
// }
76+
// implementation project(':grails-web-gsp-taglib'), { // RenderTagLib
77+
// // API dependencies in grails-web-gsp-taglib
78+
// exclude group: 'org.grails', module: 'grails-taglib'
79+
// exclude group: 'org.grails', module: 'grails-web-gsp'
80+
// }
81+
// implementation "org.apache.commons:commons-text:$commonsTextVersion" // StringEscapeUtils
82+
// implementation 'org.apache.groovy:groovy-xml' // MarkupBuilder
83+
// implementation 'org.grails:grails-core', { // Config
84+
// // API dependencies in grails-core
85+
// exclude group: 'org.apache.groovy', module: 'groovy'
86+
// exclude group: 'jakarta.inject', module: 'jakarta.inject-api'
87+
// exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
88+
// exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
89+
// exclude group: 'org.grails', module: 'grails-bootstrap'
90+
// exclude group: 'org.grails', module: 'grails-datastore-core'
91+
// exclude group: 'org.grails', module: 'grails-spring'
92+
// exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
93+
// exclude group: 'org.slf4j', module: 'slf4j-api'
94+
// exclude group: 'org.yaml', module: 'snakeyaml'
95+
// exclude group: 'org.springframework', module: 'spring-beans'
96+
// exclude group: 'org.springframework', module: 'spring-core'
97+
// exclude group: 'org.springframework', module: 'spring-context'
98+
// exclude group: 'org.springframework', module: 'spring-tx'
99+
// exclude group: 'org.springframework.boot', module: 'spring-boot'
100+
// exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
101+
// }
102+
// implementation 'org.grails:grails-spring', { // RuntimeSpringConfiguration
103+
// // API dependencies in grails-spring
104+
// exclude group: 'org.springframework', module: 'spring-tx'
105+
// exclude group: 'org.springframework', module: 'spring-web'
106+
// exclude group: 'org.springframework', module: 'spring-context'
107+
// exclude group: 'org.grails', module: 'grails-bootstrap'
108+
// exclude group: 'org.apache.groovy', module: 'groovy-xml'
109+
// }
110+
// implementation 'org.grails:grails-web-common', {
111+
// // API dependencies in grails-web-common
112+
// exclude group: 'org.apache.groovy', module: 'groovy-templates'
113+
// exclude group: 'org.grails', module: 'grails-core'
114+
// exclude group: 'org.grails', module: 'grails-databinding'
115+
// exclude group: 'org.grails', module: 'grails-encoder'
116+
// exclude group: 'org.springframework', module: 'spring-webmvc'
117+
// exclude group: 'org.springframework', module: 'spring-context-support'
118+
// }
119+
// implementation 'org.grails:grails-web-mvc', { // SynchronizerTokensHolder
120+
// // API dependencies in grails-web-mvc
121+
// exclude group: 'org.grails', module: 'grails-web-common'
122+
// exclude group: 'org.grails', module: 'grails-web-url-mappings'
123+
// }
124+
// implementation 'org.springframework:spring-beans' // PropertyEditorRegistry
125+
//
126+
// astImplementation 'org.grails:grails-web', {
127+
// // API dependencies in grails-web
128+
// exclude group: 'org.grails', module: 'grails-web-common'
129+
// exclude group: 'org.grails', module: 'grails-web-databinding'
130+
// exclude group: 'org.grails', module: 'grails-web-gsp'
131+
// exclude group: 'org.grails', module: 'grails-web-mvc'
132+
// exclude group: 'org.grails', module: 'grails-web-url-mappings'
133+
// }
134+
// astImplementation 'org.grails:grails-plugin-controllers', {
135+
// // API dependencies in grails-plugin-controllers
136+
// //exclude group: 'org.grails', module: 'grails-core' // TraitInjector
137+
// exclude group: 'org.grails', module: 'grails-web'
138+
// exclude group: 'org.grails', module: 'grails-plugin-mimetypes'
139+
// exclude group: 'org.grails', module: 'grails-plugin-validation'
140+
// exclude group: 'org.grails', module: 'grails-plugin-domain-class'
141+
// exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
142+
// }
143+
//
144+
// compileOnly project(':grails-web-jsp'), { // Provided by Application for JSP support
145+
// // API dependencies in grails-web-jsp
146+
// exclude group: 'org.grails', module: 'grails-web-gsp'
147+
// }
148+
//
149+
// runtimeOnly "org.grails:grails-plugin-codecs:$grailsVersion" // Registers CodecLookup bean
150+
//
170151
testCompileOnly 'jakarta.annotation:jakarta.annotation-api'
171152

172153
testImplementation project(':grails-web-jsp'), { // TagLibraryResolverImpl
173-
/*
174154
// API dependencies in grails-web-jsp
175155
exclude group: 'org.grails', module: 'grails-web-gsp'
176-
*/
177156
}
178157
testImplementation 'jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api'
179158
testImplementation "jakarta.servlet.jsp:jakarta.servlet.jsp-api:$jspApiVersion"

0 commit comments

Comments
 (0)