diff options
| author | David Gageot <david@gageot.net> | 2015-07-02 10:51:50 +0200 |
|---|---|---|
| committer | David Gageot <david@gageot.net> | 2015-07-02 10:51:50 +0200 |
| commit | 7098d31e221a10be219f05443b31b37aaf715e09 (patch) | |
| tree | 908c7285ddc4fde266a7421b4c98ae0b23fe86d5 /pom.xml | |
| parent | 516db42684c2887f5a2a8fa8c2ac1f7b71e29e5b (diff) | |
| parent | 68bdee9a6e550813b57c10d66dff05c6e0027509 (diff) | |
| download | sonarqube-7098d31e221a10be219f05443b31b37aaf715e09.tar.gz sonarqube-7098d31e221a10be219f05443b31b37aaf715e09.zip | |
Merge branch 'feature/it'
Conflicts:
.travis.yml
travis.sh
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.codehaus.sonar</groupId> @@ -1132,7 +1133,6 @@ </dependency> - <!-- tomcat --> <dependency> <groupId>org.apache.tomcat.embed</groupId> @@ -1606,6 +1606,14 @@ <coveragePerTest>true</coveragePerTest> </properties> </profile> + + <profile> + <!-- integration tests --> + <id>it</id> + <modules> + <module>it</module> + </modules> + </profile> </profiles> </project> |