upgrade to Java 17

grails · Dec 5, 2024 · 416eec0 · 416eec0
1 parent 8c7a021
commit 416eec0
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -14,7 +14,7 @@
     },
     {
       "matchPackagePatterns": [
-        "^org\\.codehaus\\.groovy"
+        "^org\\.apache\\.groovy"
       ],
       "groupName": "groovy monorepo"
     },

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        java: [11, 17]
+        java: [17]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,8 +3,8 @@ on:
   release:
     types: [published]
 env:
-  GIT_USER_NAME: puneetbehl
-  GIT_USER_EMAIL: [email protected]
+  GIT_USER_NAME: 'grails-build'
+  GIT_USER_EMAIL: '[email protected]'
 
 jobs:
   release:
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v2
       - uses: actions/setup-java@v4
-        with: { java-version: 11, distribution: temurin }
+        with: { java-version: 17, distribution: temurin }
 
       - name: Get the current release version
         id: release_version

diff --git a/gradle/buildsrc.libs.versions.toml b/gradle/buildsrc.libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-grails-gradle-plugin = '6.1.2'
+grails-gradle-plugin = '7.0.0-SNAPSHOT'
 nexus-publish-gradle-plugin = '1.3.0'
 
 [libraries]

diff --git a/gradle/java-config.gradle b/gradle/java-config.gradle
@@ -1,5 +1,5 @@
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
     withSourcesJar()
     withJavadocJar()
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-grails = '6.1.2'
-groovy = '3.0.21'
+grails = '7.0.0-SNAPSHOT'
+groovy = '4.0.24'
 javax-annotation-api = '1.3.2'
 quartz = '2.3.2'
 slf4j = '1.7.36'
@@ -11,9 +11,9 @@ spock = '2.3-groovy-3.0'
 grails-bootstrap = { group = 'org.grails', name = 'grails-bootstrap', version.ref = 'grails' }
 grails-core = { group = 'org.grails', name = 'grails-core', version.ref = 'grails' }
 grails-docs = { group = 'org.grails', name = 'grails-docs', version.ref = 'grails' }
-groovy-core = { group = 'org.codehaus.groovy', name = 'groovy', version.ref = 'groovy' }
-groovy-sql = { group = 'org.codehaus.groovy', name = 'groovy-sql', version.ref = 'groovy' }
-groovy-templates = { group = 'org.codehaus.groovy', name = 'groovy-templates', version.ref = 'groovy' }
+groovy-core = { group = 'org.apache.groovy', name = 'groovy', version.ref = 'groovy' }
+groovy-sql = { group = 'org.apache.groovy', name = 'groovy-sql', version.ref = 'groovy' }
+groovy-templates = { group = 'org.apache.groovy', name = 'groovy-templates', version.ref = 'groovy' }
 javax-annotation-api = { module = 'javax.annotation:javax.annotation-api', version.ref = 'javax-annotation-api' }
 quartz = { group = 'org.quartz-scheduler', name = 'quartz', version.ref = 'quartz' }
 slf4j-nop = { group = 'org.slf4j', name = 'slf4j-nop', version.ref = 'slf4j' }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/docs/guide/configuration.gdoc b/src/docs/guide/configuration.gdoc
@@ -55,7 +55,7 @@ static description = "Example Job Description"
 
 h4. Clustering
 
-Quartz plugin doesn't support clustering out-of-the-box now. However, you could use standard Quartz clustering configuration. Take a look at the [example provided by Burt Beckwith|http://docs.codehaus.org/download/attachments/78053/clustering_sample.tar.gz?version=1]. You'll also need to set jdbcStore configuration option to true .
+Quartz plugin doesn't support clustering out-of-the-box now. However, you could use standard Quartz clustering configuration. Take a look at the [example provided by Burt Beckwith|http://docs.apache.org/download/attachments/78053/clustering_sample.tar.gz?version=1]. You'll also need to set jdbcStore configuration option to true .
 
 There are also two parameters for configuring store/clustering on jobs ( volatility and durability , both are true by default) and one for triggers ( volatility , also true by default). Volatile job and trigger will not persist between Quartz runs, and durable job will live even when there is no triggers referring to it.