From 3958a422ed6fc554690ebae8e9873de8b54553cb Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Tue, 11 Feb 2025 13:08:37 +0100 Subject: [PATCH 1/8] Added the basic Develocity configuration --- .mvn/develocity.xml | 42 ++++++++++++++++++++++++++++++++++++++++++ .mvn/extensions.xml | 27 +++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 .mvn/develocity.xml create mode 100644 .mvn/extensions.xml diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml new file mode 100644 index 00000000000..da048a143b1 --- /dev/null +++ b/.mvn/develocity.xml @@ -0,0 +1,42 @@ + + + + + https://develocity-staging.eclipse.org + + rt.vertx + + + 0.0.0.0 + + + + + + + + + + false + + + false + #{isTrue(env['CI'])} + + + diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 00000000000..3fb11e9473a --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,27 @@ + + + + + com.gradle + develocity-maven-extension + 1.23.1 + + + com.gradle + common-custom-user-data-maven-extension + 2.0.1 + + \ No newline at end of file From 9b3b775181295dba4db1b405f2235bb1b212c109 Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Wed, 12 Feb 2025 13:32:40 +0100 Subject: [PATCH 2/8] Added develocity-workspace-id to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index d67493b096e..a818c4399b6 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ test-tmp *.swp .vertx .java-version + +# Develocity +.mvn/.develocity/develocity-workspace-id \ No newline at end of file From b15a7c61a4d631630c1485c5c2d48ce5bb25ee60 Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Wed, 12 Feb 2025 13:32:59 +0100 Subject: [PATCH 3/8] Bumped DV extension to 1.23.2 --- .mvn/extensions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 3fb11e9473a..eb44730a291 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -17,7 +17,7 @@ com.gradle develocity-maven-extension - 1.23.1 + 1.23.2 com.gradle From 4ea0ce74ed8a74efce9626ed4be2facddb8e25cd Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Tue, 25 Feb 2025 11:37:12 +0100 Subject: [PATCH 4/8] Added Develocity CI integration --- .github/workflows/ci.yml | 4 +++- .github/workflows/deploy.yml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c925cea261d..4da82cc9973 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,4 +29,6 @@ jobs: java-version: ${{ inputs.jdk }} distribution: temurin - name: Run tests - run: mvn -s .github/maven-ci-settings.xml -q clean verify -B ${{ inputs.profile }} + run: mvn -s .github/maven-ci-settings.xml -q clean verify -B ${{ inputs.profile }} -D.scan.value.profile="${{ inputs.profile }}" + env: + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 63dbced13a6..dc0e9eba11e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,3 +30,5 @@ jobs: - name: Maven deploy if: ${{ endsWith(env.PROJECT_VERSION, '-SNAPSHOT') }} run: mvn deploy -s .github/maven-cd-settings.xml -DskipTests -B + env: + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }} From 9e0babf366b8f16c7e0deb890e0f0ae17b444f00 Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Tue, 25 Feb 2025 11:38:51 +0100 Subject: [PATCH 5/8] Configured background scan publishing on CI --- .mvn/develocity.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml index da048a143b1..6d07a55e0e3 100644 --- a/.mvn/develocity.xml +++ b/.mvn/develocity.xml @@ -29,6 +29,7 @@ + #{isFalse(env['CI'])} From 3a2f93b99046a3d5b1fe9fe7ea4ae53f65111dbf Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Tue, 25 Feb 2025 11:39:14 +0100 Subject: [PATCH 6/8] Enabled build caching made available by Develocity --- .mvn/develocity.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml index 6d07a55e0e3..672c9a84c2f 100644 --- a/.mvn/develocity.xml +++ b/.mvn/develocity.xml @@ -33,10 +33,10 @@ - false + #{isFalse(env['CI'])} - false + true #{isTrue(env['CI'])} From 332e7a35caeb306d002e2486eee347c0bf0f1195 Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Tue, 25 Feb 2025 13:00:38 +0100 Subject: [PATCH 7/8] Added missing newlines. --- .gitignore | 2 +- .mvn/extensions.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a818c4399b6..54a8d9b1d40 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,4 @@ test-tmp .java-version # Develocity -.mvn/.develocity/develocity-workspace-id \ No newline at end of file +.mvn/.develocity/develocity-workspace-id diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index eb44730a291..ab3ed7ebf77 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -24,4 +24,4 @@ common-custom-user-data-maven-extension 2.0.1 - \ No newline at end of file + From fbe760b0aab3eb7649c926e4195e5101d0b583d8 Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Tue, 25 Feb 2025 12:32:46 +0100 Subject: [PATCH 8/8] Develocity build caching optimizations --- vertx-core/pom.xml | 88 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 1 deletion(-) diff --git a/vertx-core/pom.xml b/vertx-core/pom.xml index d8b7f598051..333037b44e3 100644 --- a/vertx-core/pom.xml +++ b/vertx-core/pom.xml @@ -266,7 +266,68 @@ - + + com.gradle + develocity-maven-extension + + + + + maven-compiler-plugin + + + + asciidocSource + + ${project.basedir}/src/main/asciidoc + + + + + + + + asciidocOutput + ${project.build.directory}/asciidoc/java + + + + + + maven-surefire-plugin + + + + buildDirectory + + ${project.build.directory} + + + + + + + maven-failsafe-plugin + + + connect-to-tls-trusted-server + + + + javax.net.ssl.trustStore + + ${project.basedir}/src/test/resources/tls/client-truststore-root-ca.jks + + + + + + + + + + + @@ -337,6 +398,8 @@ io.netty:netty-tcnative-boringssl-static + ${project.build.directory}/ssl-engine-default-first-failsafe-reports + ${project.build.directory}/ssl-engine-default-failsafe-reports/ssl-engine-default-summary.xml @@ -352,6 +415,8 @@ true + ${project.build.directory}/ssl-engine-openssl-failsafe-reports + ${project.build.directory}/ssl-engine-openssl-failsafe-reports/ssl-engine-openssl-openssl-summary.xml @@ -369,6 +434,7 @@ io.netty:netty-transport-classes-epoll io.netty:netty-transport-classes-kqueue + ${project.build.directory}/failsafe-reports/no-native-summary.xml @@ -384,6 +450,7 @@ io.netty:netty-transport-classes-epoll + ${project.build.directory}/failsafe-reports/io-uring-summary.xml @@ -400,6 +467,7 @@ ${project.basedir}/src/test/resources/tls/client-truststore-root-ca.jks wibble + ${project.build.directory}/failsafe-reports/connect-to-tls-trusted-server-summary.xml @@ -416,6 +484,7 @@ com.fasterxml.jackson.core:jackson-core com.fasterxml.jackson.core:jackson-databind + ${project.build.directory}/failsafe-reports/no-jackson-summary.xml @@ -431,6 +500,7 @@ io.netty:netty-codec-haproxy + ${project.build.directory}/failsafe-reports/no-haproxy-codec-summary.xml @@ -446,6 +516,7 @@ com.fasterxml.jackson.core:jackson-databind + ${project.build.directory}/failsafe-reports/no-jackson-databind-summary.xml @@ -465,6 +536,7 @@ com.fasterxml.jackson.core:jackson-core com.fasterxml.jackson.core:jackson-databind + ${project.build.directory}/failsafe-reports/custom-json-factory-summary.xml @@ -480,6 +552,7 @@ ${project.basedir}/src/test/classpath/jsonfactoryordering + ${project.build.directory}/failsafe-reports/json-factory-ordering-summary.xml @@ -495,6 +568,7 @@ ${project.basedir}/src/test/classpath/metrics + ${project.build.directory}/failsafe-reports/metrics-service-loader-summary.xml @@ -510,6 +584,7 @@ ${project.basedir}/src/test/classpath/customthreadfactory + ${project.build.directory}/failsafe-reports/custom-vertx-thread-factory-summary.xml @@ -525,6 +600,7 @@ ${project.basedir}/src/test/classpath/customexecutorservicefactory + ${project.build.directory}/failsafe-reports/custom-executor-service-factory-summary.xml @@ -540,6 +616,7 @@ ${project.basedir}/src/test/classpath/customeventexecutor + ${project.build.directory}/failsafe-reports/custom-event-executor-summary.xml @@ -555,6 +632,7 @@ ${project.basedir}/src/test/classpath/tracerfactory + ${project.build.directory}/failsafe-reports/custom-vertx-tracer-factory-summary.xml @@ -570,6 +648,7 @@ ${project.basedir}/src/test/classpath/customfileresolver + ${project.build.directory}/failsafe-reports/custom-file-resolver-factory-summary.xml @@ -585,6 +664,7 @@ ${project.basedir}/src/test/classpath/customcontextlocal + ${project.build.directory}/failsafe-reports/custom-context-local-summary.xml @@ -597,6 +677,7 @@ io/vertx/it/servicehelper/ServiceHelperTest.java + ${project.build.directory}/failsafe-reports/service-helper-summary.xml @@ -612,6 +693,7 @@ adaptive + ${project.build.directory}/failsafe-reports/adaptive-allocator-summary.xml @@ -627,6 +709,8 @@ pooled + ${project.build.directory}/pooled-allocator-failsafe-reports + ${project.build.directory}/pooled-allocator-failsafe-reports/pooled-allocator-summary.xml @@ -642,6 +726,8 @@ unpooled + ${project.build.directory}/unpooled-allocator-failsafe-reports + ${project.build.directory}/unpooled-allocator-failsafe-reports/unpooled-allocator-summary.xml