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.

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

Update dependency org.springframework.boot:spring-boot-test to v3 - autoclosed #263

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e8c6028
Update gradle.properties
puneetbehl Mar 31, 2023
24b26f5
Update Minimum Java Compatibility to 11 (#280)
puneetbehl Mar 31, 2023
32b9531
Update to Grails 6.0.0-M2 (#279)
puneetbehl Mar 31, 2023
4378986
Update plugin com.gradle.enterprise to v3.12.6 (#277)
renovate[bot] Mar 31, 2023
27ee85f
Update gradle.properties
puneetbehl Mar 31, 2023
0d8e058
Update to GORM 8.0.0-M1 (#281)
puneetbehl Apr 2, 2023
b9161ac
Update junit5 monorepo (#284)
renovate[bot] May 1, 2023
22e06b4
Update dependency org.springframework.boot:spring-boot-test to v2.7.1…
renovate[bot] May 1, 2023
a1df75c
Update plugin com.gradle.enterprise to v3.13 (#282)
renovate[bot] May 1, 2023
863f993
Update Grails Gradle Plugin to 6.0.0-M2
puneetbehl May 2, 2023
fd43257
Update to Gradle 7.6.1 (#286)
puneetbehl May 3, 2023
9d4765d
Update dependency org.grails:grails-datastore-gorm-test to v8.0.0-M2 …
renovate[bot] May 3, 2023
6cdfe69
Code Reformatting
puneetbehl May 3, 2023
50d8e8a
Update grailsDocVersion to 6.0.0-M2
puneetbehl May 3, 2023
6a214e2
Add asciidoctor-gradle-plugin
puneetbehl May 3, 2023
47b5d33
[skip ci] Release v3.0.0-M1
puneetbehl May 3, 2023
7c00e27
Update Workflows
puneetbehl May 3, 2023
61f37ba
Back to snapshot
puneetbehl May 3, 2023
18950dc
Update plugin com.gradle.enterprise to v3.13.1 (#287)
renovate[bot] May 4, 2023
6ff5eb1
Update Grails Doc Version
puneetbehl May 4, 2023
6e074ef
Merge branch '3.0.x' of github.com:grails/grails-testing-support into…
puneetbehl May 4, 2023
8fd0e8a
[skip ci] Release v3.0.0-M2
puneetbehl May 4, 2023
6437abd
Back to 3.0.0-SNAPSHOT
puneetbehl May 4, 2023
82dc0c5
Update plugin com.gradle.enterprise to v3.13.2 (#288)
renovate[bot] May 11, 2023
185bcc6
Update dependency org.springframework.boot:spring-boot-test to v3
renovate[bot] May 11, 2023
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
24 changes: 16 additions & 8 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ name: Java CI
on:
push:
branches:
- master
- '[2-9]+.[1-9]+.x'
- '[3-9]+.[0-9]+.x'
pull_request:
branches:
- master
- '[2-9]+.[1-9]+.x'
- '[3-9]+.[0-9]+.x'
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
java: ['8', '11', '14']
java: ['11', '14']
env:
WORKSPACE: ${{ github.workspace }}
GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
Expand All @@ -31,6 +31,7 @@ jobs:
with:
arguments: check
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 }}
- name: Run Build
Expand All @@ -51,21 +52,28 @@ jobs:
report_paths: '**/build/test-results/test/TEST-*.xml'
- name: Publish to repo.grails.org
id: publish
if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '8'
if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
uses: gradle/gradle-build-action@v2
with:
arguments: -Dorg.gradle.internal.publish.checksums.insecure=true publish
env:
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
with:
arguments: -Dorg.gradle.internal.publish.checksums.insecure=true publish
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 }}
- name: Generate Docs
id: docs
if: steps.publish.outcome == 'success' && github.event_name == 'push' && matrix.java == '8'
if: steps.publish.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
uses: gradle/gradle-build-action@v2
with:
arguments: docs
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 }}
- name: Publish to Github Pages
if: steps.docs.outcome == 'success' && github.event_name == 'push' && matrix.java == '8'
if: steps.docs.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
uses: micronaut-projects/github-pages-deploy-action@master
env:
TARGET_REPOSITORY: ${{ github.repository }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
branches:
- master
- '[2-9]+.[1-9]+.x'
- '[3-9]+.[0-9]+.x'
workflow_dispatch:
jobs:
release_notes:
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: ['8']
java: ['11']
env:
GIT_USER_NAME: puneetbehl
GIT_USER_EMAIL: [email protected]
Expand Down Expand Up @@ -37,6 +37,9 @@ jobs:
id: publish
uses: gradle/gradle-build-action@v2
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 }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
Expand All @@ -51,6 +54,10 @@ jobs:
uses: gradle/gradle-build-action@v2
with:
arguments: docs
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 }}
- name: Export Gradle Properties
uses: micronaut-projects/github-actions/export-gradle-properties@master
- name: Publish to Github Pages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/retry-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: ['8']
java: ['11']
env:
GIT_USER_NAME: puneetbehl
GIT_USER_EMAIL: [email protected]
Expand Down
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ buildscript {
classpath "org.grails:grails-docs:${project.ext.properties.grailsDocsVersion ?: grailsVersion}"
classpath "org.grails.plugins:views-gradle:$jsonViewsVersion"
classpath "io.github.gradle-nexus:publish-plugin:1.3.0"
classpath("org.asciidoctor:asciidoctor-gradle-jvm:4.0.0-alpha.1")
}
}

