Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ class SbomPlugin implements Plugin<Project> {
// There are several reasons that cyclone will get the license wrong, usually due to upstream not publishing information or publishing it incorrectly
// see the licenseMapping map above for details
def licenseId = LICENSE_MAPPING[bomRef]
logger.lifecycle('Forcing license for {} to {}', bomRef, licenseId)
logger.info('Forcing license for {} to {}', bomRef, licenseId)

def licenseBlock = LICENSES[licenseId]
if (!licenseBlock) {
Expand Down
4 changes: 2 additions & 2 deletions grails-async/plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ dependencies {
implementation 'org.springframework:spring-web'

compileOnly 'jakarta.servlet:jakarta.servlet-api' // Provided
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation and tests
testImplementation 'org.spockframework:spock-core'
testImplementation 'org.springframework:spring-test'

testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task

}

apply {
Expand Down
2 changes: 2 additions & 0 deletions grails-beans-dsl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ dependencies {
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
testImplementation 'org.spockframework:spock-core'
testRuntimeOnly 'org.slf4j:slf4j-simple'

testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
}

apply {
Expand Down
6 changes: 6 additions & 0 deletions grails-cache/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ ext {

dependencies {
implementation platform(project(':grails-bom'))
astCompileOnly platform(project(':grails-bom'))

astCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

api project(':grails-core')
api project(':grails-web-boot')
Expand All @@ -50,13 +53,16 @@ dependencies {
api "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentlinkedhashmapLruVersion"

compileOnly project(':grails-domain-class')
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

console project(':grails-console')

testImplementation project(':grails-testing-support-datamapping')
testImplementation project(':grails-testing-support-web')
testImplementation 'org.spockframework:spock-core'

testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testRuntimeOnly 'net.bytebuddy:byte-buddy' // Required by Spock's mocking support
}

Expand Down
1 change: 1 addition & 0 deletions grails-codecs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ dependencies {
runtimeOnly project(':grails-codecs-core')

compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
compileOnly 'org.springframework:spring-test', {
// MockHttpServletRequest/Response/Context used in many classes
}
Expand Down
2 changes: 2 additions & 0 deletions grails-console/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ dependencies {

api 'jakarta.servlet:jakarta.servlet-api'

compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testImplementation 'org.apache.groovy:groovy-test-junit5'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.junit.platform:junit-platform-suite'
Expand Down
1 change: 1 addition & 0 deletions grails-controllers/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ dependencies {
testRuntimeOnly 'org.jline:jline'

compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
compileOnly 'org.springframework:spring-test'

testImplementation 'jakarta.servlet:jakarta.servlet-api'
Expand Down
1 change: 1 addition & 0 deletions grails-converters/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ dependencies {
testImplementation project(':grails-web-common')

compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
compileOnly 'org.springframework:spring-test', {
// MockHttpServletRequest/Response/Context used in many classes
}
Expand Down
2 changes: 2 additions & 0 deletions grails-core-cli-legacy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ dependencies {
api 'org.apache.groovy:groovy'
implementation 'org.apache.groovy:groovy-templates'

compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testImplementation 'org.apache.groovy:groovy-test-junit5'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.junit.platform:junit-platform-suite'
Expand Down
2 changes: 2 additions & 0 deletions grails-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ dependencies {
cliImplementation 'org.apache.groovy:groovy-json'
cliImplementation 'org.apache.groovy:groovy-templates'

cliCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testImplementation 'org.springframework:spring-jdbc'
testImplementation 'org.springframework.boot:spring-boot-test'
// ApplicationContextRunner's signatures reach AssertJ through ApplicationContextAssertProvider;
Expand Down
4 changes: 4 additions & 0 deletions grails-data-graphql/plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,17 @@ dependencies {
// dependency stays `compileOnly` to avoid shipping anything new on the
// production classpath.
compileOnly 'org.springframework:spring-web'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testImplementation project(':grails-testing-support-web')
testImplementation 'org.spockframework:spock-core'

testImplementation 'org.springframework:spring-web'
testImplementation "io.github.cjstehno.ersatz:ersatz:$ersatzVersion"
testImplementation "io.github.cjstehno.ersatz:ersatz-groovy:$ersatzVersion"

testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testRuntimeOnly 'tools.jackson.core:jackson-databind'
testRuntimeOnly 'net.bytebuddy:byte-buddy' // Required by Spock's mocking support
testRuntimeOnly 'org.objenesis:objenesis' // Required by Spock for mocking classes without default constructor
Expand Down
3 changes: 3 additions & 0 deletions grails-data-hibernate5/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ dependencies {
testImplementation 'org.apache.groovy:groovy-json'
testImplementation 'org.apache.tomcat:tomcat-jdbc'
testImplementation 'org.spockframework:spock-core'

testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testRuntimeOnly 'org.hibernate:hibernate-ehcache', {
// exclude javax variant of hibernate-core 5.6
exclude group: 'org.hibernate', module: 'hibernate-core'
Expand Down
1 change: 1 addition & 0 deletions grails-data-hibernate5/dbmigration/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ dependencies {
cliImplementation project(':grails-data-hibernate5')
cliCompileOnly 'org.apache.groovy:groovy-sql'
cliCompileOnly 'org.apache.groovy:groovy-xml'
cliCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
cliImplementation(project(':grails-shell-cli')) {
exclude group: 'org.slf4j', module: 'slf4j-simple'

Expand Down
4 changes: 4 additions & 0 deletions grails-data-hibernate5/grails-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ dependencies {
requireCapability('org.apache.grails:grails-core-cli')
}
}
cliCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

// TODO: Clarify and clean up dependencies
implementation platform(project(':grails-hibernate5-bom'))
Expand All @@ -77,6 +78,7 @@ dependencies {
compileOnly project(':grails-bootstrap')
compileOnly project(':grails-core')

compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
compileOnly 'org.spockframework:spock-core', {
exclude group: 'junit', module: 'junit-dep'
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
Expand All @@ -87,6 +89,8 @@ dependencies {
testImplementation 'org.spockframework:spock-core'
testImplementation 'jakarta.servlet:jakarta.servlet-api'

testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testRuntimeOnly 'com.h2database:h2'
testRuntimeOnly 'org.apache.tomcat:tomcat-jdbc'
testRuntimeOnly 'org.hibernate:hibernate-ehcache', {
Expand Down
2 changes: 2 additions & 0 deletions grails-data-hibernate7/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ dependencies {
testImplementation 'org.apache.tomcat:tomcat-jdbc'
testImplementation 'org.spockframework:spock-core'

testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testRuntimeOnly 'org.slf4j:slf4j-simple'
testRuntimeOnly 'org.slf4j:jcl-over-slf4j'
testRuntimeOnly 'org.springframework:spring-aop'
Expand Down
1 change: 1 addition & 0 deletions grails-data-hibernate7/dbmigration/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ dependencies {
cliImplementation project(':grails-data-hibernate7')
cliCompileOnly 'org.apache.groovy:groovy-sql'
cliCompileOnly 'org.apache.groovy:groovy-xml'
cliCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
cliImplementation(project(':grails-shell-cli')) {
exclude group: 'org.slf4j', module: 'slf4j-simple'

Expand Down
5 changes: 5 additions & 0 deletions grails-data-hibernate7/grails-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ dependencies {
// SchemaExport lives in hibernate-tools, which is implementation-scoped in the main tier
cliImplementation 'org.hibernate.tool:hibernate-tools-orm'

cliCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

implementation platform(project(':grails-hibernate7-bom'))

api 'org.springframework.boot:spring-boot'
Expand All @@ -81,6 +83,7 @@ dependencies {
compileOnly project(':grails-bootstrap')
compileOnly project(':grails-core')

compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
compileOnly 'org.spockframework:spock-core', {
exclude group: 'junit', module: 'junit-dep'
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
Expand All @@ -91,6 +94,8 @@ dependencies {
testImplementation 'org.spockframework:spock-core'
testImplementation 'jakarta.servlet:jakarta.servlet-api'

testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testRuntimeOnly 'com.h2database:h2'
testRuntimeOnly 'org.apache.tomcat:tomcat-jdbc'
testRuntimeOnly 'org.hibernate.orm:hibernate-jcache'
Expand Down
5 changes: 4 additions & 1 deletion grails-data-mongodb/boot-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,14 @@ dependencies {
compileOnly 'org.slf4j:slf4j-api', {
// "optional" compile dependency in mongodb-driver-core
}
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testImplementation project(':grails-testing-support-mongodb')
testImplementation 'org.spockframework:spock-core'

testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testRuntimeOnly 'org.slf4j:slf4j-nop'
testImplementation project(':grails-testing-support-mongodb')
}

apply {
Expand Down
3 changes: 2 additions & 1 deletion grails-data-mongodb/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ dependencies {
}

compileOnly 'org.apache.groovy:groovy'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
compileOnly 'com.github.ben-manes.caffeine:caffeine', {
// comp: RemovalCause, this should perhaps be api in data-mapping as it is needed for compilation downstream
}
Expand All @@ -139,12 +140,12 @@ dependencies {
// test: GenericWebApplicationContext requires ServletContext on the classpath
}

testImplementation 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation and tests
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.testcontainers:testcontainers-mongodb'
testImplementation 'org.testcontainers:testcontainers-spock'

testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during tests
}

apply {
Expand Down
1 change: 1 addition & 0 deletions grails-data-mongodb/ext/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ dependencies {
compileOnly 'org.slf4j:slf4j-api', {
// "optional" compile dependency in mongodb-driver-core
}
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
}

apply {
Expand Down
2 changes: 2 additions & 0 deletions grails-data-mongodb/grails-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ dependencies {
}

compileOnly 'org.apache.groovy:groovy' // Provided as this is a Grails plugin
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
compileOnly project(':grails-core'), { // Provided as this is a Grails plugin
// api: GrailsPlugin
// impl: DomainClassArtefactHandler, GrailsClass, GrailsPlugin, Metadata
Expand Down Expand Up @@ -114,6 +115,7 @@ dependencies {
testFixturesImplementation 'org.spockframework:spock-core'

testFixturesCompileOnly 'org.apache.groovy:groovy'
testFixturesCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
}

def disabledTasks = ['bootRun', 'bootTestRun']
Expand Down
4 changes: 3 additions & 1 deletion grails-data-mongodb/spring-data/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ dependencies {
// impl: @AutoConfiguration, @ConditionalOnClass/Bean, @AutoConfigureAfter
}

compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testImplementation 'org.spockframework:spock-core'
testImplementation project(':grails-testing-support-mongodb')
testImplementation 'org.springframework.boot:spring-boot-test', {
Expand All @@ -71,7 +73,7 @@ dependencies {
testImplementation 'org.assertj:assertj-core', {
// test: required by Spring Boot's AssertableApplicationContext
}
testRuntimeOnly 'org.slf4j:slf4j-nop'
testImplementation 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation and tests
}

apply {
Expand Down
1 change: 1 addition & 0 deletions grails-databinding/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ dependencies {
testImplementation project(':grails-testing-support-core')

compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
compileOnly 'org.springframework:spring-test', {
// MockHttpServletRequest/Response/Context used in many classes
}
Expand Down
2 changes: 1 addition & 1 deletion grails-datamapping-core-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ dependencies {
// Use the simple datastore to ensure the base implementation works correctly
api project(':grails-data-simple')

testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during tests
testImplementation 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation and tests

runtimeOnly 'org.apache.groovy:groovy-dateutil', {
// Groovy Date Utils Extensions are used in the tests
Expand Down
2 changes: 1 addition & 1 deletion grails-datamapping-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ dependencies {
testImplementation 'org.spockframework:spock-core'

testImplementation 'com.zaxxer:HikariCP'
testImplementation 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation and tests
testRuntimeOnly 'com.h2database:h2'
testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during tests
}

//compileGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']
Expand Down
3 changes: 2 additions & 1 deletion grails-datamapping-support/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,11 @@ dependencies {
compileOnly 'org.apache.groovy:groovy', {
// comp: CompileStatic
}
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testImplementation 'org.spockframework:spock-core'

testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during tests
testImplementation 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation and tests
}

tasks.withType(Jar).configureEach {
Expand Down
1 change: 1 addition & 0 deletions grails-datamapping-tck/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ ext {
dependencies {
implementation platform(project(':grails-bom'))
compileOnly 'org.apache.groovy:groovy'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
compileOnly 'org.spockframework:spock-core'
api project(':grails-datastore-core'), {
// api: AbstractPersistenceEvent, AbstractPersistenceEventListener, AbstractQueryEvent, Datastore,
Expand Down
1 change: 1 addition & 0 deletions grails-datasource/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ dependencies {
api project(':grails-datastore-core')

compileOnly 'org.apache.tomcat:tomcat-jdbc'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

api project(':grails-core')

Expand Down
1 change: 1 addition & 0 deletions grails-domain-class/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ dependencies {
}

compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
compileOnly 'org.springframework:spring-test', {
// MockHttpServletRequest/Response/Context used in many classes
}
Expand Down
2 changes: 2 additions & 0 deletions grails-encoder/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ dependencies {
// HtmlUtils is used from spring-web
}

compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testImplementation 'org.apache.groovy:groovy-test-junit5'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.junit.platform:junit-platform-suite'
Expand Down
7 changes: 4 additions & 3 deletions grails-events/plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,15 @@ dependencies {

// As this is a plugin these dependencies will be provided by the Grails application
// This removes circular dependencies
compileOnly 'org.apache.grails.gradle:grails-gradle-model'
compileOnly project(':grails-core')
compileOnly 'org.apache.grails.gradle:grails-gradle-model'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testImplementation 'org.spockframework:spock-core'
testImplementation project(':grails-core')
testImplementation 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation and tests
testImplementation 'org.spockframework:spock-core'

testRuntimeOnly 'org.apache.grails.gradle:grails-gradle-model'
testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task
}

apply {
Expand Down
2 changes: 2 additions & 0 deletions grails-fields/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ dependencies {
exclude module: 'asm'
}

testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation

testRuntimeOnly 'org.objenesis:objenesis' // Required by Spock for mocking classes without default constructor
}

Expand Down
Loading
Loading