Skip to content

Commit 5009fcd

Browse files
iroquetatomas-sexenian
authored andcommitted
Update Java Mail version and implementation to avoid conflicts between jakarta-activation and jakarta-activation-api (#893)
Issue: 201148 (cherry picked from commit 9ec0a68)
1 parent 554d49f commit 5009fcd

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

gxmail/pom.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,15 @@
1919
<version>${project.version}</version>
2020
</dependency>
2121
<dependency>
22-
<groupId>com.sun.mail</groupId>
22+
<groupId>org.eclipse.angus</groupId>
2323
<artifactId>jakarta.mail</artifactId>
24-
<version>2.0.1</version>
25-
</dependency>
24+
<version>2.0.3</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>jakarta.mail</groupId>
28+
<artifactId>jakarta.mail-api</artifactId>
29+
<version>2.1.3</version>
30+
</dependency>
2631
</dependencies>
2732

2833
<build>

gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import jakarta.mail.internet.MimeUtility;
2525

2626
import com.genexus.common.interfaces.SpecificImplementation;
27-
import com.sun.mail.pop3.POP3Folder;
28-
import com.sun.mail.pop3.POP3Store;
27+
import org.eclipse.angus.mail.pop3.POP3Folder;
28+
import org.eclipse.angus.mail.pop3.POP3Store;
2929

3030
public class POP3SessionJavaMail implements GXInternetConstants,IPOP3Session
3131
{

wrapperjakarta/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
<groupId>com.sun.xml.fastinfoset</groupId>
4444
<artifactId>FastInfoset</artifactId>
4545
</exclusion>
46+
<exclusion>
47+
<groupId>com.sun.mail</groupId>
48+
<artifactId>jakarta.mail</artifactId>
49+
</exclusion>
4650
</exclusions>
4751
</dependency>
4852
<dependency>

wrapperjavax/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@
9898
<groupId>com.sun.xml.fastinfoset</groupId>
9999
<artifactId>FastInfoset</artifactId>
100100
</exclusion>
101+
<exclusion>
102+
<groupId>com.sun.mail</groupId>
103+
<artifactId>jakarta.mail</artifactId>
104+
</exclusion>
101105
</exclusions>
102106
</dependency>
103107
</dependencies>

0 commit comments

Comments
 (0)