[KARAF-2844] Skip maven plugin tests if standard unit tests are disabled (that was broken with commit 6bc4817ae587562042f09144f6e0ca7f2a9a4919)
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e653836d Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e653836d Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e653836d Branch: refs/heads/master Commit: e653836d74e1cedecd9d9775e9bbf596de93f620 Parents: 09c1795 Author: Guillaume Nodet <[email protected]> Authored: Tue Sep 6 13:59:12 2016 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Tue Sep 6 13:59:12 2016 +0200 ---------------------------------------------------------------------- tooling/karaf-maven-plugin/pom.xml | 35 +++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/e653836d/tooling/karaf-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml index 1c01767..646d11f 100644 --- a/tooling/karaf-maven-plugin/pom.xml +++ b/tooling/karaf-maven-plugin/pom.xml @@ -298,14 +298,37 @@ </reporting> <profiles> <profile> - <id>java9</id> - <properties> + <id>java9</id> + <properties> <mvn.opts>-XaddExports:java.base/sun.net.www.protocol.http=ALL-UNNAMED -XaddExports:java.base/sun.net.www.protocol.https=ALL-UNNAMED -XaddExports:java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED -XaddExports:jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED -addmods java.activation,java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws -Djava.io.tmpdir=${project.build.directory}</mvn.opts> - </properties> - <activation> - <jdk>9</jdk> + </properties> + <activation> + <jdk>9</jdk> </activation> - </profile> + </profile> + <profile> + <id>skiptests</id> + <properties> + <invoker.skip>true</invoker.skip> + </properties> + <activation> + <property> + <name>skipTests</name> + </property> + </activation> + </profile> + <profile> + <id>skiptests2</id> + <properties> + <invoker.skip>true</invoker.skip> + </properties> + <activation> + <property> + <name>maven.test.skip</name> + <value>true</value> + </property> + </activation> + </profile> </profiles>
