Skip to content

Commit

Permalink
Merge pull request gradle#27065 Replace mentions of 'Gradle Enterpris…
Browse files Browse the repository at this point in the history
…e' with 'Develocity'

<!--- The issue this PR addresses -->
<!-- Fixes #? -->
This PR replaces mentions of Gradle Enterprise with Develocity.

Class names and package names are left as is and should be migrated together with the new version of Develocity Gradle Plugin.

### Context
<!--- Why do you believe many users will benefit from this change? -->
<!--- Link to relevant issues or forum discussions here -->

### Contributor Checklist
- [x] [Review Contribution Guidelines](https://github.com/gradle/gradle/blob/master/CONTRIBUTING.md)
- [x] Make sure that all commits are [signed off](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff) to indicate that you agree to the terms of [Developer Certificate of Origin](https://developercertificate.org/).
- [x] Make sure all contributed code can be distributed under the terms of the [Apache License 2.0](https://github.com/gradle/gradle/blob/master/LICENSE), e.g. the code was written by yourself or the original code is licensed under [a license compatible to Apache License 2.0](https://apache.org/legal/resolved.html).
- [x] Check ["Allow edit from maintainers" option](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) in pull request so that additional changes can be pushed by Gradle team
- [x] Provide integration tests (under `<subproject>/src/integTest`) to verify changes from a user perspective
- [x] Provide unit tests (under `<subproject>/src/test`) to verify logic
- [x] Update User Guide, DSL Reference, and Javadoc for public-facing changes
- [x] Ensure that tests pass sanity check: `./gradlew sanityCheck`
- [x] Ensure that tests pass locally: `./gradlew <changed-subproject>:quickTest`

### Reviewing cheatsheet

Before merging the PR, comments starting with
- ❌ ❓**must** be fixed
- 🤔 💅 **should** be fixed
- 💭 **may** be fixed
- 🎉 celebrate happy things

Co-authored-by: Iurii Ignatko <[email protected]>
  • Loading branch information
bot-gradle and welandaz committed Nov 17, 2023
2 parents 4a51d65 + addc299 commit 3b4b0b0
Show file tree
Hide file tree
Showing 28 changed files with 57 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ platforms/core-execution/build-cache-packaging/ @gradle/bt-execution
platforms/core-execution/hashing/ @gradle/bt-execution @gradle/bt-ge-build-cache
platforms/core-execution/snapshots/ @gradle/bt-execution @gradle/bt-ge-build-cache

# Gradle Enterprise integration
# Develocity integration
platforms/enterprise/ @gradle/bt-build-scan @gradle/ge-build-insights
platforms/enterprise/enterprise/ @gradle/bt-build-scan @gradle/ge-testing @gradle/ge-build-insights @ldaley
platforms/enterprise/enterprise-logging/ @gradle/bt-build-scan @gradle/ge-build-insights @gradle/ge-testing
Expand Down
2 changes: 1 addition & 1 deletion build-logic/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ plugins {
dependencyResolutionManagement {
repositories {
maven {
name = "Gradle Enterprise release candidates"
name = "Develocity release candidates"
url = uri("https://repo.gradle.org/gradle/enterprise-libs-release-candidates")
content {
val rcAndMilestonesPattern = "\\d{1,2}?\\.\\d{1,2}?(\\.\\d{1,2}?)?-((rc-\\d{1,2}?)|(milestone-\\d{1,2}?))"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ class ConfigurationCacheState(
readCachedEnvironmentState(gradle)
readPreviewFlags(gradle)
readFileSystemDefaultExcludes(gradle)
// It is important that the Gradle Enterprise plugin be read before
// It is important that the Develocity plugin be read before
// build cache configuration, as it may contribute build cache configuration.
readGradleEnterprisePluginManager(gradle)
readBuildCacheConfiguration(gradle)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ System_Ext(ide, "IntelliJ IDE", "IDEA or Android Studio with the Kotlin plugin e

System_Ext(kotlinTools, "Kotlin Toolchain", "kotlinc, Gradle plugin etc...")

System_Ext(buildCache, "Gradle Build Cache", "Local, Gradle Enterprise Build Cache Node, etc...")
System_Ext(buildCache, "Gradle Build Cache", "Local, Develocity Build Cache Node, etc...")

Rel(dev, gradle, "Uses", "Command Line")
Rel(gradleKotlinDsl, kotlinTools, "Uses")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ System_Boundary(kotlinTools, "Kotlin Toolchain") {
Rel_Neighbor(kgp, kotlinc, "Uses", "Daemon")
}

System_Ext(buildCache, "Gradle Build Cache", "Local, Gradle Enterprise Build Cache Node, etc...")
System_Ext(buildCache, "Gradle Build Cache", "Local, Develocity Build Cache Node, etc...")

Rel(dev, gradle, "Uses", "Command Line")
Rel(dev, editor, "Uses", "GUI")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Boundary(kotlinTools, "Kotlin Toolchain") {
Rel_Neighbor(kgp, kotlinc, "Uses", "Daemon")
}

System_Ext(buildCache, "Gradle Build Cache", "Local, Gradle Enterprise Build Cache Node, etc...")
System_Ext(buildCache, "Gradle Build Cache", "Local, Develocity Build Cache Node, etc...")

Rel(dev, gradle, "Uses", "Command Line")
Rel(dev, editor, "Uses", "GUI")
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion platforms/enterprise/enterprise-logging/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id("gradlebuild.distribution.api-java")
}

description = "Logging API consumed by the Gradle Enterprise plugin"
description = "Logging API consumed by the Develocity plugin"

gradlebuildJava.usedInWorkers()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id("gradlebuild.publish-public-libraries")
}

description = "Build operations consumed by the Gradle Enterprise plugin"
description = "Build operations consumed by the Develocity plugin"

dependencies {
api(project(":build-operations"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ interface VisitState extends FilePropertyVisitor.VisitState {
/**
* The “primary” attribute of the current property.
* <p>
* Used by Gradle Enterprise plugin &lt; 3.8, retained for backwards compatibility.
* Used by Develocity plugin &lt; 3.8, retained for backwards compatibility.
* <p>
* Returns the name value of one of:
* <ul>
Expand Down Expand Up @@ -194,7 +194,7 @@ interface VisitState extends FilePropertyVisitor.VisitState {
* No null values.
* Never empty.
*
* This is kept for backward compatibility with the Gradle Enterprise Gradle plugin.
* This is kept for backward compatibility with the Develocity Gradle plugin.
*
* @deprecated Always null, since we don't capture inputs when anything is loaded by an unknown classloader.
*/
Expand Down
2 changes: 1 addition & 1 deletion platforms/enterprise/enterprise-workers/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id("gradlebuild.publish-public-libraries")
}

description = "Gradle Enterprise plugin dependencies that also need to be exposed to workers"
description = "Develocity plugin dependencies that also need to be exposed to workers"

gradlebuildJava.usedInWorkers()

Expand Down
2 changes: 1 addition & 1 deletion platforms/enterprise/enterprise/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id("gradlebuild.distribution.api-java")
}

description = "Services and utilities needed by Gradle Enterprise plugin"
description = "Services and utilities needed by Develocity plugin"

dependencies {
api(project(":base-services"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class GradleEnterprisePluginCheckInIntegrationTest extends AbstractIntegrationSp
}

@Requires(IntegTestPreconditions.NotConfigCached)
def "shows warning message when unsupported Gradle Enterprise plugin version is used with configuration caching enabled"() {
def "shows warning message when unsupported Develocity plugin version is used with configuration caching enabled"() {
given:
plugin.runtimeVersion = pluginVersion
plugin.artifactVersion = pluginVersion
Expand All @@ -108,7 +108,7 @@ class GradleEnterprisePluginCheckInIntegrationTest extends AbstractIntegrationSp

when:
if (applied && VersionNumber.parse(pluginVersion) < MINIMUM_SUPPORTED_PLUGIN_VERSION_SINCE_GRADLE_9) {
executer.expectDocumentedDeprecationWarning("Gradle Enterprise plugin $pluginVersion has been deprecated. Starting with Gradle 9.0, only Gradle Enterprise plugin 3.13.1 or newer is supported. Consult the upgrading guide for further information: https://docs.gradle.org/current/userguide/upgrading_version_8.html#unsupported_ge_plugin_3.13")
executer.expectDocumentedDeprecationWarning("Develocity plugin $pluginVersion has been deprecated. Starting with Gradle 9.0, only Develocity plugin 3.13.1 or newer is supported. Consult the upgrading guide for further information: https://docs.gradle.org/current/userguide/upgrading_version_8.html#unsupported_ge_plugin_3.13")
}
succeeds("t", "--configuration-cache")

Expand All @@ -125,7 +125,7 @@ class GradleEnterprisePluginCheckInIntegrationTest extends AbstractIntegrationSp
}

@Requires(value = IntegTestPreconditions.NotConfigCached, reason = "Isolated projects implies config cache")
def "shows warning message when Gradle Enterprise plugin version is used with isolated projects enabled"() {
def "shows warning message when Develocity plugin version is used with isolated projects enabled"() {
given:
plugin.runtimeVersion = pluginVersion
plugin.artifactVersion = pluginVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class BuildScanAutoApplyIntegrationTest extends AbstractIntegrationSpec {

and:
if (!GradleContextualExecuter.configCache && VersionNumber.parse(version) < PLUGIN_MINIMUM_NON_DEPRECATED_VERSION) {
executer.expectDocumentedDeprecationWarning("Gradle Enterprise plugin $version has been deprecated. Starting with Gradle 9.0, only Gradle Enterprise plugin 3.13.1 or newer is supported. Consult the upgrading guide for further information: https://docs.gradle.org/current/userguide/upgrading_version_8.html#unsupported_ge_plugin_3.13")
executer.expectDocumentedDeprecationWarning("Develocity plugin $version has been deprecated. Starting with Gradle 9.0, only Develocity plugin 3.13.1 or newer is supported. Consult the upgrading guide for further information: https://docs.gradle.org/current/userguide/upgrading_version_8.html#unsupported_ge_plugin_3.13")
}

and:
Expand Down Expand Up @@ -154,7 +154,7 @@ class BuildScanAutoApplyIntegrationTest extends AbstractIntegrationSpec {

and:
if (!GradleContextualExecuter.configCache && VersionNumber.parse(version) < PLUGIN_MINIMUM_NON_DEPRECATED_VERSION) {
executer.expectDocumentedDeprecationWarning("Gradle Enterprise plugin $version has been deprecated. Starting with Gradle 9.0, only Gradle Enterprise plugin 3.13.1 or newer is supported. Consult the upgrading guide for further information: https://docs.gradle.org/current/userguide/upgrading_version_8.html#unsupported_ge_plugin_3.13")
executer.expectDocumentedDeprecationWarning("Develocity plugin $version has been deprecated. Starting with Gradle 9.0, only Develocity plugin 3.13.1 or newer is supported. Consult the upgrading guide for further information: https://docs.gradle.org/current/userguide/upgrading_version_8.html#unsupported_ge_plugin_3.13")
}

and:
Expand Down Expand Up @@ -192,7 +192,7 @@ class BuildScanAutoApplyIntegrationTest extends AbstractIntegrationSpec {

and:
if (!GradleContextualExecuter.configCache && VersionNumber.parse(version) < PLUGIN_MINIMUM_NON_DEPRECATED_VERSION) {
executer.expectDocumentedDeprecationWarning("Gradle Enterprise plugin $version has been deprecated. Starting with Gradle 9.0, only Gradle Enterprise plugin 3.13.1 or newer is supported. Consult the upgrading guide for further information: https://docs.gradle.org/current/userguide/upgrading_version_8.html#unsupported_ge_plugin_3.13")
executer.expectDocumentedDeprecationWarning("Develocity plugin $version has been deprecated. Starting with Gradle 9.0, only Develocity plugin 3.13.1 or newer is supported. Consult the upgrading guide for further information: https://docs.gradle.org/current/userguide/upgrading_version_8.html#unsupported_ge_plugin_3.13")
}

and:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class LegacyGradleEnterpriseCheckInConfigCachingIntegTest extends AbstractIntegr
succeeds "t", "--configuration-cache"

then:
scanPlugin.assertUnsupportedMessage(output, "Build scans have been disabled due to incompatibility between your Gradle Enterprise plugin version (3.3.4) and configuration caching. Please use Gradle Enterprise plugin version 3.4 or later for compatibility with configuration caching.")
scanPlugin.assertUnsupportedMessage(output, "Build scans have been disabled due to incompatibility between your Develocity plugin version (3.3.4) and configuration caching. Please use Develocity plugin version 3.4 or later for compatibility with configuration caching.")
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ public DefaultGradleEnterprisePluginCheckInService(
public static final String UNSUPPORTED_TOGGLE = "org.gradle.internal.unsupported-enterprise-plugin";
public static final String UNSUPPORTED_TOGGLE_MESSAGE = "Enterprise plugin unsupported due to secret toggle";

// For Gradle versions 8+, configuration caching builds are not compatible with Gradle Enterprise plugin < 3.12
// For Gradle versions 8+, configuration caching builds are not compatible with Develocity plugin < 3.12
public static final VersionNumber MINIMUM_SUPPORTED_PLUGIN_VERSION_FOR_CONFIGURATION_CACHING = VersionNumber.version(3, 12);
public static final String UNSUPPORTED_PLUGIN_DUE_TO_CONFIGURATION_CACHING_MESSAGE = String.format("Gradle Enterprise plugin has been disabled as it is " +
"incompatible with this version of Gradle and the configuration caching feature - please upgrade to version %s.%s or later of the Gradle Enterprise plugin to restore functionality.",
public static final String UNSUPPORTED_PLUGIN_DUE_TO_CONFIGURATION_CACHING_MESSAGE = String.format("Develocity plugin has been disabled as it is " +
"incompatible with this version of Gradle and the configuration caching feature - please upgrade to version %s.%s or later of the Develocity plugin to restore functionality.",
MINIMUM_SUPPORTED_PLUGIN_VERSION_FOR_CONFIGURATION_CACHING.getMajor(),
MINIMUM_SUPPORTED_PLUGIN_VERSION_FOR_CONFIGURATION_CACHING.getMinor());

public static final VersionNumber MINIMUM_SUPPORTED_PLUGIN_VERSION_FOR_ISOLATED_PROJECTS = VersionNumber.version(3, 15);
public static final String UNSUPPORTED_PLUGIN_DUE_TO_ISOLATED_PROJECTS_MESSAGE = "Gradle Enterprise plugin has been disabled as it is incompatible with isolated projects feature";
public static final String UNSUPPORTED_PLUGIN_DUE_TO_ISOLATED_PROJECTS_MESSAGE = "Develocity plugin has been disabled as it is incompatible with isolated projects feature";

// Gradle versions 9+ are not compatible Gradle Enterprise plugin < 3.13.1
// Gradle versions 9+ are not compatible Develocity plugin < 3.13.1
public static final VersionNumber MINIMUM_SUPPORTED_PLUGIN_VERSION_SINCE_GRADLE_9 = VersionNumber.parse("3.13.1");

private static final String DISABLE_TEST_ACCELERATION_PROPERTY = "gradle.internal.testacceleration.disableImplicitApplication";
Expand Down Expand Up @@ -133,8 +133,8 @@ private static boolean isDeprecatedPluginVersion(VersionNumber pluginBaseVersion
}

private static void nagAboutDeprecatedPluginVersion(String pluginVersion) {
DeprecationLogger.deprecateIndirectUsage("Gradle Enterprise plugin " + pluginVersion)
.startingWithGradle9(String.format("only Gradle Enterprise plugin %s.%s.%s or newer is supported",
DeprecationLogger.deprecateIndirectUsage("Develocity plugin " + pluginVersion)
.startingWithGradle9(String.format("only Develocity plugin %s.%s.%s or newer is supported",
MINIMUM_SUPPORTED_PLUGIN_VERSION_SINCE_GRADLE_9.getMajor(),
MINIMUM_SUPPORTED_PLUGIN_VERSION_SINCE_GRADLE_9.getMinor(),
MINIMUM_SUPPORTED_PLUGIN_VERSION_SINCE_GRADLE_9.getMicro()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ private String unsupportedReason(VersionNumber pluginVersion) {
if (Boolean.getBoolean(UNSUPPORTED_TOGGLE)) {
return UNSUPPORTED_TOGGLE_MESSAGE;
} else if (buildModelParameters.isConfigurationCache()) {
return "Build scans have been disabled due to incompatibility between your Gradle Enterprise plugin version (" + pluginVersion.toString() + ") and configuration caching. " +
"Please use Gradle Enterprise plugin version 3.4 or later for compatibility with configuration caching.";
return "Build scans have been disabled due to incompatibility between your Develocity plugin version (" + pluginVersion.toString() + ") and configuration caching. " +
"Please use Develocity plugin version 3.4 or later for compatibility with configuration caching.";
} else {
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ public TransformStepSubject calculateValue(NodeExecutionContext context) {

protected abstract class TransformStepBuildOperation implements CallableBuildOperation<TransformStepSubject> {

@UsedByScanPlugin("The string is used for filtering out artifact transform logs in Gradle Enterprise")
@UsedByScanPlugin("The string is used for filtering out artifact transform logs in Develocity")
private static final String TRANSFORMING_PROGRESS_PREFIX = "Transforming ";

@Override
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ platform("jvm") {
subproject("war")
}

// Gradle Enterprise Platform
// Develocity Platform
platform("enterprise") {
subproject("enterprise")
subproject("enterprise-logging")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.gradle.api.NonNullApi;

/**
* Gradle Enterprise specific extensions of {@link TaskOutputsInternal}.
* Develocity specific extensions of {@link TaskOutputsInternal}.
* <p>
* This class exists to hide these additional methods from the public API since {@link DefaultTask#getOutputs()}
* returns {@link TaskOutputsInternal} rather than {@link org.gradle.api.tasks.TaskOutputs}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ private DefaultModuleRegistry(ClassLoader classLoader, ClassPath additionalModul
/**
* Determines the name without version when the JAR may have been replaced on the classpath.
* <p>
* The Test Acceleration plugins from Gradle Enterprise replace some JUnit platform JARS on the test classpath.
* The Test Acceleration plugins from Develocity replace some JUnit platform JARS on the test classpath.
* Gradle's testing modules need the original JARs with a possible different version.
* When loading the dependencies from the classpath, this may cause a problem.
* Note that this happens only in integration tests in the Gradle codebase.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.gradle.plugin.use.internal.DefaultPluginId;

/**
* Auto-applied Gradle Enterprise plugin information.
* Auto-applied Develocity plugin information.
*
* Required by the {@code kotlin-dsl} module.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class DefaultModuleRegistryTest extends Specification {
module.runtimeClasspath.asFiles == [runtimeDep]
}

def "locates dependency #dependency replaced by Gradle Enterprise plugin to #actualDependencyOnClasspath in classpath"() {
def "locates dependency #dependency replaced by Develocity plugin to #actualDependencyOnClasspath in classpath"() {
given:
def dependencyJar = tmpDir.createFile("external/${actualDependencyOnClasspath}.jar")
def moduleDir = createModule("my-testing", properties(runtime: "${dependency}.jar".toString()))
Expand All @@ -193,7 +193,7 @@ class DefaultModuleRegistryTest extends Specification {
'opentest4j-1.2.27' | 'opentest4j-1.3.38'
}

def "does not locate dependency replaced by Gradle Enterprise plugin in classpath when installation is present"() {
def "does not locate dependency replaced by Develocity plugin in classpath when installation is present"() {
given:
def dependencyJar = tmpDir.createFile("external/junit-platform-commons-1.9.9.jar")
def moduleDir = createModule("my-testing", properties(runtime: 'junit-platform-commons-1.8.3.jar'))
Expand All @@ -206,7 +206,7 @@ class DefaultModuleRegistryTest extends Specification {
e.message.startsWith("Cannot find JAR 'junit-platform-commons-1.8.3.jar' required by module 'gradle-my-testing' using classpath")
}

def "does not locate dependency not replaced by Gradle Enterprise plugin in classpath"() {
def "does not locate dependency not replaced by Develocity plugin in classpath"() {
given:
def dependencyJar = tmpDir.createFile("external/junit-platform-basics-1.9.9.jar")
def moduleDir = createModule("my-testing", properties(runtime: 'junit-platform-basics-1.8.3.jar'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import org.gradle.plugin.management.internal.autoapply.AutoAppliedGradleEnterpri
import static org.gradle.plugin.management.internal.autoapply.AutoAppliedGradleEnterprisePlugin.VERSION

/**
* Applies the Gradle Enterprise plugin via the `settings.gradle` script.
* Applies the Develocity plugin via the `settings.gradle` script.
*/
class ApplyGradleEnterprisePluginFixture {
private static final String APPLY_ENTERPRISE_PLUGIN = """plugins {
Expand Down
2 changes: 1 addition & 1 deletion subprojects/precondition-tester/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Gradle / precondition Tester

This project collections information about where test preconditions can be satisfied.
We can use this information (i.e. by looking at the test results in Gradle Enterprise) to see if we have any preconditions or combinations of preconditions, which are never satisfied &ndash; a situation which we otherwise would hardly notice.
We can use this information (i.e. by looking at the test results in Develocity) to see if we have any preconditions or combinations of preconditions, which are never satisfied &ndash; a situation which we otherwise would hardly notice.

This project originates from a discussion about the [@Requires](https://github.com/gradle/gradle/blob/94ebe9eca6b9baf8c53a6033009298ec671de812/subprojects/internal-testing/src/main/groovy/org/gradle/util/Requires.java), which can define preconditions for tests.

Expand Down
Loading

0 comments on commit 3b4b0b0

Please sign in to comment.