This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ed1d2c9b9b6517b2d3736bb359c4d1a91c014f1b
Author: Otavio R. Piske <angusyo...@gmail.com>
AuthorDate: Sat Sep 23 10:20:55 2023 +0200
(chores) tooling/maven: force skip maven plugin tests
This should prevent problems caused by cyclic dependencies between the
tests and modules that may not have been built
Signed-off-by: Otavio R. Piske <angusyo...@gmail.com>
---
Jenkinsfile.jdk17 | 2 +-
Jenkinsfile.jdk21 | 2 +-
Jenkinsfile.ppc64le | 2 +-
Jenkinsfile.s390x | 2 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 5 +++++
tooling/maven/camel-restdsl-openapi-plugin/pom.xml | 5 +++++
6 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile.jdk17 b/Jenkinsfile.jdk17
index 1ea01a4088c..a9a32e77d93 100644
--- a/Jenkinsfile.jdk17
+++ b/Jenkinsfile.jdk17
@@ -58,7 +58,7 @@ pipeline {
stage('Build & Install') {
steps {
- sh "./mvnw -U $MAVEN_PARAMS -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
+ sh "./mvnw -U $MAVEN_PARAMS -Dskip.camel.maven.plugin.tests
-Darchetype.test.skip -Dmaven.test.skip.exec=true clean install"
}
}
diff --git a/Jenkinsfile.jdk21 b/Jenkinsfile.jdk21
index 67b27e96591..5c25cfd3973 100644
--- a/Jenkinsfile.jdk21
+++ b/Jenkinsfile.jdk21
@@ -58,7 +58,7 @@ pipeline {
stage('Build & Install') {
steps {
- sh "./mvnw -U $MAVEN_PARAMS -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
+ sh "./mvnw -U $MAVEN_PARAMS -Dskip.camel.maven.plugin.tests
-Darchetype.test.skip -Dmaven.test.skip.exec=true clean install"
}
}
diff --git a/Jenkinsfile.ppc64le b/Jenkinsfile.ppc64le
index a4ed11032b7..7365e7214a2 100644
--- a/Jenkinsfile.ppc64le
+++ b/Jenkinsfile.ppc64le
@@ -67,7 +67,7 @@ pipeline {
branch 'main'
}
steps {
- sh "./mvnw -U $MAVEN_PARAMS -Dquickly clean install"
+ sh "./mvnw -U $MAVEN_PARAMS -Dskip.camel.maven.plugin.tests
-Dquickly clean install"
}
}
diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x
index 4bb43200ff5..4595accdcb4 100644
--- a/Jenkinsfile.s390x
+++ b/Jenkinsfile.s390x
@@ -67,7 +67,7 @@ pipeline {
branch 'main'
}
steps {
- sh "./mvnw -U $MAVEN_PARAMS -Dquickly clean install"
+ sh "./mvnw -U $MAVEN_PARAMS -Dskip.camel.maven.plugin.tests
-Dquickly clean install"
}
}
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml
b/tooling/maven/camel-package-maven-plugin/pom.xml
index 60892612387..ce58b19863f 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -32,6 +32,10 @@
<name>Camel :: Maven Plugins :: Camel Maven Package</name>
<description>Maven plugin to help package Camel components and
plugins</description>
+ <properties>
+ <skip.camel.maven.plugin.tests>false</skip.camel.maven.plugin.tests>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -225,6 +229,7 @@
<goal>clean</goal>
<goal>verify</goal>
</goals>
+
<skipInvocation>${skip.camel.maven.plugin.tests}</skipInvocation>
</configuration>
<executions>
<execution>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
index 1dc88ee63b7..e4fa5add3d9 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
@@ -32,6 +32,10 @@
<name>Camel :: Maven Plugins :: OpenApi REST DSL Generator Maven
Plugin</name>
<description>Maven Plugin that generates REST DSL RouteBuilder from
OpenApi specification</description>
+ <properties>
+ <skip.camel.maven.plugin.tests>false</skip.camel.maven.plugin.tests>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -186,6 +190,7 @@
<goal>clean</goal>
<goal>verify</goal>
</goals>
+
<skipInvocation>${skip.camel.maven.plugin.tests}</skipInvocation>
</configuration>
<executions>
<execution>
