Skip to content

Commit 9819ebe

Browse files
authored
Merge pull request #15334 from apache/7.0.x
Merge 7.0.x into 7.1.x
2 parents d41484e + 5ea8eba commit 9819ebe

82 files changed

Lines changed: 721 additions & 734 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/gradle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
strategy:
7171
fail-fast: false
7272
matrix:
73-
java: [ 17, 21, 24 ]
73+
java: [ 17, 21, 25 ]
7474
os: [ ubuntu-latest, windows-latest, macos-latest ]
7575
runs-on: ${{ matrix.os }}
7676
steps:
@@ -156,7 +156,7 @@ jobs:
156156
strategy:
157157
fail-fast: false
158158
matrix:
159-
java: [ 17, 21, 24 ]
159+
java: [ 17, 21, 25 ]
160160
runs-on: ubuntu-24.04
161161
steps:
162162
- name: "Output Agent IP" # in the event RAO blocks this agent, this can be used to debug it

.github/workflows/release-notes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929
workflow_dispatch:
3030
# queue jobs and only allow 1 run per branch due to the likelihood of hitting GitHub resource limits
3131
concurrency:
32-
group: ${{ github.workflow }}-${{ github.ref }}
32+
group: release-pipeline
3333
cancel-in-progress: false
3434
jobs:
3535
update_release_draft:

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ env:
3737
TAG: ${{ github.event.release.tag_name }}
3838
TARGET_BRANCH: ${{ github.event.release.target_commitish }}
3939
VERSION: will be computed in each job
40+
concurrency:
41+
group: release-pipeline
42+
cancel-in-progress: false
4043
jobs:
4144
publish:
4245
name: "Stage Jar Files"

.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
java=17.0.17-librca
2-
gradle=8.14.3
2+
gradle=8.14.4
33

INSTALL

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ By default, the Grails CLI uses standard maven repos to retrieve upstream Grails
9191

9292
export GRAILS_REPO_URL=$HOME/.m2/repository
9393

94+
This variable also supports multiple repositories by using the separator ';'. For example:
95+
96+
export GRAILS_REPO_URL=$HOME/.m2/repository;https://repo1.maven.org/maven2/
97+
9498
The CLI distributions are located under the `grails-forge/grails-cli` project. The build directory contains the CLI distribution, which can be used to create a Grails Application. Unzip it to any location, for the purposes of this document, we will use `grails-forge/grails-cli/build/distributions` as the working directory.
9599

96100
cd grails-forge/grails-cli/build/distributions

RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ In the event that artifacts differ, simply copy them to your project directory a
405405
406406
```bash
407407
cd ~/project
408-
rsync -av grails-verify/grails/etc/bin/results/ etc/bin/results/
408+
rsync -av ../grails-verify/grails/etc/bin/results/ etc/bin/results/
409409
```
410410
411411
# Appendix: Versioning

build-logic/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

