Skip to content

Commit 0f12a09

Browse files
jprinetclaude
jprinet
and
claude
authored
build: migrate to OSS Community Develocity Instance (#24050)
- Point Develocity server to https://community.develocity.cloud with project ID OpenAPITools - Upgrade develocity-maven-extension to 2.4.1 and common-custom-user-data-maven-extension to 2.2.0 - Trim develocity.xml to remove keys with default values - Rename GRADLE_ENTERPRISE_ACCESS_KEY to DEVELOCITY_ACCESS_KEY across all CI workflow files - Update Revved up by Develocity badge in README to link to the community instance Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 624d729 commit 0f12a09

10 files changed

Lines changed: 20 additions & 42 deletions

‎.github/workflows/gradle-plugin-tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
./mvnw clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
4141
- name: Run tests with wrapper
4242
env:
43-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
43+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4444
run: |
4545
(cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk) # using gradle-6.8.3 via wrapper
4646
(cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)
@@ -51,6 +51,6 @@ jobs:
5151
gradle-version: '8.14.3'
5252
- name: Run tests without wrapper
5353
env:
54-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
54+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5555
run: |
5656
(cd modules/openapi-generator-gradle-plugin/samples/local-spec && gradle buildJavaResttemplateSdk) # not using gradle wrapper

‎.github/workflows/linux.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
shell: bash
6161
run: ./mvnw clean -nsu -B --quiet -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress install --file pom.xml
6262
env:
63-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
63+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6464

6565
- name: Upload Maven build artifact
6666
uses: actions/upload-artifact@v7
@@ -77,7 +77,7 @@ jobs:
7777
if: matrix.java == '11'
7878
shell: bash
7979
env:
80-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
80+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
8181
run: |
8282
cd modules/openapi-generator-maven-plugin
8383
mvn clean verify -Pintegration

‎.github/workflows/maven-plugin-tests-jdk17.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
${{ runner.os }}-test-maven-plugin-
3636
- name: Run tests
3737
env:
38-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
38+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3939
run: |
4040
./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
4141
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error

‎.github/workflows/maven-plugin-tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
${{ runner.os }}-test-maven-plugin-
3636
- name: Run tests
3737
env:
38-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
38+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3939
run: |
4040
./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
4141
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error

‎.github/workflows/mill-plugin-tests.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Maven Clean Install
3636
env:
37-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
37+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3838
run: |
3939
./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
4040
@@ -51,19 +51,19 @@ jobs:
5151
5252
- name: Mill Example - Test Validation Command
5353
env:
54-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
54+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5555
run: |
5656
(cd modules/openapi-generator-mill-plugin/example/ && ./mill validateOpenapiSpec $(pwd)/api/petstore-invalid.yaml)
5757
5858
- name: Mill Example - Test Validation Task
5959
env:
60-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
60+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6161
run: |
6262
(cd modules/openapi-generator-mill-plugin/example/ && ./mill openapi.validate)
6363
6464
- name: Mill Example - Test Compile Task
6565
env:
66-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
66+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6767
run: |
6868
(cd modules/openapi-generator-mill-plugin/example/ && ./mill __.compile)
6969

‎.github/workflows/openapi-generator.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Run maven
4040
run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
4141
env:
42-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
42+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4343
- run: ls -la modules/openapi-generator-cli/target
4444
- name: Upload openapi-generator-cli.jar artifact
4545
uses: actions/upload-artifact@v7
@@ -78,7 +78,7 @@ jobs:
7878
- name: Run unit tests
7979
run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet --fail-at-end test -Dorg.slf4j.simpleLogger.defaultLogLevel=error
8080
env:
81-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
81+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
8282
- name: Publish unit test reports
8383
if: ${{ always() }}
8484
uses: actions/upload-artifact@v7

‎.github/workflows/windows.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Run maven
4848
run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet install
4949
env:
50-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
50+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5151
- name: Test Template Retrieval
5252
run: |
5353
cd modules/openapi-generator-cli/target

‎.mvn/develocity.xml‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
2-
3-
<!-- Common develocity.xml configuration for Maven shared between CI agents and developers building locally.
4-
5-
The build cache credentials required for CI builds to write to the remote build cache are read from environment variables.
6-
Possibly, the credentials are configured in Jenkins via Credentials plugin (https://plugins.jenkins.io/credentials/) and
7-
Credentials Binding plugin (https://plugins.jenkins.io/credentials-binding/), or the credentials are injected using the
8-
vendor-specific mechanism of the CI server running the build.
9-
10-
Note: In the XML configuration below, you need to adjust
11-
12-
- the server url of your Develocity server
13-
- the name of the environment variable that reveals the build is running in a CI environment
14-
- the names of the environment variables holding the build cache credentials
15-
16-
to the specifics of your CI server settings. -->
17-
182
<develocity
193
xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
204
xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
5+
<projectId>OpenAPITools</projectId>
216
<server>
22-
<url>https://ge.openapi-generator.tech/</url>
23-
<allowUntrusted>false</allowUntrusted>
7+
<url>https://community.develocity.cloud</url>
248
</server>
259
<buildScan>
26-
<backgroundBuildScanUpload>#{isFalse(env['CI'])}</backgroundBuildScanUpload> <!-- adjust to your CI provider -->
10+
<backgroundBuildScanUpload>#{isFalse(env['CI'])}</backgroundBuildScanUpload>
2711
<publishing>
2812
<onlyIf>authenticated</onlyIf>
2913
</publishing>
3014
<obfuscation>
31-
<!-- Use a redacted value.-->
3215
<ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
3316
</obfuscation>
3417
</buildScan>
3518
<buildCache>
36-
<local>
37-
<enabled>true</enabled>
38-
</local>
3919
<remote>
40-
<enabled>true</enabled>
41-
<!-- Check credentials presence to avoid build cache errors on PR builds when credentials are not present -->
42-
<storeEnabled>#{isTrue(env['CI']) and isTrue(env['GRADLE_ENTERPRISE_ACCESS_KEY'])}</storeEnabled>
20+
<storeEnabled>#{isTrue(env['CI']) and isTrue(env['DEVELOCITY_ACCESS_KEY'])}</storeEnabled>
4321
</remote>
4422
</buildCache>
4523
</develocity>

‎.mvn/extensions.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<extension>
44
<groupId>com.gradle</groupId>
55
<artifactId>develocity-maven-extension</artifactId>
6-
<version>1.23.2</version>
6+
<version>2.4.1</version>
77
</extension>
88
<extension>
99
<groupId>com.gradle</groupId>
1010
<artifactId>common-custom-user-data-maven-extension</artifactId>
11-
<version>2.0.2</version>
11+
<version>2.2.0</version>
1212
</extension>
1313
</extensions>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[![Follow OpenAPI Generator Twitter account to get the latest update](https://img.shields.io/twitter/follow/oas_generator.svg?style=social&label=Follow)](https://twitter.com/oas_generator)
1111
[![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/OpenAPITools/openapi-generator)
1212
[![Conan Center](https://shields.io/conan/v/openapi-generator)](https://conan.io/center/recipes/openapi-generator)
13-
[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.openapi-generator.tech/scans)
13+
[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://community.develocity.cloud/scans?search.rootProjectNames=openapi-generator-project)
1414
</div>
1515

1616
<div align="center">

0 commit comments

Comments
 (0)