diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 51cf58f28..cd2b71087 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,16 +23,12 @@ jobs: - name: Build with Maven env: - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: ./mvnw -B - name: Deploy to Artifactory env: ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: ./mvnw -B clean deploy -Pci,artifactory diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index ef9ac70c8..5b420203f 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -34,9 +34,7 @@ jobs: env: COMMERCIAL_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_USERNAME }} COMMERCIAL_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_PASSWORD }} - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: | cd spring-modulith-examples ../mvnw -B versions:update-parent -s ../settings.xml -Pwith-preview-repos,with-commercial-repos -DskipResolution=true -DparentVersion=${{ matrix.version }} diff --git a/.github/workflows/milestone.yaml b/.github/workflows/milestone.yaml index 91a277044..fb54e250b 100644 --- a/.github/workflows/milestone.yaml +++ b/.github/workflows/milestone.yaml @@ -23,18 +23,14 @@ jobs: - name: Build with Maven env: - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: ./mvnw -B - name: Deploy to Artifactory env: ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: ./mvnw -B clean deploy -Pci,artifactory - name: Setup Graphviz @@ -44,7 +40,5 @@ jobs: env: ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: ./mvnw -B clean deploy -Pdocumentation diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3e96b6657..53ac9ddfc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -31,9 +31,7 @@ jobs: SONATYPE_USER: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: | ./mvnw -B clean install -DskipTests ./mvnw -B clean deploy -Pci,sonatype -s settings.xml @@ -45,7 +43,5 @@ jobs: env: ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: ./mvnw -B clean deploy -Pdocumentation diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml deleted file mode 100644 index c65cc28e8..000000000 --- a/.mvn/develocity.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - https://ge.spring.io - - - #{isFalse(env['CI'])} - true - true - - #{{'0.0.0.0'}} - - - - - true - - - - - ${env.GRADLE_ENTERPRISE_CACHE_USERNAME} - ${env.GRADLE_ENTERPRISE_CACHE_PASSWORD} - - - true - #{env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null and env['GRADLE_ENTERPRISE_CACHE_PASSWORD'] != null} - - - diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 861a083eb..1e3bb355f 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,13 +1,8 @@ - com.gradle - develocity-maven-extension - 1.21.5 - - - com.gradle - common-custom-user-data-maven-extension - 2.0 + io.spring.develocity.conventions + develocity-conventions-maven-extension + 0.0.19 diff --git a/pom.xml b/pom.xml index 5d1c6c61d..f649f3484 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,6 @@ 4.14.0 1.5.2 2023.1.3 - 1.18.32 UTF-8 UTF-8 3.3.0 @@ -494,12 +493,10 @@ limitations under the License. org.springframework.boot spring-boot-configuration-processor - ${spring-boot.version} org.projectlombok lombok - ${lombok.version} diff --git a/spring-modulith-examples/pom.xml b/spring-modulith-examples/pom.xml index 07ac6f637..de4af47e7 100644 --- a/spring-modulith-examples/pom.xml +++ b/spring-modulith-examples/pom.xml @@ -26,7 +26,6 @@ 17 2023.1.3 - 3.3.0 @@ -85,12 +84,10 @@ org.springframework.boot spring-boot-configuration-processor - ${spring-boot.version} org.projectlombok lombok - ${lombok.version}