diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-12 15:56:49 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-12 15:56:49 +0200 |
| commit | e5aea553f53345a490c3d7a0dd89e80358f19e5c (patch) | |
| tree | b001f21abcb475377a533b1f7e16d2bfa9675dfc /server/pom.xml | |
| parent | 0ccbeceffbac2071eccca12f807dde9b2934e3eb (diff) | |
| parent | 3166381a9020db85e45bfef8ebea9f841736af69 (diff) | |
| download | sonarqube-e5aea553f53345a490c3d7a0dd89e80358f19e5c.tar.gz sonarqube-e5aea553f53345a490c3d7a0dd89e80358f19e5c.zip | |
Merge remote-tracking branch 'origin/branch-4.5'
Conflicts:
server/process/pom.xml
server/process/sonar-process/src/main/java/org/sonar/process/MonitoredProcess.java
server/sonar-process-monitor/pom.xml
server/sonar-process/pom.xml
Diffstat (limited to 'server/pom.xml')
| -rw-r--r-- | server/pom.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/pom.xml b/server/pom.xml index c32d9042576..7a5c9de19d8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -11,7 +11,8 @@ <name>SonarQube :: Server :: Parent</name> <modules> - <module>process</module> + <module>sonar-process</module> + <module>sonar-process-monitor</module> <module>sonar-search</module> <module>sonar-server</module> <module>sonar-web</module> |