Skip to content

Commit fe58976

Browse files
authored
Merge branch '6.2.x' into revert-13407-13399-deprecate-the-old-grails-shell-project
2 parents cfd9515 + 44f46fd commit fe58976

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

.github/workflows/gradle.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ jobs:
4545
steps:
4646
- name: Checkout repository
4747
uses: actions/checkout@v4
48-
with:
49-
token: ${{ secrets.GH_TOKEN }}
5048
- name: Set up JDK 11
5149
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
5250
with:

.github/workflows/groovy-joint-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
key: cache-local-groovy-maven-${{ github.sha }}
5252
- name: Checkout Groovy 3_0_X (Grails 5 and later)
5353
if: startsWith(github.ref, 'refs/heads/6.') || startsWith(github.base_ref, '6.') || startsWith(github.ref, 'refs/heads/5.') || startsWith(github.base_ref, '5.')
54-
run: cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b GROOVY_3_0_X --single-branch
54+
run: cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b GROOVY_3_0_X --single-branch && sed -i '/maven { url /s|^//||' groovy/build.gradle
5555
- name: Set CI_GROOVY_VERSION for Grails
5656
id: groovy-version
5757
run: |

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jaxbImplVersion=4.0.5
2525
jlineVersion=2.14.6
2626
jnaVersion=5.14.0
2727
junitVersion=4.13.2
28-
logbackVersion=1.2.7
28+
logbackVersion=1.2.13
2929
legacyConvertersVersion=5.0.0
3030
methvinDirectoryWatcherVersion=0.18.0
3131
micronautCacheVersion=3.5.0
@@ -45,7 +45,7 @@ springVersion=5.3.33
4545
testingSupportVersion=3.2.1
4646
testingSupportVersionForTests=3.2.2
4747
tomcatLog4jVersion=8.5.2
48-
tomcatVersion=9.0.88
48+
tomcatVersion=9.0.91
4949
viewsVersion=3.2.3
5050
org.gradle.caching=true
5151
org.gradle.parallel=true

0 commit comments

Comments
 (0)