Skip to content

Commit 3405ea2

Browse files
jormundur00vjovanov
authored andcommitted
Fix org.eclipse.angus:jakarta.mail metadata and tests
1 parent 6e8da41 commit 3405ea2

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

metadata/org.eclipse.angus/jakarta.mail/1.0.0/resource-config.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,39 @@
22
"resources": {
33
"includes": [
44
{
5+
"condition": {
6+
"typeReachable": "jakarta.activation.MailcapCommandMap"
7+
},
58
"pattern": "\\QMETA-INF/hk2-locator/default\\E"
69
},
710
{
11+
"condition": {
12+
"typeReachable": "jakarta.activation.MailcapCommandMap"
13+
},
814
"pattern": "\\QMETA-INF/gfprobe-provider.xml\\E"
915
},
1016
{
17+
"condition": {
18+
"typeReachable": "jakarta.activation.MailcapCommandMap"
19+
},
1120
"pattern": "\\QMETA-INF/javamail.charset.map\\E"
1221
},
1322
{
23+
"condition": {
24+
"typeReachable": "jakarta.activation.MailcapCommandMap"
25+
},
1426
"pattern": "\\QMETA-INF/javamail.default.address.map\\E"
1527
},
1628
{
29+
"condition": {
30+
"typeReachable": "jakarta.activation.MailcapCommandMap"
31+
},
1732
"pattern": "\\QMETA-INF/javamail.default.providers\\E"
1833
},
1934
{
35+
"condition": {
36+
"typeReachable": "jakarta.activation.MailcapCommandMap"
37+
},
2038
"pattern": "\\QMETA-INF/mailcap\\E"
2139
}
2240
]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
greenmail/standalone:2.1.0-alpha-4

tests/src/org.eclipse.angus/jakarta.mail/1.0.0/src/test/java/com/sun/mail/JakartaMailTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class JakartaMailTest {
3535
static void beforeAll() throws IOException {
3636
System.out.println("Starting email server ...");
3737
new ProcessBuilder("docker", "run", "--cidfile", "greenmail.cid", "-p", "3025:3025", "--rm", "-e",
38-
"GREENMAIL_OPTS=-Dgreenmail.setup.test.all -Dgreenmail.hostname=0.0.0.0 -Dgreenmail.auth.disabled -Dgreenmail.verbose", "greenmail/standalone:1.6.10")
38+
"GREENMAIL_OPTS=-Dgreenmail.setup.test.all -Dgreenmail.hostname=0.0.0.0 -Dgreenmail.auth.disabled -Dgreenmail.verbose", "greenmail/standalone:2.1.0-alpha-4")
3939
.redirectOutput(new File("greenmail-stdout.txt"))
4040
.redirectError(new File("greenmail-stderr.txt")).start();
4141
Awaitility.await().atMost(Duration.ofSeconds(10)).until(() -> {

0 commit comments

Comments
 (0)