Merge pull request #54 from GregoireW/JENKINS-42098

JENKINS-42098 - Linkage error
jenkinsci · Sep 4, 2017 · 44568f3e23b1d3433a0ab86078b2cc8160e906ff · 44568f3
2 parents 71829ca + d676d73
commit 44568f3e23b1d3433a0ab86078b2cc8160e906ff
Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,8 @@ release.properties
 # IntelliJ project files 
 *.iml
 .idea/
+
+# eclipse project file
+.project
+.settings/
+.classpath
diff --git a/client/pom.xml b/client/pom.xml
@@ -44,6 +44,18 @@
                     </excludes>
                   </filter>
                 </filters>
+                <relocations>
+                  <!-- Be ware! there is org.xxx class in the fwk, do not relocate them! -->
+                  <!-- hudson remoting seems to check some class also, so cannot be shaded -->
+                  <relocation>
+                    <pattern>org.apache</pattern>
+                    <shadedPattern>shaded.org.apache</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.slf4j</pattern>
+                    <shadedPattern>shaded.org.slf4j</shadedPattern>
+                  </relocation>
+                </relocations>
                 <transformers>
                   <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                     <manifestEntries>