build-logic/plugins/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,9 @@ gradlePlugin {
6262
id = 'org.apache.grails.gradle.grails-code-style'
6363
implementationClass = 'org.apache.grails.buildsrc.GrailsCodeStylePlugin'
6464
}
65+
register('grailsRepoSettings') {
66+
id = 'org.apache.grails.buildsrc.repo'
67+
implementationClass = 'org.apache.grails.buildsrc.GrailsRepoSettingsPlugin'
68+
}
6569
}
6670
}
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* https://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
package org.apache.grails.buildsrc
18+
19+
import org.gradle.api.Plugin
20+
import org.gradle.api.artifacts.dsl.RepositoryHandler
21+
import org.gradle.api.initialization.Settings
22+
import org.gradle.api.initialization.resolve.DependencyResolutionManagement
23+
import org.gradle.api.initialization.resolve.RepositoriesMode
24+
import org.gradle.plugin.management.PluginManagementSpec
25+
26+
class GrailsRepoSettingsPlugin implements Plugin<Settings> {
27+
28+
@Override
29+
void apply(Settings target) {
30+
target.pluginManagement { PluginManagementSpec manager ->
31+
manager.repositories { RepositoryHandler repo ->
32+
if (System.getenv('GRAILS_INCLUDE_MAVEN_LOCAL')) {
33+
repo.mavenLocal()
34+
}
35+
repo.mavenCentral()
36+
repo.gradlePluginPortal()
37+
repo.maven {
38+
url = 'https://repository.apache.org/content/groups/snapshots'
39+
content {
40+
it.includeVersionByRegex('org[.]apache[.]grails[.]gradle.*', '.*', '.*-SNAPSHOT')
41+
}
42+
mavenContent {
43+
it.snapshotsOnly()
44+
}
45+
}
46+
repo.maven {
47+
url = 'https://central.sonatype.com/repository/maven-snapshots'
48+
content {
49+
it.includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
50+
}
51+
mavenContent {
52+
it.snapshotsOnly()
53+
}
54+
}
55+
repo.maven {
56+
url = 'https://repository.apache.org/content/groups/staging'
57+
content {
58+
it.includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
59+
it.includeModuleByRegex('org[.]apache[.]groovy', 'groovy.*')
60+
}
61+
mavenContent {
62+
it.releasesOnly()
63+
}
64+
}
65+
}
66+
}
67+
68+
target.dependencyResolutionManagement { DependencyResolutionManagement manager ->
69+
manager.repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
70+
manager.repositories { RepositoryHandler repo ->
71+
if (System.getenv('GRAILS_INCLUDE_MAVEN_LOCAL')) {
72+
repo.mavenLocal()
73+
}
74+
repo.maven {
75+
url = 'https://repo.grails.org/grails/restricted'
76+
mavenContent {
77+
it.releasesOnly()
78+
}
79+
}
80+
repo.maven {
81+
url = 'https://repository.apache.org/content/groups/snapshots'
82+
content {
83+
it.includeVersionByRegex('org[.]apache[.]grails.*', '.*', '.*-SNAPSHOT')
84+
it.includeVersionByRegex('org[.]apache[.]groovy.*', '.*', '.*-SNAPSHOT')
85+
}
86+
mavenContent {
87+
it.snapshotsOnly()
88+
}
89+
}
90+
repo.maven {
91+
url = 'https://central.sonatype.com/repository/maven-snapshots'
92+
content {
93+
it.includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
94+
}
95+
mavenContent {
96+
it.snapshotsOnly()
97+
}
98+
}
99+
repo.maven {
100+
url = 'https://repository.apache.org/content/groups/staging'
101+
content {
102+
it.includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
103+
it.includeModuleByRegex('org[.]apache[.]groovy[.]geb', 'geb.*')
104+
it.includeModuleByRegex('org[.]apache[.]groovy', 'groovy.*')
105+
}
106+
mavenContent {
107+
it.releasesOnly()
108+
}
109+
}
110+
}
111+
}
112+
}
113+
}

build-logic/settings.gradle

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ pluginManagement {
4646
url = 'https://repository.apache.org/content/groups/staging'
4747
content {
4848
includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
49+
includeModuleByRegex('org[.]apache[.]groovy', 'groovy.*')
4950
}
5051
mavenContent {
5152
releasesOnly()
@@ -92,17 +93,12 @@ dependencyResolutionManagement {
9293
}
9394
mavenCentral()
9495
gradlePluginPortal()
96+
// publish plugin
9597
maven {
9698
url = 'https://repository.apache.org/content/groups/snapshots'
9799
content {
98100
includeVersionByRegex('org[.]apache[.]grails[.]gradle.*', '.*', '.*-SNAPSHOT')
99101
}
100-
}
101-
maven {
102-
url = 'https://central.sonatype.com/repository/maven-snapshots'
103-
content {
104-
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
105-
}
106102
mavenContent {
107103
snapshotsOnly()
108104
}

0 commit comments

Comments
 (0)