Skip to content
Permalink
Browse files
Upgrade jsieve from mime4j-0.6 to mime4j-0.7.2 (JSIEVE-81)
git-svn-id: https://svn.apache.org/repos/asf/james/jsieve/trunk@1243975 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Eric Charles committed Feb 14, 2012
1 parent c4ff6f3 commit 45b8904600c0c526b5f221653fe6ed49841bd6f4
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 24 deletions.
@@ -70,7 +70,7 @@

<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j</artifactId>
<artifactId>apache-mime4j-core</artifactId>
</dependency>

<dependency>
@@ -66,7 +66,12 @@

<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j</artifactId>
<artifactId>apache-mime4j-core</artifactId>
</dependency>

<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>

<dependency>
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/

package org.apache.jsieve.mailet;
import java.io.IOException;
import java.util.ArrayList;
@@ -36,10 +35,11 @@

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.mime4j.field.address.AddressList;
import org.apache.james.mime4j.field.address.Mailbox;
import org.apache.james.mime4j.field.address.MailboxList;
import org.apache.james.mime4j.field.address.parser.ParseException;
import org.apache.james.mime4j.dom.address.AddressList;
import org.apache.james.mime4j.dom.address.Mailbox;
import org.apache.james.mime4j.dom.address.MailboxList;
import org.apache.james.mime4j.dom.field.ParseException;
import org.apache.james.mime4j.field.address.AddressBuilder;
import org.apache.jsieve.SieveContext;
import org.apache.jsieve.exception.InternetAddressException;
import org.apache.jsieve.exception.SieveException;
@@ -393,7 +393,7 @@ public String getContentType() throws SieveMailException {

public Address[] parseAddresses(String arg) throws SieveMailException, InternetAddressException {
try {
final MailboxList list = AddressList.parse(arg).flatten();
final MailboxList list = new AddressList(AddressBuilder.DEFAULT.parseAddressList(arg), true).flatten();
final int size = list.size();
final Address[] results = new Address[size];
for (int i=0;i<size;i++) {
25 pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
<version>1.8</version>
<version>1.9-SNAPSHOT</version>
<relativePath></relativePath>
</parent>

@@ -66,7 +66,6 @@
<properties>
<!-- Override the source descriptor -->
<sourceReleaseAssemblyDescriptor>src</sourceReleaseAssemblyDescriptor>

<!--
The website is committed to subversion. This property can be overriden
to upload the site to a local staging location.
@@ -90,8 +89,8 @@
<james.jsieve.www>${james.www}/jsieve/</james.jsieve.www>
<!-- Overridding this value allows single set of loopback settings to be maintained -->
<james.www.id>jsieve-website</james.www.id>

<target.jdk>1.5</target.jdk>
<mime4j.version>0.7.2</mime4j.version>
</properties>

<dependencyManagement>
@@ -101,37 +100,36 @@
<artifactId>apache-jsieve</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-mailet</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-util</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
<version>2.4</version>
</dependency>

<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>1.0</version>
</dependency>

<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j</artifactId>
<version>0.6</version>
<artifactId>apache-mime4j-core</artifactId>
<version>${mime4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-dom</artifactId>
<version>${mime4j.version}</version>
</dependency>

<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -155,34 +153,29 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<version>1.1.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
</dependency>

<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>

0 comments on commit 45b8904

Please sign in to comment.