Skip to content

Commit a922455

Browse files
jamesfredleyjamesfredley
committed
Merge branch '7.0.x' into code-style
# Conflicts: # grails-views-gson/src/main/groovy/grails/plugin/json/view/JsonViewGrailsPlugin.groovy # grails-views-markup/src/main/groovy/grails/plugin/markup/view/MarkupViewGrailsPlugin.groovy
2 parents 124133f + 5917fc2 commit a922455

File tree

361 files changed

+872
-803
lines changed

Some content is hidden

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

361 files changed

+872
-803
lines changed

‎.github/workflows/forge-deploy-next.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ jobs:
3535
- name: "🔨 Build"
3636
working-directory: grails-forge
3737
run: ./gradlew build
38+
env:
39+
TEST_BUILD_REPRODUCIBLE: "true"
3840
deploy:
3941
name: "Deploy to Google Cloud Run"
4042
runs-on: ubuntu-24.04
@@ -70,6 +72,8 @@ jobs:
7072
./gradlew
7173
grails-forge-api:test
7274
grails-forge-web-netty:test
75+
env:
76+
TEST_BUILD_REPRODUCIBLE: "true"
7377
- name: "🔨 Build Docker image"
7478
working-directory: grails-forge
7579
# To deploy native executables built with GraalVM, replace dockerBuild with dockerBuildNative and dockerPush
@@ -78,6 +82,8 @@ jobs:
7882
./gradlew
7983
grails-forge-web-netty:dockerBuildNative
8084
-PdockerImageName=${{ env.IMAGE_NAME }}
85+
env:
86+
TEST_BUILD_REPRODUCIBLE: "true"
8187
- name: "📤 Push Container to Google Cloud Artifact Registry"
8288
run: |
8389
docker push ${{ env.IMAGE_NAME }}
@@ -122,6 +128,8 @@ jobs:
122128
- name: "🏃 Run tests"
123129
working-directory: grails-forge
124130
run: ./gradlew grails-forge-analytics-postgres:test
131+
env:
132+
TEST_BUILD_REPRODUCIBLE: "true"
125133
- name: "🔨 Build Docker image"
126134
working-directory: grails-forge
127135
# To deploy native executables built with GraalVM, replace dockerBuild with dockerBuildNative and dockerPush
@@ -130,6 +138,8 @@ jobs:
130138
./gradlew
131139
grails-forge-analytics-postgres:dockerBuildNative
132140
-PdockerImageName=${{ env.IMAGE_NAME }}
141+
env:
142+
TEST_BUILD_REPRODUCIBLE: "true"
133143
- name: "📤 Push Container to Google Cloud Artifact Registry"
134144
run: |
135145
docker push ${{ env.IMAGE_NAME }}

‎.github/workflows/forge-deploy-prev-snapshot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ jobs:
3535
- name: "🔨 Build"
3636
working-directory: grails-forge
3737
run: ./gradlew build
38+
env:
39+
TEST_BUILD_REPRODUCIBLE: "true"
3840
deploy:
3941
name: "Deploy to Google Cloud Run"
4042
runs-on: ubuntu-24.04
@@ -70,6 +72,8 @@ jobs:
7072
./gradlew
7173
grails-forge-api:test
7274
grails-forge-web-netty:test
75+
env:
76+
TEST_BUILD_REPRODUCIBLE: "true"
7377
- name: "🔨 Build Docker image"
7478
working-directory: grails-forge
7579
# To deploy native executables built with GraalVM, replace dockerBuild with dockerBuildNative and dockerPush
@@ -78,6 +82,8 @@ jobs:
7882
./gradlew
7983
grails-forge-web-netty:dockerBuildNative
8084
-PdockerImageName=${{ env.IMAGE_NAME }}
85+
env:
86+
TEST_BUILD_REPRODUCIBLE: "true"
8187
- name: "📤 Push Container to Google Cloud Artifact Registry"
8288
run: |
8389
docker push ${{ env.IMAGE_NAME }}
@@ -122,6 +128,8 @@ jobs:
122128
- name: "🏃 Run tests"
123129
working-directory: grails-forge
124130
run: ./gradlew grails-forge-analytics-postgres:test
131+
env:
132+
TEST_BUILD_REPRODUCIBLE: "true"
125133
- name: "🔨 Build Docker image"
126134
working-directory: grails-forge
127135
# To deploy native executables built with GraalVM, replace dockerBuild with dockerBuildNative and dockerPush
@@ -130,6 +138,8 @@ jobs:
130138
./gradlew
131139
grails-forge-analytics-postgres:dockerBuildNative
132140
-PdockerImageName=${{ env.IMAGE_NAME }}
141+
env:
142+
TEST_BUILD_REPRODUCIBLE: "true"
133143
- name: "📤 Push Container to Google Cloud Artifact Registry"
134144
run: |
135145
docker push ${{ env.IMAGE_NAME }}

