Rename to align with Gradle Enterprise's Develocity rebranding

Closes gh-82

Author: wilkinsona

.github/workflows/build-and-deploy-snapshot.yml

@@ -7,7 +7,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
   build:
-    if: ${{ github.repository == 'spring-io/gradle-enterprise-conventions' }}
+    if: ${{ github.repository == 'spring-io/develocity-conventions' }}
     name: Build and deploy snapshot
     runs-on: ubuntu-latest
     steps:
@@ -35,7 +35,7 @@ jobs:
           uri: 'https://repo.spring.io'
           username: ${{ secrets.ARTIFACTORY_USERNAME }}
           password: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          build-name: gradle-enterprise-conventions
+          build-name: develocity-conventions
           repository: 'libs-snapshot-local'
           folder: 'deployment-repository'
           signing-key: ${{ secrets.GPG_PRIVATE_KEY }}

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
     outputs:
       version: ${{ steps.version-from-tag.outputs.version }}
   build-and-stage-release:
-    if: ${{ github.repository == 'spring-io/gradle-enterprise-conventions' }}
+    if: ${{ github.repository == 'spring-io/develocity-conventions' }}
     name: Build and stage release
     needs: get-version
     runs-on: ubuntu-latest
@@ -47,7 +47,7 @@ jobs:
           uri: 'https://repo.spring.io'
           username: ${{ secrets.ARTIFACTORY_USERNAME }}
           password: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          build-name: ${{ format('gradle-enterprise-conventions-{0}', needs.get-version.outputs.version)}}
+          build-name: ${{ format('develocity-conventions-{0}', needs.get-version.outputs.version)}}
           repository: 'libs-staging-local'
           folder: 'deployment-repository'
           signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
@@ -66,7 +66,7 @@ jobs:
         env:
           JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Download release artifacts
-        run: jf rt download --spec .github/release-artifacts.spec --spec-vars 'buildName=${{ format('gradle-enterprise-conventions-{0}', needs.get-version.outputs.version) }};buildNumber=${{ github.run_number }}'
+        run: jf rt download --spec .github/release-artifacts.spec --spec-vars 'buildName=${{ format('develocity-conventions-{0}', needs.get-version.outputs.version) }};buildNumber=${{ github.run_number }}'
       - name: Sync
         uses: spring-io/nexus-sync-action@42477a2230a2f694f9eaa4643fa9e76b99b7ab84 # v0.0.1
         with:
@@ -91,7 +91,7 @@ jobs:
         env:
           JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Promote build
-        run: jfrog rt build-promote ${{ format('gradle-enterprise-conventions-{0}', needs.get-version.outputs.version)}} ${{ github.run_number }} libs-release-local
+        run: jfrog rt build-promote ${{ format('develocity-conventions-{0}', needs.get-version.outputs.version)}} ${{ github.run_number }} libs-release-local
   create-github-release:
     name: Create GitHub release
     needs:

CONTRIBUTING.md

@@ -1,6 +1,6 @@
-# Contributing to Gradle Enterprise Conventions Plugin
+# Contributing to Develocity Conventions Plugin
 
-Gradle Enterprise Conventions Plugin is released under the Apache 2.0 license.
+Develocity Conventions Plugin is released under the Apache 2.0 license.
 If you would like to contribute something, or simply want to work with the code, this document should help you to get started.
 
 ## Code of conduct

README.md

@@ -1,6 +1,6 @@
-# Gradle Enterprise Conventions
+# Develocity Conventions
 
