jamesfredley commented on code in PR #15365:
URL: https://github.com/apache/grails-core/pull/15365#discussion_r3142224148
##########
buildSrc/settings.gradle:
##########
@@ -17,6 +17,23 @@
* under the License.
*/
pluginManagement {
+ repositories {
+ mavenCentral()
+ gradlePluginPortal()
+ // Needed to resolve grails-publish snapshots that the build-logic
composite
Review Comment:
Done in fe527d1419. Merged matrei's gradle-plugin-bootstrap branch from
#15597 (preserving authorship through the merge commit) and removed the inline
pluginManagement.repositories { ... } block I had here. All seven settings
files (root, build-logic, buildSrc, grails-forge, grails-forge/buildSrc,
grails-gradle, grails-gradle/buildSrc) now route plugin repos through the
shared gradle/plugin-repositories.gradle script.
##########
grails-forge/buildSrc/settings.gradle:
##########
@@ -17,6 +17,23 @@
* under the License.
*/
pluginManagement {
+ repositories {
Review Comment:
Done in fe527d1419. Merged matrei's gradle-plugin-bootstrap branch from
#15597 (preserving authorship through the merge commit) and removed the inline
pluginManagement.repositories { ... } block I had here. All seven settings
files (root, build-logic, buildSrc, grails-forge, grails-forge/buildSrc,
grails-gradle, grails-gradle/buildSrc) now route plugin repos through the
shared gradle/plugin-repositories.gradle script.
##########
grails-forge/settings.gradle:
##########
@@ -19,6 +19,23 @@
import org.gradle.api.initialization.resolve.RepositoriesMode
pluginManagement {
+ repositories {
Review Comment:
Done in fe527d1419. Merged matrei's gradle-plugin-bootstrap branch from
#15597 (preserving authorship through the merge commit) and removed the inline
pluginManagement.repositories { ... } block I had here. All seven settings
files (root, build-logic, buildSrc, grails-forge, grails-forge/buildSrc,
grails-gradle, grails-gradle/buildSrc) now route plugin repos through the
shared gradle/plugin-repositories.gradle script.
##########
grails-gradle/buildSrc/settings.gradle:
##########
@@ -17,6 +17,23 @@
* under the License.
*/
pluginManagement {
+ repositories {
Review Comment:
Done in fe527d1419. Merged matrei's gradle-plugin-bootstrap branch from
#15597 (preserving authorship through the merge commit) and removed the inline
pluginManagement.repositories { ... } block I had here. All seven settings
files (root, build-logic, buildSrc, grails-forge, grails-forge/buildSrc,
grails-gradle, grails-gradle/buildSrc) now route plugin repos through the
shared gradle/plugin-repositories.gradle script.
##########
grails-gradle/settings.gradle:
##########
@@ -19,14 +19,31 @@
import org.gradle.api.initialization.resolve.RepositoriesMode
pluginManagement {
+ repositories {
Review Comment:
Done in fe527d1419. Merged matrei's gradle-plugin-bootstrap branch from
#15597 (preserving authorship through the merge commit) and removed the inline
pluginManagement.repositories { ... } block I had here. All seven settings
files (root, build-logic, buildSrc, grails-forge, grails-forge/buildSrc,
grails-gradle, grails-gradle/buildSrc) now route plugin repos through the
shared gradle/plugin-repositories.gradle script.
##########
settings.gradle:
##########
@@ -20,6 +20,23 @@ import org.apache.tools.ant.DirectoryScanner
import org.gradle.api.initialization.resolve.RepositoriesMode
pluginManagement {
+ repositories {
Review Comment:
Done in fe527d1419. Merged matrei's gradle-plugin-bootstrap branch from
#15597 (preserving authorship through the merge commit) and removed the inline
pluginManagement.repositories { ... } block I had here. All seven settings
files (root, build-logic, buildSrc, grails-forge, grails-forge/buildSrc,
grails-gradle, grails-gradle/buildSrc) now route plugin repos through the
shared gradle/plugin-repositories.gradle script.
##########
dependencies.gradle:
##########
@@ -22,15 +22,16 @@
// These files are split to facilitate separation of build vs application
dependencies. These are the application dependencies.
ext {
gradleBomDependencyVersions = [
- 'ant.version' : '1.10.15',
+ 'ant.version' : '1.10.17',
'asciidoctor-gradle-jvm.version': '4.0.5',
'asciidoctorj.version' : '3.0.0',
'asset-pipeline-gradle.version' : '5.1.0-M4',
- 'byte-buddy.version' : '1.17.8',
- 'commons-text.version' : '1.14.0',
+ 'byte-buddy.version' : '1.18.8',
+ 'commons-text.version' : '1.15.0',
'directory-watcher.version' : '0.19.1',
- 'gradle-spock.version' : '2.3-groovy-3.0',
- 'grails-publish-plugin.version' : '0.0.4',
+ 'gradle-groovy.version' : '4.0.31',
Review Comment:
Done in cc2f85fe07. `gradle-groovy.version` is now `GroovySystem.version`.
Verified the published `grails-gradle-bom` POM contains
`<gradle-groovy.version>4.0.29</gradle-groovy.version>` (Gradle 9.4.1's bundled
Groovy). Future wrapper bumps flow through automatically.
##########
dependencies.gradle:
##########
@@ -73,20 +75,26 @@ ext {
'asset-pipeline-bom.version' : '5.1.0-M4',
'bootstrap-icons.version' : '1.13.1',
'bootstrap.version' : '5.3.8',
- 'commons-codec.version' : '1.19.0',
+ 'commons-codec.version' : '1.21.0',
'commons-lang3.version' : '3.20.0',
'geb-spock.version' : '8.0.1',
'groovy.version' : '4.0.31',
'jquery.version' : '3.7.1',
'liquibase-hibernate5.version': '4.27.0',
'mongodb.version' : '5.6.4',
+ // Selenium 4.41+ requires OpenTelemetry 1.59+, which is newer
than the
+ // 1.55.x that Spring Boot 4.0.5 manages. Pin the version on the
individual
+ // OpenTelemetry modules (see the constraints block in
grails-bom/build.gradle)
+ // so the explicit constraint overrides whatever Spring Boot's
imported BOM
+ // declares, regardless of platform import ordering.
+ 'opentelemetry.version' : '1.59.0',
'rxjava.version' : '1.3.8',
'rxjava2.version' : '2.2.21',
'rxjava3.version' : '3.1.12',
- 'selenium.version' : '4.38.0',
+ 'selenium.version' : '4.41.0',
Review Comment:
Investigated; resolved in ccafe2bd86.
Spring Boot 4.0.5's BOM declares selenium `4.37.0`
([spring-boot-dependencies
4.0.5](https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/4.0.5/dependencies)).
I rolled selenium back from 4.41.0 to 4.37.0 to track Spring Boot's choice.
The OpenTelemetry 1.59.0 override and the 24-module constraint list that the
4.41 bump previously required are no longer needed - Spring Boot's managed
1.55.x line is sufficient for selenium 4.37.
Verified:
- `gradle validateDependencyVersions` passes across all 157 reporting tasks
(no resolved-vs-BOM mismatches).
- `gradle
:grails-test-examples-{geb,geb-context-path,geb-gebconfig}:compileTestGroovy`
succeeds.
- The geb test apps now resolve
`org.seleniumhq.selenium:selenium-bom:4.37.0` with no transitive opentelemetry
conflict.
Net diff: `dependencies.gradle` shrinks by 40 lines.
##########
dependencies.gradle:
##########
@@ -73,20 +75,26 @@ ext {
'asset-pipeline-bom.version' : '5.1.0-M4',
'bootstrap-icons.version' : '1.13.1',
'bootstrap.version' : '5.3.8',
- 'commons-codec.version' : '1.19.0',
+ 'commons-codec.version' : '1.21.0',
'commons-lang3.version' : '3.20.0',
'geb-spock.version' : '8.0.1',
'groovy.version' : '4.0.31',
'jquery.version' : '3.7.1',
'liquibase-hibernate5.version': '4.27.0',
'mongodb.version' : '5.6.4',
+ // Selenium 4.41+ requires OpenTelemetry 1.59+, which is newer
than the
Review Comment:
The opentelemetry pin existed only because selenium 4.41+ pulled in
`opentelemetry-*` modules newer than the 1.55.x line that Spring Boot 4.0.5
manages, which the dependency-version validator flagged. Not related to forge /
micronaut.
Now that ccafe2bd86 rolls selenium back to 4.37.0 (Spring Boot's managed
version), there is no more transitive conflict and the entire opentelemetry
block - the `opentelemetry.version` constant plus all 24 `opentelemetry-*`
constraints - is gone.
##########
gradle.properties:
##########
@@ -50,8 +50,8 @@ yakworksHibernateGroovyProxyVersion=1.1
# Build dependency versions not managed by BOMs
apacheRatVersion=0.8.1
gradleChecksumPluginVersion=1.4.0
-# note: the cyclonedx 3 requires Gradle 9
-gradleCycloneDxPluginVersion=2.4.1
+# CycloneDX Gradle plugin version
Review Comment:
Done in 5d21fc3a39.
##########
grails-bom/build.gradle:
##########
@@ -107,6 +107,8 @@ configurations.register('bomDependencies').configure {
}
tasks.register('extractConstraints', ExtractDependenciesTask).configure {
ExtractDependenciesTask it ->
+ // Capture project services at configuration time so the task avoids the
deprecated Task.project at execution time
Review Comment:
Done in 5d21fc3a39.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