‎.github/workflows/forge-deploy-prev.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ jobs:
3535
- name: "🔨 Build"
3636
working-directory: grails-forge
3737
run: ./gradlew build
38+
env:
39+
TEST_BUILD_REPRODUCIBLE: "true"
3840
deploy:
3941
name: "Deploy to Google Cloud Run"
4042
runs-on: ubuntu-24.04
@@ -70,6 +72,8 @@ jobs:
7072
./gradlew
7173
grails-forge-api:test
7274
grails-forge-web-netty:test
75+
env:
76+
TEST_BUILD_REPRODUCIBLE: "true"
7377
- name: "🔨 Build Docker image"
7478
working-directory: grails-forge
7579
# To deploy native executables built with GraalVM, replace dockerBuild with dockerBuildNative and dockerPush
@@ -78,6 +82,8 @@ jobs:
7882
./gradlew
7983
grails-forge-web-netty:dockerBuildNative
8084
-PdockerImageName=${{ env.IMAGE_NAME }}
85+
env:
86+
TEST_BUILD_REPRODUCIBLE: "true"
8187
- name: "📤 Push Container to Google Cloud Artifact Registry"
8288
run: |
8389
docker push ${{ env.IMAGE_NAME }}
@@ -122,6 +128,8 @@ jobs:
122128
- name: "🏃 Run tests"
123129
working-directory: grails-forge
124130
run: ./gradlew grails-forge-analytics-postgres:test
131+
env:
132+
TEST_BUILD_REPRODUCIBLE: "true"
125133
- name: "🔨 Build Docker image"
126134
working-directory: grails-forge
127135
# To deploy native executables built with GraalVM, replace dockerBuild with dockerBuildNative and dockerPush
@@ -130,6 +138,8 @@ jobs:
130138
./gradlew
131139
grails-forge-analytics-postgres:dockerBuildNative
132140
-PdockerImageName=${{ env.IMAGE_NAME }}
141+
env:
142+
TEST_BUILD_REPRODUCIBLE: "true"
133143
- name: "📤 Push Container to Google Cloud Artifact Registry"
134144
run: |
135145
docker push ${{ env.IMAGE_NAME }}

‎.github/workflows/forge-deploy-release.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ jobs:
4141
- name: "🧩 Assemble"
4242
working-directory: grails-forge
4343
run: ./gradlew grails-cli:assemble
44+
env:
45+
TEST_BUILD_REPRODUCIBLE: "true"
4446
deploy:
4547
name: "Deploy to Google Cloud Run"
4648
runs-on: ubuntu-24.04
@@ -74,6 +76,8 @@ jobs:
7476
./gradlew
7577
grails-forge-api:test
7678
grails-forge-web-netty:test
79+
env:
80+
TEST_BUILD_REPRODUCIBLE: "true"
7781
- name: "🔨 Build Docker native image"
7882
working-directory: grails-forge
7983
env:
@@ -82,6 +86,8 @@ jobs:
8286
./gradlew
8387
grails-forge-web-netty:dockerBuildNative
8488
-PdockerImageName=${{ env.IMAGE_NAME }}
89+
env:
90+
TEST_BUILD_REPRODUCIBLE: "true"
8591
- name: "📤 Push Container to Google Cloud Artifact Registry"
8692
env:
8793
IMAGE_NAME: us-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_APP_NAME }}/${{ secrets.GCP_APP_NAME }}:${{ needs.build.outputs.release_version }}
@@ -127,6 +133,8 @@ jobs:
127133
run: >
128134
./gradlew
129135
grails-forge-analytics-postgres:test
136+
env:
137+
TEST_BUILD_REPRODUCIBLE: "true"
130138
- name: "🔨 Build Docker native image"
131139
working-directory: grails-forge
132140
env:
@@ -135,6 +143,8 @@ jobs:
135143
./gradlew
136144
grails-forge-analytics-postgres:dockerBuildNative
137145
-PdockerImageName=${{ env.IMAGE_NAME }}
146+
env:
147+
TEST_BUILD_REPRODUCIBLE: "true"
138148
- name: "📤 Push Container to Google Cloud Artifact Registry"
139149
env:
140150
IMAGE_NAME: us-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_APP_NAME }}/${{ secrets.GCP_APP_NAME }}-analytics:${{ needs.build.outputs.release_version }}

