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

Commit 694d2f2

Browse files
authored
Merge pull request #947 from jdaugherty/9.0.x
Fixes found after pre release for mongodb
2 parents 48e59ad + c0f33db commit 694d2f2

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

boot-plugin/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
dependencies {
2+
implementation platform("org.grails:grails-bom:$grailsVersion")
3+
24
compileOnly "org.grails:grails-shell", {
35
exclude group:'org.apache.groovy', module:'groovy'
46
}

build.gradle

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ allprojects {
6868
}
6969
}
7070
if (System.getenv("GITHUB_MAVEN_PASSWORD") && !grailsVersion.endsWith('-SNAPSHOT')) {
71-
System.out.println("Adding Grails Core Repo")
71+
System.out.println("Adding Grails Core Repo for ${project.name}")
7272
maven {
7373
url = 'https://maven.pkg.github.com/grails/grails-core'
7474
credentials {
@@ -102,11 +102,6 @@ subprojects { Project subproject ->
102102
}
103103

104104
dependencies {
105-
106-
// Global dependencies for every app should be added here with great caution.
107-
// Gorm is used by other frameworks (ie springboot, micronaut, etc) and we
108-
// don't want to add dependencies that would make it harder to use in those frameworks.
109-
110105
testImplementation "jakarta.annotation:jakarta.annotation-api"
111106
testImplementation "io.micrometer:micrometer-core:latest.integration"
112107
testImplementation "io.projectreactor:reactor-test"
@@ -171,10 +166,6 @@ subprojects { Project subproject ->
171166

172167
apply plugin: 'groovy'
173168

174-
dependencies {
175-
implementation platform("org.grails:grails-bom:$grailsVersion")
176-
}
177-
178169
configurations {
179170
documentation.extendsFrom(compileClasspath)
180171
}
@@ -203,10 +194,8 @@ subprojects { Project subproject ->
203194
apply plugin: 'maven-publish'
204195
apply plugin: 'signing'
205196

197+
compileJava.options.release = 17
206198
java {
207-
toolchain {
208-
languageVersion = JavaLanguageVersion.of(17)
209-
}
210199
withJavadocJar()
211200
withSourcesJar()
212201
}

grails-datastore-gorm-hibernate/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
dependencies {
2+
implementation platform("org.grails:grails-bom:$grailsVersion")
3+
24
api "org.slf4j:slf4j-api"
35

46
api "org.apache.groovy:groovy"

0 commit comments

Comments
 (0)