From 72a6a02f333440f6f94e71127231748a2198baac Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 24 Apr 2015 14:30:45 +0200
Subject: [PATCH] Build must not copy sonar-colorizer/sonar-colorizer.css in
 sonar-web.

* it is not used by webapp as it's duplicated by sonar-web/sonar-colorizer.less
* maven parallel build breaks during the first execution (empty local repo). The real reason was that dependency on sonar-colorizer was missing in sonar-web.
---
 server/sonar-web/pom.xml                      | 24 -------------------
 .../src/main/resources/sonar-colorizer.css    |  7 ++++++
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/server/sonar-web/pom.xml b/server/sonar-web/pom.xml
index 564b58a1652..83579fa6459 100644
--- a/server/sonar-web/pom.xml
+++ b/server/sonar-web/pom.xml
@@ -43,30 +43,6 @@
           </filesets>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.codehaus.sonar</groupId>
-                  <artifactId>sonar-colorizer</artifactId>
-                  <version>${project.version}</version>
-                  <outputDirectory>${basedir}/src/main/webapp/stylesheets</outputDirectory>
-                  <includes>**/sonar-colorizer.css</includes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
diff --git a/sonar-colorizer/src/main/resources/sonar-colorizer.css b/sonar-colorizer/src/main/resources/sonar-colorizer.css
index 4e77db66567..06328e22632 100644
--- a/sonar-colorizer/src/main/resources/sonar-colorizer.css
+++ b/sonar-colorizer/src/main/resources/sonar-colorizer.css
@@ -1,3 +1,10 @@
+/*
+  WARNING - THIS FILE IS USED ONLY A TEMPLATE USED BY HtmlDecorator
+  The CSS file used by webapp is defined at in the sonar-web module (see sonar-colorizer.less)
+
+  Any modification of this file must be applied to the sonar-web less file.
+*/
+
 .code {
   font-size: 12px;
 }
-- 
2.39.5