revert Merge branch '7.0.x' into 6.2.x (#501)

* revert github resolve merge conflict bug that resulted in 7.0.x merge into 6.2.x branch

* use grails-core:6.2.1-SNAPSHOT

.github/workflows/docs.yml

@@ -15,8 +15,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: 'adopt'
+          java-version: '11'
       - name: Checkout repository
         uses: actions/checkout@v4
         with:

.github/workflows/gradle.yml

@@ -1,4 +1,4 @@
-name: "Java CI"
+name: Java CI
 on:
   push:
     branches:
@@ -12,23 +12,25 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
+    strategy:
+      matrix:
+        java: ['11', '14', '17']
     steps:
-      - name: "📥 Checkout the repository"
-        uses: actions/checkout@v4
-      - name: "☕️ Setup JDK"
+      - uses: actions/checkout@v4
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: "🐘 Setup Gradle"
-        uses: gradle/actions/setup-gradle@v4
-      - name: "🔨 Run Build"
+          distribution: 'adopt'
+          java-version: ${{ matrix.java }}
+      - name: Run Build
         id: build
+        uses: gradle/gradle-build-action@v3
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-        run: ./gradlew build --refresh-dependencies
-      - name: "📤 Upload Artifact"
-        if: success()
+        with:
+          arguments: build --refresh-dependencies
+      - name: Upload Distribution
+        if: success() && matrix.java == '11'
         uses: actions/upload-artifact@v4
         with:
           name: grails-gsp-SNAPSHOT.zip
@@ -40,49 +42,47 @@ jobs:
     permissions:
       contents: read
     steps:
-      - name: "📥 Checkout the repository"
-        uses: actions/checkout@v4
-      - name: "☕️ Setup JDK"
+      - uses: actions/checkout@v4
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: "🐘 Setup Gradle"
-        uses: gradle/actions/setup-gradle@v4
-      - name: "📤 Publish Snapshot to repo.grails.org"
+          distribution: 'adopt'
+          java-version: '11'
+      - name: Publish to repo.grails.org
+        uses: gradle/gradle-build-action@v3
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-        run: ./gradlew publish
+        with:
+          arguments: publish
   docs:
     if: github.event_name == 'push'
     needs: build
     runs-on: ubuntu-latest
     permissions:
       contents: write
     steps:
-      - name: "📥 Checkout the repository"
-        uses: actions/checkout@v4
-      - name: "☕️ Setup JDK"
+      - uses: actions/checkout@v4
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: "🐘 Setup Gradle"
-        uses: gradle/actions/setup-gradle@v4
-      - name: "🔨 Build Docs"
+          distribution: 'adopt'
+          java-version: '11'
+      - name: Build Docs
         id: docs
+        uses: gradle/gradle-build-action@v3
+        with:
+          arguments: docs
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-        run: ./gradlew docs --refresh-dependencies
-      - name: "📤 Publish docs to Github Pages"
+      - name: Publish to Github Pages
         if: steps.docs.outcome == 'success'
         uses: grails/github-pages-deploy-action@v2
         env:
           TARGET_REPOSITORY: ${{ github.repository }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           BRANCH: gh-pages
           FOLDER: build/docs
-          COMMIT_EMAIL: [email protected]
-          COMMIT_NAME: grails-build
+          COMMIT_EMAIL: [email protected]
+          COMMIT_NAME: Puneet Behl

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

@@ -5,7 +5,7 @@
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,10 +20,10 @@ name: "Grails Joint Validation Build"
 on:
   push:
     branches:
-      - '[6-9]+.[0-9]+.x'
+      - '[6-9]+.[1-9]+.x'
   pull_request:
     branches:
-      - '[6-9]+.[0-9]+.x'
+      - '[6-9]+.[1-9]+.x'
   workflow_dispatch:
 permissions:
   contents: read
@@ -40,81 +40,66 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
-          java-version: 17
+          distribution: 'adopt'
+          java-version: '11.0.6'
       - name: Cache local Maven repository & Groovy
         uses: actions/cache@v4
         with:
           path: |
             ~/groovy
             ~/.m2/repository
           key: cache-local-groovy-maven-${{ github.sha }}
-      - name: Checkout Groovy 4_0_X (Grails 7 and later)
-        run: cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b GROOVY_4_0_X --single-branch
+      - name: Checkout Groovy 3_0_X (Grails 5 and later)
+        if: startsWith(github.ref, 'refs/heads/6.') || startsWith(github.base_ref, '6.') || startsWith(github.ref, 'refs/heads/5.') || startsWith(github.base_ref, '5.')
+        run: cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b GROOVY_3_0_X --single-branch
       - name: Set CI_GROOVY_VERSION for Grails
         id: groovy-version
         run: |
           cd ../groovy
           echo "CI_GROOVY_VERSION=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 |  tr -d '[:space:]')" >> $GITHUB_ENV
           echo "value=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 |  tr -d '[:space:]')" >> $GITHUB_OUTPUT
-      - name: Prepare Develocity Setup 1
-        id: develocity_conf_1
+      - name: Prepare GE Set-up Configuration
+        id: ge_conf
         run: |
           echo "VALUE<<EOF" >> $GITHUB_OUTPUT
           echo "plugins { " >> $GITHUB_OUTPUT
-          echo "    id 'com.gradle.enterprise' version '3.15.1'" >> $GITHUB_OUTPUT 
-          echo "    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11.3'" >> $GITHUB_OUTPUT 
-          echo "}" >> $GITHUB_OUTPUT 
-          echo "" >> $GITHUB_OUTPUT 
-          echo "EOF" >> $GITHUB_OUTPUT
-      - name: Prepare Develocity Setup 2
-        id: develocity_conf_2
-        run: |
-          echo "VALUE<<EOF" >> $GITHUB_OUTPUT
-          echo "gradleEnterprise {" >> $GITHUB_OUTPUT 
-          echo "    server = 'https://ge.grails.org'" >> $GITHUB_OUTPUT 
-          echo "    buildScan {" >> $GITHUB_OUTPUT 
-          echo "        publishAlways()" >> $GITHUB_OUTPUT 
-          echo "        publishIfAuthenticated()" >> $GITHUB_OUTPUT 
-          echo "        uploadInBackground = System.getenv('CI') == null" >> $GITHUB_OUTPUT 
-          echo "        capture {" >> $GITHUB_OUTPUT 
-          echo "            taskInputFiles = true" >> $GITHUB_OUTPUT 
-          echo "        }" >> $GITHUB_OUTPUT 
-          echo "    }" >> $GITHUB_OUTPUT 
-          echo "}" >> $GITHUB_OUTPUT 
+          echo "    id 'com.gradle.enterprise' version '3.15.1'" >> $GITHUB_OUTPUT
+          echo "    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11.3'" >> $GITHUB_OUTPUT
+          echo "}" >> $GITHUB_OUTPUT
+          echo "" >> $GITHUB_OUTPUT
+          echo "gradleEnterprise {" >> $GITHUB_OUTPUT
+          echo "    server = 'https://ge.grails.org'" >> $GITHUB_OUTPUT
+          echo "    buildScan {" >> $GITHUB_OUTPUT
+          echo "        publishAlways()" >> $GITHUB_OUTPUT
+          echo "        publishIfAuthenticated()" >> $GITHUB_OUTPUT
+          echo "        uploadInBackground = System.getenv('CI') == null" >> $GITHUB_OUTPUT
+          echo "        capture {" >> $GITHUB_OUTPUT
+          echo "            taskInputFiles = true" >> $GITHUB_OUTPUT
+          echo "        }" >> $GITHUB_OUTPUT
+          echo "    }" >> $GITHUB_OUTPUT
+          echo "}" >> $GITHUB_OUTPUT
           echo "" >> $GITHUB_OUTPUT
-          echo "buildCache {" >> $GITHUB_OUTPUT 
-          echo "    local { enabled = System.getenv('CI') != 'true' }" >> $GITHUB_OUTPUT 
-          echo "    remote(HttpBuildCache) {" >> $GITHUB_OUTPUT 
+          echo "buildCache {" >> $GITHUB_OUTPUT
+          echo "    local { enabled = System.getenv('CI') != 'true' }" >> $GITHUB_OUTPUT
+          echo "    remote(gradleEnterprise.buildCache) {" >> $GITHUB_OUTPUT
           echo "        push = System.getenv('CI') == 'true'" >> $GITHUB_OUTPUT
-          echo "        enabled = true" >> $GITHUB_OUTPUT 
-          echo "        url = 'https://ge.grails.org/cache/'" >> $GITHUB_OUTPUT 
-          echo "        credentials {" >> $GITHUB_OUTPUT 
-          echo "            username = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER')" >> $GITHUB_OUTPUT 
-          echo "            password = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY')" >> $GITHUB_OUTPUT 
-          echo "        }" >> $GITHUB_OUTPUT 
-          echo "    }" >> $GITHUB_OUTPUT 
-          echo "}" >> $GITHUB_OUTPUT 
+          echo "        enabled = true" >> $GITHUB_OUTPUT
+          echo "    }" >> $GITHUB_OUTPUT
+          echo "}" >> $GITHUB_OUTPUT
           echo "" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
-      - name: Develocity Set-up
+      - name: Gradle Enterprise Set-up
         run: |
           cd ../groovy
-          # Delete existing plugins from settings.gradle file
-          sed -i '32,37d' settings.gradle
-          # Add Gradle Enterprise set-up related configuration after line no 31 in settings.gradle
-          echo "${{ steps.develocity_conf_1.outputs.value }}" | sed -i -e "31r /dev/stdin" settings.gradle
-          # Delete existing buildCache configuration from gradle/build-scans.gradle file
-          sed -i '23,46d' gradle/build-scans.gradle
-          # Add Gradle Enterprise set-up related configuration after line no 22 in gradle/build-scans.gradle
-          echo "${{ steps.develocity_conf_2.outputs.value }}" | sed -i -e "22r /dev/stdin" gradle/build-scans.gradle
+          # Delete exiting plugins and build-scan from settings.gradle file
+          sed -i '21,31d' settings.gradle
+          # Add Gradle Enterprise set-up related configuration after line no 20 in settings.gradle
+          echo "${{ steps.ge_conf.outputs.value}}" | sed -i -e "20r /dev/stdin" settings.gradle
       - name: Build and install groovy (no docs)
         uses: gradle/gradle-build-action@v3
         env:
           GRADLE_SCANS_ACCEPT: yes
           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 }}
         with:
           build-root-directory: ../groovy
           arguments: |
