From 42ccdb8997f146c539f5de89562d07389a7e03dc Mon Sep 17 00:00:00 2001 From: Andrea Tarocchi Date: Tue, 28 May 2024 17:39:38 +0200 Subject: [PATCH 1/2] Updated maven surefire option in order to prevent failure if no tests are run --- camel-kafka-connector-catalog/pom.xml | 8 ++++++++ connectors/pom.xml | 5 +++-- core/pom.xml | 2 +- tests/pom.xml | 13 +++++++++++++ tooling/pom.xml | 8 ++++++++ 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/camel-kafka-connector-catalog/pom.xml b/camel-kafka-connector-catalog/pom.xml index 7290a8b0ee..a58b512a3c 100644 --- a/camel-kafka-connector-catalog/pom.xml +++ b/camel-kafka-connector-catalog/pom.xml @@ -102,6 +102,14 @@ + + org.apache.maven.plugins + maven-surefire-plugin + ${version.maven.surefire.plugin} + + false + + org.codehaus.mojo build-helper-maven-plugin diff --git a/connectors/pom.xml b/connectors/pom.xml index 918a8d7596..6ebb863ab1 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -50,11 +50,12 @@ + org.apache.maven.plugins maven-surefire-plugin + ${version.maven.surefire.plugin} - false + false - ${version.maven.surefire.plugin} org.apache.camel.kafkaconnector diff --git a/core/pom.xml b/core/pom.xml index 6b76f3d8b8..3967bec14e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -207,7 +207,7 @@ maven-surefire-plugin ${version.maven.surefire.plugin} - false + false diff --git a/tests/pom.xml b/tests/pom.xml index a0b2f52c70..a9b2e9c574 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -66,4 +66,17 @@ itests-netty-http itests-google-pubsub + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.maven.surefire.plugin} + + false + + + + diff --git a/tooling/pom.xml b/tooling/pom.xml index 1ffd8d2e44..80d5c07640 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -66,6 +66,14 @@ ${compiler.fork} + + org.apache.maven.plugins + maven-surefire-plugin + ${version.maven.surefire.plugin} + + false + + org.apache.maven.plugins maven-javadoc-plugin From 98194a38dd448042b05f1c57c4a134c9475b8a55 Mon Sep 17 00:00:00 2001 From: Andrea Tarocchi Date: Tue, 28 May 2024 17:57:59 +0200 Subject: [PATCH 2/2] Updated javadoc maven plugin source to release configuration --- parent/pom.xml | 3 ++- tooling/pom.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9394e6472b..c07d7142e2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -308,7 +308,8 @@ maven-javadoc-plugin ${version.maven.javadoc} - none + none + ${version.java} diff --git a/tooling/pom.xml b/tooling/pom.xml index 80d5c07640..750d307bb3 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -79,7 +79,7 @@ maven-javadoc-plugin true - ${version.java} + ${version.java} true Apache Camel false