Author: norman
Date: Tue Dec 20 19:07:43 2011
New Revision: 1221440
URL: http://svn.apache.org/viewvc?rev=1221440&view=rev
Log:
Remove shade plugin for now again
Modified:
james/protocols/trunk/smtp/pom.xml
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
Modified: james/protocols/trunk/smtp/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1221440&r1=1221439&r2=1221440&view=diff
==============================================================================
--- james/protocols/trunk/smtp/pom.xml (original)
+++ james/protocols/trunk/smtp/pom.xml Tue Dec 20 19:07:43 2011
@@ -93,11 +93,10 @@
<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>
@@ -120,7 +119,7 @@
<exclude>org/apache/commons/codec/*</exclude>
</excludes>
<includes>
-
<include>org/apache/commons/codec/binary/Base64.*</include>
+
<include>org/apache/commons/codec/binary/Base64*</include>
</includes>
</filter>
</filters>
@@ -137,6 +136,7 @@
</execution>
</executions>
</plugin>
+ -->
</plugins>
</build>
</project>
\ No newline at end of file
Modified:
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java?rev=1221440&r1=1221439&r2=1221440&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
(original)
+++
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
Tue Dec 20 19:07:43 2011
@@ -192,7 +192,10 @@ public class BaseFakeSMTPSession impleme
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.protocols.smtp.SMTPSession#getConfiguration()
+ */
public SMTPConfiguration getConfiguration() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
