From a37d98bbdc43269c75a04fb78f9c78e27623a50b Mon Sep 17 00:00:00 2001
From: Mariano Rean <mrean@mulesoft.com>
Date: Thu, 12 Dec 2024 10:48:44 -0300
Subject: [PATCH] Revert "W-17281517: Upgrade jakarta dependencies (#659)"

This reverts commit 67452e3c904078a2ede44a3fdf76b7dbea8394dd.
---
 pom.xml                                              | 10 ++--------
 .../service/server/grizzly/HttpMimeMultipart.java    |  2 +-
 .../service/server/grizzly/HttpMultipartEncoder.java | 12 ++++++------
 .../http/impl/service/server/grizzly/HttpParser.java | 10 +++++-----
 .../server/grizzly/HttpMultipartEncoderTestCase.java |  4 ++--
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5cdc0476..401bf218 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpMimeMultipart.java b/src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpMimeMultipart.java
index 20adfcae..4633cc82 100644
--- a/src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpMimeMultipart.java
+++ b/src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpMimeMultipart.java
@@ -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 {
 
diff --git a/src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpMultipartEncoder.java b/src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpMultipartEncoder.java
index 5bfa9c41..1d21d429 100644
--- a/src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpMultipartEncoder.java
+++ b/src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpMultipartEncoder.java
@@ -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}.
diff --git a/src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpParser.java b/src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpParser.java
index be59ee18..f2c0941a 100644
--- a/src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpParser.java
+++ b/src/main/java/org/mule/service/http/impl/service/server/grizzly/HttpParser.java
@@ -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 {
 
diff --git a/src/test/java/org/mule/service/http/impl/service/server/grizzly/HttpMultipartEncoderTestCase.java b/src/test/java/org/mule/service/http/impl/service/server/grizzly/HttpMultipartEncoderTestCase.java
index 5ed239dd..496244d8 100644
--- a/src/test/java/org/mule/service/http/impl/service/server/grizzly/HttpMultipartEncoderTestCase.java
+++ b/src/test/java/org/mule/service/http/impl/service/server/grizzly/HttpMultipartEncoderTestCase.java
@@ -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;