From 2659ea6bf568a3c6ef3517689f4ae421603f795a Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Thu, 31 Oct 2024 16:04:49 -0700 Subject: [PATCH 1/8] Dependency cleanup --- build.gradle | 63 +++++++++++++----------------- gradle.properties | 12 +----- grails-gsp/build.gradle | 4 +- grails-plugin-gsp/build.gradle | 22 ++++------- grails-taglib/build.gradle | 4 +- grails-web-gsp-taglib/build.gradle | 2 +- grails-web-gsp/build.gradle | 6 +-- grails-web-jsp/build.gradle | 2 +- grails-web-taglib/build.gradle | 4 +- 9 files changed, 46 insertions(+), 73 deletions(-) diff --git a/build.gradle b/build.gradle index 2eb6a914d9..1c535a0759 100644 --- a/build.gradle +++ b/build.gradle @@ -91,10 +91,10 @@ subprojects { subproject -> api "org.apache.groovy:groovy:$groovyVersion" api "org.slf4j:slf4j-api:$slf4jVersion" - testImplementation "org.spockframework:spock-core:$spockVersion" - testImplementation "org.springframework:spring-test:$springVersion" + testImplementation "org.spockframework:spock-core" + testImplementation "org.springframework:spring-test" - documentation "org.fusesource.jansi:jansi:$jansiVersion" + documentation "org.fusesource.jansi:jansi" } @@ -107,7 +107,7 @@ subprojects { subproject -> groovydoc.classpath += (configurations.documentation + configurations.compileClasspath) dependencies { - documentation "org.apache.groovy:groovy-dateutil:$groovyVersion" + documentation "org.apache.groovy:groovy-dateutil" } } @@ -129,13 +129,6 @@ subprojects { subproject -> } } - // FORCE UPGRADE OF SPRING BOOT IN DEPENDENCIES TO SPRING BOOT 3 - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if (details.requested.group == 'org.springframework.boot') { - details.useTarget(group: 'org.springframework.boot', name: details.requested.name, version: springBootVersion) - } - } - resolutionStrategy.eachDependency { DependencyResolveDetails details -> if (details.requested.group == "org.spockframework") { details.useVersion(spockVersion) @@ -148,14 +141,14 @@ subprojects { subproject -> } dependencies { - compileOnly "jakarta.servlet:jakarta.servlet-api:$servletApiVersion" - - testImplementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion" - implementation "jakarta.persistence:jakarta.persistence-api:$jakartaPersistenceVersion" - testImplementation "org.apache.groovy:groovy-test-junit5:${groovyVersion}" - testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}" - testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVerison}" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}" + compileOnly "jakarta.servlet:jakarta.servlet-api" + + testImplementation "jakarta.servlet:jakarta.servlet-api" + implementation "jakarta.persistence:jakarta.persistence-api" + testImplementation "org.apache.groovy:groovy-test-junit5" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.platform:junit-platform-runner" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" } tasks.withType(Test) { @@ -177,14 +170,14 @@ subprojects { subproject -> dependencies { if (configurations.find { subproject.name == 'documentation' }) { - documentation "org.fusesource.jansi:jansi:$jansiVersion" - documentation "jline:jline:$jlineVersion" - documentation "com.github.javaparser:javaparser-core:$javaParserCoreVersion" - documentation "org.apache.groovy:groovy:${groovyVersion}" - documentation "org.apache.groovy:groovy-ant:$groovyVersion" - documentation "org.apache.groovy:groovy-dateutil:$groovyVersion" - documentation "org.apache.groovy:groovy-cli-picocli:$groovyVersion" - documentation "org.asciidoctor:asciidoctorj:$asciidoctorjVersion" + documentation "org.fusesource.jansi:jansi" + documentation "jline:jline" + documentation "com.github.javaparser:javaparser-core" + documentation "org.apache.groovy:groovy" + documentation "org.apache.groovy:groovy-ant" + documentation "org.apache.groovy:groovy-dateutil" + documentation "org.apache.groovy:groovy-cli-picocli" + documentation "org.asciidoctor:asciidoctorj" } } @@ -350,14 +343,14 @@ configurations { dependencies { if (configurations.find { it.name == 'documentation' }) { - documentation "info.picocli:picocli:$picocliVersion" - documentation "org.fusesource.jansi:jansi:$jansiVersion" - documentation "jline:jline:$jlineVersion" - documentation "com.github.javaparser:javaparser-core:$javaParserCoreVersion" - documentation "org.apache.groovy:groovy:${groovyVersion}" - documentation "org.apache.groovy:groovy-ant:$groovyVersion" - documentation "org.apache.groovy:groovy-cli-picocli:$groovyVersion" - documentation "org.asciidoctor:asciidoctorj:$asciidoctorjVersion" + documentation "info.picocli:picocli" + documentation "org.fusesource.jansi:jansi" + documentation "jline:jline" + documentation "com.github.javaparser:javaparser-core" + documentation "org.apache.groovy:groovy" + documentation "org.apache.groovy:groovy-ant" + documentation "org.apache.groovy:groovy-cli-picocli" + documentation "org.asciidoctor:asciidoctorj" } } diff --git a/gradle.properties b/gradle.properties index 6568813e66..537e8d1eae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,25 +7,15 @@ githubSlug=grails/grails-gsp githubBranch=7.0.x developers=Puneet Behl, Graeme Rocher -asciidoctorjVersion=3.0.0 commonsTextVersion=1.12.0 +elApiVersion=6.0.1 grailsGradlePluginVersion=7.0.0-SNAPSHOT grailsVersion=7.0.0-SNAPSHOT groovyVersion=4.0.24-SNAPSHOT -springVersion=6.1.14 -annotationApiVersion=3.0.0 -byteBuddyVersion=1.15.5 -elApiVersion=6.0.1 -servletApiVersion=6.0.0 -javaParserCoreVersion=3.26.2 -jakartaPersistenceVersion=3.1.0 -jansiVersion=2.4.1 -jlineVersion=2.14.6 jspApiVersion=4.0.0 jstlVersion=3.0.1 junitJupiterVersion=5.11.2 junitPlatformVerison=1.11.2 -picocliVersion=3.8.0 sitemeshVersion=7.0.0-SNAPSHOT spockVersion=2.3-groovy-4.0 slf4jVersion=2.0.16 diff --git a/grails-gsp/build.gradle b/grails-gsp/build.gradle index e8dc776dae..4feeb6b6c7 100644 --- a/grails-gsp/build.gradle +++ b/grails-gsp/build.gradle @@ -1,7 +1,5 @@ dependencies { - api "org.grails:grails-core:$grailsVersion", { - exclude group:'org.grails', module:'grails-spring' - } + api "org.grails:grails-core:$grailsVersion" api project(":grails-taglib") api "org.apache.groovy:groovy-templates:$groovyVersion" } diff --git a/grails-plugin-gsp/build.gradle b/grails-plugin-gsp/build.gradle index e4337a3aa2..ffaa84d290 100644 --- a/grails-plugin-gsp/build.gradle +++ b/grails-plugin-gsp/build.gradle @@ -14,33 +14,27 @@ configurations.all { } } dependencies { - compileOnly "jakarta.servlet:jakarta.servlet-api:$servletApiVersion" + compileOnly "jakarta.servlet:jakarta.servlet-api" api project(":grails-web-gsp-taglib") api "org.sitemesh:grails-plugin-sitemesh3:$sitemeshVersion" runtimeOnly(project(":grails-web-jsp")) api "org.apache.commons:commons-text:$commonsTextVersion" api "org.grails:grails-plugin-codecs:$grailsVersion" - astImplementation "org.grails:grails-web:$grailsVersion" - astImplementation "org.grails:grails-plugin-controllers:$grailsVersion" + astImplementation "org.grails:grails-web" + astImplementation "org.grails:grails-plugin-controllers" - testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion", { - exclude module:'async' - } - testImplementation "org.grails:grails-testing-support:$testingSupportVersion", { - exclude module:'async' - } - testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion", { - exclude module:'async' - } + testImplementation "org.grails:grails-web-testing-support" + testImplementation "org.grails:grails-testing-support" + testImplementation "org.grails:grails-gorm-testing-support" testRuntimeOnly "org.grails.plugins:async" - testImplementation "jakarta.annotation:jakarta.annotation-api:$annotationApiVersion" + testImplementation "jakarta.annotation:jakarta.annotation-api" testImplementation "jakarta.servlet.jsp:jakarta.servlet.jsp-api:${jspApiVersion}" testRuntimeOnly "org.glassfish.web:jakarta.servlet.jsp.jstl:${jstlVersion}" testImplementation "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:${jstlVersion}" - testRuntimeOnly "org.grails:grails-plugin-url-mappings:$grailsVersion" + testRuntimeOnly "org.grails:grails-plugin-url-mappings" } test { diff --git a/grails-taglib/build.gradle b/grails-taglib/build.gradle index e99495c9cb..c2582cdc4e 100644 --- a/grails-taglib/build.gradle +++ b/grails-taglib/build.gradle @@ -1,6 +1,4 @@ dependencies { - api "org.grails:grails-core:$grailsVersion", { - exclude group:'org.grails', module:'grails-spring' - } + api "org.grails:grails-core:$grailsVersion" api "org.grails:grails-encoder:$grailsVersion" } diff --git a/grails-web-gsp-taglib/build.gradle b/grails-web-gsp-taglib/build.gradle index 2dd3d86bef..245bcba864 100644 --- a/grails-web-gsp-taglib/build.gradle +++ b/grails-web-gsp-taglib/build.gradle @@ -1,4 +1,4 @@ dependencies { - compileOnly "jakarta.servlet:jakarta.servlet-api:$servletApiVersion" + compileOnly "jakarta.servlet:jakarta.servlet-api" api project(':grails-web-jsp') } diff --git a/grails-web-gsp/build.gradle b/grails-web-gsp/build.gradle index 3c5cbcc88a..bd5f1bb640 100644 --- a/grails-web-gsp/build.gradle +++ b/grails-web-gsp/build.gradle @@ -1,9 +1,9 @@ dependencies { - compileOnly "org.apache.ant:ant:${antVersion}" + compileOnly "org.apache.ant:ant" api project(":grails-gsp") api "org.grails:grails-web-common:$grailsVersion" api project(":grails-web-taglib") - testImplementation "net.bytebuddy:byte-buddy:$byteBuddyVersion" - testRuntimeOnly "org.grails:grails-spring:$grailsVersion" + testImplementation "net.bytebuddy:byte-buddy" + testRuntimeOnly "org.grails:grails-spring" } diff --git a/grails-web-jsp/build.gradle b/grails-web-jsp/build.gradle index 09a9af5ea1..10c7147a38 100644 --- a/grails-web-jsp/build.gradle +++ b/grails-web-jsp/build.gradle @@ -3,7 +3,7 @@ dependencies { api project(":grails-web-gsp") - compileOnly "jakarta.servlet:jakarta.servlet-api:$servletApiVersion" + compileOnly "jakarta.servlet:jakarta.servlet-api" // Required for JSP support compileOnly "jakarta.servlet.jsp:jakarta.servlet.jsp-api:$jspApiVersion" compileOnly "jakarta.el:jakarta.el-api:$elApiVersion" diff --git a/grails-web-taglib/build.gradle b/grails-web-taglib/build.gradle index 1cc81391c3..ce8c581b35 100644 --- a/grails-web-taglib/build.gradle +++ b/grails-web-taglib/build.gradle @@ -1,9 +1,9 @@ dependencies { - compileOnlyApi "jakarta.servlet:jakarta.servlet-api:$servletApiVersion" + compileOnlyApi "jakarta.servlet:jakarta.servlet-api" api "org.grails:grails-web-common:$grailsVersion" api project(":grails-taglib") - testRuntimeOnly "org.grails:grails-spring:$grailsVersion" + testRuntimeOnly "org.grails:grails-spring" } // TODO: Remove this after update to Grails 5.0.0.M2 From a4adc0738ac3168addf1c58e2458ec7d30107a0c Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Fri, 1 Nov 2024 13:11:02 -0700 Subject: [PATCH 2/8] Use bom for documentation --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 1c535a0759..8fc7a07b2a 100644 --- a/build.gradle +++ b/build.gradle @@ -169,6 +169,7 @@ subprojects { subproject -> } dependencies { + documentation platform("org.grails:grails-bom:$grailsVersion") if (configurations.find { subproject.name == 'documentation' }) { documentation "org.fusesource.jansi:jansi" documentation "jline:jline" From d0c6610c73166e87b6c45d4904fef82fa8ed9673 Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Fri, 1 Nov 2024 14:20:38 -0700 Subject: [PATCH 3/8] buildscript is resolving groovy version from bom and needs groovy snapshot repo. Need for CI_GROOVY_VERSION --- build.gradle | 40 +++++++++++++------------------------- grails-taglib/build.gradle | 1 + 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 8fc7a07b2a..463614eb7e 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ buildscript { mavenCentral() maven { url "https://repo.grails.org/grails/core" } maven { url "https://plugins.gradle.org/m2/" } + maven { url "https://repository.apache.org/content/repositories/snapshots" } } dependencies { classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" @@ -21,12 +22,6 @@ ext { repositories { mavenCentral() maven { url "https://repo.grails.org/grails/core" } - if(groovyVersion.endsWith('-SNAPSHOT')) { - maven { - name = 'ASF Snapshot repo' - url = 'https://repository.apache.org/content/repositories/snapshots' - } - } } group = "org.grails" @@ -62,12 +57,7 @@ subprojects { subproject -> repositories { mavenCentral() maven { url "https://repo.grails.org/grails/core" } - if(groovyVersion.endsWith('-SNAPSHOT')) { - maven { - name = 'ASF Snapshot repo' - url = 'https://repository.apache.org/content/repositories/snapshots' - } - } + maven { url "https://repository.apache.org/content/repositories/snapshots" } } if (subproject.name.startsWith("examples")) { @@ -78,16 +68,14 @@ subprojects { subproject -> apply plugin: 'groovy' apply plugin: 'java-library' - repositories { - maven { url "https://repo.grails.org/grails/core" } - } - configurations { documentation } dependencies { implementation platform("org.grails:grails-bom:$grailsVersion") + documentation platform("org.grails:grails-bom:$grailsVersion") + api "org.apache.groovy:groovy:$groovyVersion" api "org.slf4j:slf4j-api:$slf4jVersion" @@ -95,7 +83,6 @@ subprojects { subproject -> testImplementation "org.springframework:spring-test" documentation "org.fusesource.jansi:jansi" - } test { @@ -107,7 +94,7 @@ subprojects { subproject -> groovydoc.classpath += (configurations.documentation + configurations.compileClasspath) dependencies { - documentation "org.apache.groovy:groovy-dateutil" + documentation "org.apache.groovy:groovy-dateutil:$groovyVersion" } } @@ -145,7 +132,7 @@ subprojects { subproject -> testImplementation "jakarta.servlet:jakarta.servlet-api" implementation "jakarta.persistence:jakarta.persistence-api" - testImplementation "org.apache.groovy:groovy-test-junit5" + testImplementation "org.apache.groovy:groovy-test-junit5:$groovyVersion" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.platform:junit-platform-runner" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" @@ -169,15 +156,14 @@ subprojects { subproject -> } dependencies { - documentation platform("org.grails:grails-bom:$grailsVersion") if (configurations.find { subproject.name == 'documentation' }) { documentation "org.fusesource.jansi:jansi" documentation "jline:jline" documentation "com.github.javaparser:javaparser-core" - documentation "org.apache.groovy:groovy" - documentation "org.apache.groovy:groovy-ant" - documentation "org.apache.groovy:groovy-dateutil" - documentation "org.apache.groovy:groovy-cli-picocli" + documentation "org.apache.groovy:groovy:$groovyVersion" + documentation "org.apache.groovy:groovy-ant:$groovyVersion" + documentation "org.apache.groovy:groovy-dateutil:$groovyVersion" + documentation "org.apache.groovy:groovy-cli-picocli:$groovyVersion" documentation "org.asciidoctor:asciidoctorj" } } @@ -348,9 +334,9 @@ dependencies { documentation "org.fusesource.jansi:jansi" documentation "jline:jline" documentation "com.github.javaparser:javaparser-core" - documentation "org.apache.groovy:groovy" - documentation "org.apache.groovy:groovy-ant" - documentation "org.apache.groovy:groovy-cli-picocli" + documentation "org.apache.groovy:groovy:$groovyVersion" + documentation "org.apache.groovy:groovy-ant:$groovyVersion" + documentation "org.apache.groovy:groovy-cli-picocli:$groovyVersion" documentation "org.asciidoctor:asciidoctorj" } } diff --git a/grails-taglib/build.gradle b/grails-taglib/build.gradle index c2582cdc4e..ce95f5c0e3 100644 --- a/grails-taglib/build.gradle +++ b/grails-taglib/build.gradle @@ -1,4 +1,5 @@ dependencies { + documentation platform("org.grails:grails-bom:$grailsVersion") api "org.grails:grails-core:$grailsVersion" api "org.grails:grails-encoder:$grailsVersion" } From 97f37a0a3b509af860a8972f589fee0460641654 Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Fri, 1 Nov 2024 15:19:21 -0700 Subject: [PATCH 4/8] Revert to Groovy 4.0.23 --- build.gradle | 6 +----- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 463614eb7e..36fe1bdec8 100644 --- a/build.gradle +++ b/build.gradle @@ -101,11 +101,7 @@ subprojects { subproject -> apply plugin: 'idea' apply plugin: 'java-library' - java { - toolchain { - languageVersion = JavaLanguageVersion.of(17) - } - } + compileJava.options.release = 17 configurations.all { diff --git a/gradle.properties b/gradle.properties index 537e8d1eae..2af42de155 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ commonsTextVersion=1.12.0 elApiVersion=6.0.1 grailsGradlePluginVersion=7.0.0-SNAPSHOT grailsVersion=7.0.0-SNAPSHOT -groovyVersion=4.0.24-SNAPSHOT +groovyVersion=4.0.23 jspApiVersion=4.0.0 jstlVersion=3.0.1 junitJupiterVersion=5.11.2 From 47006271dedfd11c38ad626dc7d306ccc7f8eb47 Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Fri, 1 Nov 2024 15:20:25 -0700 Subject: [PATCH 5/8] Remove apache repos that are not needed --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index 36fe1bdec8..05cc3c4413 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,6 @@ buildscript { mavenCentral() maven { url "https://repo.grails.org/grails/core" } maven { url "https://plugins.gradle.org/m2/" } - maven { url "https://repository.apache.org/content/repositories/snapshots" } } dependencies { classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" @@ -57,7 +56,6 @@ subprojects { subproject -> repositories { mavenCentral() maven { url "https://repo.grails.org/grails/core" } - maven { url "https://repository.apache.org/content/repositories/snapshots" } } if (subproject.name.startsWith("examples")) { From 0ceb99f1aaea03f8d343f8de5a7c85f3e0f5665e Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Fri, 1 Nov 2024 17:13:02 -0700 Subject: [PATCH 6/8] gsp required for compilation and tests --- grails-web-taglib/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/grails-web-taglib/build.gradle b/grails-web-taglib/build.gradle index ce8c581b35..07c7dd6981 100644 --- a/grails-web-taglib/build.gradle +++ b/grails-web-taglib/build.gradle @@ -2,6 +2,8 @@ dependencies { compileOnlyApi "jakarta.servlet:jakarta.servlet-api" api "org.grails:grails-web-common:$grailsVersion" api project(":grails-taglib") + compileOnly project(":grails-gsp") + testImplementation project(":grails-gsp") testRuntimeOnly "org.grails:grails-spring" } From a77d5461ea65c7234a4285255a563e4a39f66b47 Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Fri, 1 Nov 2024 17:24:21 -0700 Subject: [PATCH 7/8] More cleanup --- build.gradle | 22 +--------------------- gradle.properties | 6 ------ 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 05cc3c4413..8b5364d5db 100644 --- a/build.gradle +++ b/build.gradle @@ -75,7 +75,7 @@ subprojects { subproject -> documentation platform("org.grails:grails-bom:$grailsVersion") api "org.apache.groovy:groovy:$groovyVersion" - api "org.slf4j:slf4j-api:$slf4jVersion" + api "org.slf4j:slf4j-api" testImplementation "org.spockframework:spock-core" testImplementation "org.springframework:spring-test" @@ -101,26 +101,6 @@ subprojects { subproject -> compileJava.options.release = 17 - configurations.all { - - // FORCE UPGRADE OF GROOVY IN DEPENDENCIES TO GROOVY 4 - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if (details.requested.group == 'org.codehaus.groovy') { - details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: groovyVersion) - } - } - - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if (details.requested.group == "org.spockframework") { - details.useVersion(spockVersion) - } else if (details.requested.group == "org.junit.jupiter") { - details.useVersion(junitJupiterVersion) - } else if (details.requested.group == "org.junit.platform") { - details.useVersion(junitPlatformVerison) - } - } - } - dependencies { compileOnly "jakarta.servlet:jakarta.servlet-api" diff --git a/gradle.properties b/gradle.properties index 2af42de155..ac75cd9de4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,13 +14,7 @@ grailsVersion=7.0.0-SNAPSHOT groovyVersion=4.0.23 jspApiVersion=4.0.0 jstlVersion=3.0.1 -junitJupiterVersion=5.11.2 -junitPlatformVerison=1.11.2 sitemeshVersion=7.0.0-SNAPSHOT -spockVersion=2.3-groovy-4.0 -slf4jVersion=2.0.16 -springBootVersion=3.3.4 -antVersion=1.10.15 controllersRef=https://docs.grails.org/latest/ref/Controllers commandLineRef=https://docs.grails.org/latest/ref/Command%20Line grailsDocsVersion=7.0.0-SNAPSHOT From 9f7eda8dd015d9a45e0a27290da026760c2592fe Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Fri, 1 Nov 2024 17:26:29 -0700 Subject: [PATCH 8/8] temporariliy comment out joint workflow --- .github/workflows/groovy-joint-workflow.yml | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml index 79145e1b5c..cc08e110e8 100644 --- a/.github/workflows/groovy-joint-workflow.yml +++ b/.github/workflows/groovy-joint-workflow.yml @@ -147,14 +147,14 @@ jobs: - name: Set CI_GROOVY_VERSION for Grails run: | echo "CI_GROOVY_VERSION=${{needs.build_groovy.outputs.groovyVersion}}" >> $GITHUB_ENV - - name: Build GSP - id: build_gsp - uses: gradle/gradle-build-action@v3 - env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} - GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} - with: - arguments: | - build - -x groovydoc +# - name: Build GSP +# id: build_gsp +# uses: gradle/gradle-build-action@v3 +# env: +# GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} +# GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} +# GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} +# with: +# arguments: | +# build +# -x groovydoc