From 29735d4f23f70561e16c0e41e1c083fa633dac28 Mon Sep 17 00:00:00 2001 From: panos-kakos Date: Wed, 18 Dec 2024 20:21:36 +0200 Subject: [PATCH 1/4] [JAVA-42732] --- pom.xml | 87 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/pom.xml b/pom.xml index 019a36e6cfd9..f99450a6605c 100644 --- a/pom.xml +++ b/pom.xml @@ -329,7 +329,6 @@ - core-java-modules/core-java-8 core-java-modules/core-java-8-2 core-java-modules/core-java-8-datetime @@ -339,10 +338,6 @@ core-java-modules/core-java-lang core-java-modules/core-java-lang-math-3 core-java-modules/core-java-streams-2 - - - - libraries-jdk8 lombok-modules/lombok-custom muleesb @@ -356,10 +351,8 @@ jenkins-modules spring-4 spring-cloud-modules - spring-exceptions spring-integration - spring-security-modules/spring-security-ldap spring-swagger-codegen-modules video-tutorials @@ -403,8 +396,6 @@ - - jhipster-8-modules microservices-modules/microprofile spring-cloud-modules/spring-cloud-azure @@ -451,7 +442,6 @@ - core-java-modules/core-java-8 core-java-modules/core-java-8-2 core-java-modules/core-java-8-datetime @@ -461,9 +451,6 @@ core-java-modules/core-java-lang core-java-modules/core-java-lang-math-3 core-java-modules/core-java-streams-2 - - - libraries-jdk8 lombok-modules/lombok-custom muleesb @@ -477,10 +464,8 @@ jenkins-modules spring-4 spring-cloud-modules - spring-exceptions spring-integration - spring-security-modules/spring-security-ldap spring-swagger-codegen-modules video-tutorials @@ -517,8 +502,6 @@ - - jhipster-8-modules microservices-modules/microprofile spring-cloud-modules/spring-cloud-azure @@ -584,23 +567,13 @@ core-java-modules/core-java-jvm core-java-modules/core-java-lang-7 core-java-modules/core-java-datetime-conversion - libraries-data-io - persistence-modules/spring-data-neo4j persistence-modules/spring-persistence-simple quarkus-modules/quarkus quarkus-modules/quarkus-vs-springboot/quarkus-project - - spring-di-2 - - spring-security-modules/spring-security-legacy-oidc - - - @@ -713,7 +686,6 @@ jws ksqldb kubernetes-modules - libraries libraries-2 libraries-3 @@ -828,7 +800,6 @@ spring-quartz spring-reactive-modules spring-remoting-modules - spring-scheduling-2 spring-security-modules spring-shell @@ -981,23 +952,13 @@ core-java-modules/core-java-jvm core-java-modules/core-java-lang-7 core-java-modules/core-java-datetime-conversion - libraries-data-io - persistence-modules/spring-data-neo4j persistence-modules/spring-persistence-simple quarkus-modules/quarkus quarkus-modules/quarkus-vs-springboot/quarkus-project - - spring-di-2 - - spring-security-modules/spring-security-legacy-oidc - - - @@ -1104,7 +1065,6 @@ jws ksqldb kubernetes-modules - libraries libraries-2 libraries-3 @@ -1219,7 +1179,6 @@ spring-quartz spring-reactive-modules spring-remoting-modules - spring-scheduling-2 spring-security-modules spring-shell @@ -1323,6 +1282,52 @@ parent-spring-6 + + + disabled-modules + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + + + clojure-modules + ethereum + gradle-modules + guest + pants + spring-cloud-cli + spring-roo + + + apache-spark + jhipster-modules/jhipster-uaa + + + libraries-security + persistence-modules/java-harperdb + spring-cloud-modules/spring-cloud-data-flow + spring-cloud-modules/spring-cloud-stream-starters + spring-jinq + static-analysis-modules + tablesaw + spring-swagger-codegen-modules/openapi-custom-generator + spring-swagger-codegen-modules/openapi-custom-generator-api-client + + + language-interop + spring-scheduling + + + + + + From a4151c6322de3ca2719e99be6ca66e709f7c86e1 Mon Sep 17 00:00:00 2001 From: panos-kakos Date: Thu, 19 Dec 2024 17:51:01 +0200 Subject: [PATCH 2/4] [JAVA-42732] Created default and integration disabled profiles + added disabled modules (part 1) --- core-java-modules/pom.xml | 3 +- maven-modules/pom.xml | 2 +- persistence-modules/pom.xml | 7 +- pom.xml | 123 ++++++++++++++++++++++++++------ spring-boot-modules/pom.xml | 10 +-- spring-reactive-modules/pom.xml | 2 +- 6 files changed, 116 insertions(+), 31 deletions(-) diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index 38c00570a6e8..0ba0865cc2f0 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -86,6 +86,7 @@ core-java-arrays-operations-advanced-3 core-java-booleans core-java-char + core-java-collections core-java-collections-2 core-java-collections-3 @@ -236,7 +237,7 @@ core-java-9-jigsaw core-java-21 - + core-java-collections-set core-java-date-operations-1 core-java-datetime-conversion diff --git a/maven-modules/pom.xml b/maven-modules/pom.xml index 143a88364c1c..62bb0e0f6381 100644 --- a/maven-modules/pom.xml +++ b/maven-modules/pom.xml @@ -28,7 +28,7 @@ maven-classifier maven-copy-files maven-custom-plugin - + maven-generate-war maven-integration-test maven-jvm-args diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml index b58c02d899e9..68b320cdf168 100644 --- a/persistence-modules/pom.xml +++ b/persistence-modules/pom.xml @@ -42,6 +42,7 @@ hibernate-jpa-2 hibernate-jpa-3 hibernate-queries + hibernate-enterprise influxdb java-calcite @@ -80,7 +81,7 @@ spring-boot-persistence-mongodb-3 spring-data-arangodb - + spring-data-cassandra-test spring-data-cosmosdb spring-data-couchbase-2 @@ -136,8 +137,8 @@ scylladb spring-data-cassandra-2 spring-data-jpa-repo-3 - - + + hibernate-annotations-2 hibernate-reactive my-sql diff --git a/pom.xml b/pom.xml index f99450a6605c..b32967d9e43b 100644 --- a/pom.xml +++ b/pom.xml @@ -1284,7 +1284,7 @@ - disabled-modules + default-disabled @@ -1296,35 +1296,116 @@ - clojure-modules - ethereum - gradle-modules - guest - pants - spring-cloud-cli - spring-roo + clojure-modules + ethereum + gradle-modules + guest + pants + spring-cloud-cli + spring-roo - apache-spark - jhipster-modules/jhipster-uaa + apache-spark + jhipster-modules/jhipster-uaa - libraries-security - persistence-modules/java-harperdb - spring-cloud-modules/spring-cloud-data-flow - spring-cloud-modules/spring-cloud-stream-starters - spring-jinq - static-analysis-modules - tablesaw - spring-swagger-codegen-modules/openapi-custom-generator - spring-swagger-codegen-modules/openapi-custom-generator-api-client + libraries-security + persistence-modules/java-harperdb + spring-cloud-modules/spring-cloud-data-flow + spring-cloud-modules/spring-cloud-stream-starters + spring-jinq + static-analysis-modules + tablesaw + spring-swagger-codegen-modules/openapi-custom-generator + spring-swagger-codegen-modules/openapi-custom-generator-api-client + persistence-modules/spring-data-cassandra - language-interop - spring-scheduling + language-interop + spring-scheduling + spring-security-modules/spring-security-web-login + persistence-modules/spring-boot-persistence-mongodb --> + persistence-modules/spring-boot-persistence-mongodb-2 --> + persistence-modules/spring-boot-persistence-mongodb-4 --> + persistence-modules/spring-data-elasticsearch --> + persistence-modules/spring-boot-persistence-4 + persistence-modules/spring-boot-persistence-5 + maven-modules/maven-exec-plugin + spring-boot-modules/spring-boot-swagger-2 + spring-boot-modules/spring-boot-groovy + spring-boot-modules/spring-boot-data-3 + spring-reactive-modules/spring-reactive-performance + + aspectj + core-java-modules/core-java-classloader + core-java-modules/core-java-conditionals + persistence-modules/hibernate-queries-2 + spring-boot-modules/spring-boot-3 + + + + + integration-disabled + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + + + clojure-modules + ethereum + gradle-modules + guest + pants + spring-cloud-cli + spring-roo + + + apache-spark + jhipster-modules/jhipster-uaa + + libraries-security + persistence-modules/java-harperdb + spring-cloud-modules/spring-cloud-data-flow + spring-cloud-modules/spring-cloud-stream-starters + spring-jinq + static-analysis-modules + tablesaw + spring-swagger-codegen-modules/openapi-custom-generator + spring-swagger-codegen-modules/openapi-custom-generator-api-client + persistence-modules/spring-data-cassandra + + + language-interop + spring-scheduling + spring-security-modules/spring-security-web-login + persistence-modules/spring-boot-persistence-mongodb --> + persistence-modules/spring-boot-persistence-mongodb-2 --> + persistence-modules/spring-boot-persistence-mongodb-4 --> + persistence-modules/spring-data-elasticsearch --> + persistence-modules/spring-boot-persistence-4 + persistence-modules/spring-boot-persistence-5 + maven-modules/maven-exec-plugin + spring-boot-modules/spring-boot-swagger-2 + spring-boot-modules/spring-boot-groovy + spring-boot-modules/spring-boot-data-3 + spring-reactive-modules/spring-reactive-performance + + + + aspectj + core-java-modules/core-java-classloader + core-java-modules/core-java-conditionals + persistence-modules/hibernate-queries-2 + spring-boot-modules/spring-boot-3 diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index 8c2e88f257d1..c98d5a6c3d06 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -46,7 +46,8 @@ spring-boot-exceptions spring-boot-flowable spring-boot-graphql - + + spring-boot-grpc spring-boot-jasypt @@ -80,7 +81,7 @@ spring-boot-springdoc spring-boot-swagger + compatible?!--> spring-boot-swagger-jwt spring-boot-swagger-keycloak spring-boot-swagger-springfox @@ -93,10 +94,10 @@ spring-boot-actuator spring-boot-data-2 spring-boot-validation - + spring-boot-redis spring-boot-cassandre - + spring-caching-3 spring-boot-3-grpc @@ -105,6 +106,7 @@ spring-boot-3-test-pitfalls spring-boot-3-testcontainers spring-boot-3-2 + spring-boot-resilience4j spring-boot-properties spring-boot-properties-2 diff --git a/spring-reactive-modules/pom.xml b/spring-reactive-modules/pom.xml index d9c301632f95..4b9528e57366 100644 --- a/spring-reactive-modules/pom.xml +++ b/spring-reactive-modules/pom.xml @@ -33,7 +33,7 @@ spring-webflux-amqp - + From a6d469d3dfdfd2e1a5744eafcbc9a9c01f2238fc Mon Sep 17 00:00:00 2001 From: panos-kakos Date: Fri, 20 Dec 2024 06:44:04 +0200 Subject: [PATCH 3/4] [JAVA-42732] typo fix --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index b32967d9e43b..933cc38d7855 100644 --- a/pom.xml +++ b/pom.xml @@ -1324,10 +1324,10 @@ language-interop spring-scheduling spring-security-modules/spring-security-web-login - persistence-modules/spring-boot-persistence-mongodb --> - persistence-modules/spring-boot-persistence-mongodb-2 --> - persistence-modules/spring-boot-persistence-mongodb-4 --> - persistence-modules/spring-data-elasticsearch --> + persistence-modules/spring-boot-persistence-mongodb + persistence-modules/spring-boot-persistence-mongodb-2 + persistence-modules/spring-boot-persistence-mongodb-4 + persistence-modules/spring-data-elasticsearch persistence-modules/spring-boot-persistence-4 persistence-modules/spring-boot-persistence-5 maven-modules/maven-exec-plugin @@ -1387,10 +1387,10 @@ language-interop spring-scheduling spring-security-modules/spring-security-web-login - persistence-modules/spring-boot-persistence-mongodb --> - persistence-modules/spring-boot-persistence-mongodb-2 --> - persistence-modules/spring-boot-persistence-mongodb-4 --> - persistence-modules/spring-data-elasticsearch --> + persistence-modules/spring-boot-persistence-mongodb + persistence-modules/spring-boot-persistence-mongodb-2 + persistence-modules/spring-boot-persistence-mongodb-4 + persistence-modules/spring-data-elasticsearch persistence-modules/spring-boot-persistence-4 persistence-modules/spring-boot-persistence-5 maven-modules/maven-exec-plugin From 2473e41175103e521f133b2518736b79a04cca75 Mon Sep 17 00:00:00 2001 From: panos-kakos Date: Sun, 22 Dec 2024 10:09:33 +0200 Subject: [PATCH 4/4] [JAVA-42732] --- pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 933cc38d7855..6feef98533ee 100644 --- a/pom.xml +++ b/pom.xml @@ -1327,9 +1327,10 @@ persistence-modules/spring-boot-persistence-mongodb persistence-modules/spring-boot-persistence-mongodb-2 persistence-modules/spring-boot-persistence-mongodb-4 - persistence-modules/spring-data-elasticsearch persistence-modules/spring-boot-persistence-4 persistence-modules/spring-boot-persistence-5 + persistence-modules/spring-data-elasticsearch + persistence-modules/spring-data-mongodb-2 maven-modules/maven-exec-plugin spring-boot-modules/spring-boot-swagger-2 spring-boot-modules/spring-boot-groovy @@ -1390,9 +1391,10 @@ persistence-modules/spring-boot-persistence-mongodb persistence-modules/spring-boot-persistence-mongodb-2 persistence-modules/spring-boot-persistence-mongodb-4 - persistence-modules/spring-data-elasticsearch persistence-modules/spring-boot-persistence-4 persistence-modules/spring-boot-persistence-5 + persistence-modules/spring-data-elasticsearch + persistence-modules/spring-data-mongodb-2 maven-modules/maven-exec-plugin spring-boot-modules/spring-boot-swagger-2 spring-boot-modules/spring-boot-groovy