From 7f402f5c350b0d9965c21d206b42767e2c4964f3 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Fri, 13 Oct 2023 10:04:15 -0500 Subject: [PATCH 1/2] Connect build to ge.spring.io. This change publishes a build scan to ge.spring.io for every local build from an authenticated Spring committer and for CI where appropriate access tokens are available. The build will not fail if publishing fails. This change also allows the build to benefit from local and remote build caching, providing faster builds for all contributors. Additionally, the project will have access to all features of Gradle Enterprise such as: - Dashboards to view all historical build scans, along with performance trends over time - Build failure analytics for enhanced investigation and diagnosis of build failures - Test failure analytics to better understand trends and causes around slow, failing, and flaky tests --- .gitignore | 1 + .mvn/extensions.xml | 13 +++++++++++++ .mvn/gradle-enterprise.xml | 31 +++++++++++++++++++++++++++++++ README.adoc | 2 +- 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 .mvn/extensions.xml create mode 100644 .mvn/gradle-enterprise.xml diff --git a/.gitignore b/.gitignore index f4e51a4235..b86bc9b13c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ node node_modules package-lock.json package.json +.mvn/.gradle-enterprise diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000000..eda2f38098 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,13 @@ + + + + com.gradle + gradle-enterprise-maven-extension + 1.19.3 + + + com.gradle + common-custom-user-data-maven-extension + 1.12.4 + + diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml new file mode 100644 index 0000000000..bbe439e12b --- /dev/null +++ b/.mvn/gradle-enterprise.xml @@ -0,0 +1,31 @@ + + + + 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/README.adoc b/README.adoc index b43841e29d..13fa5c3adb 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -= Spring Data Commons image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-commons%2F&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-commons/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]] += Spring Data Commons image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-commons%2F&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-commons/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]] image:https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Gradle Enterprise", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Core"] https://projects.spring.io/spring-data/[Spring Data Commons] is part of the umbrella Spring Data project that provides shared infrastructure across the Spring Data projects. It contains technology neutral repository interfaces as well as a metadata model for persisting Java classes. From c9615603fb5b32f67b3190497fb05c28df4cc1a9 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Mon, 6 Nov 2023 11:44:08 -0600 Subject: [PATCH 2/2] Add annotation processors for compiler avoidance. This is done to speed up builds by avoiding recompilation of all sources when making non-ABI changes. This also optimizes the Gradle Enterprise build caching infrastructure. --- pom.xml | 26 ++++++++++++++----- .../javax.annotation.processing.Processor | 1 - 2 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 src/test/resources/META-INF/services/javax.annotation.processing.Processor diff --git a/pom.xml b/pom.xml index 0925107f18..3175fb7979 100644 --- a/pom.xml +++ b/pom.xml @@ -151,13 +151,6 @@ true - - com.querydsl - querydsl-apt - ${querydsl} - provided - - com.querydsl querydsl-collections @@ -349,6 +342,25 @@ io.spring.maven.antora antora-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + + java-test-compile + + + + com.querydsl + querydsl-apt + ${querydsl} + general + + + + + + diff --git a/src/test/resources/META-INF/services/javax.annotation.processing.Processor b/src/test/resources/META-INF/services/javax.annotation.processing.Processor deleted file mode 100644 index 0060cc3f15..0000000000 --- a/src/test/resources/META-INF/services/javax.annotation.processing.Processor +++ /dev/null @@ -1 +0,0 @@ -com.querydsl.apt.QuerydslAnnotationProcessor