From ab52b6d6966f4f95fab33a595f549a10d870ec07 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 2 Jul 2024 11:49:24 +0100 Subject: [PATCH] Rename to align with Gradle Enterprise's Develocity rebranding Closes gh-82 --- .../workflows/build-and-deploy-snapshot.yml | 4 +-- .github/workflows/release.yml | 8 ++--- CONTRIBUTING.md | 4 +-- README.md | 10 +++--- .../build.gradle | 2 +- .../core/BuildCacheConventions.java | 2 +- .../core/BuildScanConventions.java | 4 +-- .../core/ConfigurableBuildCache.java | 2 +- .../core/ConfigurableBuildScan.java | 2 +- .../core/ConfigurableDevelocity.java | 2 +- .../core/ContinuousIntegration.java | 2 +- .../conventions/core/ProcessRunner.java | 2 +- .../conventions/core}/package-info.java | 4 +-- .../core/BuildCacheConventionsTests.java | 2 +- .../core/BuildScanConventionsTests.java | 4 +-- .../conventions/core/TestProcessRunner.java | 2 +- .../build.gradle | 34 +++++++++++++++++++ ...nymousPublicationBuildScanConventions.java | 10 +++--- .../gradle/DevelocityConventionsPlugin.java | 12 +++---- .../gradle/GradleConfigurableBuildCache.java | 4 +-- .../gradle/GradleConfigurableBuildScan.java | 4 +-- .../gradle/GradleConfigurableDevelocity.java | 4 +-- .../ProcessOperationsProcessRunner.java | 4 +-- .../WorkingDirectoryProcessOperations.java | 2 +- .../conventions/gradle}/package-info.java | 4 +-- ...sPublicationBuildScanConventionsTests.java | 2 +- ...cityConventionsPluginIntegrationTests.java | 12 +++---- .../GradleConfigurableBuildCacheTests.java | 2 +- .../GradleConfigurableBuildScanTests.java | 2 +- .../gradle/TestBuildScanConfiguration.java | 2 +- .../gradle/TestDevelocityConfiguration.java | 2 +- .../conventions/gradle/TestProcessRunner.java | 4 +-- .../conventions/gradle/TestProperty.java | 2 +- .../build.gradle | 6 ++-- .../maven/ConventionsDevelocityListener.java | 6 ++-- .../maven/MavenConfigurableBuildCache.java | 4 +-- .../maven/MavenConfigurableBuildScan.java | 4 +-- .../maven/MavenConfigurableDevelocity.java | 4 +-- .../maven/ProcessBuilderProcessRunner.java | 4 +-- .../conventions/maven/package-info.java | 4 +-- .../resources/META-INF/plexus/components.xml | 2 +- .../MavenConfigurableBuildCacheTests.java | 2 +- .../MavenConfigurableBuildScanTests.java | 4 +-- .../build.gradle | 34 ------------------- gradle.properties | 2 +- gradle/plugins/build-conventions/build.gradle | 2 +- .../build/BuildConventionsPlugin.java | 2 +- .../conventions/build/JavaConventions.java | 2 +- .../build/MavenPublishConventions.java | 10 +++--- .../conventions/build/package-info.java | 2 +- settings.gradle | 19 +++-------- 51 files changed, 132 insertions(+), 143 deletions(-) rename {gradle-enterprise-conventions-core => develocity-conventions-core}/build.gradle (88%) rename {gradle-enterprise-conventions-core/src/main/java/io/spring/ge => develocity-conventions-core/src/main/java/io/spring/develocity}/conventions/core/BuildCacheConventions.java (97%) rename {gradle-enterprise-conventions-core/src/main/java/io/spring/ge => develocity-conventions-core/src/main/java/io/spring/develocity}/conventions/core/BuildScanConventions.java (98%) rename {gradle-enterprise-conventions-core/src/main/java/io/spring/ge => develocity-conventions-core/src/main/java/io/spring/develocity}/conventions/core/ConfigurableBuildCache.java (97%) rename {gradle-enterprise-conventions-core/src/main/java/io/spring/ge => develocity-conventions-core/src/main/java/io/spring/develocity}/conventions/core/ConfigurableBuildScan.java (98%) rename {gradle-enterprise-conventions-core/src/main/java/io/spring/ge => develocity-conventions-core/src/main/java/io/spring/develocity}/conventions/core/ConfigurableDevelocity.java (95%) rename {gradle-enterprise-conventions-core/src/main/java/io/spring/ge => develocity-conventions-core/src/main/java/io/spring/develocity}/conventions/core/ContinuousIntegration.java (97%) rename {gradle-enterprise-conventions-core/src/main/java/io/spring/ge => develocity-conventions-core/src/main/java/io/spring/develocity}/conventions/core/ProcessRunner.java (97%) rename {gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle => develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core}/package-info.java (84%) rename {gradle-enterprise-conventions-core/src/test/java/io/spring/ge => develocity-conventions-core/src/test/java/io/spring/develocity}/conventions/core/BuildCacheConventionsTests.java (99%) rename {gradle-enterprise-conventions-core/src/test/java/io/spring/ge => develocity-conventions-core/src/test/java/io/spring/develocity}/conventions/core/BuildScanConventionsTests.java (99%) rename {gradle-enterprise-conventions-core/src/test/java/io/spring/ge => develocity-conventions-core/src/test/java/io/spring/develocity}/conventions/core/TestProcessRunner.java (97%) create mode 100644 develocity-conventions-gradle-plugin/build.gradle rename {gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge => develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity}/conventions/gradle/AnonymousPublicationBuildScanConventions.java (79%) rename gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleEnterpriseConventionsPlugin.java => develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/DevelocityConventionsPlugin.java (89%) rename {gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge => develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity}/conventions/gradle/GradleConfigurableBuildCache.java (95%) rename {gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge => develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity}/conventions/gradle/GradleConfigurableBuildScan.java (96%) rename {gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge => develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity}/conventions/gradle/GradleConfigurableDevelocity.java (91%) rename {gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge => develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity}/conventions/gradle/ProcessOperationsProcessRunner.java (94%) rename {gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge => develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity}/conventions/gradle/WorkingDirectoryProcessOperations.java (97%) rename {gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core => develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle}/package-info.java (84%) rename {gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge => develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity}/conventions/gradle/AnonymousPublicationBuildScanConventionsTests.java (97%) rename gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/GradleEnterpriseConventionsPluginIntegrationTests.java => develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/DevelocityConventionsPluginIntegrationTests.java (94%) rename {gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge => develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity}/conventions/gradle/GradleConfigurableBuildCacheTests.java (98%) rename {gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge => develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity}/conventions/gradle/GradleConfigurableBuildScanTests.java (98%) rename {gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge => develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity}/conventions/gradle/TestBuildScanConfiguration.java (99%) rename {gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge => develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity}/conventions/gradle/TestDevelocityConfiguration.java (97%) rename {gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge => develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity}/conventions/gradle/TestProcessRunner.java (95%) rename {gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge => develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity}/conventions/gradle/TestProperty.java (98%) rename {gradle-enterprise-conventions-maven-extension => develocity-conventions-maven-extension}/build.gradle (73%) rename {gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge => develocity-conventions-maven-extension/src/main/java/io/spring/develocity}/conventions/maven/ConventionsDevelocityListener.java (90%) rename {gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge => develocity-conventions-maven-extension/src/main/java/io/spring/develocity}/conventions/maven/MavenConfigurableBuildCache.java (95%) rename {gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge => develocity-conventions-maven-extension/src/main/java/io/spring/develocity}/conventions/maven/MavenConfigurableBuildScan.java (95%) rename {gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge => develocity-conventions-maven-extension/src/main/java/io/spring/develocity}/conventions/maven/MavenConfigurableDevelocity.java (90%) rename {gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge => develocity-conventions-maven-extension/src/main/java/io/spring/develocity}/conventions/maven/ProcessBuilderProcessRunner.java (95%) rename {gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge => develocity-conventions-maven-extension/src/main/java/io/spring/develocity}/conventions/maven/package-info.java (84%) rename {gradle-enterprise-conventions-maven-extension => develocity-conventions-maven-extension}/src/main/resources/META-INF/plexus/components.xml (71%) rename {gradle-enterprise-conventions-maven-extension/src/test/java/io/spring/ge => develocity-conventions-maven-extension/src/test/java/io/spring/develocity}/conventions/maven/MavenConfigurableBuildCacheTests.java (99%) rename {gradle-enterprise-conventions-maven-extension/src/test/java/io/spring/ge => develocity-conventions-maven-extension/src/test/java/io/spring/develocity}/conventions/maven/MavenConfigurableBuildScanTests.java (98%) delete mode 100644 gradle-enterprise-conventions-gradle-plugin/build.gradle rename gradle/plugins/build-conventions/src/main/java/io/spring/{ge => develocity}/conventions/build/BuildConventionsPlugin.java (95%) rename gradle/plugins/build-conventions/src/main/java/io/spring/{ge => develocity}/conventions/build/JavaConventions.java (98%) rename gradle/plugins/build-conventions/src/main/java/io/spring/{ge => develocity}/conventions/build/MavenPublishConventions.java (90%) rename gradle/plugins/build-conventions/src/main/java/io/spring/{ge => develocity}/conventions/build/package-info.java (93%) diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index d41d913..7dacedd 100644 --- a/.github/workflows/build-and-deploy-snapshot.yml +++ b/.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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eb32868..604f452 100644 --- a/.github/workflows/release.yml +++ b/.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: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index de2af4e..f5cc2c5 100644 --- a/CONTRIBUTING.md +++ b/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 diff --git a/README.md b/README.md index f510fa8..576cf85 100644 --- a/README.md +++ b/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 "<>" - id "io.spring.ge.conventions" version "<>" + id "io.spring.develocity.conventions" version "<>" // … } ``` @@ -133,8 +133,8 @@ To use the conventions, create a `.mvn/extensions.xml` file in the root of the p - io.spring.ge.conventions - gradle-enterprise-conventions-maven-extension + io.spring.develocity.conventions + develocity-conventions-maven-extension <> diff --git a/gradle-enterprise-conventions-core/build.gradle b/develocity-conventions-core/build.gradle similarity index 88% rename from gradle-enterprise-conventions-core/build.gradle rename to develocity-conventions-core/build.gradle index 45fdbb3..5249829 100644 --- a/gradle-enterprise-conventions-core/build.gradle +++ b/develocity-conventions-core/build.gradle @@ -4,7 +4,7 @@ plugins { id "maven-publish" } -description = "Gradle Enterprise Conventions Core" +description = "Develocity Conventions Core" repositories { mavenCentral() diff --git a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/BuildCacheConventions.java b/develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/BuildCacheConventions.java similarity index 97% rename from gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/BuildCacheConventions.java rename to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/BuildCacheConventions.java index 379a147..f6baf5d 100644 --- a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/BuildCacheConventions.java +++ b/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; diff --git a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/BuildScanConventions.java b/develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/BuildScanConventions.java similarity index 98% rename from gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/BuildScanConventions.java rename to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/BuildScanConventions.java index dcff6d4..63e0baa 100644 --- a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/BuildScanConventions.java +++ b/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 diff --git a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ConfigurableBuildCache.java b/develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ConfigurableBuildCache.java similarity index 97% rename from gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ConfigurableBuildCache.java rename to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ConfigurableBuildCache.java index 409c0c9..38508de 100644 --- a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ConfigurableBuildCache.java +++ b/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; diff --git a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ConfigurableBuildScan.java b/develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ConfigurableBuildScan.java similarity index 98% rename from gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ConfigurableBuildScan.java rename to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ConfigurableBuildScan.java index c65da26..4a7c5bf 100644 --- a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ConfigurableBuildScan.java +++ b/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; diff --git a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ConfigurableDevelocity.java b/develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ConfigurableDevelocity.java similarity index 95% rename from gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ConfigurableDevelocity.java rename to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ConfigurableDevelocity.java index 6d4acf1..2cda5a8 100644 --- a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ConfigurableDevelocity.java +++ b/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. diff --git a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ContinuousIntegration.java b/develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ContinuousIntegration.java similarity index 97% rename from gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ContinuousIntegration.java rename to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ContinuousIntegration.java index 7fce2cd..5acb965 100644 --- a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ContinuousIntegration.java +++ b/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; diff --git a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ProcessRunner.java b/develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ProcessRunner.java similarity index 97% rename from gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ProcessRunner.java rename to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/ProcessRunner.java index 314f054..6938d98 100644 --- a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/ProcessRunner.java +++ b/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; diff --git a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/package-info.java b/develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/package-info.java similarity index 84% rename from gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/package-info.java rename to develocity-conventions-core/src/main/java/io/spring/develocity/conventions/core/package-info.java index e5d5ed6..8125099 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/package-info.java +++ b/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; diff --git a/gradle-enterprise-conventions-core/src/test/java/io/spring/ge/conventions/core/BuildCacheConventionsTests.java b/develocity-conventions-core/src/test/java/io/spring/develocity/conventions/core/BuildCacheConventionsTests.java similarity index 99% rename from gradle-enterprise-conventions-core/src/test/java/io/spring/ge/conventions/core/BuildCacheConventionsTests.java rename to develocity-conventions-core/src/test/java/io/spring/develocity/conventions/core/BuildCacheConventionsTests.java index 12c375b..f1cd667 100644 --- a/gradle-enterprise-conventions-core/src/test/java/io/spring/ge/conventions/core/BuildCacheConventionsTests.java +++ b/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; diff --git a/gradle-enterprise-conventions-core/src/test/java/io/spring/ge/conventions/core/BuildScanConventionsTests.java b/develocity-conventions-core/src/test/java/io/spring/develocity/conventions/core/BuildScanConventionsTests.java similarity index 99% rename from gradle-enterprise-conventions-core/src/test/java/io/spring/ge/conventions/core/BuildScanConventionsTests.java rename to develocity-conventions-core/src/test/java/io/spring/develocity/conventions/core/BuildScanConventionsTests.java index bffff53..522a27d 100644 --- a/gradle-enterprise-conventions-core/src/test/java/io/spring/ge/conventions/core/BuildScanConventionsTests.java +++ b/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; diff --git a/gradle-enterprise-conventions-core/src/test/java/io/spring/ge/conventions/core/TestProcessRunner.java b/develocity-conventions-core/src/test/java/io/spring/develocity/conventions/core/TestProcessRunner.java similarity index 97% rename from gradle-enterprise-conventions-core/src/test/java/io/spring/ge/conventions/core/TestProcessRunner.java rename to develocity-conventions-core/src/test/java/io/spring/develocity/conventions/core/TestProcessRunner.java index 392fc02..68871e3 100644 --- a/gradle-enterprise-conventions-core/src/test/java/io/spring/ge/conventions/core/TestProcessRunner.java +++ b/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; diff --git a/develocity-conventions-gradle-plugin/build.gradle b/develocity-conventions-gradle-plugin/build.gradle new file mode 100644 index 0000000..39c454d --- /dev/null +++ b/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' + } + } +} diff --git a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/AnonymousPublicationBuildScanConventions.java b/develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/AnonymousPublicationBuildScanConventions.java similarity index 79% rename from gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/AnonymousPublicationBuildScanConventions.java rename to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/AnonymousPublicationBuildScanConventions.java index 30f7aae..8984371 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/AnonymousPublicationBuildScanConventions.java +++ b/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 diff --git a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleEnterpriseConventionsPlugin.java b/develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/DevelocityConventionsPlugin.java similarity index 89% rename from gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleEnterpriseConventionsPlugin.java rename to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/DevelocityConventionsPlugin.java index 894e301..cf774da 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleEnterpriseConventionsPlugin.java +++ b/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 * ge.spring.io. * * @author Andy Wilkinson */ -public class GradleEnterpriseConventionsPlugin implements Plugin { +public class DevelocityConventionsPlugin implements Plugin { private final ProcessOperations processOperations; @Inject - public GradleEnterpriseConventionsPlugin(ProcessOperations processOperations) { + public DevelocityConventionsPlugin(ProcessOperations processOperations) { this.processOperations = processOperations; } diff --git a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildCache.java b/develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/GradleConfigurableBuildCache.java similarity index 95% rename from gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildCache.java rename to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/GradleConfigurableBuildCache.java index 0bc70a5..dfc31ad 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildCache.java +++ b/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; diff --git a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildScan.java b/develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/GradleConfigurableBuildScan.java similarity index 96% rename from gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildScan.java rename to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/GradleConfigurableBuildScan.java index 8ebf575..7649c97 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildScan.java +++ b/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. diff --git a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleConfigurableDevelocity.java b/develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/GradleConfigurableDevelocity.java similarity index 91% rename from gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleConfigurableDevelocity.java rename to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/GradleConfigurableDevelocity.java index ac07029..93762d0 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/GradleConfigurableDevelocity.java +++ b/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. diff --git a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/ProcessOperationsProcessRunner.java b/develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/ProcessOperationsProcessRunner.java similarity index 94% rename from gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/ProcessOperationsProcessRunner.java rename to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/ProcessOperationsProcessRunner.java index d817151..ed15fd1 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/ProcessOperationsProcessRunner.java +++ b/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; diff --git a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/WorkingDirectoryProcessOperations.java b/develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/WorkingDirectoryProcessOperations.java similarity index 97% rename from gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/WorkingDirectoryProcessOperations.java rename to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/WorkingDirectoryProcessOperations.java index 3791e72..0c62536 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/main/java/io/spring/ge/conventions/gradle/WorkingDirectoryProcessOperations.java +++ b/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; diff --git a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/package-info.java b/develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/package-info.java similarity index 84% rename from gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/package-info.java rename to develocity-conventions-gradle-plugin/src/main/java/io/spring/develocity/conventions/gradle/package-info.java index c9ce56a..f2bcb61 100644 --- a/gradle-enterprise-conventions-core/src/main/java/io/spring/ge/conventions/core/package-info.java +++ b/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; diff --git a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/AnonymousPublicationBuildScanConventionsTests.java b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/AnonymousPublicationBuildScanConventionsTests.java similarity index 97% rename from gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/AnonymousPublicationBuildScanConventionsTests.java rename to develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/AnonymousPublicationBuildScanConventionsTests.java index b85f0b9..531667a 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/AnonymousPublicationBuildScanConventionsTests.java +++ b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/AnonymousPublicationBuildScanConventionsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.ge.conventions.gradle; +package io.spring.develocity.conventions.gradle; import org.junit.jupiter.api.Test; diff --git a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/GradleEnterpriseConventionsPluginIntegrationTests.java b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/DevelocityConventionsPluginIntegrationTests.java similarity index 94% rename from gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/GradleEnterpriseConventionsPluginIntegrationTests.java rename to develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/DevelocityConventionsPluginIntegrationTests.java index ccdb4e4..c8180f7 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/GradleEnterpriseConventionsPluginIntegrationTests.java +++ b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/DevelocityConventionsPluginIntegrationTests.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; import java.io.FileReader; @@ -29,7 +29,7 @@ import java.util.function.Consumer; import com.gradle.develocity.agent.gradle.DevelocityPlugin; -import io.spring.ge.conventions.core.ConfigurableBuildScan; +import io.spring.develocity.conventions.core.ConfigurableBuildScan; import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.GradleRunner; import org.junit.jupiter.api.Test; @@ -38,11 +38,11 @@ import static org.assertj.core.api.Assertions.assertThat; /** - * Integrations tests for {@link GradleEnterpriseConventionsPlugin}. + * Integrations tests for {@link DevelocityConventionsPlugin}. * * @author Andy Wilkinson */ -class GradleEnterpriseConventionsPluginIntegrationTests { +class DevelocityConventionsPluginIntegrationTests { @Test void whenThePluginIsAppliedThenBuildScanConventionsAreApplied(@TempDir File projectDir) { @@ -105,7 +105,7 @@ private void prepareProject(File projectDir) { write(new File(projectDir, "settings.gradle"), (writer) -> { writer.println("plugins {"); writer.println(" id 'com.gradle.develocity'"); - writer.println(" id 'io.spring.ge.conventions' version '" + version() + "'"); + writer.println(" id 'io.spring.develocity.conventions' version '" + version() + "'"); writer.println("}"); writer.println("gradle.afterProject { project -> project.ext['settings'] = settings }"); }); @@ -130,7 +130,7 @@ private void prepareMultiModuleProject(File projectDir) { write(new File(projectDir, "settings.gradle"), (writer) -> { writer.println("plugins {"); writer.println(" id 'com.gradle.develocity'"); - writer.println(" id 'io.spring.ge.conventions' version '" + version() + "'"); + writer.println(" id 'io.spring.develocity.conventions' version '" + version() + "'"); writer.println("}"); writer.println("include 'sub'"); writer.println("gradle.afterProject { project -> project.ext['settings'] = settings }"); diff --git a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildCacheTests.java b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/GradleConfigurableBuildCacheTests.java similarity index 98% rename from gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildCacheTests.java rename to develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/GradleConfigurableBuildCacheTests.java index 179ba82..4d9140b 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildCacheTests.java +++ b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/GradleConfigurableBuildCacheTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.ge.conventions.gradle; +package io.spring.develocity.conventions.gradle; import com.gradle.develocity.agent.gradle.buildcache.DevelocityBuildCache; import org.gradle.api.Action; diff --git a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildScanTests.java b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/GradleConfigurableBuildScanTests.java similarity index 98% rename from gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildScanTests.java rename to develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/GradleConfigurableBuildScanTests.java index 3ea41e3..a80bf08 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/GradleConfigurableBuildScanTests.java +++ b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/GradleConfigurableBuildScanTests.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.net.UnknownHostException; diff --git a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/TestBuildScanConfiguration.java b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/TestBuildScanConfiguration.java similarity index 99% rename from gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/TestBuildScanConfiguration.java rename to develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/TestBuildScanConfiguration.java index e448d9c..829fe52 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/TestBuildScanConfiguration.java +++ b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/TestBuildScanConfiguration.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.ArrayList; diff --git a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/TestDevelocityConfiguration.java b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/TestDevelocityConfiguration.java similarity index 97% rename from gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/TestDevelocityConfiguration.java rename to develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/TestDevelocityConfiguration.java index 2d668ec..af828f3 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/TestDevelocityConfiguration.java +++ b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/TestDevelocityConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.ge.conventions.gradle; +package io.spring.develocity.conventions.gradle; import com.gradle.develocity.agent.gradle.DevelocityConfiguration; import com.gradle.develocity.agent.gradle.buildcache.DevelocityBuildCache; diff --git a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/TestProcessRunner.java b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/TestProcessRunner.java similarity index 95% rename from gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/TestProcessRunner.java rename to develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/TestProcessRunner.java index 1d6fbda..cf2e6d5 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/TestProcessRunner.java +++ b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/TestProcessRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.ge.conventions.gradle; +package io.spring.develocity.conventions.gradle; import java.io.IOException; import java.io.OutputStream; @@ -23,7 +23,7 @@ import java.util.Map; import java.util.function.Consumer; -import io.spring.ge.conventions.core.ProcessRunner; +import io.spring.develocity.conventions.core.ProcessRunner; import org.mockito.ArgumentCaptor; import static org.mockito.Mockito.mock; diff --git a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/TestProperty.java b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/TestProperty.java similarity index 98% rename from gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/TestProperty.java rename to develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/TestProperty.java index 82ee40e..e48a43b 100644 --- a/gradle-enterprise-conventions-gradle-plugin/src/test/java/io/spring/ge/conventions/gradle/TestProperty.java +++ b/develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/TestProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.ge.conventions.gradle; +package io.spring.develocity.conventions.gradle; import org.gradle.api.Transformer; import org.gradle.api.provider.Property; diff --git a/gradle-enterprise-conventions-maven-extension/build.gradle b/develocity-conventions-maven-extension/build.gradle similarity index 73% rename from gradle-enterprise-conventions-maven-extension/build.gradle rename to develocity-conventions-maven-extension/build.gradle index 68c93fc..4fddd3b 100644 --- a/gradle-enterprise-conventions-maven-extension/build.gradle +++ b/develocity-conventions-maven-extension/build.gradle @@ -4,7 +4,7 @@ plugins { id "maven-publish" } -description = "Gradle Enterprise Conventions Maven extension" +description = "Develocity Conventions Maven extension" repositories { mavenCentral() @@ -15,9 +15,9 @@ dependencies { compileOnly("org.codehaus.plexus:plexus-component-annotations:1.7.1") implementation("com.gradle:develocity-maven-extension:1.21.5") - implementation(project(":gradle-enterprise-conventions-core")) + implementation(project(":develocity-conventions-core")) - testImplementation("org.assertj:assertj-core:3.24.2") + 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") } diff --git a/gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/ConventionsDevelocityListener.java b/develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/ConventionsDevelocityListener.java similarity index 90% rename from gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/ConventionsDevelocityListener.java rename to develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/ConventionsDevelocityListener.java index 36a1cc3..4575361 100644 --- a/gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/ConventionsDevelocityListener.java +++ b/develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/ConventionsDevelocityListener.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.spring.ge.conventions.maven; +package io.spring.develocity.conventions.maven; import com.gradle.develocity.agent.maven.api.DevelocityApi; import com.gradle.develocity.agent.maven.api.DevelocityListener; -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.apache.maven.execution.MavenSession; import org.codehaus.plexus.component.annotations.Component; diff --git a/gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/MavenConfigurableBuildCache.java b/develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/MavenConfigurableBuildCache.java similarity index 95% rename from gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/MavenConfigurableBuildCache.java rename to develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/MavenConfigurableBuildCache.java index 6794371..3f9bb8f 100644 --- a/gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/MavenConfigurableBuildCache.java +++ b/develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/MavenConfigurableBuildCache.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.spring.ge.conventions.maven; +package io.spring.develocity.conventions.maven; import java.util.function.Consumer; import com.gradle.develocity.agent.maven.api.cache.BuildCacheApi; -import io.spring.ge.conventions.core.ConfigurableBuildCache; +import io.spring.develocity.conventions.core.ConfigurableBuildCache; /** * {@link ConfigurableBuildCache} for Maven builds. diff --git a/gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/MavenConfigurableBuildScan.java b/develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/MavenConfigurableBuildScan.java similarity index 95% rename from gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/MavenConfigurableBuildScan.java rename to develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/MavenConfigurableBuildScan.java index 7526b47..ea736d9 100644 --- a/gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/MavenConfigurableBuildScan.java +++ b/develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/MavenConfigurableBuildScan.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.ge.conventions.maven; +package io.spring.develocity.conventions.maven; import java.net.InetAddress; import java.util.List; @@ -23,7 +23,7 @@ import com.gradle.develocity.agent.maven.api.scan.BuildScanApi; import com.gradle.develocity.agent.maven.api.scan.BuildScanPublishing.PublishingContext; -import io.spring.ge.conventions.core.ConfigurableBuildScan; +import io.spring.develocity.conventions.core.ConfigurableBuildScan; class MavenConfigurableBuildScan implements ConfigurableBuildScan { diff --git a/gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/MavenConfigurableDevelocity.java b/develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/MavenConfigurableDevelocity.java similarity index 90% rename from gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/MavenConfigurableDevelocity.java rename to develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/MavenConfigurableDevelocity.java index d07a7e1..a21ac7e 100644 --- a/gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/MavenConfigurableDevelocity.java +++ b/develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/MavenConfigurableDevelocity.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.spring.ge.conventions.maven; +package io.spring.develocity.conventions.maven; import com.gradle.develocity.agent.maven.api.DevelocityApi; -import io.spring.ge.conventions.core.ConfigurableDevelocity; +import io.spring.develocity.conventions.core.ConfigurableDevelocity; /** * {@link ConfigurableDevelocity} for Maven builds. diff --git a/gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/ProcessBuilderProcessRunner.java b/develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/ProcessBuilderProcessRunner.java similarity index 95% rename from gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/ProcessBuilderProcessRunner.java rename to develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/ProcessBuilderProcessRunner.java index 6c13a1d..b97ce5b 100644 --- a/gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/ProcessBuilderProcessRunner.java +++ b/develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/ProcessBuilderProcessRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.ge.conventions.maven; +package io.spring.develocity.conventions.maven; import java.io.IOException; import java.io.OutputStream; @@ -25,7 +25,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import io.spring.ge.conventions.core.ProcessRunner; +import io.spring.develocity.conventions.core.ProcessRunner; /** * {@link ProcessRunner} implementation that uses {@link ProcessBuilder}. diff --git a/gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/package-info.java b/develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/package-info.java similarity index 84% rename from gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/package-info.java rename to develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/package-info.java index 4961acb..d532b01 100644 --- a/gradle-enterprise-conventions-maven-extension/src/main/java/io/spring/ge/conventions/maven/package-info.java +++ b/develocity-conventions-maven-extension/src/main/java/io/spring/develocity/conventions/maven/package-info.java @@ -15,6 +15,6 @@ */ /** - * Gradle Enterprise conventions for Spring projects built with Maven. + * Develocity conventions for Spring projects built with Maven. */ -package io.spring.ge.conventions.maven; +package io.spring.develocity.conventions.maven; diff --git a/gradle-enterprise-conventions-maven-extension/src/main/resources/META-INF/plexus/components.xml b/develocity-conventions-maven-extension/src/main/resources/META-INF/plexus/components.xml similarity index 71% rename from gradle-enterprise-conventions-maven-extension/src/main/resources/META-INF/plexus/components.xml rename to develocity-conventions-maven-extension/src/main/resources/META-INF/plexus/components.xml index 7949754..a4b5e5c 100644 --- a/gradle-enterprise-conventions-maven-extension/src/main/resources/META-INF/plexus/components.xml +++ b/develocity-conventions-maven-extension/src/main/resources/META-INF/plexus/components.xml @@ -4,7 +4,7 @@ com.gradle.develocity.agent.maven.api.DevelocityListener conventions-develocity-listener - io.spring.ge.conventions.maven.ConventionsDevelocityListener + io.spring.develocity.conventions.maven.ConventionsDevelocityListener \ No newline at end of file diff --git a/gradle-enterprise-conventions-maven-extension/src/test/java/io/spring/ge/conventions/maven/MavenConfigurableBuildCacheTests.java b/develocity-conventions-maven-extension/src/test/java/io/spring/develocity/conventions/maven/MavenConfigurableBuildCacheTests.java similarity index 99% rename from gradle-enterprise-conventions-maven-extension/src/test/java/io/spring/ge/conventions/maven/MavenConfigurableBuildCacheTests.java rename to develocity-conventions-maven-extension/src/test/java/io/spring/develocity/conventions/maven/MavenConfigurableBuildCacheTests.java index be1392c..2b70171 100644 --- a/gradle-enterprise-conventions-maven-extension/src/test/java/io/spring/ge/conventions/maven/MavenConfigurableBuildCacheTests.java +++ b/develocity-conventions-maven-extension/src/test/java/io/spring/develocity/conventions/maven/MavenConfigurableBuildCacheTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.ge.conventions.maven; +package io.spring.develocity.conventions.maven; import java.io.File; import java.net.URI; diff --git a/gradle-enterprise-conventions-maven-extension/src/test/java/io/spring/ge/conventions/maven/MavenConfigurableBuildScanTests.java b/develocity-conventions-maven-extension/src/test/java/io/spring/develocity/conventions/maven/MavenConfigurableBuildScanTests.java similarity index 98% rename from gradle-enterprise-conventions-maven-extension/src/test/java/io/spring/ge/conventions/maven/MavenConfigurableBuildScanTests.java rename to develocity-conventions-maven-extension/src/test/java/io/spring/develocity/conventions/maven/MavenConfigurableBuildScanTests.java index 64fba75..e5a387e 100644 --- a/gradle-enterprise-conventions-maven-extension/src/test/java/io/spring/ge/conventions/maven/MavenConfigurableBuildScanTests.java +++ b/develocity-conventions-maven-extension/src/test/java/io/spring/develocity/conventions/maven/MavenConfigurableBuildScanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.ge.conventions.maven; +package io.spring.develocity.conventions.maven; import java.net.InetAddress; import java.net.URI; @@ -37,7 +37,7 @@ import com.gradle.develocity.agent.maven.api.scan.BuildScanPublishing; import com.gradle.develocity.agent.maven.api.scan.BuildScanPublishing.PublishingContext; import com.gradle.develocity.agent.maven.api.scan.PublishedBuildScan; -import io.spring.ge.conventions.core.ConfigurableBuildScan; +import io.spring.develocity.conventions.core.ConfigurableBuildScan; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/gradle-enterprise-conventions-gradle-plugin/build.gradle b/gradle-enterprise-conventions-gradle-plugin/build.gradle deleted file mode 100644 index bfdcf69..0000000 --- a/gradle-enterprise-conventions-gradle-plugin/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -plugins { - id "build-conventions" - id "java-gradle-plugin" - id "maven-publish" -} - -description = "Gradle Enterprise Conventions Gradle plugin" - -repositories { - mavenCentral() - gradlePluginPortal() -} - -dependencies { - compileOnly("com.gradle:develocity-gradle-plugin:${gradleEnterprisePluginVersion}") - - implementation(project(":gradle-enterprise-conventions-core")) - - testImplementation("com.gradle:develocity-gradle-plugin:${gradleEnterprisePluginVersion}") - 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 { - gradleEnterprisePlugin { - displayName = project.description - description = project.description - id = 'io.spring.ge.conventions' - implementationClass = 'io.spring.ge.conventions.gradle.GradleEnterpriseConventionsPlugin' - } - } -} diff --git a/gradle.properties b/gradle.properties index 8cb366a..e029e84 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ version=0.0.18-SNAPSHOT -gradleEnterprisePluginVersion=3.17.2 +develocityPluginVersion=3.17.2 javaFormatVersion=0.0.39 diff --git a/gradle/plugins/build-conventions/build.gradle b/gradle/plugins/build-conventions/build.gradle index 36ea72f..b043ea7 100644 --- a/gradle/plugins/build-conventions/build.gradle +++ b/gradle/plugins/build-conventions/build.gradle @@ -12,7 +12,7 @@ gradlePlugin { plugins { conventionsPlugin { id = "build-conventions" - implementationClass = "io.spring.ge.conventions.build.BuildConventionsPlugin" + implementationClass = "io.spring.develocity.conventions.build.BuildConventionsPlugin" } } } diff --git a/gradle/plugins/build-conventions/src/main/java/io/spring/ge/conventions/build/BuildConventionsPlugin.java b/gradle/plugins/build-conventions/src/main/java/io/spring/develocity/conventions/build/BuildConventionsPlugin.java similarity index 95% rename from gradle/plugins/build-conventions/src/main/java/io/spring/ge/conventions/build/BuildConventionsPlugin.java rename to gradle/plugins/build-conventions/src/main/java/io/spring/develocity/conventions/build/BuildConventionsPlugin.java index 15147d4..47074b0 100644 --- a/gradle/plugins/build-conventions/src/main/java/io/spring/ge/conventions/build/BuildConventionsPlugin.java +++ b/gradle/plugins/build-conventions/src/main/java/io/spring/develocity/conventions/build/BuildConventionsPlugin.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.ge.conventions.build; +package io.spring.develocity.conventions.build; import org.gradle.api.Plugin; import org.gradle.api.Project; diff --git a/gradle/plugins/build-conventions/src/main/java/io/spring/ge/conventions/build/JavaConventions.java b/gradle/plugins/build-conventions/src/main/java/io/spring/develocity/conventions/build/JavaConventions.java similarity index 98% rename from gradle/plugins/build-conventions/src/main/java/io/spring/ge/conventions/build/JavaConventions.java rename to gradle/plugins/build-conventions/src/main/java/io/spring/develocity/conventions/build/JavaConventions.java index 258fdbf..f58a0d8 100644 --- a/gradle/plugins/build-conventions/src/main/java/io/spring/ge/conventions/build/JavaConventions.java +++ b/gradle/plugins/build-conventions/src/main/java/io/spring/develocity/conventions/build/JavaConventions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.ge.conventions.build; +package io.spring.develocity.conventions.build; import java.util.Arrays; diff --git a/gradle/plugins/build-conventions/src/main/java/io/spring/ge/conventions/build/MavenPublishConventions.java b/gradle/plugins/build-conventions/src/main/java/io/spring/develocity/conventions/build/MavenPublishConventions.java similarity index 90% rename from gradle/plugins/build-conventions/src/main/java/io/spring/ge/conventions/build/MavenPublishConventions.java rename to gradle/plugins/build-conventions/src/main/java/io/spring/develocity/conventions/build/MavenPublishConventions.java index a12ce67..bf5a182 100644 --- a/gradle/plugins/build-conventions/src/main/java/io/spring/ge/conventions/build/MavenPublishConventions.java +++ b/gradle/plugins/build-conventions/src/main/java/io/spring/develocity/conventions/build/MavenPublishConventions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.ge.conventions.build; +package io.spring.develocity.conventions.build; import java.util.Arrays; @@ -27,7 +27,7 @@ public class MavenPublishConventions { void apply(Project project) { - project.setGroup("io.spring.ge.conventions"); + project.setGroup("io.spring.develocity.conventions"); configureDeploymentRepository(project); configurePom(project); disableModuleMetadataGeneration(project); @@ -51,7 +51,7 @@ private void configurePom(Project project) { mavenPublication.pom((pom) -> { pom.getName().set(project.getDescription()); pom.getDescription().set(project.getDescription()); - pom.getUrl().set("https://github.com/spring-io/gradle-enterprise-conventions"); + pom.getUrl().set("https://github.com/spring-io/develocity-conventions"); pom.organization((organization) -> { organization.getName().set("Pivotal Software, Inc."); organization.getUrl().set("https://spring.io"); @@ -61,8 +61,8 @@ private void configurePom(Project project) { license.getUrl().set("https://www.apache.org/licenses/LICENSE-2.0.txt"); })); pom.scm((scm) -> { - scm.getUrl().set("https://github.com/spring-io/gradle-enterprise-conventions"); - scm.getConnection().set("scm:git:https://github.com/spring-io/gradle-enterprise-conventions"); + scm.getUrl().set("https://github.com/spring-io/develocity-conventions"); + scm.getConnection().set("scm:git:https://github.com/spring-io/develocity-conventions"); }); pom.developers((developers) -> { developers.developer((developer) -> { diff --git a/gradle/plugins/build-conventions/src/main/java/io/spring/ge/conventions/build/package-info.java b/gradle/plugins/build-conventions/src/main/java/io/spring/develocity/conventions/build/package-info.java similarity index 93% rename from gradle/plugins/build-conventions/src/main/java/io/spring/ge/conventions/build/package-info.java rename to gradle/plugins/build-conventions/src/main/java/io/spring/develocity/conventions/build/package-info.java index 69e14c3..e8a274e 100644 --- a/gradle/plugins/build-conventions/src/main/java/io/spring/ge/conventions/build/package-info.java +++ b/gradle/plugins/build-conventions/src/main/java/io/spring/develocity/conventions/build/package-info.java @@ -17,4 +17,4 @@ /** * Conventions for the project's build. */ -package io.spring.ge.conventions.build; +package io.spring.develocity.conventions.build; diff --git a/settings.gradle b/settings.gradle index 0cec21c..0f9f182 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,20 +1,9 @@ pluginManagement { includeBuild "gradle/plugins/build-conventions" - repositories { - mavenCentral() - gradlePluginPortal() - } - resolutionStrategy { - eachPlugin { - if (requested.id.id == "io.spring.javaformat") { - useModule "io.spring.javaformat:spring-javaformat-gradle-plugin:${requested.version}" - } - } - } } -rootProject.name = 'gradle-enterprise-conventions' +rootProject.name = 'develocity-conventions' -include("gradle-enterprise-conventions-core") -include("gradle-enterprise-conventions-gradle-plugin") -include("gradle-enterprise-conventions-maven-extension") +include("develocity-conventions-core") +include("develocity-conventions-gradle-plugin") +include("develocity-conventions-maven-extension")