From 5c3398a7c1320cac7ade2cc986019462f2465a02 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Tue, 2 Jan 2024 15:05:15 +0100 Subject: [PATCH] Replace `DV ` with `Develocity ` --- .../gradle-data-capturing-samples-verification.yml | 2 +- .../maven-data-capturing-samples-verification.yml | 4 ++-- build-data-capturing-gradle-samples/README.md | 2 +- .../gradle-develocity-plugin-version.gradle | 2 +- .../gradle-develocity-plugin-version.gradle.kts | 2 +- build-data-capturing-maven-samples/README.md | 2 +- .../maven-develocity-extension-version.groovy | 2 +- .../settings.gradle | 2 +- .../settings.gradle.kts | 4 ++-- .../.mvn/gradle-enterprise.xml | 2 +- common-develocity-sbt-configuration/build.sbt | 2 +- convention-develocity-gradle-plugin/README.md | 8 ++++---- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/gradle-data-capturing-samples-verification.yml b/.github/workflows/gradle-data-capturing-samples-verification.yml index 11d67d9c9..0ef2c69af 100644 --- a/.github/workflows/gradle-data-capturing-samples-verification.yml +++ b/.github/workflows/gradle-data-capturing-samples-verification.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: include: - - name: 'DV Gradle plugin version' + - name: 'Develocity Gradle plugin version' sample-file: 'capture-develocity-plugin-version/gradle-develocity-plugin-version.gradle' - name: 'Git diffs' sample-file: 'capture-git-diffs/gradle-git-diffs.gradle' diff --git a/.github/workflows/maven-data-capturing-samples-verification.yml b/.github/workflows/maven-data-capturing-samples-verification.yml index f896f677f..73afb771b 100644 --- a/.github/workflows/maven-data-capturing-samples-verification.yml +++ b/.github/workflows/maven-data-capturing-samples-verification.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: include: - - name: 'DV Maven extension version' + - name: 'Develocity Maven extension version' sample-file: 'capture-develocity-extension-version/maven-develocity-extension-version.groovy' - name: 'OS processes' sample-file: 'capture-os-processes/maven-os-processes.groovy' @@ -41,7 +41,7 @@ jobs: distribution: 'temurin' - name: Provide data capture script to Maven build run: | - # copy over sample script such that it gets pulled in by the DV extension + # copy over sample script such that it gets pulled in by the Develocity extension cp build-data-capturing-maven-samples/${{ matrix.sample-file }} common-develocity-maven-configuration/.mvn/develocity-custom-user-data.groovy - name: Run Maven build id: mvn-build diff --git a/build-data-capturing-gradle-samples/README.md b/build-data-capturing-gradle-samples/README.md index 9a139bc32..5c93bd2ef 100644 --- a/build-data-capturing-gradle-samples/README.md +++ b/build-data-capturing-gradle-samples/README.md @@ -26,7 +26,7 @@ tags, links, and custom values. To learn more, see the Develocity documentation on [Extending build scans](https://docs.gradle.com/enterprise/gradle-plugin/#extending_build_scans). -### Capture DV Plugin Version +### Capture Develocity Plugin Version _Demonstrates: Custom values_ diff --git a/build-data-capturing-gradle-samples/capture-develocity-plugin-version/gradle-develocity-plugin-version.gradle b/build-data-capturing-gradle-samples/capture-develocity-plugin-version/gradle-develocity-plugin-version.gradle index db04407aa..b4bd6e881 100644 --- a/build-data-capturing-gradle-samples/capture-develocity-plugin-version/gradle-develocity-plugin-version.gradle +++ b/build-data-capturing-gradle-samples/capture-develocity-plugin-version/gradle-develocity-plugin-version.gradle @@ -9,5 +9,5 @@ if (!buildScanApi) { URL url = buildScanApi.class.classLoader.getResource("com.gradle.scan.plugin.internal.meta.buildAgentVersion.txt") String buildAgentVersion = url.text -buildScan.value("DV Gradle plugin version", buildAgentVersion) +buildScan.value("Develocity Gradle plugin version", buildAgentVersion) diff --git a/build-data-capturing-gradle-samples/capture-develocity-plugin-version/gradle-develocity-plugin-version.gradle.kts b/build-data-capturing-gradle-samples/capture-develocity-plugin-version/gradle-develocity-plugin-version.gradle.kts index deec5fe6e..cd3056775 100644 --- a/build-data-capturing-gradle-samples/capture-develocity-plugin-version/gradle-develocity-plugin-version.gradle.kts +++ b/build-data-capturing-gradle-samples/capture-develocity-plugin-version/gradle-develocity-plugin-version.gradle.kts @@ -8,7 +8,7 @@ project.extensions.configure() { buildScan { val url = GradleEnterpriseExtension::class.java.classLoader.getResource("com.gradle.scan.plugin.internal.meta.buildAgentVersion.txt") val buildAgentVersion = url.readText() - value("DV Gradle plugin version", buildAgentVersion) + value("Develocity Gradle plugin version", buildAgentVersion) } } diff --git a/build-data-capturing-maven-samples/README.md b/build-data-capturing-maven-samples/README.md index 0d44ecce8..d66fe4d0c 100644 --- a/build-data-capturing-maven-samples/README.md +++ b/build-data-capturing-maven-samples/README.md @@ -16,7 +16,7 @@ tags, links, and custom values. To learn more, see the Develocity documentation on [Extending build scans](https://docs.gradle.com/enterprise/maven-extension/#extending_build_scans). -### Capture DV Extension Version +### Capture Develocity Extension Version _Demonstrates: Custom values_ diff --git a/build-data-capturing-maven-samples/capture-develocity-extension-version/maven-develocity-extension-version.groovy b/build-data-capturing-maven-samples/capture-develocity-extension-version/maven-develocity-extension-version.groovy index 81d8e32fa..3daeae2e6 100644 --- a/build-data-capturing-maven-samples/capture-develocity-extension-version/maven-develocity-extension-version.groovy +++ b/build-data-capturing-maven-samples/capture-develocity-extension-version/maven-develocity-extension-version.groovy @@ -4,4 +4,4 @@ URL url = buildScan.class.classLoader.getResource("com.gradle.scan.plugin.internal.meta.buildAgentVersion.txt") String buildAgentVersion = url.text -buildScan.value("DV Maven extension version", buildAgentVersion) +buildScan.value("Develocity Maven extension version", buildAgentVersion) diff --git a/common-develocity-gradle-configuration-groovy/settings.gradle b/common-develocity-gradle-configuration-groovy/settings.gradle index 433c92980..8428c2a6e 100644 --- a/common-develocity-gradle-configuration-groovy/settings.gradle +++ b/common-develocity-gradle-configuration-groovy/settings.gradle @@ -6,7 +6,7 @@ plugins { def isCI = System.getenv('CI') != null // adjust to your CI provider gradleEnterprise { - server = 'https://enterprise-samples.gradle.com' // adjust to your DV server + server = 'https://enterprise-samples.gradle.com' // adjust to your Develocity server allowUntrustedServer = false // ensure a trusted certificate is configured buildScan { diff --git a/common-develocity-gradle-configuration-kotlin/settings.gradle.kts b/common-develocity-gradle-configuration-kotlin/settings.gradle.kts index daedf9d7e..c1d7d8db1 100644 --- a/common-develocity-gradle-configuration-kotlin/settings.gradle.kts +++ b/common-develocity-gradle-configuration-kotlin/settings.gradle.kts @@ -6,7 +6,7 @@ plugins { val isCI = !System.getenv("CI").isNullOrEmpty() // adjust to your CI provider gradleEnterprise { - server = "https://enterprise-samples.gradle.com" // adjust to your DV server + server = "https://enterprise-samples.gradle.com" // adjust to your Develocity server allowUntrustedServer = false // ensure a trusted certificate is configured buildScan { @@ -32,7 +32,7 @@ buildCache { // This is available in all Develocity and Develocity Plugin versions. /** remote(HttpBuildCache::class) { - url = uri("https://enterprise-samples.gradle.com/cache/") // adjust to your DV server, and note the trailing slash + url = uri("https://enterprise-samples.gradle.com/cache/") // adjust to your Develocity server, and note the trailing slash isAllowUntrustedServer = false // ensure a trusted certificate is configured credentials { username = System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME") diff --git a/common-develocity-maven-configuration/.mvn/gradle-enterprise.xml b/common-develocity-maven-configuration/.mvn/gradle-enterprise.xml index bbe9c4519..64ac95ac7 100644 --- a/common-develocity-maven-configuration/.mvn/gradle-enterprise.xml +++ b/common-develocity-maven-configuration/.mvn/gradle-enterprise.xml @@ -19,7 +19,7 @@ xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd"> - https://enterprise-samples.gradle.com + https://enterprise-samples.gradle.com false diff --git a/common-develocity-sbt-configuration/build.sbt b/common-develocity-sbt-configuration/build.sbt index ef5ab2870..edf24301b 100644 --- a/common-develocity-sbt-configuration/build.sbt +++ b/common-develocity-sbt-configuration/build.sbt @@ -4,7 +4,7 @@ Global / gradleEnterpriseConfiguration := GradleEnterpriseConfiguration( server = Server( - url = Some(url("https://enterprise-samples.gradle.com")), // adjust to your DV server + url = Some(url("https://enterprise-samples.gradle.com")), // adjust to your Develocity server allowUntrusted = false), // ensure a trusted certificate is configured buildScan = BuildScan( publishConfig = PublishConfig.Always, diff --git a/convention-develocity-gradle-plugin/README.md b/convention-develocity-gradle-plugin/README.md index df0af8ee0..07c98e6d4 100644 --- a/convention-develocity-gradle-plugin/README.md +++ b/convention-develocity-gradle-plugin/README.md @@ -12,10 +12,10 @@ This project is structured as follows: * `gradle-2-through-4` - Applies and configures the Build Scan plugin on builds using Gradle 2.0 through Gradle 4.10.3 * `gradle-5-or-newer` - Applies and configures the Develocity plugin on builds using Gradle 5.0 or higher * `examples` - Contains example builds that apply the convention plugin for different Gradle versions - * `gradle_2.0` - Applies the convention plugin on a Gradle 2.0 build (only the DV plugin is applied) - * `gradle_4.1` - Applies the convention plugin on a Gradle 4.1 build (the DV and CCUD plugins are applied) - * `gradle_5.1.1` - Applies the convention plugin on a Gradle 5 build (the DV and CCUD plugins are applied) - * `gradle_6.0.1` - Applies the convention plugin on a Gradle 6+ build (the DV and CCUD plugins are applied) + * `gradle_2.0` - Applies the convention plugin on a Gradle 2.0 build (only the Develocity plugin is applied) + * `gradle_4.1` - Applies the convention plugin on a Gradle 4.1 build (the Develocity and CCUD plugins are applied) + * `gradle_5.1.1` - Applies the convention plugin on a Gradle 5 build (the Develocity and CCUD plugins are applied) + * `gradle_6.0.1` - Applies the convention plugin on a Gradle 6+ build (the Develocity and CCUD plugins are applied) ### Running the example builds