@@ -135,8 +120,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
-          java-version: 17
+          distribution: 'adopt'
+          java-version: '11'
       - name: Cache local Maven repository & Groovy
         uses: actions/cache@v4
         with:
@@ -152,8 +137,6 @@ jobs:
         uses: gradle/gradle-build-action@v3
         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 }}
         with:
           arguments: |
             build

.github/workflows/release.yml

@@ -3,8 +3,8 @@ on:
   release:
     types: [published]
 env:
-  GIT_USER_NAME: 'grails-build'
-  GIT_USER_EMAIL: '[email protected]'
+  GIT_USER_NAME: puneetbehl
+  GIT_USER_EMAIL: [email protected]
 jobs:
   publish:
     outputs:
@@ -18,8 +18,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: 'adopt'
+          java-version: 11
       - name: Set the current release version
         id: release_version
         run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
@@ -104,8 +104,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: 'adopt'
+          java-version: '11'
       - name: Publish Documentation
         id: docs
         uses: gradle/gradle-build-action@v3
@@ -123,4 +123,4 @@ jobs:
           FOLDER: build/docs
           VERSION: ${{ needs.publish.outputs.release_version }}
           COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }}
-          COMMIT_NAME: ${{ env.GIT_USER_NAME }}
+          COMMIT_NAME: "Puneet Behl"

