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/sonar-web | |
| 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/sonar-web')
| -rw-r--r-- | server/sonar-web/pom.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server/sonar-web/pom.xml b/server/sonar-web/pom.xml index 0fcf1a9f973..324df14854a 100644 --- a/server/sonar-web/pom.xml +++ b/server/sonar-web/pom.xml @@ -1,6 +1,5 @@ <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.codehaus.sonar</groupId> |