Author: norman
Date: Tue Dec 20 09:29:39 2011
New Revision: 1221162
URL: http://svn.apache.org/viewvc?rev=1221162&view=rev
Log:
Remove dependency on commons-codec. See PROTOCOLS-58
Modified:
james/protocols/trunk/smtp/pom.xml
Modified: james/protocols/trunk/smtp/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1221162&r1=1221161&r2=1221162&view=diff
==============================================================================
--- james/protocols/trunk/smtp/pom.xml (original)
+++ james/protocols/trunk/smtp/pom.xml Tue Dec 20 09:29:39 2011
@@ -44,6 +44,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -92,9 +93,50 @@
<instructions>
<Export-Package>org.apache.james.protocols.smtp.*</Export-Package>
<Embed-Dependency>*;scope=runtime</Embed-Dependency>
+ <!-- exclude commons codec as we pull it in via shade
plugin -->
+
<Import-Package>!org.apache.commons.codec.*,*</Import-Package>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+
<include>commons-codec:commons-codec</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+
<artifact>commons-codec:commons-codec</artifact>
+ <excludes>
+
<exclude>org/apache/commons/codec/*</exclude>
+ </excludes>
+ <includes>
+
<include>org/apache/commons/codec/binary/Base64*</include>
+ </includes>
+ </filter>
+ </filters>
+ <relocations>
+ <relocation>
+
<pattern>org.apache.commons.codec.binary</pattern>
+
<shadedPattern>org.apache.james.protocols.smtp.util</shadedPattern>
+ </relocation>
+ </relocations>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
/>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
