Commit 085044e6e79cfa5b1487ee4040dcc944b847e8f9
1 parent
050f0d9b
Exclude black box tests module from build when black box tests are not enabled.
Showing
2 changed files
with
19 additions
and
4 deletions
| @@ -34,7 +34,6 @@ | @@ -34,7 +34,6 @@ | ||
| 34 | <properties> | 34 | <properties> |
| 35 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | 35 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
| 36 | <main.dir>${basedir}/../..</main.dir> | 36 | <main.dir>${basedir}/../..</main.dir> |
| 37 | - <blackBoxTests.skip>true</blackBoxTests.skip> | ||
| 38 | <testcontainers.version>1.11.4</testcontainers.version> | 37 | <testcontainers.version>1.11.4</testcontainers.version> |
| 39 | <zeroturnaround.version>1.10</zeroturnaround.version> | 38 | <zeroturnaround.version>1.10</zeroturnaround.version> |
| 40 | <httpclient.version>4.5.13</httpclient.version> | 39 | <httpclient.version>4.5.13</httpclient.version> |
| @@ -33,6 +33,8 @@ | @@ -33,6 +33,8 @@ | ||
| 33 | <main.dir>${basedir}/..</main.dir> | 33 | <main.dir>${basedir}/..</main.dir> |
| 34 | <docker.repo>thingsboard</docker.repo> | 34 | <docker.repo>thingsboard</docker.repo> |
| 35 | <dockerfile.skip>true</dockerfile.skip> | 35 | <dockerfile.skip>true</dockerfile.skip> |
| 36 | + <blackBoxTests.skip>true</blackBoxTests.skip> | ||
| 37 | + <dockerfile-maven.version>1.4.13</dockerfile-maven.version> | ||
| 36 | </properties> | 38 | </properties> |
| 37 | 39 | ||
| 38 | <modules> | 40 | <modules> |
| @@ -41,15 +43,29 @@ | @@ -41,15 +43,29 @@ | ||
| 41 | <module>web-ui</module> | 43 | <module>web-ui</module> |
| 42 | <module>tb-node</module> | 44 | <module>tb-node</module> |
| 43 | <module>transport</module> | 45 | <module>transport</module> |
| 44 | - <module>black-box-tests</module> | ||
| 45 | </modules> | 46 | </modules> |
| 46 | 47 | ||
| 48 | + <profiles> | ||
| 49 | + <profile> | ||
| 50 | + <id>black-box-tests</id> | ||
| 51 | + <activation> | ||
| 52 | + <property> | ||
| 53 | + <name>blackBoxTests.skip</name> | ||
| 54 | + <value>false</value> | ||
| 55 | + </property> | ||
| 56 | + </activation> | ||
| 57 | + <modules> | ||
| 58 | + <module>black-box-tests</module> | ||
| 59 | + </modules> | ||
| 60 | + </profile> | ||
| 61 | + </profiles> | ||
| 62 | + | ||
| 47 | <build> | 63 | <build> |
| 48 | <extensions> | 64 | <extensions> |
| 49 | <extension> | 65 | <extension> |
| 50 | <groupId>com.spotify</groupId> | 66 | <groupId>com.spotify</groupId> |
| 51 | <artifactId>dockerfile-maven-extension</artifactId> | 67 | <artifactId>dockerfile-maven-extension</artifactId> |
| 52 | - <version>1.4.13</version> | 68 | + <version>${dockerfile-maven.version}</version> |
| 53 | </extension> | 69 | </extension> |
| 54 | </extensions> | 70 | </extensions> |
| 55 | <pluginManagement> | 71 | <pluginManagement> |
| @@ -57,7 +73,7 @@ | @@ -57,7 +73,7 @@ | ||
| 57 | <plugin> | 73 | <plugin> |
| 58 | <groupId>com.spotify</groupId> | 74 | <groupId>com.spotify</groupId> |
| 59 | <artifactId>dockerfile-maven-plugin</artifactId> | 75 | <artifactId>dockerfile-maven-plugin</artifactId> |
| 60 | - <version>1.4.13</version> | 76 | + <version>${dockerfile-maven.version}</version> |
| 61 | </plugin> | 77 | </plugin> |
| 62 | </plugins> | 78 | </plugins> |
| 63 | </pluginManagement> | 79 | </pluginManagement> |