You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2015/07/15 01:02:25 UTC
svn commit: r1691103 - /myfaces/core/trunk/impl/pom.xml
Author: lu4242
Date: Tue Jul 14 23:02:25 2015
New Revision: 1691103
URL: http://svn.apache.org/r1691103
Log:
MYFACES-4005 Classloading conflict with httpclient (update commons-codec to 1.10) (not updated, instead use shade plugin to bundle commons-codec 1.3)
Modified:
myfaces/core/trunk/impl/pom.xml
Modified: myfaces/core/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/pom.xml?rev=1691103&r1=1691102&r2=1691103&view=diff
==============================================================================
--- myfaces/core/trunk/impl/pom.xml (original)
+++ myfaces/core/trunk/impl/pom.xml Tue Jul 14 23:02:25 2015
@@ -578,21 +578,30 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
+ <id>shade_package</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <configuration>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.commons.codec</pattern>
+ <shadedPattern>org.apache.myfaces.shade.commons.codec</shadedPattern>
+ </relocation>
+ </relocations>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <createSourcesJar>true</createSourcesJar>
+ <artifactSet>
+ <includes>
+ <include>org.apache.myfaces.core.internal:myfaces-impl-shared</include>
+ <include>commons-codec:commons-codec</include>
+ </includes>
+ </artifactSet>
+ </configuration>
</execution>
</executions>
- <configuration>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <createSourcesJar>true</createSourcesJar>
- <artifactSet>
- <includes>
- <include>org.apache.myfaces.core.internal:myfaces-impl-shared</include>
- </includes>
- </artifactSet>
- </configuration>
</plugin>
<!-- create OSGI-ready manifest.mf -->
@@ -1122,6 +1131,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>