Skip to content

Commit af883e7

Browse files
erichaagdevodrotbohm
erichaagdev
authored and
odrotbohm
committed
GH-720 - Migrate to Maven Develocity conventions.
1 parent 00852d2 commit af883e7

File tree

8 files changed

+13
-69
lines changed

8 files changed

+13
-69
lines changed

‎.github/workflows/build.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,12 @@ jobs:
2323

2424
- name: Build with Maven
2525
env:
26-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
27-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
28-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
26+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
2927
run: ./mvnw -B
3028

3129
- name: Deploy to Artifactory
3230
env:
3331
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
3432
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
35-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
36-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
37-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
33+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
3834
run: ./mvnw -B clean deploy -Pci,artifactory

‎.github/workflows/integration.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030

3131
- name: Build with Maven
3232
env:
33-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
34-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
35-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
33+
COMMERCIAL_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_USERNAME }}
34+
COMMERCIAL_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_PASSWORD }}
35+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
3636
run: |
3737
cd spring-modulith-examples
3838
../mvnw -B versions:update-parent -DskipResolution=true -DparentVersion=${{ matrix.version }}

‎.github/workflows/milestone.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,14 @@ jobs:
2323

2424
- name: Build with Maven
2525
env:
26-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
27-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
28-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
26+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
2927
run: ./mvnw -B
3028

3129
- name: Deploy to Artifactory
3230
env:
3331
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
3432
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
35-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
36-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
37-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
33+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
3834
run: ./mvnw -B clean deploy -Pci,artifactory
3935

4036
- name: Setup Graphviz
@@ -44,7 +40,5 @@ jobs:
4440
env:
4541
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
4642
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
47-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
48-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
49-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
43+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
5044
run: ./mvnw -B clean deploy -Pdocumentation

‎.github/workflows/release.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ jobs:
3131
SONATYPE_USER: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
3232
SONATYPE_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
3333
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
34-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
35-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
36-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
34+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
3735
run: |
3836
./mvnw -B clean install -DskipTests
3937
./mvnw -B clean deploy -Pci,sonatype -s settings.xml
@@ -45,7 +43,5 @@ jobs:
4543
env:
4644
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
4745
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
48-
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
49-
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
50-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
46+
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
5147
run: ./mvnw -B clean deploy -Pdocumentation

‎.mvn/develocity.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎.mvn/extensions.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<extensions>
33
<extension>
4-
<groupId>com.gradle</groupId>
5-
<artifactId>develocity-maven-extension</artifactId>
6-
<version>1.21.5</version>
7-
</extension>
8-
<extension>
9-
<groupId>com.gradle</groupId>
10-
<artifactId>common-custom-user-data-maven-extension</artifactId>
11-
<version>2.0</version>
4+
<groupId>io.spring.develocity.conventions</groupId>
5+
<artifactId>develocity-conventions-maven-extension</artifactId>
6+
<version>0.0.19</version>
127
</extension>
138
</extensions>

‎pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<artifactory-maven-plugin.version>3.6.1</artifactory-maven-plugin.version>
3838
<flapdoodle-mongodb.version>4.6.1</flapdoodle-mongodb.version>
3939
<jmolecules-bom.version>2023.1.3</jmolecules-bom.version>
40-
<lombok.version>1.18.32</lombok.version>
4140
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4241
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4342
<spring.version>6.1.10</spring.version> <!-- For Javadoc links only -->
@@ -466,12 +465,10 @@ limitations under the License.
466465
<path>
467466
<groupId>org.springframework.boot</groupId>
468467
<artifactId>spring-boot-configuration-processor</artifactId>
469-
<version>${spring-boot.version}</version>
470468
</path>
471469
<path>
472470
<groupId>org.projectlombok</groupId>
473471
<artifactId>lombok</artifactId>
474-
<version>${lombok.version}</version>
475472
</path>
476473
</annotationProcessorPaths>
477474
</configuration>

‎spring-modulith-examples/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<properties>
2727
<java.version>17</java.version>
2828
<jmolecules.version>2023.1.3</jmolecules.version>
29-
<spring-boot.version>3.2.7</spring-boot.version>
3029
</properties>
3130

3231
<build>
@@ -42,12 +41,10 @@
4241
<path>
4342
<groupId>org.springframework.boot</groupId>
4443
<artifactId>spring-boot-configuration-processor</artifactId>
45-
<version>${spring-boot.version}</version>
4644
</path>
4745
<path>
4846
<groupId>org.projectlombok</groupId>
4947
<artifactId>lombok</artifactId>
50-
<version>${lombok.version}</version>
5148
</path>
5249
</annotationProcessorPaths>
5350
</configuration>

0 commit comments

Comments
 (0)