Expand All @@ -18,7 +19,7 @@ repositories {
version project.projectVersion

ext {
commonBuild = 'https://raw.githubusercontent.com/grails/grails-common-build/master'
commonBuild = 'https://raw.githubusercontent.com/grails/grails-common-build/gradle7'
}

subprojects { project ->
Expand All @@ -39,7 +40,7 @@ subprojects { project ->

repositories {
maven { url "https://repo.grails.org/grails/core" }
if(groovyVersion && groovyVersion.endsWith('-SNAPSHOT')) {
if (groovyVersion && groovyVersion.endsWith('-SNAPSHOT')) {
maven {
name 'JFrog OSS snapshot repo'
url 'https://oss.jfrog.org/oss-snapshot-local/'
Expand All @@ -59,16 +60,15 @@ subprojects { project ->
apply from: "${commonBuild}/common-project.gradle"
}

sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 1.11
targetCompatibility = 1.11
}

configurations.all {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
if(details.requested.group == 'org.springframework') {
if (details.requested.group == 'org.springframework') {
details.useVersion(springVersion)
}
else if(details.requested.group == 'org.springframework.boot') {
} else if (details.requested.group == 'org.springframework.boot') {
details.useVersion(springBootVersion)
}
}
Expand All @@ -80,9 +80,9 @@ subprojects { project ->

testImplementation "javax.servlet:javax.servlet-api:$servletApiVersion"
testImplementation "org.codehaus.groovy:groovy-test-junit5:$groovyVersion"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
testImplementation "org.junit.platform:junit-platform-runner:1.9.2"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.3"
testImplementation "org.junit.platform:junit-platform-runner:1.9.3"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.3"
}

tasks.withType(Test) {
Expand Down
3 changes: 3 additions & 0 deletions examples/demo33/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ tasks.withType(Test) {
}
}

tasks.withType(Jar).configureEach {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}



Expand Down
5 changes: 1 addition & 4 deletions examples/demo33/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
grailsVersion=5.0.3-SNAPSHOT
gormVersion=7.1.0
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
geckodriverVersion=0.26.0
chromeDriverVersion=96.0.4664.45
micrometer.version=1.8.0
micronaut.spring.version=4.0.1
micrometer.version=1.8.0
16 changes: 8 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
projectVersion=2.6.2-SNAPSHOT
projectVersion=3.0.0-SNAPSHOT
title=Grails Testing Support
authors=Jeff Brown,James Kleeh
projectDesc=Support for writing concise expressive tests for Grails artifacts
projectUrl=https://github.com/grails/grails-testing-support
githubSlug=grails/grails-testing-support
githubBranch=2.3.x
githubBranch=3.0.x
developers=Jeff Brown,James Kleeh
grailsGradlePluginVersion=5.3.0
grailsVersion=5.3.2
grailsDocsVersion=5.0.0.RC1
grailsGradlePluginVersion=6.0.0-M2
grailsVersion=6.0.0-M2
grailsDocsVersion=6.0.0-SNAPSHOT
asyncVersion=4.0.0
groovyVersion=3.0.11
gormVersion=7.3.4
gormVersion=8.0.0-M2
jsonViewsVersion=2.3.2
gspVersion=5.3.0
gspVersion=6.0.0-M1
spockVersion=2.1-groovy-3.0
springVersion=5.3.20
springBootVersion=2.7.9
springBootVersion=3.0.6
slf4jVersion=1.7.22
junitVersion=4.12
javassistVersion=3.29.2-GA
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 14 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -205,6 +209,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
15 changes: 9 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
6 changes: 3 additions & 3 deletions grails-testing-support/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ dependencies {
api("org.spockframework:spock-spring:${spockVersion}") { transitive = false }
api("org.spockframework:spock-core:${spockVersion}") { transitive = false }
api "org.codehaus.groovy:groovy-test-junit5:$groovyVersion"
api "org.junit.jupiter:junit-jupiter-api:5.9.2"
api "org.junit.platform:junit-platform-runner:1.9.2"
runtimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
api "org.junit.jupiter:junit-jupiter-api:5.9.3"
api "org.junit.platform:junit-platform-runner:1.9.3"
runtimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.3"
}

2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.gradle.enterprise" version "3.12.4"
id "com.gradle.enterprise" version "3.13.2"
id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.10'
}

Expand Down