-Conventions for Maven and Gradle projects that use the Gradle Enterprise instance hosted at [ge.spring.io](https://ge.spring.io).
+Conventions for Maven and Gradle projects that use the Develocity instance hosted at [ge.spring.io](https://ge.spring.io).
 
 ## Build cache conventions
 
@@ -120,7 +120,7 @@ Now apply the plugin in `settings.gradle`, alongside the `com.gradle.develocity`
 plugins {
 	// …
 	id "com.gradle.develocity" version "<<version>>"
-	id "io.spring.ge.conventions" version "<<version>>"
+	id "io.spring.develocity.conventions" version "<<version>>"
 	// …
 }
 ```
@@ -133,8 +133,8 @@ To use the conventions, create a `.mvn/extensions.xml` file in the root of the p
 <?xml version="1.0" encoding="UTF-8"?>
 <extensions>
         <extension>
-                <groupId>io.spring.ge.conventions</groupId>
-                <artifactId>gradle-enterprise-conventions-maven-extension</artifactId>
+                <groupId>io.spring.develocity.conventions</groupId>
+                <artifactId>develocity-conventions-maven-extension</artifactId>
                 <version><<version>></version>
         </extension>
 </extensions>

gradle-enterprise-conventions-core/build.gradle renamed to develocity-conventions-core/build.gradle

@@ -4,7 +4,7 @@ plugins {
 	id "maven-publish"
 }
 
-description = "Gradle Enterprise Conventions Core"
+description = "Develocity Conventions Core"
 
 repositories {
 	mavenCentral()

gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/BuildCacheConventions.java renamed to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/BuildCacheConventions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.core;
+package io.spring.develocity.conventions.core;
 
 import java.util.Map;
 

gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/BuildScanConventions.java renamed to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/BuildScanConventions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.core;
+package io.spring.develocity.conventions.core;
 
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
@@ -23,7 +23,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import io.spring.ge.conventions.core.ProcessRunner.RunFailedException;
+import io.spring.develocity.conventions.core.ProcessRunner.RunFailedException;
 
 /**
  * Conventions that are applied to build scans for Maven and Gradle builds. Spring

gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ConfigurableBuildCache.java renamed to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ConfigurableBuildCache.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.core;
+package io.spring.develocity.conventions.core;
 
 import java.util.function.Consumer;
 

gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ConfigurableBuildScan.java renamed to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ConfigurableBuildScan.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.core;
+package io.spring.develocity.conventions.core;
 
 import java.net.InetAddress;
 import java.util.List;

gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ConfigurableDevelocity.java renamed to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ConfigurableDevelocity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.core;
+package io.spring.develocity.conventions.core;
 
 /**
  * Configuration for Develocity.

gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ContinuousIntegration.java renamed to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ContinuousIntegration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.core;
+package io.spring.develocity.conventions.core;
 
 import java.util.Map;
 import java.util.function.Function;

gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ProcessRunner.java renamed to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ProcessRunner.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.core;
+package io.spring.develocity.conventions.core;
 
 import java.io.OutputStream;
 import java.util.function.Consumer;

gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/package-info.java renamed to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/package-info.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Gradle Enterprise conventions for Spring projects built with Gradle.
+ * Core classes for the Develocity conventions for Spring projects.
  */
-package io.spring.ge.conventions.gradle;
+package io.spring.develocity.conventions.core;

gradle-enterprise-conventions-core/src/test/java/io/spring/ge/conventions/core/BuildCacheConventionsTests.java renamed to develocity-conventions-core/src/test/java/io/spring/develocity/conventions/core/BuildCacheConventionsTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.core;
+package io.spring.develocity.conventions.core;
 
 import java.util.Collections;
 import java.util.HashMap;

gradle-enterprise-conventions-core/src/test/java/io/spring/ge/conventions/core/BuildScanConventionsTests.java renamed to develocity-conventions-core/src/test/java/io/spring/develocity/conventions/core/BuildScanConventionsTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.core;
+package io.spring.develocity.conventions.core;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -27,7 +27,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import io.spring.ge.conventions.core.ConfigurableBuildScan.ObfuscationConfigurer;
+import io.spring.develocity.conventions.core.ConfigurableBuildScan.ObfuscationConfigurer;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

gradle-enterprise-conventions-core/src/test/java/io/spring/ge/conventions/core/TestProcessRunner.java renamed to develocity-conventions-core/src/test/java/io/spring/develocity/conventions/core/TestProcessRunner.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.core;
+package io.spring.develocity.conventions.core;
 
 import java.io.IOException;
 import java.io.OutputStream;

develocity-conventions-gradle-plugin/build.gradle

@@ -0,0 +1,34 @@
+plugins {
+	id "build-conventions"
+	id "java-gradle-plugin"
+	id "maven-publish"
+}
+
+description = "Develocity Conventions Gradle plugin"
+
+repositories {
+	mavenCentral()
+	gradlePluginPortal()
+}
+
+dependencies {
+	compileOnly("com.gradle:develocity-gradle-plugin:${develocityPluginVersion}")
+	
+	implementation(project(":develocity-conventions-core"))
+
+	testImplementation("com.gradle:develocity-gradle-plugin:${develocityPluginVersion}")
+	testImplementation("org.assertj:assertj-core:3.24.2")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+	testImplementation("org.mockito:mockito-core:4.11.0")
+}
+
+gradlePlugin {
+	plugins {
+		develocityConventionsPlugin {
+			displayName = project.description
+			description = project.description
+			id = 'io.spring.develocity.conventions'
+			implementationClass = 'io.spring.develocity.conventions.gradle.DevelocityConventionsPlugin'
+		}
+	}
+}

gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/AnonymousPublicationBuildScanConventions.java renamed to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/AnonymousPublicationBuildScanConventions.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.gradle;
+package io.spring.develocity.conventions.gradle;
 
 import java.util.Map;
 
-import io.spring.ge.conventions.core.BuildScanConventions;
-import io.spring.ge.conventions.core.ConfigurableBuildScan;
-import io.spring.ge.conventions.core.ConfigurableDevelocity;
-import io.spring.ge.conventions.core.ProcessRunner;
+import io.spring.develocity.conventions.core.BuildScanConventions;
+import io.spring.develocity.conventions.core.ConfigurableBuildScan;
+import io.spring.develocity.conventions.core.ConfigurableDevelocity;
+import io.spring.develocity.conventions.core.ProcessRunner;
 
 /**
  * Conventions for build scans that are published anonymously to

gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleEnterpriseConventionsPlugin.java renamed to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/DevelocityConventionsPlugin.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.gradle;
+package io.spring.develocity.conventions.gradle;
 
 import java.io.File;
 
@@ -23,25 +23,25 @@
 import com.gradle.develocity.agent.gradle.DevelocityConfiguration;
 import com.gradle.develocity.agent.gradle.DevelocityPlugin;
 import com.gradle.develocity.agent.gradle.scan.BuildScanConfiguration;
-import io.spring.ge.conventions.core.BuildCacheConventions;
-import io.spring.ge.conventions.core.BuildScanConventions;
+import io.spring.develocity.conventions.core.BuildCacheConventions;
+import io.spring.develocity.conventions.core.BuildScanConventions;
 import org.gradle.StartParameter;
 import org.gradle.api.Plugin;
 import org.gradle.api.initialization.Settings;
 import org.gradle.api.internal.ProcessOperations;
 
 /**
- * {@link Plugin plugin} for configuring the use of Gradle Enterprise hosted at
+ * {@link Plugin plugin} for configuring the use of Develocity hosted at
  * <a href="https://ge.spring.io">ge.spring.io</a>.
  *
  * @author Andy Wilkinson
  */
-public class GradleEnterpriseConventionsPlugin implements Plugin<Settings> {
+public class DevelocityConventionsPlugin implements Plugin<Settings> {
 
 	private final ProcessOperations processOperations;
 
 	@Inject
-	public GradleEnterpriseConventionsPlugin(ProcessOperations processOperations) {
+	public DevelocityConventionsPlugin(ProcessOperations processOperations) {
 		this.processOperations = processOperations;
 	}
 

gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildCache.java renamed to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/GradleConfigurableBuildCache.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.gradle;
+package io.spring.develocity.conventions.gradle;
 
 import java.util.function.Consumer;
 
 import com.gradle.develocity.agent.gradle.buildcache.DevelocityBuildCache;
-import io.spring.ge.conventions.core.ConfigurableBuildCache;
+import io.spring.develocity.conventions.core.ConfigurableBuildCache;
 import org.gradle.caching.configuration.BuildCacheConfiguration;
 import org.gradle.caching.local.DirectoryBuildCache;
 

gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildScan.java renamed to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/GradleConfigurableBuildScan.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.gradle;
+package io.spring.develocity.conventions.gradle;
 
 import java.net.InetAddress;
 import java.util.List;
@@ -24,7 +24,7 @@
 import com.gradle.develocity.agent.gradle.scan.BuildScanConfiguration;
 import com.gradle.develocity.agent.gradle.scan.BuildScanDataObfuscationConfiguration;
 import com.gradle.develocity.agent.gradle.scan.BuildScanPublishingConfiguration.PublishingContext;
-import io.spring.ge.conventions.core.ConfigurableBuildScan;
+import io.spring.develocity.conventions.core.ConfigurableBuildScan;
 
 /**
  * A {@link ConfigurableBuildScan} for Gradle builds.

gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleConfigurableDevelocity.java renamed to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/GradleConfigurableDevelocity.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.gradle;
+package io.spring.develocity.conventions.gradle;
 
 import com.gradle.develocity.agent.gradle.DevelocityConfiguration;
-import io.spring.ge.conventions.core.ConfigurableDevelocity;
+import io.spring.develocity.conventions.core.ConfigurableDevelocity;
 
 /**
  * {@link ConfigurableDevelocity} implementation for Gradle builds.

gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/ProcessOperationsProcessRunner.java renamed to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/ProcessOperationsProcessRunner.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.gradle;
+package io.spring.develocity.conventions.gradle;
 
 import java.io.OutputStream;
 import java.util.function.Consumer;
 
-import io.spring.ge.conventions.core.ProcessRunner;
+import io.spring.develocity.conventions.core.ProcessRunner;
 import org.gradle.api.internal.ProcessOperations;
 import org.gradle.process.ExecSpec;
 

gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/WorkingDirectoryProcessOperations.java renamed to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/WorkingDirectoryProcessOperations.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.ge.conventions.gradle;
+package io.spring.develocity.conventions.gradle;
 
 import java.io.File;
 

gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/package-info.java renamed to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/package-info.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Core classes for the Gradle Enterprise conventions for Spring projects.
+ * Develocity conventions for Spring projects built with Gradle.
  */
-package io.spring.ge.conventions.core;
+package io.spring.develocity.conventions.gradle;