From: Julien HENRY <julien.henry@sonarsource.com>
Date: Tue, 24 Sep 2013 09:25:44 +0000 (+0200)
Subject: SONARPLUGINS-3164 Some shaded dependencies are not relocated
X-Git-Tag: 2.5-rc1~111
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9188444d5e4ceda8ed655dd2149b58c113ab914e;p=sonar-scanner-cli.git

SONARPLUGINS-3164 Some shaded dependencies are not relocated
---

diff --git a/sonar-runner-api/pom.xml b/sonar-runner-api/pom.xml
index 9d0148e..be3d9f5 100644
--- a/sonar-runner-api/pom.xml
+++ b/sonar-runner-api/pom.xml
@@ -21,6 +21,13 @@
       <artifactId>jsr305</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.0.1</version>
+      <!-- Provided by sonar-runner-impl but relocated -->
+      <scope>provided</scope>
+    </dependency>
 
     <!-- Unit tests -->
     <dependency>
@@ -106,6 +113,12 @@
             <configuration>
               <createDependencyReducedPom>true</createDependencyReducedPom>
               <minimizeJar>true</minimizeJar>
+              <relocations>
+                <relocation>
+                  <pattern>org.apache.commons.io</pattern>
+                  <shadedPattern>org.sonar.runner.commonsio</shadedPattern>
+                </relocation>
+              </relocations>
             </configuration>
           </execution>
         </executions>
diff --git a/sonar-runner-impl/pom.xml b/sonar-runner-impl/pom.xml
index eba773a..488f612 100644
--- a/sonar-runner-impl/pom.xml
+++ b/sonar-runner-impl/pom.xml
@@ -101,6 +101,14 @@
                   <pattern>com.github.kevinsawicki.http</pattern>
                   <shadedPattern>org.sonar.runner.kevinsawicki</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>org.apache.commons.io</pattern>
+                  <shadedPattern>org.sonar.runner.commonsio</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.sonar.home</pattern>
+                  <shadedPattern>org.sonar.runner.home</shadedPattern>
+                </relocation>
               </relocations>
             </configuration>
           </execution>