LICENSE

@@ -224,6 +224,7 @@ SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES
    >>> dom4j-1.6.1
    >>> hsqldb-1.8.0.10
    >>> jline-2.11
+   >>> sitemesh-2.4
    >>> slf4j-1.7.5
 
 
@@ -392,6 +393,58 @@ Copyright (c) 2002-2007, Marc Prud'hommeaux. All rights reserved.
 This software is distributable under the BSD license. See the terms of the
 BSD license in the documentation provided with this software.
 
+
+>>> sitemesh-2.4
+
+The OpenSymphony Software License, Version 1.1
+
+(this license is derived and fully compatible with the Apache Software
+License - see http://www.apache.org/LICENSE.txt)
+
+Copyright (c) 2001 The OpenSymphony Group. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the
+distribution.
+
+3. The end-user documentation included with the redistribution,
+if any, must include the following acknowledgment:
+"This product includes software developed by the
+OpenSymphony Group (http://www.opensymphony.com/)."
+Alternately, this acknowledgment may appear in the software itself,
+if and wherever such third-party acknowledgments normally appear.
+
+4. The names "OpenSymphony" and "The OpenSymphony Group"
+must not be used to endorse or promote products derived from this
+software without prior written permission. For written
+permission, please contact [email protected] .
+
+5. Products derived from this software may not be called "OpenSymphony"
+or "SiteMesh", nor may "OpenSymphony" or "SiteMesh" appear in their
+name, without prior written permission of the OpenSymphony Group.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+
 >>> slf4j-1.7.5
 
 Copyright (c) 2004-2007 QOS.ch