Skip to content

Commit 3a318bb

Browse files
authored
Split JAVAX_MAIL_PROVIDER out of JAVAX_MAIL_API (#203)
The 'geronimo-javamail' modules do not contain the API.
1 parent 53fb702 commit 3a318bb

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

samples/sample-all/build.out

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,12 @@ compileClasspath - Compile classpath for source set 'main'.
154154
| \--- org.slf4j:slf4j-api:1.6.1 -> 2.0.12 (*)
155155
+--- org.apache.commons:commons-io:1.3.2 -> commons-io:commons-io:2.11.0
156156
+--- org.apache.geronimo.javamail:geronimo-javamail_1.3.1_mail:1.1 -> com.sun.mail:javax.mail:1.6.2 (*)
157-
+--- org.apache.geronimo.javamail:geronimo-javamail_1.3.1_provider:1.1 -> com.sun.mail:javax.mail:1.6.2 (*)
157+
+--- org.apache.geronimo.javamail:geronimo-javamail_1.3.1_provider:1.1 -> org.apache.geronimo.javamail:geronimo-javamail_1.6_provider:1.0.1
158+
| \--- org.apache.geronimo.specs:geronimo-javamail_1.6_spec:1.0.1 -> com.sun.mail:javax.mail:1.6.2 (*)
158159
+--- org.apache.geronimo.javamail:geronimo-javamail_1.4_mail:1.8.4 -> com.sun.mail:javax.mail:1.6.2 (*)
159-
+--- org.apache.geronimo.javamail:geronimo-javamail_1.4_provider:1.8.3 -> com.sun.mail:javax.mail:1.6.2 (*)
160+
+--- org.apache.geronimo.javamail:geronimo-javamail_1.4_provider:1.8.3 -> org.apache.geronimo.javamail:geronimo-javamail_1.6_provider:1.0.1 (*)
160161
+--- org.apache.geronimo.javamail:geronimo-javamail_1.6_mail:1.0.1 -> com.sun.mail:javax.mail:1.6.2 (*)
161-
+--- org.apache.geronimo.javamail:geronimo-javamail_1.6_provider:1.0.1 -> com.sun.mail:javax.mail:1.6.2 (*)
162+
+--- org.apache.geronimo.javamail:geronimo-javamail_1.6_provider:1.0.1 (*)
162163
+--- org.apache.geronimo.specs:geronimo-javamail_1.3.1_spec:1.3 -> com.sun.mail:javax.mail:1.6.2 (*)
163164
+--- org.apache.geronimo.specs:geronimo-javamail_1.4_spec:1.6 -> com.sun.mail:javax.mail:1.6.2 (*)
164165
+--- org.apache.geronimo.specs:geronimo-javamail_1.6_spec:1.0.1 -> com.sun.mail:javax.mail:1.6.2 (*)

src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinition.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,15 +372,17 @@ public enum CapabilityDefinition {
372372
"com.sun.mail:javax.mail", // API + Implementation
373373
"com.sun.mail:jakarta.mail", // API + Implementation
374374
"org.apache.geronimo.javamail:geronimo-javamail_1.3.1_mail",
375-
"org.apache.geronimo.javamail:geronimo-javamail_1.3.1_provider",
376375
"org.apache.geronimo.specs:geronimo-javamail_1.3.1_spec",
377376
"org.apache.geronimo.javamail:geronimo-javamail_1.4_mail",
378-
"org.apache.geronimo.javamail:geronimo-javamail_1.4_provider",
379377
"org.apache.geronimo.specs:geronimo-javamail_1.4_spec",
380378
"org.apache.geronimo.javamail:geronimo-javamail_1.6_mail",
381-
"org.apache.geronimo.javamail:geronimo-javamail_1.6_provider",
382379
"org.apache.geronimo.specs:geronimo-javamail_1.6_spec"
383380
),
381+
JAVAX_MAIL_PROVIDER(HIGHEST_VERSION, JavaxMailApiRule.class,
382+
"org.apache.geronimo.javamail:geronimo-javamail_1.3.1_provider",
383+
"org.apache.geronimo.javamail:geronimo-javamail_1.4_provider",
384+
"org.apache.geronimo.javamail:geronimo-javamail_1.6_provider"
385+
),
384386
JAVAX_PERSISTENCE_API(HIGHEST_VERSION, JavaxPersistenceApiRule.class,
385387
"javax.persistence:javax.persistence-api",
386388
"jakarta.persistence:jakarta.persistence-api",

0 commit comments

Comments
 (0)