Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "W-17281517: Upgrade jakarta dependencies (#659)" #693

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "W-17281517: Upgrade jakarta dependencies (#659)" #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,8 @@
<artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<scope>provided</scope>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</dependency>
<dependency>
<groupId>org.mule.glassfish.grizzly</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpMimeMultipart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
package org.mule.service.http.impl.service.server.grizzly;

import jakarta.mail.internet.MimeMultipart;
import javax.mail.internet.MimeMultipart;

public class HttpMimeMultipart extends MimeMultipart {

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpMultipartEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
import java.io.IOException;
import java.util.Collection;

import jakarta.mail.MessagingException;
import jakarta.mail.internet.ContentType;
import jakarta.mail.internet.InternetHeaders;
import jakarta.mail.internet.MimeBodyPart;
import jakarta.mail.internet.MimeMultipart;
import jakarta.mail.internet.ParseException;
import javax.mail.MessagingException;
import javax.mail.internet.ContentType;
import javax.mail.internet.InternetHeaders;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.ParseException;

/**
* Creates multipart content from a composed {@link HttpEntity}.
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
import java.util.List;
import java.util.regex.Pattern;

import jakarta.mail.BodyPart;
import jakarta.mail.Header;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMultipart;
import jakarta.mail.util.ByteArrayDataSource;
import javax.mail.BodyPart;
import javax.mail.Header;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMultipart;
import javax.mail.util.ByteArrayDataSource;

public class HttpParser {

Expand Down
4 changes: 2 additions & 2 deletions .../java/org/mule/service/http/impl/service/server/grizzly/HttpMultipartEncoderTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import java.util.ArrayList;
import java.util.List;

import jakarta.mail.BodyPart;
import jakarta.mail.internet.MimeMultipart;
import javax.mail.BodyPart;
import javax.mail.internet.MimeMultipart;

import org.junit.Before;
import org.junit.Test;
Expand Down