Skip to content
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.

Sign up for GitHub

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

Revert dependencies changes until test projects are added & fix gsp plugin artifact name #563

Merged
merged 1 commit into from
Jan 15, 2025
Merged

Revert dependencies changes until test projects are added & fix gsp plugin artifact name #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/publish-config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ publishing {
publications {
maven(MavenPublication) {

artifactId = project.name
artifactId = project.findProperty('artifactId') ?: project.name
groupId = project.group
version = project.version

Expand Down
93 changes: 44 additions & 49 deletions grails-gsp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,56 +9,51 @@ group = 'org.grails'
dependencies {

implementation platform("org.grails:grails-bom:$grailsVersion")
api "org.grails:grails-core"
api project(":grails-taglib")
api "org.apache.groovy:groovy-templates"

api 'org.grails:grails-bootstrap', { // ConfigMap
/*
// API dependencies in grails-bootstrap
exclude group: 'org.yaml', module: 'snakeyaml'
*/
}
api 'org.apache.groovy:groovy-templates' // Template, TemplateEngine

implementation project(':grails-taglib'), { // GrailsTagException, OutputEncodingSettings are used
/*
// API dependencies in grails-taglib
exclude group: 'org.grails', module: 'grails-core'
exclude group: 'org.grails', module: 'grails-encoder'
*/
}
implementation 'org.grails:grails-core', { // GrailsStringUtils
/*
// API dependencies in grails-core
exclude group: 'org.apache.groovy', module: 'groovy'
exclude group: 'jakarta.inject', module: 'jakarta.inject-api'
exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
exclude group: 'org.grails', module: 'grails-bootstrap'
//exclude group: 'org.grails', module: 'grails-datastore-core' // ClassPropertyFetcher
//exclude group: 'org.grails', module: 'grails-spring' // RuntimeSpringConfiguration (somehow needed for groovydoc)
exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
exclude group: 'org.slf4j', module: 'slf4j-api'
exclude group: 'org.yaml', module: 'snakeyaml'
exclude group: 'org.springframework', module: 'spring-beans'
exclude group: 'org.springframework', module: 'spring-core'
exclude group: 'org.springframework', module: 'spring-context'
exclude group: 'org.springframework', module: 'spring-tx'
exclude group: 'org.springframework.boot', module: 'spring-boot'
exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
*/
}
implementation 'org.grails:grails-encoder', { // FastStringWriter, StreamByteBuffer, StreamCharBuffer are used
/*
// API dependencies in grails-encoder
exclude group: 'org.apache.groovy', module: 'groovy'
exclude group: 'org.apache.groovy', module: 'groovy-json'
exclude group: 'org.grails', module: 'grails-core'
exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
exclude group: 'org.slf4j', module: 'slf4j-api'
exclude group: 'org.springframework', module: 'spring-web'
*/
}
implementation 'org.springframework:spring-context' // ApplicationContext

// api 'org.grails:grails-bootstrap', { // ConfigMap
// // API dependencies in grails-bootstrap
// exclude group: 'org.yaml', module: 'snakeyaml'
// }
// api 'org.apache.groovy:groovy-templates' // Template, TemplateEngine
//
// api project(':grails-taglib'), { // GrailsTagException, OutputEncodingSettings are used
// // API dependencies in grails-taglib
// exclude group: 'org.grails', module: 'grails-core'
// exclude group: 'org.grails', module: 'grails-encoder'
// }
// api 'org.grails:grails-core', { // GrailsStringUtils
// // API dependencies in grails-core
// exclude group: 'org.apache.groovy', module: 'groovy'
// exclude group: 'jakarta.inject', module: 'jakarta.inject-api'
// exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
// exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
// exclude group: 'org.grails', module: 'grails-bootstrap'
// //exclude group: 'org.grails', module: 'grails-datastore-core' // ClassPropertyFetcher
// //exclude group: 'org.grails', module: 'grails-spring' // RuntimeSpringConfiguration (somehow needed for groovydoc)
// exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
// exclude group: 'org.slf4j', module: 'slf4j-api'
// exclude group: 'org.yaml', module: 'snakeyaml'
// exclude group: 'org.springframework', module: 'spring-beans'
// exclude group: 'org.springframework', module: 'spring-core'
// exclude group: 'org.springframework', module: 'spring-context'
// exclude group: 'org.springframework', module: 'spring-tx'
// exclude group: 'org.springframework.boot', module: 'spring-boot'
// exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
// }
// implementation 'org.grails:grails-encoder', { // FastStringWriter, StreamByteBuffer, StreamCharBuffer are used
// // API dependencies in grails-encoder
// exclude group: 'org.apache.groovy', module: 'groovy'
// exclude group: 'org.apache.groovy', module: 'groovy-json'
// exclude group: 'org.grails', module: 'grails-core'
// exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
// exclude group: 'org.slf4j', module: 'slf4j-api'
// exclude group: 'org.springframework', module: 'spring-web'
// }
// implementation 'org.springframework:spring-context' // ApplicationContext
//
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.spockframework:spock-core'

Expand Down
265 changes: 122 additions & 143 deletions grails-plugin-gsp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ apply plugin: 'java-library'
apply plugin: 'org.grails.grails-plugin'

ext {
artifactId = 'gsp'
testMaxParallelFork = isCiBuild ? 1 : 4
testForkEvery = isCiBuild ? 10 : 20
testJvmArgs = ['-Xmx1536M']
Expand All @@ -24,156 +25,134 @@ ext {
dependencies {

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

api project(':grails-gsp'), { // GroovyPageResourceLoader, GroovyPagesTemplateEngine, CachingGroovyPageStaticResourceLocator
/*
// API dependencies in grails-gsp
exclude group: 'org.grails', module: 'grails-bootstrap'
//exclude group: 'org.apache.groovy', module: 'groovy-templates' // TemplateEngine
*/
}
api project(':grails-web-gsp'), { // PageRenderer
/*
// API dependencies in grails-web-gsp
exclude group: 'org.grails', module: 'grails-gsp'
exclude group: 'org.grails', module: 'grails-web-common'
exclude group: 'org.grails', module: 'grails-web-taglib'
*/
}
api project(':grails-web-taglib'), { // TagLibraryInvoker, TagLib, TagLibrary
/*
// API dependencies in grails-web-taglib
exclude group: 'org.grails', module: 'grails-taglib'
exclude group: 'org.grails', module: 'grails-web-common'
*/
}
api 'org.grails:grails-encoder', { // CodecLookup, Encoder
/*
// API dependencies in grails-encoder
exclude group: 'org.apache.groovy', module: 'groovy'
exclude group: 'org.apache.groovy', module: 'groovy-json'
exclude group: 'org.grails', module: 'grails-core'
exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
exclude group: 'org.slf4j', module: 'slf4j-api'
exclude group: 'org.springframework', module: 'spring-web'
*/
}
api 'org.grails:grails-web-url-mappings', { // LinkGenerator
/*
// API dependencies in grails-web-url-mappings
exclude group: 'org.grails', module: 'grails-web-common'
//exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // Constrained
*/
}
api 'org.springframework:spring-context' // MessageSource, Errors, MessageSourceResolvable, DefaultMessageSourceResolvable, NoSuchMessageException
api 'org.springframework.boot:spring-boot' // ServletRegistrationBean

implementation project(':grails-taglib'), { // GroovyPageAttributes
/*
// API dependencies in grails-taglib
exclude group: 'org.grails', module: 'grails-core'
exclude group: 'org.grails', module: 'grails-encoder'
exclude group: 'org.springframework', module: 'spring-core'
*/
}
implementation project(':grails-web-gsp-taglib'), { // RenderTagLib
/*
// API dependencies in grails-web-gsp-taglib
exclude group: 'org.grails', module: 'grails-taglib'
exclude group: 'org.grails', module: 'grails-web-gsp'
*/
}
implementation "org.apache.commons:commons-text:$commonsTextVersion" // StringEscapeUtils
implementation 'org.apache.groovy:groovy-xml' // MarkupBuilder
implementation 'org.grails:grails-core', { // Config
/*
// API dependencies in grails-core
exclude group: 'org.apache.groovy', module: 'groovy'
exclude group: 'jakarta.inject', module: 'jakarta.inject-api'
exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
exclude group: 'org.grails', module: 'grails-bootstrap'
exclude group: 'org.grails', module: 'grails-datastore-core'
exclude group: 'org.grails', module: 'grails-spring'
exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
exclude group: 'org.slf4j', module: 'slf4j-api'
exclude group: 'org.yaml', module: 'snakeyaml'
exclude group: 'org.springframework', module: 'spring-beans'
exclude group: 'org.springframework', module: 'spring-core'
exclude group: 'org.springframework', module: 'spring-context'
exclude group: 'org.springframework', module: 'spring-tx'
exclude group: 'org.springframework.boot', module: 'spring-boot'
exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
*/
}
implementation 'org.grails:grails-spring', { // RuntimeSpringConfiguration
/*
// API dependencies in grails-spring
exclude group: 'org.springframework', module: 'spring-tx'
exclude group: 'org.springframework', module: 'spring-web'
exclude group: 'org.springframework', module: 'spring-context'
exclude group: 'org.grails', module: 'grails-bootstrap'
exclude group: 'org.apache.groovy', module: 'groovy-xml'
*/
}
implementation 'org.grails:grails-web-common', {
/*
// API dependencies in grails-web-common
exclude group: 'org.apache.groovy', module: 'groovy-templates'
exclude group: 'org.grails', module: 'grails-core'
exclude group: 'org.grails', module: 'grails-databinding'
exclude group: 'org.grails', module: 'grails-encoder'
exclude group: 'org.springframework', module: 'spring-webmvc'
exclude group: 'org.springframework', module: 'spring-context-support'
*/
}
implementation 'org.grails:grails-web-mvc', { // SynchronizerTokensHolder
/*
// API dependencies in grails-web-mvc
exclude group: 'org.grails', module: 'grails-web-common'
exclude group: 'org.grails', module: 'grails-web-url-mappings'
*/
}
implementation 'org.springframework:spring-beans' // PropertyEditorRegistry

astImplementation 'org.grails:grails-web', {
/*
// API dependencies in grails-web
exclude group: 'org.grails', module: 'grails-web-common'
exclude group: 'org.grails', module: 'grails-web-databinding'
exclude group: 'org.grails', module: 'grails-web-gsp'
exclude group: 'org.grails', module: 'grails-web-mvc'
exclude group: 'org.grails', module: 'grails-web-url-mappings'
*/
}
astImplementation 'org.grails:grails-plugin-controllers', {
/*
// API dependencies in grails-plugin-controllers
//exclude group: 'org.grails', module: 'grails-core' // TraitInjector
exclude group: 'org.grails', module: 'grails-web'
exclude group: 'org.grails', module: 'grails-plugin-mimetypes'
exclude group: 'org.grails', module: 'grails-plugin-validation'
exclude group: 'org.grails', module: 'grails-plugin-domain-class'
exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
*/
}

compileOnly project(':grails-web-jsp'), { // Provided by Application for JSP support
/*
// API dependencies in grails-web-jsp
exclude group: 'org.grails', module: 'grails-web-gsp'
*/
}

runtimeOnly "org.grails:grails-plugin-codecs:$grailsVersion" // Registers CodecLookup bean
runtimeOnly(project(":grails-web-jsp"))
api "org.apache.commons:commons-text:$commonsTextVersion"
api "org.grails:grails-plugin-codecs"
astImplementation "org.grails:grails-web"
astImplementation "org.grails:grails-plugin-controllers"

// api project(':grails-gsp'), { // GroovyPageResourceLoader, GroovyPagesTemplateEngine, CachingGroovyPageStaticResourceLocator
// // API dependencies in grails-gsp
// exclude group: 'org.grails', module: 'grails-bootstrap'
// //exclude group: 'org.apache.groovy', module: 'groovy-templates' // TemplateEngine
// }
// api project(':grails-web-gsp'), { // PageRenderer
// // API dependencies in grails-web-gsp
// exclude group: 'org.grails', module: 'grails-gsp'
// exclude group: 'org.grails', module: 'grails-web-common'
// exclude group: 'org.grails', module: 'grails-web-taglib'
// }
// api project(':grails-web-taglib'), { // TagLibraryInvoker, TagLib, TagLibrary
// // API dependencies in grails-web-taglib
// exclude group: 'org.grails', module: 'grails-taglib'
// exclude group: 'org.grails', module: 'grails-web-common'
// }
// api 'org.grails:grails-encoder', { // CodecLookup, Encoder
// // API dependencies in grails-encoder
// exclude group: 'org.apache.groovy', module: 'groovy'
// exclude group: 'org.apache.groovy', module: 'groovy-json'
// exclude group: 'org.grails', module: 'grails-core'
// exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
// exclude group: 'org.slf4j', module: 'slf4j-api'
// exclude group: 'org.springframework', module: 'spring-web'
// }
// api 'org.grails:grails-web-url-mappings', { // LinkGenerator
// // API dependencies in grails-web-url-mappings
// exclude group: 'org.grails', module: 'grails-web-common'
// //exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // Constrained
// }
// api 'org.springframework:spring-context' // MessageSource, Errors, MessageSourceResolvable, DefaultMessageSourceResolvable, NoSuchMessageException
// api 'org.springframework.boot:spring-boot' // ServletRegistrationBean
//
// implementation project(':grails-taglib'), { // GroovyPageAttributes
// // API dependencies in grails-taglib
// exclude group: 'org.grails', module: 'grails-core'
// exclude group: 'org.grails', module: 'grails-encoder'
// exclude group: 'org.springframework', module: 'spring-core'
// }
// implementation project(':grails-web-gsp-taglib'), { // RenderTagLib
// // API dependencies in grails-web-gsp-taglib
// exclude group: 'org.grails', module: 'grails-taglib'
// exclude group: 'org.grails', module: 'grails-web-gsp'
// }
// implementation "org.apache.commons:commons-text:$commonsTextVersion" // StringEscapeUtils
// implementation 'org.apache.groovy:groovy-xml' // MarkupBuilder
// implementation 'org.grails:grails-core', { // Config
// // API dependencies in grails-core
// exclude group: 'org.apache.groovy', module: 'groovy'
// exclude group: 'jakarta.inject', module: 'jakarta.inject-api'
// exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
// exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
// exclude group: 'org.grails', module: 'grails-bootstrap'
// exclude group: 'org.grails', module: 'grails-datastore-core'
// exclude group: 'org.grails', module: 'grails-spring'
// exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
// exclude group: 'org.slf4j', module: 'slf4j-api'
// exclude group: 'org.yaml', module: 'snakeyaml'
// exclude group: 'org.springframework', module: 'spring-beans'
// exclude group: 'org.springframework', module: 'spring-core'
// exclude group: 'org.springframework', module: 'spring-context'
// exclude group: 'org.springframework', module: 'spring-tx'
// exclude group: 'org.springframework.boot', module: 'spring-boot'
// exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
// }
// implementation 'org.grails:grails-spring', { // RuntimeSpringConfiguration
// // API dependencies in grails-spring
// exclude group: 'org.springframework', module: 'spring-tx'
// exclude group: 'org.springframework', module: 'spring-web'
// exclude group: 'org.springframework', module: 'spring-context'
// exclude group: 'org.grails', module: 'grails-bootstrap'
// exclude group: 'org.apache.groovy', module: 'groovy-xml'
// }
// implementation 'org.grails:grails-web-common', {
// // API dependencies in grails-web-common
// exclude group: 'org.apache.groovy', module: 'groovy-templates'
// exclude group: 'org.grails', module: 'grails-core'
// exclude group: 'org.grails', module: 'grails-databinding'
// exclude group: 'org.grails', module: 'grails-encoder'
// exclude group: 'org.springframework', module: 'spring-webmvc'
// exclude group: 'org.springframework', module: 'spring-context-support'
// }
// implementation 'org.grails:grails-web-mvc', { // SynchronizerTokensHolder
// // API dependencies in grails-web-mvc
// exclude group: 'org.grails', module: 'grails-web-common'
// exclude group: 'org.grails', module: 'grails-web-url-mappings'
// }
// implementation 'org.springframework:spring-beans' // PropertyEditorRegistry
//
// astImplementation 'org.grails:grails-web', {
// // API dependencies in grails-web
// exclude group: 'org.grails', module: 'grails-web-common'
// exclude group: 'org.grails', module: 'grails-web-databinding'
// exclude group: 'org.grails', module: 'grails-web-gsp'
// exclude group: 'org.grails', module: 'grails-web-mvc'
// exclude group: 'org.grails', module: 'grails-web-url-mappings'
// }
// astImplementation 'org.grails:grails-plugin-controllers', {
// // API dependencies in grails-plugin-controllers
// //exclude group: 'org.grails', module: 'grails-core' // TraitInjector
// exclude group: 'org.grails', module: 'grails-web'
// exclude group: 'org.grails', module: 'grails-plugin-mimetypes'
// exclude group: 'org.grails', module: 'grails-plugin-validation'
// exclude group: 'org.grails', module: 'grails-plugin-domain-class'
// exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
// }
//
// compileOnly project(':grails-web-jsp'), { // Provided by Application for JSP support
// // API dependencies in grails-web-jsp
// exclude group: 'org.grails', module: 'grails-web-gsp'
// }
//
// runtimeOnly "org.grails:grails-plugin-codecs:$grailsVersion" // Registers CodecLookup bean
//
testCompileOnly 'jakarta.annotation:jakarta.annotation-api'

testImplementation project(':grails-web-jsp'), { // TagLibraryResolverImpl
/*
// API dependencies in grails-web-jsp
exclude group: 'org.grails', module: 'grails-web-gsp'
*/
}
testImplementation 'jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api'
testImplementation "jakarta.servlet.jsp:jakarta.servlet.jsp-api:$jspApiVersion"
Expand Down
Loading
Loading