diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index 0353d810..e1d6eae5 100644 --- a/.github/workflows/build-and-deploy-snapshot.yml +++ b/.github/workflows/build-and-deploy-snapshot.yml @@ -31,8 +31,6 @@ jobs: env: GRADLE_ENTERPRISE_URL: 'https://ge.spring.io' GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} run: ./gradlew -PdeploymentRepository=$(pwd)/distribution-repository build publishAllPublicationsToDeploymentRepository - name: Deploy uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dffa49e7..53d4fa27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,6 +46,4 @@ jobs: env: GRADLE_ENTERPRISE_URL: 'https://ge.spring.io' GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} run: ./gradlew build diff --git a/settings.gradle b/settings.gradle index 2d7381ae..051b9561 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,6 +2,7 @@ pluginManagement { repositories { mavenCentral() gradlePluginPortal() + maven { url 'https://repo.spring.io/snapshot' } } resolutionStrategy { eachPlugin { @@ -13,14 +14,14 @@ pluginManagement { } plugins { - id "com.gradle.enterprise" version "3.15.1" - id "io.spring.ge.conventions" version "0.0.16" + id "com.gradle.develocity" version "3.17.2" + id "io.spring.ge.conventions" version "0.0.17-SNAPSHOT" } rootProject.name = "spring-restdocs" settings.gradle.projectsLoaded { - gradleEnterprise { + develocity { buildScan { settings.gradle.rootProject.getBuildDir().mkdirs() new File(settings.gradle.rootProject.getBuildDir(), "build-scan-uri.txt").text = "build scan not generated"