‎.github/workflows/forge-deploy-snapshot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ jobs:
3535
- name: "🔨 Build"
3636
working-directory: grails-forge
3737
run: ./gradlew build
38+
env:
39+
TEST_BUILD_REPRODUCIBLE: "true"
3840
deploy:
3941
name: "Deploy to Google Cloud Run"
4042
runs-on: ubuntu-24.04
@@ -70,12 +72,16 @@ jobs:
7072
./gradlew
7173
grails-forge-api:test
7274
grails-forge-web-netty:test
75+
env:
76+
TEST_BUILD_REPRODUCIBLE: "true"
7377
- name: "🔨 Build Docker native image"
7478
working-directory: grails-forge
7579
run: >
7680
./gradlew
7781
grails-forge-web-netty:dockerBuildNative
7882
-PdockerImageName=${{ env.IMAGE_NAME }}
83+
env:
84+
TEST_BUILD_REPRODUCIBLE: "true"
7985
- name: "📤 Push Container to Google Cloud Artifact Registry"
8086
run: |
8187
docker push ${{ env.IMAGE_NAME }}
@@ -120,12 +126,16 @@ jobs:
120126
- name: "🏃 Run tests"
121127
working-directory: grails-forge
122128
run: ./gradlew grails-forge-analytics-postgres:test
129+
env:
130+
TEST_BUILD_REPRODUCIBLE: "true"
123131
- name: "🔨 Build Docker native image"
124132
working-directory: grails-forge
125133
run: >
126134
./gradlew
127135
grails-forge-analytics-postgres:dockerBuildNative
128136
-PdockerImageName=${{ env.IMAGE_NAME }}
137+
env:
138+
TEST_BUILD_REPRODUCIBLE: "true"
129139
- name: "📤 Push Container to Google Cloud Artifact Registry"
130140
run: |
131141
docker push ${{ env.IMAGE_NAME }}

‎INSTALL‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ For the remaining commands in this document: `gradle` is used if tooling is inst
2424

2525
Requirements for Testing
2626
------------------------------
27-
Grails has a comprehensive test suite that includes unit, integration, and functional tests. The functional tests use Testcontainers (https://www.testcontainers.org), which requires a container runtime. In the event that a container runtime is not available, the tests can be skipped by using the argument the argument `-PskipTests`. Some container runtimes require more configuration than others. Please see the Testcontainers documentation at https://java.testcontainers.org/features/configuration for how to customize the container runtime used by Testcontainers.
27+
Grails has a comprehensive test suite that includes unit, integration, and functional tests. The functional tests use Testcontainers (https://java.testcontainers.org/), which requires a container runtime. In the event that a container runtime is not available, the tests can be skipped by using the argument the argument `-PskipTests`. Some container runtimes require more configuration than others. Please see the Testcontainers documentation at https://java.testcontainers.org/features/configuration for how to customize the container runtime used by Testcontainers.
2828

2929
Project Structure
3030
------------------------------

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ limitations under the License.
2727

2828
## Introduction
2929

30-
[Apache Grails](https://grails.org/) is a framework used to build web applications with
30+
[Apache Grails](https://grails.apache.org/) is a framework used to build web applications with
3131
the [Apache Groovy](https://groovy-lang.org/) programming language. Releases prior to 7.0.0 were outside of the Apache
3232
Software Foundation. The core framework is very extensible and there are numerous [plugins](https://plugins.grails.org/)
3333
available that provide easy integration of add-on features. To assist in getting started, various Application generators
@@ -46,7 +46,7 @@ Please see the [INSTALL](INSTALL) document for instructions on how to build, use
4646

4747
Please note that the Apache Software Foundation does not offer commercial support for Apache Grails or related applications.
4848

49-
[Commercial support](https://grails.org/support.html) options are available. The products and services listed at this link are provided for information use only to our users. The Apache Grails Project does not endorse or recommend any of the products or services.
49+
[Commercial support](https://grails.apache.org/support.html) options are available. The products and services listed at this link are provided for information use only to our users. The Apache Grails Project does not endorse or recommend any of the products or services.
5050

5151
## Application Generation
5252

‎SECURITY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The Apache Grails (incubating) is committed to the continued innovation, develop
2020
Our goal is to provide Grails framework users the support they need while maintaining as much focus as possible on innovation.
2121
The level and type of support available for earlier versions of the Grails framework will change as the framework continues to evolve.
2222

23-
For information about the currently supported versions of the Grails framework, please see our [Support Schedule](https://grails.org/support-schedule.html).
23+
For information about the currently supported versions of the Grails framework, please see our [Support Schedule](https://grails.apache.org/support-schedule.html).
2424

2525
## Reporting Vulnerabilities
2626

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# (the "License"); you may not use this file except in compliance with
66
# the License. You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# https://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,

‎gradle/docs-dependencies.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ tasks.withType(Groovydoc).configureEach { Groovydoc gdoc ->
6565
doFirst {
6666
def gebVersion = resolveProjectVersion('geb-spock')
6767
if(gebVersion) {
68-
gdoc.link("https://www.gebish.org/manual/${gebVersion}/api/", 'geb.')
68+
gdoc.link("https://groovy.apache.org/geb/manual/${gebVersion}/api/", 'geb.')
6969
}
7070

7171
def testContainersVersion = resolveProjectVersion('testcontainers')

0 commit comments

Comments
 (0)