Add debug logs

.github/renovate.json5

@@ -1,9 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended",
-    "github>gradle/renovate-agent//presets/dv.json5",
-  ],
-  "dependencyDashboardApproval": true,
-  "prConcurrentLimit": 0,
-}

.github/workflow-samples/groovy-dsl/settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "4.1"
+    id "com.gradle.develocity" version "4.0.2"
     id "com.gradle.common-custom-user-data-gradle-plugin" version "2.3"
 }
 

.github/workflow-samples/kotlin-dsl/settings.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.gradle.develocity") version "4.1"
+    id("com.gradle.develocity") version "4.0.2"
     id("com.gradle.common-custom-user-data-gradle-plugin") version "2.3"
 }
 

.github/workflow-samples/no-wrapper-gradle-5/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "4.1" 
+    id "com.gradle.develocity" version "4.0.2" 
 }
 
 develocity {

.github/workflow-samples/no-wrapper/settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "4.1"
+    id "com.gradle.develocity" version "4.0.2"
 }
 
 develocity {

.github/workflow-samples/non-executable-wrapper/settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "4.1"
+    id "com.gradle.develocity" version "4.0.2"
 }
 
 develocity {

.github/workflows/ci-check-and-unit-test.yml

@@ -43,7 +43,7 @@ jobs:
         npm run compile
       working-directory: sources
       env:
-        NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload'
+        NODE_OPTIONS: '-r @gradle/develocity-agent/preload'
         DEVELOCITY_URL: 'https://ge.solutions-team.gradle.com'
         DEVELOCITY_ACCESS_KEY: '${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}'
 
@@ -52,6 +52,6 @@ jobs:
         npm test
       working-directory: sources
       env:
-        NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload'
+        NODE_OPTIONS: '-r @gradle/develocity-agent/preload'
         DEVELOCITY_URL: 'https://ge.solutions-team.gradle.com'
         DEVELOCITY_ACCESS_KEY: '${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}'

.github/workflows/ci-codeql.yml

@@ -35,7 +35,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+      uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
       with:
         languages: ${{ matrix.language }}
         config: |
@@ -43,4 +43,4 @@ jobs:
           - sources/src
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+      uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0

.github/workflows/ci-ossf-scorecard.yml

@@ -52,6 +52,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           sarif_file: results.sarif

.github/workflows/ci-update-dist.yml

@@ -3,7 +3,7 @@ name: CI-update-dist
 on:
   workflow_dispatch:
   push:
-    branches:
+    branches: 
     - 'main'
     - 'prerelease/**'
     - 'release/**'
@@ -45,7 +45,7 @@ jobs:
         npm run compile
       working-directory: sources
       env:
-        NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload'
+        NODE_OPTIONS: '-r @gradle/develocity-agent/preload'
         DEVELOCITY_URL: 'https://ge.solutions-team.gradle.com'
         DEVELOCITY_ACCESS_KEY: '${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}'
 
@@ -61,7 +61,7 @@ jobs:
         git_user_signingkey: true
         git_commit_gpgsign: true
         git_config_global: true
-
+    
     # Commit and push changes; has no effect if the files did not change
     # Important: The push event will not trigger any other workflows, see
     # https://github.com/stefanzweifel/git-auto-commit-action?tab=readme-ov-file#commits-made-by-this-action-do-not-trigger-new-workflow-runs

.github/workflows/integ-test-inject-develocity.yml

@@ -30,11 +30,11 @@ jobs:
       matrix:
         gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
         os: ${{fromJSON(inputs.runner-os)}}
-        plugin-version: ['3.16.2', '4.1']
+        plugin-version: ['3.16.2', '4.0.2']
         include:
         - plugin-version: '3.16.2'
           accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY
-        - plugin-version: '4.1'
+        - plugin-version: '4.0.2'
           accessKeyEnv: DEVELOCITY_ACCESS_KEY
     runs-on: ${{ matrix.os }}
     env:
@@ -82,7 +82,7 @@ jobs:
       matrix:
         gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
         os: ${{fromJSON(inputs.runner-os)}}
-        plugin-version: ['3.16.2', '4.1']
+        plugin-version: ['3.16.2', '4.0.2']
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources
@@ -126,7 +126,7 @@ jobs:
       matrix:
         gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
         os: ${{fromJSON(inputs.runner-os)}}
-        plugin-version: [ '3.16.2', '4.1' ]
+        plugin-version: [ '3.16.2', '4.0.2' ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
@@ -157,7 +157,7 @@ jobs:
       matrix:
         gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
         os: ${{fromJSON(inputs.runner-os)}}
-        plugin-version: [ '3.16.2', '4.1' ]
+        plugin-version: [ '3.16.2', '4.0.2' ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources

.github/workflows/integ-test-provision-gradle-versions.yml

@@ -81,6 +81,7 @@ jobs:
         uses: ./.github/actions/init-integ-test
         with:
           java-version: '17'
+
       - name: Setup Gradle with release-candidate
         uses: ./setup-gradle
         with:

build

@@ -3,7 +3,7 @@
 cd sources
 
 if [[ -f ~/.gradle/develocity/keys.properties ]]; then
-    export NODE_OPTIONS='-r @gradle-tech/develocity-agent/preload'
+    export NODE_OPTIONS='-r @gradle/develocity-agent/preload'
     export DEVELOCITY_URL=https://ge.solutions-team.gradle.com
     export DEVELOCITY_ACCESS_KEY=$(paste -sd ';' ~/.gradle/develocity/keys.properties)
 fi

docs/setup-gradle.md

@@ -847,7 +847,7 @@ Here's a minimal example:
       run: ./gradlew build
 ```
 
-This configuration will automatically apply `v4.1` of the [Develocity Gradle plugin](https://docs.gradle.com/develocity/gradle-plugin/), and publish build scans to https://develocity.your-server.com.
+This configuration will automatically apply `v4.0.2` of the [Develocity Gradle plugin](https://docs.gradle.com/develocity/gradle-plugin/), and publish build scans to https://develocity.your-server.com.
 
 This example assumes that the `develocity.your-server.com` server allows anonymous publishing of build scans.
 In the likely scenario that your Develocity server requires authentication, you will also need to pass a valid [Develocity access key](https://docs.gradle.com/develocity/gradle-plugin/#via_environment_variable) taken from a secret:

sources/jest.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   reporters: [
       'default',
-      '@gradle-tech/develocity-agent/jest-reporter',
+      '@gradle/develocity-agent/jest-reporter',
   ],
   verbose: true
 }

sources/package.json

@@ -41,31 +41,32 @@
     "@actions/http-client": "2.2.3",
     "@actions/tool-cache": "2.0.2",
     "@octokit/webhooks-types": "7.6.1",
-    "cheerio": "1.1.2",
+    "cheerio": "1.1.0",
     "semver": "7.7.2",
     "string-argv": "0.3.2",
+    "typed-rest-client": "2.1.0",
     "unhomoglyph": "1.0.6",
     "which": "5.0.0"
   },
   "devDependencies": {
-    "@gradle-tech/develocity-agent": "1.0.1",
+    "@gradle/develocity-agent": "https://develocity-npm-pkgs.gradle.com/gradle-develocity-agent-0.10.0.tgz",
-    "@jest/globals": "30.0.5",
+    "@jest/globals": "29.7.0",
-    "@types/jest": "30.0.0",
+    "@types/jest": "29.5.14",
-    "@types/node": "24.1.0",
+    "@types/node": "20.19.0",
     "@types/semver": "7.7.0",
     "@types/unzipper": "0.10.11",
     "@types/which": "3.0.4",
-    "@typescript-eslint/eslint-plugin": "8.38.0",
+    "@typescript-eslint/eslint-plugin": "8.34.0",
     "@vercel/ncc": "0.38.3",
     "dedent": "1.6.0",
     "eslint": "9.24.0",
-    "globals": "16.3.0",
+    "globals": "16.2.0",
-    "jest": "30.0.5",
+    "jest": "29.7.0",
     "nock": "13.5.6",
     "npm-run-all": "4.1.5",
     "patch-package": "8.0.0",
-    "prettier": "3.6.2",
+    "prettier": "3.5.3",
-    "ts-jest": "29.4.0",
+    "ts-jest": "29.3.4",
     "typescript": "5.8.3"
   },
   "overrides": {

sources/src/develocity/build-scan.ts

@@ -34,7 +34,7 @@ export async function setup(config: BuildScanConfig): Promise<void> {
     // except if they are defined in the configuration
     if (config.getBuildScanPublishEnabled()) {
         maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true')
-        maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.1')
+        maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.0.2')
         maybeExportVariable('DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION', '2.1')
         maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl())
         maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree())

sources/src/wrapper-validation/checksums.ts

@@ -1,6 +1,7 @@
+import * as httpm from 'typed-rest-client/HttpClient'
 import * as cheerio from 'cheerio'
 import * as core from '@actions/core'
-import * as httpm from '@actions/http-client'
+//import * as httpm from '@actions/http-client'
 
 import fileWrapperChecksums from './wrapper-checksums.json'
 
@@ -69,20 +70,23 @@ async function httpGetJsonArray(url: string): Promise<unknown[]> {
 }
 
 async function httpGetText(url: string): Promise<string> {
-    const maxAttempts = 4
+    const response = await httpc.get(url)
-    let attempts = 0
+    return await response.readBody()
-    while (attempts < maxAttempts) {
+
-        try {
+    // const maxAttempts = 4
-            const response = await httpc.get(url)
+    // let attempts = 0
-            return await response.readBody()
+    // while (attempts < maxAttempts) {
-        } catch (error) {
+    //     try {
-            attempts++
+    //         const response = await httpc.get(url)
-            if (attempts === maxAttempts) {
+    //         return await response.readBody()
-                return new Promise((_resolve, reject) => reject(error))
+    //     } catch (error) {
-            }
+    //         attempts++
-        }
+    //         if (attempts === maxAttempts) {
-    }
+    //             return new Promise((_resolve, reject) => reject(error))
-    return new Promise((_resolve, reject) => reject(new Error('Illegal state')))
+    //         }
+    //     }
+    // }
+    // return new Promise((_resolve, reject) => reject(new Error('Illegal state')))
 }
 
 async function addDistributionSnapshotChecksumUrls(checksumUrls: [string, string][]): Promise<void> {

sources/src/wrapper-validation/validate.ts

@@ -1,3 +1,5 @@
+import * as core from '@actions/core'
+
 import * as find from './find'
 import * as checksums from './checksums'
 import * as hash from './hash'
@@ -21,6 +23,16 @@ export async function findInvalidWrapperJars(
                 previouslyValidatedChecksums.includes(sha) ||
                 knownValidChecksums.checksums.has(sha)
             ) {
+                if (allowedChecksums.includes(sha)) {
+                    core.info("Found allowed Gradle Wrapper JAR file: " + sha)
+                }
+                if (previouslyValidatedChecksums.includes(sha)) {
+                    core.info(`Found previously validated Gradle Wrapper JAR file: ${sha}`)
+                }
+                if(knownValidChecksums.checksums.has(sha)) {
+                    core.info(`Found known valid Gradle Wrapper JAR file: ${sha}`)
+                }
+                
                 result.valid.push(new WrapperJar(wrapperJar, sha))
             } else {
                 notYetValidatedWrappers.push(new WrapperJar(wrapperJar, sha))
@@ -36,6 +48,7 @@ export async function findInvalidWrapperJars(
                 if (!fetchedValidChecksums.checksums.has(wrapperJar.checksum)) {
                     result.invalid.push(wrapperJar)
                 } else {
+                    core.info(`Fall back - Found valid Gradle Wrapper JAR file: ${wrapperJar.checksum}`)
                     result.valid.push(wrapperJar)
                 }
             }

sources/src/wrapper-validation/wrapper-validator.ts

@@ -17,7 +17,9 @@ export async function validateWrappers(
 
     const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || []
     const previouslyValidatedChecksums = checksumCache.load()
-
+    core.info(`gradleUserHome = ${gradleUserHome}`)
+    core.info(`Previously validated checksums loaded from cache: ${previouslyValidatedChecksums.join(', ')}`)
+    
     const result = await findInvalidWrapperJars(
         workspaceRoot,
         config.allowSnapshotWrappers(),

sources/test/init-scripts/build.gradle

@@ -20,7 +20,7 @@ dependencies {
     testImplementation ('io.ratpack:ratpack-groovy-test:1.9.0') {
         exclude group: 'org.codehaus.groovy', module: 'groovy-all'
     }
-    testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.19.2'
+    testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.19.1'
 }
 
 test {

sources/test/init-scripts/settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "4.1"
+    id "com.gradle.develocity" version "4.0.2"
     id "com.gradle.common-custom-user-data-gradle-plugin" version "2.3"
 }
 

sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy

@@ -16,7 +16,7 @@ import java.nio.file.Files
 import java.util.zip.GZIPOutputStream
 
 class BaseInitScriptTest extends Specification {
-    static final String DEVELOCITY_PLUGIN_VERSION = '4.1'
+    static final String DEVELOCITY_PLUGIN_VERSION = '4.0.2'
     static final String CCUD_PLUGIN_VERSION = '2.1'
 
     static final TestGradleVersion GRADLE_3_X = new TestGradleVersion(GradleVersion.version('3.5.1'), 7, 9)

sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy

@@ -248,7 +248,7 @@ task expectFailure {
         when:
         settingsFile.text = """
             plugins {
-                id 'com.gradle.develocity' version '4.1' apply(false)
+                id 'com.gradle.develocity' version '4.0.2' apply(false)
             }
             gradle.settingsEvaluated {
                 apply plugin: 'com.gradle.develocity'