dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exclude black box tests module from build when black box tests are not enabled.

Browse Source
This commit is contained in:
Igor Kulikov 2021-07-16 12:21:00 +03:00
parent 050f0d9b07
commit 085044e6e7
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
msa/black-box-tests/pom.xml
View File

@ -34,7 +34,6 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.dir>${basedir}/../..</main.dir> <main.dir>${basedir}/../..</main.dir>
<blackBoxTests.skip>true</blackBoxTests.skip>
<testcontainers.version>1.11.4</testcontainers.version> <testcontainers.version>1.11.4</testcontainers.version>
<zeroturnaround.version>1.10</zeroturnaround.version> <zeroturnaround.version>1.10</zeroturnaround.version>
<httpclient.version>4.5.13</httpclient.version> <httpclient.version>4.5.13</httpclient.version>

22
msa/pom.xml
View File

@ -33,6 +33,8 @@
<main.dir>${basedir}/..</main.dir> <main.dir>${basedir}/..</main.dir>
<docker.repo>thingsboard</docker.repo> <docker.repo>thingsboard</docker.repo>
<dockerfile.skip>true</dockerfile.skip> <dockerfile.skip>true</dockerfile.skip>
<blackBoxTests.skip>true</blackBoxTests.skip>
<dockerfile-maven.version>1.4.13</dockerfile-maven.version>
</properties> </properties>
<modules> <modules>
@ -41,15 +43,29 @@
<module>web-ui</module> <module>web-ui</module>
<module>tb-node</module> <module>tb-node</module>
<module>transport</module> <module>transport</module>
<module>black-box-tests</module>
</modules> </modules>
<profiles>
<profile>
<id>black-box-tests</id>
<activation>
<property>
<name>blackBoxTests.skip</name>
<value>false</value>
</property>
</activation>
<modules>
<module>black-box-tests</module>
</modules>
</profile>
</profiles>
<build> <build>
<extensions> <extensions>
<extension> <extension>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-extension</artifactId> <artifactId>dockerfile-maven-extension</artifactId>
<version>1.4.13</version> <version>${dockerfile-maven.version}</version>
</extension> </extension>
</extensions> </extensions>
<pluginManagement> <pluginManagement>
@ -57,7 +73,7 @@
<plugin> <plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId> <artifactId>dockerfile-maven-plugin</artifactId>
<version>1.4.13</version> <version>${dockerfile-maven.version}</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>