Replace ocurrences of Gradle Enterprise with Develocity

Author: erichaagdev

Diff for: Gradle.md

@@ -109,13 +109,13 @@ To get the most out of the experiments and also when building with Develocity du
 
 You can find a complete example of how to apply the Common Custom User Data Gradle plugin to your build [here](https://github.com/gradle/develocity-build-config-samples/tree/main/common-develocity-gradle-configuration-groovy/settings.gradle) for Groovy DSL and [here](https://github.com/gradle/develocity-build-config-samples/blob/main/common-develocity-gradle-configuration-kotlin/settings.gradle.kts) for Kotlin DSL.
 
-## Authenticating with Gradle Enterprise
+## Authenticating with Develocity
 
-Some scripts fetch data from build scans that were published as part of running an experiment. The build scan data is fetched by leveraging the [Develocity API](https://docs.gradle.com/enterprise/api-manual/). It is not strictly necessary that you have permission to call these APIs to execute a script successfully, but the summary provided once the script has finished running its experiment will be more comprehensive if the build scan data is accessible.
+Some scripts fetch data from build scans that were published as part of running an experiment. The build scan data is fetched by leveraging the [Develocity API](https://docs.gradle.com/develocity/api-manual/). It is not strictly necessary that you have permission to call these APIs to execute a script successfully, but the summary provided once the script has finished running its experiment will be more comprehensive if the build scan data is accessible.
 
-You can check your granted permissions by navigating in the browser to the 'My Settings' section from the user menu of your Develocity UI. You need the 'Access build data via the API' permission. Additionally, the script needs an access key to authenticate with the APIs. See [Authenticating with Develocity](https://docs.gradle.com/enterprise/gradle-plugin/#authenticating) for details on how to create an access key and storing it locally.
+You can check your granted permissions by navigating in the browser to the 'My Settings' section from the user menu of your Develocity UI. You need the 'Access build data via the API' permission. Additionally, the script needs an access key to authenticate with the APIs. See [Authenticating with Develocity](https://docs.gradle.com/develocity/gradle-plugin/current/#authenticating) for details on how to create an access key and storing it locally.
 
-By default, the scripts fetching build scan data try to find the access key in the `enterprise/keys.properties` file within the Gradle user home directory (`~/.gradle` by default). Alternatively, the access key can be specified via the `GRADLE_ENTERPRISE_ACCESS_KEY` environment variable. You can also authenticate with the APIs using username and password instead by setting the `GRADLE_ENTERPRISE_USERNAME` and `GRADLE_ENTERPRISE_PASSWORD` environment variables.
+By default, the scripts fetching build scan data try to find the access key in the `develocity/keys.properties` file within the Gradle user home directory (`~/.gradle` by default). Alternatively, the access key can be specified via the `DEVELOCITY_ACCESS_KEY` environment variable. You can also authenticate with the APIs using username and password instead by setting the `DEVELOCITY_USERNAME` and `DEVELOCITY_PASSWORD` environment variables.
 
 ## Configuring the network settings to connect to Develocity
 
@@ -140,7 +140,7 @@ The scripts that fetch build scan data expect some of it to be present as custom
 ## Redirecting build scan publishing
 
 The scripts that run one or more builds locally can be configured to publish build scans to a different
-Develocity server than the one that the builds point to by passing the `-s` or `--gradle-enterprise-server`
+Develocity server than the one that the builds point to by passing the `-s` or `--develocity-server`
 command line argument. In the example below, the script will configure the local builds to publish their build scans
 to develocity.example.io regardless of what server is configured in the build.
 
@@ -151,7 +151,7 @@ to develocity.example.io regardless of what server is configured in the build.
 ## Instrumenting the build with Develocity
 
 The scripts that run one or more builds locally can be configured to connect the builds to a given Develocity
-server in case the builds are not already connected to Develocity by passing the `-e` or `--enable-gradle-enterprise`
+server in case the builds are not already connected to Develocity by passing the `-e` or `--enable-develocity`
 command line argument. In the example below, the script will configure the non-instrumented builds to connect to the
 Develocity server at develocity.example.io.
 

Diff for: Maven.md

@@ -107,13 +107,13 @@ To get the most out of the experiments and also when building with Develocity du
 
 You can find a complete example of how to apply the Common Custom User Data Maven extension to your build [here](https://github.com/gradle/develocity-build-config-samples/blob/main/common-develocity-maven-configuration/.mvn/extensions.xml).
 
-## Authenticating with Gradle Enterprise
+## Authenticating with Develocity
 
-Some scripts fetch data from build scans that were published as part of running an experiment. The build scan data is fetched by leveraging the [Develocity API](https://docs.gradle.com/enterprise/api-manual/). It is not strictly necessary that you have permission to call these APIs to execute a script successfully, but the summary provided once the script has finished running its experiment will be more comprehensive if the build scan data is accessible.
+Some scripts fetch data from build scans that were published as part of running an experiment. The build scan data is fetched by leveraging the [Develocity API](https://docs.gradle.com/develocity/api-manual/). It is not strictly necessary that you have permission to call these APIs to execute a script successfully, but the summary provided once the script has finished running its experiment will be more comprehensive if the build scan data is accessible.
 
-You can check your granted permissions by navigating in the browser to the 'My Settings' section from the user menu of your Develocity UI. You need the 'Access build data via the API' permission. Additionally, the script needs an access key to authenticate with the APIs. See [Authenticating with Develocity](https://docs.gradle.com/enterprise/maven-extension/#authenticating_with_gradle_enterprise) for details on how to create an access key and storing it locally.
+You can check your granted permissions by navigating in the browser to the 'My Settings' section from the user menu of your Develocity UI. You need the 'Access build data via the API' permission. Additionally, the script needs an access key to authenticate with the APIs. See [Authenticating with Develocity](https://docs.gradle.com/develocity/maven-extension/current/#authenticating_with_develocity) for details on how to create an access key and storing it locally.
 
-By default, the scripts fetching build scan data try to find the access key in the `enterprise/keys.properties` file within the Gradle user home directory (`~/.gradle` by default). Alternatively, the access key can be specified via the `GRADLE_ENTERPRISE_ACCESS_KEY` environment variable. You can also authenticate with the APIs using username and password instead by setting the `GRADLE_ENTERPRISE_USERNAME` and `GRADLE_ENTERPRISE_PASSWORD` environment variables.
+By default, the scripts fetching build scan data try to find the access key in the `.m2/.develocity/keys.properties` file within the user's home directory. Alternatively, the access key can be specified via the `DEVELOCITY_ACCESS_KEY` environment variable. You can also authenticate with the APIs using username and password instead by setting the `DEVELOCITY_USERNAME` and `DEVELOCITY_PASSWORD` environment variables.
 
 ## Configuring the network settings to connect to Develocity
 
@@ -138,7 +138,7 @@ The scripts that fetch build scan data expect some of it to be present as custom
 ## Redirecting build scan publishing
 
 The scripts that run one or more builds locally can be configured to publish build scans to a different
-Develocity server than the one that the builds point to by passing the `-s` or `--gradle-enterprise-server`
+Develocity server than the one that the builds point to by passing the `-s` or `--develocity-server`
 command line argument. In the example below, the script will configure the local builds to publish their build scans
 to develocity.example.io regardless of what server is configured in the build.
 
@@ -149,7 +149,7 @@ to develocity.example.io regardless of what server is configured in the build.
 ## Instrumenting the build with Develocity
 
 The scripts that run one or more builds locally can be configured to connect the builds to a given Develocity
-server in case the builds are not already connected to Develocity by passing the `-e` or `--enable-gradle-enterprise`
+server in case the builds are not already connected to Develocity by passing the `-e` or `--enable-develocity`
 command line argument. In the example below, the script will configure the non-instrumented builds to connect to the
 Develocity server at develocity.example.io.
 

Diff for: components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureDevelocityAdaptor.java

@@ -58,7 +58,7 @@ private static void registerBuildScanActions(BuildScanApiAdapter buildScan, Stri
             if (buildScan.getServer() == null && !omitServerUrlValidation) {
                 buildScan.publishAlwaysIf(false); // disable publishing, otherwise scans.gradle.com will be used
                 File errorFile = new File(EXPERIMENT_DIR, "errors.txt");
-                append(errorFile, "The Gradle Enterprise server URL has not been configured in the project or on the command line.");
+                append(errorFile, "The Develocity server URL has not been configured in the project or on the command line.");
             }
         });
 

Diff for: components/scripts/README.md

@@ -1,8 +1,8 @@
-Gradle Enterprise Build Validation Scripts
+Develocity Build Validation Scripts
 ==========================================
 
 Details and instructions on how to use the build validation scripts can be found here:
 https://github.com/gradle/gradle-enterprise-build-validation-scripts
 
-The Gradle Enterprise Build Validation scripts are open-source software released under the Apache 2.0 License:
+The Develocity Build Validation scripts are open-source software released under the Apache 2.0 License:
 https://www.apache.org/licenses/LICENSE-2.0.html

Diff for: components/scripts/gradle/01-validate-incremental-building.sh

@@ -263,7 +263,7 @@ $(print_separator)
 ${HEADER_COLOR}Measure build results${RESTORE}
 
 Now that the second build has finished successfully, you are ready to measure
-in Gradle Enterprise how well your build leverages Gradle’s incremental build
+in Develocity how well your build leverages Gradle’s incremental build
 functionality for the invoked set of Gradle tasks.
 
 Some of the build scan data will be fetched from the build scans produced by

Diff for: components/scripts/gradle/02-validate-local-build-caching-same-location.sh

@@ -241,7 +241,7 @@ $(print_separator)
 ${HEADER_COLOR}Measure build results${RESTORE}
 
 Now that the second build has finished successfully, you are ready to measure in
-Gradle Enterprise how well your build leverages Gradle’s local build caching
+Develocity how well your build leverages Gradle’s local build caching
 functionality for the invoked set of Gradle tasks.
 
 Some of the build scan data will be fetched from the build scans produced by the

Diff for: components/scripts/gradle/03-validate-local-build-caching-different-locations.sh

@@ -278,7 +278,7 @@ $(print_separator)
 ${HEADER_COLOR}Measure build results${RESTORE}
 
 Now that the second build has finished successfully, you are ready to measure in
-Gradle Enterprise how well your build leverages Gradle’s local build caching
+Develocity how well your build leverages Gradle’s local build caching
 functionality for the invoked set of Gradle tasks.
 
 Some of the build scan data will be fetched from the build scans produced by the

Diff for: components/scripts/gradle/04-validate-remote-build-caching-ci-ci.sh

@@ -242,8 +242,8 @@ Now that the second build has finished successfully, some of the build scan
 data will be fetched from the two provided build scans to assist you in your
 investigation.
 
-The build scan data will be fetched via the Gradle Enterprise API, as explained
-earlier in the preparations section of this experiment.
+The build scan data will be fetched via the Develocity API, as explained earlier
+in the preparations section of this experiment.
 
 Some of the fetched build scan data is expected to be present as custom values.
 By default, this experiment assumes that these custom values have been created
@@ -262,9 +262,9 @@ explain_measure_build_results() {
 $(print_separator)
 ${HEADER_COLOR}Measure build results${RESTORE}
 
-At this point, you are ready to measure in Gradle Enterprise how well your
-build leverages Gradle’s remote build cache for the set of Gradle tasks invoked
-from two different CI agents.
+At this point, you are ready to measure in Develocity how well your build
+leverages Gradle’s remote build cache for the set of Gradle tasks invoked from
+two different CI agents.
 
 ${USER_ACTION_COLOR}Press <Enter> to measure the build results.${RESTORE}
 EOF

Diff for: components/scripts/gradle/05-validate-remote-build-caching-ci-local.sh

@@ -149,7 +149,7 @@ validate_required_args() {
   fi
 
   if [[ "${enable_ge}" == "on" && -z "${ge_server}" ]]; then
-    _PRINT_HELP=yes die "ERROR: Missing required argument when enabling Gradle Enterprise on a project not already connected: --gradle-enterprise-server" "${INVALID_INPUT}"
+    _PRINT_HELP=yes die "ERROR: Missing required argument when enabling Develocity on a project not already connected: --develocity-server" "${INVALID_INPUT}"
   fi
 }
 
@@ -309,8 +309,8 @@ Now that the build on CI has finished successfully, some of the build scan
 data will be fetched from the provided build scan to assist you in your
 investigation.
 
-The build scan data will be fetched via the Gradle Enterprise API, as explained
-earlier in the preparations section of this experiment.
+The build scan data will be fetched via the Develocity API, as explained earlier
+in the preparations section of this experiment.
 
 Some of the fetched build scan data is expected to be present as custom values.
 By default, this experiment assumes that these custom values have been created
@@ -415,9 +415,9 @@ explain_measure_build_results() {
 $(print_separator)
 ${HEADER_COLOR}Measure build results${RESTORE}
 
-At this point, you are ready to measure in Gradle Enterprise how well your
-build leverages Gradle’s remote build cache for the set of Gradle tasks invoked
-from a CI agent and then on a local machine.
+At this point, you are ready to measure in Develocity how well your build
+leverages Gradle’s remote build cache for the set of Gradle tasks invoked from a
+CI agent and then on a local machine.
 
 Some of the build scan data will be fetched from the build scans produced by the
 two builds to assist you in your investigation.

Diff for: components/scripts/gradle/gradle-init-scripts/configure-build-validation.gradle

@@ -70,7 +70,7 @@ def failMissingDevelocityServerURL = { def docs ->
     errorFile.text = 'The Develocity server URL has not been configured in the project or on the command line.'
     throw new IllegalStateException("The Develocity server URL is not configured.\n"
             + "Either configure it directly (see $docs) in the project,\n"
-            + "or use --gradle-enterprise-server when running the build validation script.")
+            + "or use --develocity-server when running the build validation script.")
 }
 
 // fail if a plugin is not applied
@@ -79,7 +79,7 @@ def failMissingPlugin = { def plugin, docs ->
     errorFile.text = "The $plugin plugin is missing from the project."
     throw new IllegalStateException("The $plugin plugin is missing from the project.\n" +
             "Either apply it directly (see $docs),\n" +
-            "or use --enable-gradle-enterprise when running the build validation script.")
+            "or use --enable-develocity when running the build validation script.")
 }
 
 // do not fail if the CCUD plugin is not applied but surface a warning

Diff for: components/scripts/lib/config.sh

@@ -97,7 +97,7 @@ validate_required_args() {
   fi
 
   if [[ "${enable_ge}" == "on" && -z "${ge_server}" ]]; then
-    _PRINT_HELP=yes die "ERROR: Missing required argument when enabling Gradle Enterprise on a project not already connected: --gradle-enterprise-server" "${INVALID_INPUT}"
+    _PRINT_HELP=yes die "ERROR: Missing required argument when enabling Develocity on a project not already connected: --develocity-server" "${INVALID_INPUT}"
   fi
 }