diff --git a/README.adoc b/README.adoc index 60a78cf9..2e83f4a5 100644 --- a/README.adoc +++ b/README.adoc @@ -12,10 +12,10 @@ image:https://img.shields.io/jenkins/plugin/i/gradle.svg?color=blue[Jenkins Plug This plugin adds http://www.gradle.org/[Gradle] Support to Jenkins. http://www.gradle.org/[Gradle] is managed as another tool inside Jenkins (the same way as Ant or Maven), including support for automatic installation and a new build step is provided to execute Gradle tasks. -It also allows detecting https://gradle.com/build-scans/[Build Scans] in arbitrary console logs, for Maven and Gradle builds and display them in the Jenkins UI. +It also allows detecting https://gradle.com/build-scans/[Develocity] in arbitrary console logs, for Maven and Gradle builds and display them in the Jenkins UI. -You can have the https://docs.gradle.com/enterprise/gradle-plugin/[Gradle Enterprise Gradle plugin] and the https://docs.gradle.com/enterprise/maven-extension/[Gradle Enterprise Maven extension] automatically injected into your Gradle and Maven builds. -See <> for more details. +You can have the https://docs.gradle.com/enterprise/gradle-plugin/[Develocity Gradle plugin] and the https://docs.gradle.com/enterprise/maven-extension/[Develocity Maven extension] automatically injected into your Gradle and Maven builds. +See <> for more details. == Configuration @@ -89,7 +89,7 @@ image::find-build-scans.png[Find build scans,{thumbnail}] == Enriched build scans -Build scans links on the Job summary page can be enriched with data fetched from the https://docs.gradle.com/enterprise/api-manual/[Gradle Enterprise server API]. +Build scans links on the Job summary page can be enriched with data fetched from the https://docs.gradle.com/enterprise/api-manual/[Develocity server API]. If enabled, the project name, requested tasks, build tool version, build outcome and build scan links will be provided. This feature is available for both Gradle and Maven builds and compatible with auto-injection documented below. @@ -99,7 +99,7 @@ image::enriched-build-scans.png[Enriched build scans,{thumbnail}] > - Build scans published on the public instance (https://scans.gradle.com) are not eligible. > **Note** -> - Enabling this feature will trigger 2 HTTP requests to the Gradle Enterprise server per build scan published. +> - Enabling this feature will trigger 2 HTTP requests to the Develocity server per build scan published. === Enriched build scans configuration @@ -113,9 +113,9 @@ HTTP client settings can also be customized. image::enriched-build-scans-configuration.png[Enriched build scans configuration,{thumbnail}] -== Gradle Enterprise integration +== Develocity integration -The plugin can be configured to inject the https://docs.gradle.com/enterprise/gradle-plugin/[Gradle Enterprise Gradle plugin] or the https://docs.gradle.com/enterprise/maven-extension/[Gradle Enterprise Maven extension] into any Gradle or Maven build that is executed on the Jenkins server or on any of its connected agents. +The plugin can be configured to inject the https://docs.gradle.com/enterprise/gradle-plugin/[Develocity Gradle plugin] or the https://docs.gradle.com/enterprise/maven-extension/[Develocity Maven extension] into any Gradle or Maven build that is executed on the Jenkins server or on any of its connected agents. To achieve this, the plugin installs various files on each agent depending on the configuration via the global options in the `Manage Jenkins/Configure System` section. The same auto-injection behavior is available for the https://github.com/gradle/common-custom-user-data-gradle-plugin[Common Custom User Data Gradle plugin] and the https://github.com/gradle/common-custom-user-data-maven-extension[Common Custom User Data Maven extension]. @@ -129,12 +129,12 @@ The auto-injection is split into several levels to have fine-grained control ove ==== Global -To globally enable the auto-injection, click the `Enable auto-injection` checkbox in the `Gradle Enterprise integration` section of the global options in the `Manage Jenkins/Configure System` section. -Next set the URL of the Gradle Enterprise instance to which the build scans should be published to. +To globally enable the auto-injection, click the `Enable auto-injection` checkbox in the `Develocity integration` section of the global options in the `Manage Jenkins/Configure System` section. +Next set the URL of the Develocity instance to which the build scans should be published to. image::enable-auto-injection.png[Enable auto-injection,{thumbnail}] -Optionally you can click the `Enforce Gradle Enterprise server url` checkbox to enforce the configured Gradle Enterprise URL over a URL configured in the project's build (only applies to Gradle projects). +Optionally you can click the `Enforce Develocity server url` checkbox to enforce the configured Develocity URL over a URL configured in the project's build (only applies to Gradle projects). ===== VCS repository filtering (Beta) @@ -172,7 +172,7 @@ image::general-git-plugin-not-installed.png[Git Plugin is not installed, {thumbn ==== Gradle -To enable the auto-injection for Gradle builds, set the desired https://docs.gradle.com/enterprise/gradle-plugin/[Gradle Enterprise Gradle plugin] version in the `Gradle Enterprise Gradle plugin version` field in the `Gradle settings` section of the configuration form. +To enable the auto-injection for Gradle builds, set the desired https://docs.gradle.com/enterprise/gradle-plugin/[Develocity Gradle plugin] version in the `Develocity Gradle plugin version` field in the `Gradle settings` section of the configuration form. image::gradle-settings.png[Gradle settings,{thumbnail}] @@ -180,7 +180,7 @@ Optionally set the desired version of the https://github.com/gradle/common-custo ==== Maven -To enable the auto-injection for Maven builds, click the `Enable Gradle Enterprise Maven extension auto-injection` checkbox in the `Maven settings` section of the configuration form. +To enable the auto-injection for Maven builds, click the `Enable Develocity Maven extension auto-injection` checkbox in the `Maven settings` section of the configuration form. image::maven-settings.png[Maven settings,{thumbnail}] @@ -193,18 +193,18 @@ To see which versions are injected, refer to <>. === Disable auto-injection -Disabling the auto-injection requires that all Gradle Enterprise resources are cleaned up from the agents. +Disabling the auto-injection requires that all Develocity resources are cleaned up from the agents. To achieve this, the Gradle or Maven injections must be disabled individually (see the following sections). This triggers a cleanup of the resources. If the auto-injection should be disabled globally, then uncheck the `Enable auto-injection` checkbox as well. ==== Gradle -To disable the auto-injection for Gradle builds, remove the `Gradle Enterprise Gradle plugin version` in the `Gradle settings` section of the configuration form. +To disable the auto-injection for Gradle builds, remove the `Develocity Gradle plugin version` in the `Gradle settings` section of the configuration form. ==== Maven -To disable the auto-injection for Maven builds, uncheck the `Enable Gradle Enterprise Maven extension auto-injection` checkbox in the `Maven settings` section of the configuration form. +To disable the auto-injection for Maven builds, uncheck the `Enable Develocity Maven extension auto-injection` checkbox in the `Maven settings` section of the configuration form. === Control auto-injection based on node labels @@ -223,70 +223,70 @@ The following sections list all available configuration options which can be set `Enable auto-injection` + Globally enable auto-injection. -`Gradle Enterprise server url` + -The URL of the Gradle Enterprise instance. +`Develocity server url` + +The URL of the Develocity instance. `Allow untrusted server` + Whether to allow publishing to a server with a self-signed certificate. -`Gradle Enterprise access key` + -The access key for authenticating with the Gradle Enterprise server. +`Develocity access key` + +The access key for authenticating with the Develocity server. The access key is stored encrypted within the Jenkins instance. During the job execution, the access key is decrypted and set as `GRADLE_ENTERPRISE_ACCESS_KEY` environment variable. -Refer to the https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable[Gradle Enterprise Gradle plugin manual] and the https://docs.gradle.com/enterprise/maven-extension/#via_environment_variable[Gradle Enterprise Maven Extension manual] for more details about this configuration. +Refer to the https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable[Develocity Gradle plugin manual] and the https://docs.gradle.com/enterprise/maven-extension/#via_environment_variable[Develocity Maven Extension manual] for more details about this configuration. ==== Gradle specific configuration options -`Gradle Enterprise Gradle plugin version` + -Enables auto-injection for Gradle builds and defines which version of the https://docs.gradle.com/enterprise/gradle-plugin/[Gradle Enterprise Gradle plugin] to use. +`Develocity Gradle plugin version` + +Enables auto-injection for Gradle builds and defines which version of the https://docs.gradle.com/enterprise/gradle-plugin/[Develocity Gradle plugin] to use. `Common Custom User Data Gradle plugin version` + Defines which version of the https://github.com/gradle/common-custom-user-data-gradle-plugin[Common Custom User Data Gradle plugin] to use. `Gradle plugin repository url` + -The URL of the repository to use to resolve the Gradle Enterprise Gradle plugin and the Common Custom User Data Gradle plugin. +The URL of the repository to use to resolve the Develocity Gradle plugin and the Common Custom User Data Gradle plugin. This is required if the Jenkins agents are not able to access the https://plugins.gradle.org[Gradle Plugin Portal]. `Gradle auto-injection enabled nodes` + -A list of node labels on which the Gradle Enterprise Gradle plugin or Common Custom User Data Gradle plugin injection should be enabled. +A list of node labels on which the Develocity Gradle plugin or Common Custom User Data Gradle plugin injection should be enabled. By default, all nodes are enabled. `Gradle auto-injection disabled nodes` + -A list of node labels on which the Gradle Enterprise Gradle plugin or Common Custom User Data Gradle plugin injection should be disabled. +A list of node labels on which the Develocity Gradle plugin or Common Custom User Data Gradle plugin injection should be disabled. By default, all nodes are enabled. ==== Maven specific configuration options -`Enable Gradle Enterprise Maven extension auto-injection` + -Enables auto-injection for Maven builds and injects https://docs.gradle.com/enterprise/maven-extension[Gradle Enterprise Maven extension]. +`Enable Develocity Maven extension auto-injection` + +Enables auto-injection for Maven builds and injects https://docs.gradle.com/enterprise/maven-extension[Develocity Maven extension]. `Enable Common Custom User Data Maven extension auto-injection` + Enables auto-injection of https://github.com/gradle/common-custom-user-data-maven-extension[Common Custom User Data Maven extension]. `Maven auto-injection enabled nodes` + -A list of node labels where the Gradle Enterprise Maven extension or Common Custom User Data Maven extension injection should be enabled. +A list of node labels where the Develocity Maven extension or Common Custom User Data Maven extension injection should be enabled. By default, all nodes are enabled. `Maven auto-injection disabled nodes` + -A list of node labels where the Gradle Enterprise Maven extension or Common Custom User Data Maven extension injection should be disabled. +A list of node labels where the Develocity Maven extension or Common Custom User Data Maven extension injection should be disabled. By default, all nodes are enabled. === Auto-injection compatibility -The following sections list the compatibility of the plugin with the Gradle Enterprise version based on the given build tool in use. +The following sections list the compatibility of the plugin with the Develocity version based on the given build tool in use. ==== For Gradle builds -For Gradle builds the version used for the Gradle Enterprise Gradle plugin is defined in the `Gradle Enterprise Gradle plugin version` field in the `Gradle settings` section of the configuration form. +For Gradle builds the version used for the Develocity Gradle plugin is defined in the `Develocity Gradle plugin version` field in the `Gradle settings` section of the configuration form. See <> for details. -The compatibility of the specified version with Gradle Enterprise can be found https://docs.gradle.com/enterprise/compatibility/#gradle_enterprise_gradle_plugin[here]. +The compatibility of the specified version with Develocity can be found https://docs.gradle.com/enterprise/compatibility/#gradle_enterprise_gradle_plugin[here]. -For the optional Common Custom User Data Gradle plugin which is defined the same form, you can see the compatibility of the specified version with the Gradle Enterprise Gradle plugin https://github.com/gradle/common-custom-user-data-gradle-plugin#version-compatibility[here]. +For the optional Common Custom User Data Gradle plugin which is defined the same form, you can see the compatibility of the specified version with the Develocity Gradle plugin https://github.com/gradle/common-custom-user-data-gradle-plugin#version-compatibility[here]. ==== For Maven builds -For Maven builds the version of the Gradle Enterprise Maven extension is bundled into the plugin, meaning that the user can’t change what version is injected into the Maven build. +For Maven builds the version of the Develocity Maven extension is bundled into the plugin, meaning that the user can’t change what version is injected into the Maven build. -The following table shows the compatibility of the plugin version with Gradle Enterprise: +The following table shows the compatibility of the plugin version with Develocity: |=== -|Jenkins Gradle Plugin version | Injected Gradle Enterprise Maven extension version | Injected Common Custom User Data Maven extension version | Minimum supported Gradle Enterprise version +|Jenkins Gradle Plugin version | Injected Develocity Maven extension version | Injected Common Custom User Data Maven extension version | Minimum supported Develocity version |Next version | 1.20 | 1.12.5 | 2023.4 |2.9 | 1.19.3 | 1.12.4 | 2023.3 |2.8.2 | 1.18.1 | 1.12.2 | 2023.2 @@ -310,14 +310,14 @@ The following table shows the compatibility of the plugin version with Gradle En == Disabling/uninstalling Gradle Jenkins plugin -To ensure that all Gradle Enterprise resources are cleaned up from the agents, before disabling/uninstalling the plugin the auto-injection has to be manually disabled. Please, refer to the <> section for details. +To ensure that all Develocity resources are cleaned up from the agents, before disabling/uninstalling the plugin the auto-injection has to be manually disabled. Please, refer to the <> section for details. == Upgrade notes === 2.0 > **Note** -> - These upgrade notes only apply if you configured the Gradle Enterprise auto-injection feature. +> - These upgrade notes only apply if you configured the Develocity auto-injection feature. A new form based configuration was introduced in this version, which replaces the configuration via environment variables. There is no automatic migration, therefore you need to manually migrate the already configured auto-injection via environment variables you'd need to follow these steps: diff --git a/acceptance-tests/src/main/java/hudson/plugin/gradle/BuildScansInjectionSettings.java b/acceptance-tests/src/main/java/hudson/plugin/gradle/BuildScansInjectionSettings.java index d2db4426..3613334c 100644 --- a/acceptance-tests/src/main/java/hudson/plugin/gradle/BuildScansInjectionSettings.java +++ b/acceptance-tests/src/main/java/hudson/plugin/gradle/BuildScansInjectionSettings.java @@ -41,7 +41,7 @@ public void setGradleEnterpriseServerUrl(URI server) { } public void clickEnforceUrl() { - clickCheckboxOnConfig("Enforce Gradle Enterprise server url"); + clickCheckboxOnConfig("Enforce Develocity server url"); } public void clickAllowUntrustedServer() { @@ -49,7 +49,7 @@ public void clickAllowUntrustedServer() { } public void clickCheckForGradleEnterpriseErrors() { - clickCheckboxOnConfig("Check for the Gradle Enterprise build agent errors"); + clickCheckboxOnConfig("Check for the Develocity build agent errors"); } public void setGradleEnterpriseAccessKey(String accessKey) { @@ -73,7 +73,7 @@ public String getGitRepositoryFilters() { } public void clickInjectMavenExtension() { - clickCheckboxOnConfig("Enable Gradle Enterprise Maven extension auto-injection"); + clickCheckboxOnConfig("Enable Develocity Maven extension auto-injection"); } private void setBuildScansInjectionFormValue(String field, String value) { diff --git a/acceptance-tests/src/test/java/hudson/plugins/gradle/GradleEnterpriseErrorsTest.java b/acceptance-tests/src/test/java/hudson/plugins/gradle/GradleEnterpriseErrorsTest.java index 488c051f..76598506 100644 --- a/acceptance-tests/src/test/java/hudson/plugins/gradle/GradleEnterpriseErrorsTest.java +++ b/acceptance-tests/src/test/java/hudson/plugins/gradle/GradleEnterpriseErrorsTest.java @@ -52,14 +52,14 @@ public void checkForGradleEnterpriseErrors() { // single build has the error build.open(); assertThat(build.find(By.cssSelector(".alert")).getText(), - containsString("Gradle Enterprise Gradle plugin errors detected. Please check the logs for details.")); + containsString("Develocity Gradle plugin errors detected. Please check the logs for details.")); jenkins.action(GeErrorPage.class) .canClickActionButton() .hasRowForBuild(build); } - @ActionPageObject("gradle_enterprise") + @ActionPageObject("develocity") public static class GeErrorPage extends Action { public GeErrorPage(ContainerPageObject parent, String relative) { @@ -74,7 +74,7 @@ public boolean isApplicable(ContainerPageObject po) { public GeErrorPage canClickActionButton() { // Go to home page parent.open(); - String label = "Gradle Enterprise"; + String label = "Develocity"; find(By.linkText(label)).click(); waitFor(by.xpath("//h1[normalize-space(text()) = '%s']", label)); return this; diff --git a/acceptance-tests/src/test/java/hudson/plugins/gradle/GradleInjectionTest.java b/acceptance-tests/src/test/java/hudson/plugins/gradle/GradleInjectionTest.java index e03aa6e5..f4f0b2a6 100644 --- a/acceptance-tests/src/test/java/hudson/plugins/gradle/GradleInjectionTest.java +++ b/acceptance-tests/src/test/java/hudson/plugins/gradle/GradleInjectionTest.java @@ -321,7 +321,7 @@ public void setEnforceUrlPublishesBuildScan() throws Exception { // then build.shouldSucceed(); - assertBuildScanPublished(build, false, String.format("Enforcing Gradle Enterprise: %s, allowUntrustedServer: true", mockGeServer.getAddress().toString())); + assertBuildScanPublished(build, false, String.format("Enforcing Develocity: %s, allowUntrustedServer: true", mockGeServer.getAddress().toString())); MockGeServer.ScanTokenRequest scanTokenRequest = mockGeServer.getLastScanTokenRequest(); assertThat(scanTokenRequest, notNullValue()); diff --git a/build.gradle.kts b/build.gradle.kts index 5854fa07..61f1b6c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -102,7 +102,7 @@ dependencies { // Higher versions fail in our tests with ClassNotFoundException during SCM initialization unless Jenkins is updated "optionalPluginImplementation"("org.jenkins-ci.plugins:git:4.9.4") { - because("VCS repositories filtering is supported for Gradle Enterprise auto-injection") + because("VCS repositories filtering is supported for Develocity auto-injection") } implementation("commons-validator:commons-validator:1.8.0") { diff --git a/configuration-maven-extension/src/main/java/com/gradle/jenkins/maven/extension/internal/GradleEnterpriseConfigurerListener.java b/configuration-maven-extension/src/main/java/com/gradle/jenkins/maven/extension/internal/DevelocityConfigurerListener.java similarity index 77% rename from configuration-maven-extension/src/main/java/com/gradle/jenkins/maven/extension/internal/GradleEnterpriseConfigurerListener.java rename to configuration-maven-extension/src/main/java/com/gradle/jenkins/maven/extension/internal/DevelocityConfigurerListener.java index c7a02b3c..85e611a5 100644 --- a/configuration-maven-extension/src/main/java/com/gradle/jenkins/maven/extension/internal/GradleEnterpriseConfigurerListener.java +++ b/configuration-maven-extension/src/main/java/com/gradle/jenkins/maven/extension/internal/DevelocityConfigurerListener.java @@ -9,11 +9,11 @@ @Component( role = GradleEnterpriseListener.class, - hint = "gradle-enterprise-configurer" + hint = "develocity-configurer" ) -public class GradleEnterpriseConfigurerListener implements GradleEnterpriseListener { +public class DevelocityConfigurerListener implements GradleEnterpriseListener { - private static final Logger LOGGER = LoggerFactory.getLogger(GradleEnterpriseConfigurerListener.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DevelocityConfigurerListener.class); // Have to be in sync with what is set in MavenBuildScanInjection private static final String JENKINSGRADLEPLUGIN_MAVEN_PLUGIN_CONFIG_SERVER_URL = "JENKINSGRADLEPLUGIN_MAVEN_PLUGIN_CONFIG_SERVER_URL"; @@ -22,7 +22,7 @@ public class GradleEnterpriseConfigurerListener implements GradleEnterpriseListe @Override public void configure(GradleEnterpriseApi api, MavenSession session) { if (api.getServer() != null) { - LOGGER.debug("Gradle Enterprise server is already configured"); + LOGGER.debug("Develocity server is already configured"); return; } @@ -33,13 +33,13 @@ public void configure(GradleEnterpriseApi api, MavenSession session) { } api.setServer(server); - LOGGER.debug("Gradle Enterprise server URL is set to: {}", server); + LOGGER.debug("Develocity server URL is set to: {}", server); api.getBuildScan().setUploadInBackground(false); if (Boolean.parseBoolean(System.getenv(JENKINSGRADLEPLUGIN_MAVEN_PLUGIN_CONFIG_ALLOW_UNTRUSTED_SERVER))) { api.setAllowUntrustedServer(true); - LOGGER.debug("Allow communication with a Gradle Enterprise server using an untrusted SSL certificate"); + LOGGER.debug("Allow communication with a Develocity server using an untrusted SSL certificate"); } } } diff --git a/configuration-maven-extension/src/main/resources/META-INF/plexus/components.xml b/configuration-maven-extension/src/main/resources/META-INF/plexus/components.xml index 3c383112..f9001dc4 100644 --- a/configuration-maven-extension/src/main/resources/META-INF/plexus/components.xml +++ b/configuration-maven-extension/src/main/resources/META-INF/plexus/components.xml @@ -3,8 +3,8 @@ com.gradle.maven.extension.api.GradleEnterpriseListener - gradle-enterprise-configurer - com.gradle.jenkins.maven.extension.internal.GradleEnterpriseConfigurerListener + develocity-configurer + com.gradle.jenkins.maven.extension.internal.DevelocityConfigurerListener false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a7c2bd1b..db8c3baa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/images/enable-auto-injection.png b/images/enable-auto-injection.png index 8cf0e046..338cc8cc 100644 Binary files a/images/enable-auto-injection.png and b/images/enable-auto-injection.png differ diff --git a/images/enriched-build-scans-configuration.png b/images/enriched-build-scans-configuration.png index c0bcf23f..564869a1 100644 Binary files a/images/enriched-build-scans-configuration.png and b/images/enriched-build-scans-configuration.png differ diff --git a/images/gradle-settings.png b/images/gradle-settings.png index 19659e32..c94f1491 100644 Binary files a/images/gradle-settings.png and b/images/gradle-settings.png differ diff --git a/images/maven-settings.png b/images/maven-settings.png index 519cd41d..21aa5bae 100644 Binary files a/images/maven-settings.png and b/images/maven-settings.png differ diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml index 6e80e315..6be537c7 100644 --- a/spotbugs-exclude.xml +++ b/spotbugs-exclude.xml @@ -30,7 +30,7 @@ - + diff --git a/src/main/java/hudson/plugins/gradle/DevelocityLogger.java b/src/main/java/hudson/plugins/gradle/DevelocityLogger.java new file mode 100644 index 00000000..f09813ce --- /dev/null +++ b/src/main/java/hudson/plugins/gradle/DevelocityLogger.java @@ -0,0 +1,10 @@ +package hudson.plugins.gradle; + +import hudson.model.TaskListener; + +public final class DevelocityLogger extends AbstractLogger { + + public DevelocityLogger(TaskListener listener) { + super("Develocity", listener); + } +} diff --git a/src/main/java/hudson/plugins/gradle/GradleEnterpriseLogger.java b/src/main/java/hudson/plugins/gradle/GradleEnterpriseLogger.java deleted file mode 100644 index b8cd07ec..00000000 --- a/src/main/java/hudson/plugins/gradle/GradleEnterpriseLogger.java +++ /dev/null @@ -1,10 +0,0 @@ -package hudson.plugins.gradle; - -import hudson.model.TaskListener; - -public final class GradleEnterpriseLogger extends AbstractLogger { - - public GradleEnterpriseLogger(TaskListener listener) { - super("Gradle Enterprise", listener); - } -} diff --git a/src/main/java/hudson/plugins/gradle/injection/BuildScanEnvironmentContributor.java b/src/main/java/hudson/plugins/gradle/injection/BuildScanEnvironmentContributor.java index 537a560e..29ac8a1a 100644 --- a/src/main/java/hudson/plugins/gradle/injection/BuildScanEnvironmentContributor.java +++ b/src/main/java/hudson/plugins/gradle/injection/BuildScanEnvironmentContributor.java @@ -8,7 +8,7 @@ import hudson.model.PasswordParameterValue; import hudson.model.Run; import hudson.model.TaskListener; -import hudson.plugins.gradle.GradleEnterpriseLogger; +import hudson.plugins.gradle.DevelocityLogger; import hudson.util.Secret; import javax.annotation.Nonnull; @@ -33,37 +33,37 @@ public void buildEnvironmentFor(@Nonnull Run run, @Nonnull EnvVars envs, @Nonnul return; } - run.addAction(GradleEnterpriseParametersAction.of(new GradleEnterpriseLogger(listener), secretKey, secretPassword)); + run.addAction(DevelocityParametersAction.of(new DevelocityLogger(listener), secretKey, secretPassword)); } private static boolean alreadyExecuted(@Nonnull Run run) { - return run.getAction(GradleEnterpriseParametersAction.class) != null; + return run.getAction(DevelocityParametersAction.class) != null; } - public static class GradleEnterpriseParametersAction extends ParametersAction { + public static class DevelocityParametersAction extends ParametersAction { private static final String GRADLE_ENTERPRISE_ACCESS_KEY = "GRADLE_ENTERPRISE_ACCESS_KEY"; private static final String GRADLE_ENTERPRISE_REPO_PASSWORD = JENKINSGRADLEPLUGIN_GRADLE_PLUGIN_REPOSITORY_PASSWORD; - private static final GradleEnterpriseParametersAction EMPTY = new GradleEnterpriseParametersAction(); + private static final DevelocityParametersAction EMPTY = new DevelocityParametersAction(); - GradleEnterpriseParametersAction(List parameters, Collection additionalSafeParameters) { + DevelocityParametersAction(List parameters, Collection additionalSafeParameters) { super(parameters, additionalSafeParameters); } - GradleEnterpriseParametersAction() { + DevelocityParametersAction() { super(Collections.emptyList()); } - static GradleEnterpriseParametersAction empty() { + static DevelocityParametersAction empty() { return EMPTY; } - static GradleEnterpriseParametersAction of(GradleEnterpriseLogger logger, @Nullable Secret accessKey, @Nullable Secret repoPassword) { + static DevelocityParametersAction of(DevelocityLogger logger, @Nullable Secret accessKey, @Nullable Secret repoPassword) { List values = new ArrayList<>(); if (accessKey != null) { - if (!GradleEnterpriseAccessKeyValidator.getInstance().isValid(accessKey.getPlainText())) { - logger.error("Gradle Enterprise access key format is not valid"); + if (!DevelocityAccessKeyValidator.getInstance().isValid(accessKey.getPlainText())) { + logger.error("Develocity access key format is not valid"); } else { values.add(new PasswordParameterValue(GRADLE_ENTERPRISE_ACCESS_KEY, accessKey.getPlainText())); } @@ -72,9 +72,9 @@ static GradleEnterpriseParametersAction of(GradleEnterpriseLogger logger, @Nulla values.add(new PasswordParameterValue(GRADLE_ENTERPRISE_REPO_PASSWORD, repoPassword.getPlainText())); } if (values.isEmpty()) { - return GradleEnterpriseParametersAction.empty(); + return DevelocityParametersAction.empty(); } - return new GradleEnterpriseParametersAction( + return new DevelocityParametersAction( values, Stream.of(GRADLE_ENTERPRISE_ACCESS_KEY, GRADLE_ENTERPRISE_REPO_PASSWORD).collect(Collectors.toSet()) ); diff --git a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseAccessKeyValidator.java b/src/main/java/hudson/plugins/gradle/injection/DevelocityAccessKeyValidator.java similarity index 73% rename from src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseAccessKeyValidator.java rename to src/main/java/hudson/plugins/gradle/injection/DevelocityAccessKeyValidator.java index f8471dcc..2d3c61a5 100644 --- a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseAccessKeyValidator.java +++ b/src/main/java/hudson/plugins/gradle/injection/DevelocityAccessKeyValidator.java @@ -2,14 +2,14 @@ import com.google.common.base.Strings; -public final class GradleEnterpriseAccessKeyValidator implements Validator { +public final class DevelocityAccessKeyValidator implements Validator { - private static final GradleEnterpriseAccessKeyValidator INSTANCE = new GradleEnterpriseAccessKeyValidator(); + private static final DevelocityAccessKeyValidator INSTANCE = new DevelocityAccessKeyValidator(); - private GradleEnterpriseAccessKeyValidator() { + private DevelocityAccessKeyValidator() { } - public static GradleEnterpriseAccessKeyValidator getInstance() { + public static DevelocityAccessKeyValidator getInstance() { return INSTANCE; } diff --git a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseComputerListener.java b/src/main/java/hudson/plugins/gradle/injection/DevelocityComputerListener.java similarity index 79% rename from src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseComputerListener.java rename to src/main/java/hudson/plugins/gradle/injection/DevelocityComputerListener.java index 3897e505..35f523a7 100644 --- a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseComputerListener.java +++ b/src/main/java/hudson/plugins/gradle/injection/DevelocityComputerListener.java @@ -17,20 +17,20 @@ * @see InjectionConfig */ @Extension -public class GradleEnterpriseComputerListener extends ComputerListener { +public class DevelocityComputerListener extends ComputerListener { - private static final Logger LOGGER = Logger.getLogger(GradleEnterpriseComputerListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DevelocityComputerListener.class.getName()); - private final GradleEnterpriseInjector injector; + private final DevelocityInjector injector; private final Supplier injectionConfigSupplier; - public GradleEnterpriseComputerListener() { - this(new GradleEnterpriseInjector(), new JenkinsInjectionConfig()); + public DevelocityComputerListener() { + this(new DevelocityInjector(), new JenkinsInjectionConfig()); } @VisibleForTesting - GradleEnterpriseComputerListener(GradleEnterpriseInjector injector, - Supplier injectionConfigSupplier) { + DevelocityComputerListener(DevelocityInjector injector, + Supplier injectionConfigSupplier) { this.injector = injector; this.injectionConfigSupplier = injectionConfigSupplier; } diff --git a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseErrorsAction.java b/src/main/java/hudson/plugins/gradle/injection/DevelocityErrorsAction.java similarity index 97% rename from src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseErrorsAction.java rename to src/main/java/hudson/plugins/gradle/injection/DevelocityErrorsAction.java index d1d72cc7..c9a0776f 100644 --- a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseErrorsAction.java +++ b/src/main/java/hudson/plugins/gradle/injection/DevelocityErrorsAction.java @@ -24,7 +24,7 @@ import java.util.stream.Stream; @Extension -public class GradleEnterpriseErrorsAction implements RootAction, StaplerProxy { +public class DevelocityErrorsAction implements RootAction, StaplerProxy { @Override public String getIconFileName() { return isVisible() && Jenkins.get().hasPermission(Jenkins.ADMINISTER) ? "/plugin/gradle/images/svgs/gradle-build-scan.svg" : null; @@ -32,12 +32,12 @@ public String getIconFileName() { @Override public String getDisplayName() { - return "Gradle Enterprise"; + return "Develocity"; } @Override public String getUrlName() { - return "gradle_enterprise"; + return "develocity"; } @Override diff --git a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionDetector.java b/src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionDetector.java similarity index 85% rename from src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionDetector.java rename to src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionDetector.java index 08a22745..44f1ca0a 100644 --- a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionDetector.java +++ b/src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionDetector.java @@ -2,13 +2,13 @@ import hudson.plugins.gradle.BuildToolType; -public interface GradleEnterpriseExceptionDetector { +public interface DevelocityExceptionDetector { BuildToolType getBuildToolType(); boolean detect(String line); - final class ByPrefix implements GradleEnterpriseExceptionDetector { + final class ByPrefix implements DevelocityExceptionDetector { private final BuildToolType buildToolType; private final String prefix; diff --git a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionLogFilter.java b/src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionLogFilter.java similarity index 75% rename from src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionLogFilter.java rename to src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionLogFilter.java index a86c1bd7..17600403 100644 --- a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionLogFilter.java +++ b/src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionLogFilter.java @@ -9,13 +9,13 @@ @SuppressWarnings("unused") @Extension -public class GradleEnterpriseExceptionLogFilter extends ConsoleLogFilter implements Serializable { +public class DevelocityExceptionLogFilter extends ConsoleLogFilter implements Serializable { @Override public OutputStream decorateLogger(Run build, OutputStream logger) { InjectionConfig injectionConfig = InjectionConfig.get(); if (injectionConfig.isEnabled() && injectionConfig.isCheckForBuildAgentErrors() && build != null) { - return new GradleEnterpriseExceptionLogProcessor(logger, build); + return new DevelocityExceptionLogProcessor(logger, build); } return logger; } diff --git a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionLogProcessor.java b/src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionLogProcessor.java similarity index 69% rename from src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionLogProcessor.java rename to src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionLogProcessor.java index b2def9ea..4dd1789f 100644 --- a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionLogProcessor.java +++ b/src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionLogProcessor.java @@ -12,15 +12,15 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -public final class GradleEnterpriseExceptionLogProcessor extends AbstractGradleLogProcessor { +public final class DevelocityExceptionLogProcessor extends AbstractGradleLogProcessor { - private static final GradleEnterpriseExceptionDetector[] DETECTORS = + private static final DevelocityExceptionDetector[] DETECTORS = { - new GradleEnterpriseExceptionDetector.ByPrefix( + new DevelocityExceptionDetector.ByPrefix( BuildToolType.GRADLE, "Internal error in Gradle Enterprise Gradle plugin:" ), - new GradleEnterpriseExceptionDetector.ByPrefix( + new DevelocityExceptionDetector.ByPrefix( BuildToolType.MAVEN, "[ERROR] Internal error in Gradle Enterprise Maven extension:" ) @@ -28,11 +28,11 @@ public final class GradleEnterpriseExceptionLogProcessor extends AbstractGradleL private final BuildAgentErrorListener listener; - public GradleEnterpriseExceptionLogProcessor(OutputStream out, @Nullable Run build) { + public DevelocityExceptionLogProcessor(OutputStream out, @Nullable Run build) { this(out, build != null ? build.getCharset() : StandardCharsets.UTF_8, build); } - public GradleEnterpriseExceptionLogProcessor(OutputStream out, Charset charset, Actionable actionable) { + public DevelocityExceptionLogProcessor(OutputStream out, Charset charset, Actionable actionable) { super(out, charset); this.listener = new DefaultBuildAgentErrorListener(actionable); } @@ -40,7 +40,7 @@ public GradleEnterpriseExceptionLogProcessor(OutputStream out, Charset charset, @Override protected void processLogLine(String line) { line = ConsoleNote.removeNotes(line); - for (GradleEnterpriseExceptionDetector detector : DETECTORS) { + for (DevelocityExceptionDetector detector : DETECTORS) { if (detector.detect(line)) { BuildAgentError buildAgentError = new BuildAgentError(detector.getBuildToolType()); listener.onBuildAgentError(buildAgentError); diff --git a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionTaskListenerDecoratorFactory.java b/src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionTaskListenerDecoratorFactory.java similarity index 72% rename from src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionTaskListenerDecoratorFactory.java rename to src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionTaskListenerDecoratorFactory.java index a74298d7..83e2abb8 100644 --- a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionTaskListenerDecoratorFactory.java +++ b/src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionTaskListenerDecoratorFactory.java @@ -17,9 +17,9 @@ @SuppressWarnings("unused") @Extension -public class GradleEnterpriseExceptionTaskListenerDecoratorFactory implements TaskListenerDecorator.Factory { +public class DevelocityExceptionTaskListenerDecoratorFactory implements TaskListenerDecorator.Factory { - private static final Logger LOGGER = Logger.getLogger(GradleEnterpriseExceptionTaskListenerDecoratorFactory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DevelocityExceptionTaskListenerDecoratorFactory.class.getName()); @Override @CheckForNull @@ -30,7 +30,7 @@ public TaskListenerDecorator of(@Nonnull FlowExecutionOwner owner) { try { Queue.Executable executable = owner.getExecutable(); if (executable instanceof WorkflowRun) { - return new GradleEnterpriseExceptionTaskListenerDecorator((WorkflowRun) executable); + return new DevelocityExceptionTaskListenerDecorator((WorkflowRun) executable); } } catch (IOException ex) { LOGGER.log(Level.WARNING, null, ex); @@ -39,12 +39,12 @@ public TaskListenerDecorator of(@Nonnull FlowExecutionOwner owner) { } @SuppressWarnings("rawtypes") - public static class GradleEnterpriseExceptionTaskListenerDecorator extends TaskListenerDecorator implements Serializable { + public static class DevelocityExceptionTaskListenerDecorator extends TaskListenerDecorator implements Serializable { private static final long serialVersionUID = 1L; private final transient Run run; - public GradleEnterpriseExceptionTaskListenerDecorator(Run run) { + public DevelocityExceptionTaskListenerDecorator(Run run) { this.run = run; } @@ -52,7 +52,7 @@ public GradleEnterpriseExceptionTaskListenerDecorator(Run run) { @Override public OutputStream decorate(@Nonnull OutputStream logger) { if (run != null) { - return new GradleEnterpriseExceptionLogProcessor(logger, run); + return new DevelocityExceptionLogProcessor(logger, run); } return logger; } diff --git a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseInjector.java b/src/main/java/hudson/plugins/gradle/injection/DevelocityInjector.java similarity index 80% rename from src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseInjector.java rename to src/main/java/hudson/plugins/gradle/injection/DevelocityInjector.java index e11824d4..1d87496e 100644 --- a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseInjector.java +++ b/src/main/java/hudson/plugins/gradle/injection/DevelocityInjector.java @@ -10,18 +10,18 @@ import java.util.logging.Level; import java.util.logging.Logger; -public final class GradleEnterpriseInjector { +public final class DevelocityInjector { - private static final Logger LOGGER = Logger.getLogger(GradleEnterpriseInjector.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DevelocityInjector.class.getName()); private final Collection injectors; - public GradleEnterpriseInjector() { + public DevelocityInjector() { this(new GradleBuildScanInjection(), new MavenBuildScanInjection()); } @VisibleForTesting - GradleEnterpriseInjector(BuildScanInjection... injectors) { + DevelocityInjector(BuildScanInjection... injectors) { this.injectors = Arrays.asList(injectors); } diff --git a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseVersionValidator.java b/src/main/java/hudson/plugins/gradle/injection/DevelocityVersionValidator.java similarity index 52% rename from src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseVersionValidator.java rename to src/main/java/hudson/plugins/gradle/injection/DevelocityVersionValidator.java index b1d6e185..fbe60281 100644 --- a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseVersionValidator.java +++ b/src/main/java/hudson/plugins/gradle/injection/DevelocityVersionValidator.java @@ -2,16 +2,16 @@ import java.util.regex.Pattern; -public final class GradleEnterpriseVersionValidator implements Validator { +public final class DevelocityVersionValidator implements Validator { - private static final GradleEnterpriseVersionValidator INSTANCE = new GradleEnterpriseVersionValidator(); + private static final DevelocityVersionValidator INSTANCE = new DevelocityVersionValidator(); private static final Pattern VERSION_PATTERN = Pattern.compile("^\\d+\\.\\d+(\\.\\d+)?(-[-\\w]+)?$"); - private GradleEnterpriseVersionValidator() { + private DevelocityVersionValidator() { } - public static GradleEnterpriseVersionValidator getInstance() { + public static DevelocityVersionValidator getInstance() { return INSTANCE; } diff --git a/src/main/java/hudson/plugins/gradle/injection/InjectionConfig.java b/src/main/java/hudson/plugins/gradle/injection/InjectionConfig.java index 268b1e2c..fcec6632 100644 --- a/src/main/java/hudson/plugins/gradle/injection/InjectionConfig.java +++ b/src/main/java/hudson/plugins/gradle/injection/InjectionConfig.java @@ -354,7 +354,7 @@ public FormValidation doCheckAccessKey(@QueryParameter String value) { return FormValidation.ok(); } - return GradleEnterpriseAccessKeyValidator.getInstance().isValid(accessKey) + return DevelocityAccessKeyValidator.getInstance().isValid(accessKey) ? FormValidation.ok() : FormValidation.error(Messages.InjectionConfig_InvalidAccessKey()); } @@ -396,7 +396,7 @@ private static FormValidation checkVersion(String value, boolean required) { : FormValidation.ok(); } - return GradleEnterpriseVersionValidator.getInstance().isValid(version) + return DevelocityVersionValidator.getInstance().isValid(version) ? FormValidation.ok() : FormValidation.error(Messages.InjectionConfig_InvalidVersion()); } diff --git a/src/main/java/hudson/plugins/gradle/injection/InjectionConfigChangeListener.java b/src/main/java/hudson/plugins/gradle/injection/InjectionConfigChangeListener.java index 2244afc7..6cce39bc 100644 --- a/src/main/java/hudson/plugins/gradle/injection/InjectionConfigChangeListener.java +++ b/src/main/java/hudson/plugins/gradle/injection/InjectionConfigChangeListener.java @@ -19,20 +19,20 @@ @Extension public class InjectionConfigChangeListener extends SaveableListener { - private final GradleEnterpriseInjector injector; + private final DevelocityInjector injector; private final Supplier globalEnvVarsSupplier; private final Supplier> computersSupplier; public InjectionConfigChangeListener() { this( - new GradleEnterpriseInjector(), + new DevelocityInjector(), new JenkinsGlobalEnvVars(), new JenkinsComputers() ); } @VisibleForTesting - InjectionConfigChangeListener(GradleEnterpriseInjector injector, + InjectionConfigChangeListener(DevelocityInjector injector, Supplier globalEnvVarsSupplier, Supplier> computersSupplier) { this.injector = injector; diff --git a/src/main/java/hudson/plugins/gradle/injection/maven/GradleEnterpriseExtensionsContributorFactory.java b/src/main/java/hudson/plugins/gradle/injection/maven/DevelocityExtensionsContributorFactory.java similarity index 91% rename from src/main/java/hudson/plugins/gradle/injection/maven/GradleEnterpriseExtensionsContributorFactory.java rename to src/main/java/hudson/plugins/gradle/injection/maven/DevelocityExtensionsContributorFactory.java index f5c278e7..d4c032ff 100644 --- a/src/main/java/hudson/plugins/gradle/injection/maven/GradleEnterpriseExtensionsContributorFactory.java +++ b/src/main/java/hudson/plugins/gradle/injection/maven/DevelocityExtensionsContributorFactory.java @@ -21,9 +21,9 @@ import java.util.stream.Collectors; @Extension(optional = true) -public class GradleEnterpriseExtensionsContributorFactory extends PlexusModuleContributorFactory { +public class DevelocityExtensionsContributorFactory extends PlexusModuleContributorFactory { - private static final Logger LOGGER = Logger.getLogger(GradleEnterpriseExtensionsContributorFactory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DevelocityExtensionsContributorFactory.class.getName()); private static final PlexusModuleContributor EMPTY_CONTRIBUTOR = PlexusModuleContributor.of(); private static final Splitter UNIX_CLASSPATH_SPLITTER = Splitter.on(':').omitEmptyStrings(); @@ -54,7 +54,7 @@ public PlexusModuleContributor createFor(AbstractBuild build) { if (!InjectionUtil.isSupportedMavenPluginVersion(mavenPluginVersion)) { LOGGER.log( Level.WARNING, - "Detected Maven Integration plugin version {0}. For auto-injection of the Gradle Enterprise Maven extension, version {1} or above is required. Please upgrade the version of the Maven Integration plugin", + "Detected Maven Integration plugin version {0}. For auto-injection of the Develocity Maven extension, version {1} or above is required. Please upgrade the version of the Maven Integration plugin", new VersionNumber[]{mavenPluginVersion, InjectionUtil.MINIMUM_SUPPORTED_MAVEN_PLUGIN_VERSION} ); return EMPTY_CONTRIBUTOR; diff --git a/src/main/resources/hudson/plugins/gradle/AbstractBuildScanAction/build-agent-errors.jelly b/src/main/resources/hudson/plugins/gradle/AbstractBuildScanAction/build-agent-errors.jelly index 869a53b2..266cfc88 100644 --- a/src/main/resources/hudson/plugins/gradle/AbstractBuildScanAction/build-agent-errors.jelly +++ b/src/main/resources/hudson/plugins/gradle/AbstractBuildScanAction/build-agent-errors.jelly @@ -3,15 +3,15 @@ diff --git a/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/config.jelly b/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/config.jelly index d5354008..8bffd1ad 100644 --- a/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/config.jelly +++ b/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/config.jelly @@ -1,14 +1,14 @@ - + - + - + diff --git a/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-buildScanAccessKey.html b/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-buildScanAccessKey.html index 20383230..43467aed 100644 --- a/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-buildScanAccessKey.html +++ b/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-buildScanAccessKey.html @@ -1,3 +1,3 @@
- The access key for authenticating with the Gradle Enterprise server. + The access key for authenticating with the Develocity server.
diff --git a/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-buildScanServer.html b/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-buildScanServer.html index fb16ad34..71e3c799 100644 --- a/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-buildScanServer.html +++ b/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-buildScanServer.html @@ -1,3 +1,3 @@
- The URL of the Gradle Enterprise server. + The URL of the Develocity server.
diff --git a/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-httpClientDelayBetweenRetriesInSeconds.html b/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-httpClientDelayBetweenRetriesInSeconds.html index 3aacc4bb..1361051a 100644 --- a/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-httpClientDelayBetweenRetriesInSeconds.html +++ b/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-httpClientDelayBetweenRetriesInSeconds.html @@ -1,3 +1,3 @@
- HTTP client delay between retries in seconds for requests to Gradle Enterprise API. + HTTP client delay between retries in seconds for requests to Develocity API.
diff --git a/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-httpClientMaxRetries.html b/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-httpClientMaxRetries.html index 4cf0a84f..d3e68b72 100644 --- a/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-httpClientMaxRetries.html +++ b/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-httpClientMaxRetries.html @@ -1,3 +1,3 @@
- HTTP client max retries for requests to Gradle Enterprise API. + HTTP client max retries for requests to Develocity API.
diff --git a/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-httpClientTimeoutInSeconds.html b/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-httpClientTimeoutInSeconds.html index 2647305a..e79f1bb8 100644 --- a/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-httpClientTimeoutInSeconds.html +++ b/src/main/resources/hudson/plugins/gradle/enriched/EnrichedSummaryConfig/help-httpClientTimeoutInSeconds.html @@ -1,3 +1,3 @@
- HTTP client timeout in seconds for requests to Gradle Enterprise API. + HTTP client timeout in seconds for requests to Develocity API.
diff --git a/src/main/resources/hudson/plugins/gradle/injection/GradleEnterpriseErrorsAction/index.jelly b/src/main/resources/hudson/plugins/gradle/injection/DevelocityErrorsAction/index.jelly similarity index 89% rename from src/main/resources/hudson/plugins/gradle/injection/GradleEnterpriseErrorsAction/index.jelly rename to src/main/resources/hudson/plugins/gradle/injection/DevelocityErrorsAction/index.jelly index 4854cf52..d0e35df2 100644 --- a/src/main/resources/hudson/plugins/gradle/injection/GradleEnterpriseErrorsAction/index.jelly +++ b/src/main/resources/hudson/plugins/gradle/injection/DevelocityErrorsAction/index.jelly @@ -1,10 +1,10 @@ - + -

Gradle Enterprise

+

Develocity

-

Errors that were not gracefully handled by the Gradle Enterprise plugin/Gradle Enterprise Maven extension

+

Errors that were not gracefully handled by the Develocity plugin/Develocity Maven extension

diff --git a/src/main/resources/hudson/plugins/gradle/injection/InjectionConfig/config.jelly b/src/main/resources/hudson/plugins/gradle/injection/InjectionConfig/config.jelly index 92707207..83699a13 100644 --- a/src/main/resources/hudson/plugins/gradle/injection/InjectionConfig/config.jelly +++ b/src/main/resources/hudson/plugins/gradle/injection/InjectionConfig/config.jelly @@ -1,6 +1,6 @@ - + @@ -17,23 +17,23 @@ - - + + - + - +