Skip to content

Commit f1dc83e

Browse files
committed
We need to include the jar jakarta.activation instead of jakarta.activation-api
Relates to #5720
1 parent d6d3ba4 commit f1dc83e

File tree

7 files changed

+16
-6
lines changed

7 files changed

+16
-6
lines changed

checksum.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<trusted-key id='aa49c633b4734832' group='com.pinterest.ktlint' />
6161
<trusted-key id='1063fe98bcecb758' group='com.puppycrawl.tools' />
6262
<trusted-key id='6425559c47cc79c4' group='com.sun.activation' />
63+
<trusted-key id='d908a43fb7ec07ac' group='com.sun.activation' />
6364
<trusted-key id='1b2718089ce964b8' group='com.thoughtworks.qdox' />
6465
<trusted-key id='602ec18d20c4661c' group='com.thoughtworks.xstream' />
6566
<trusted-key id='1861c322c56014b2' group='commons-beanutils' />

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ httpcore.version=4.4.15
100100
httpmime.version=4.5.13
101101
jackson.version=2.13.3
102102
jackson-databind.version=2.13.2.2
103-
jakarta.activation-api.version=1.2.2
103+
jakarta.activation.version=1.2.2
104104
jcharts.version=0.7.5
105105
jdom.version=1.1.3
106106
jetbrains-annotations.version=23.0.0

src/bom/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ dependencies {
8585
apiv("com.jayway.jsonpath:json-path")
8686
apiv("com.miglayout:miglayout-core", "miglayout")
8787
apiv("com.miglayout:miglayout-swing", "miglayout")
88-
apiv("jakarta.activation:jakarta.activation-api")
88+
apiv("com.sun.activation:jakarta.activation", "jakarta.activation")
8989
apiv("com.thoughtworks.xstream:xstream")
9090
apiv("commons-codec:commons-codec")
9191
apiv("commons-collections:commons-collections")
@@ -96,6 +96,7 @@ dependencies {
9696
apiv("dnsjava:dnsjava")
9797
apiv("io.burt:jmespath-core")
9898
apiv("io.burt:jmespath-jackson")
99+
apiv("jakarta.activation:jakarta.activation-api", "jakarta.activation")
99100
apiv("javax.mail:mail")
100101
apiv("jcharts:jcharts")
101102
apiv("junit:junit", "junit4")

src/components/build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ dependencies {
3232
api("javax.mail:mail") {
3333
exclude("javax.activation", "activation")
3434
}
35-
implementation("jakarta.activation:jakarta.activation-api")
35+
// The runtime dependency for jakarta.activation is different from the compile time
36+
runtimeOnly("com.sun.activation:jakarta.activation")
37+
// This is an API-only jar. javax.activation is present in Java 8,
38+
// however it is not there in Java 9
39+
compileOnly("jakarta.activation:jakarta.activation-api")
3640
implementation("com.github.ben-manes.caffeine:caffeine")
3741
implementation("io.burt:jmespath-core")
3842
implementation("io.burt:jmespath-jackson")

src/dist/src/dist/expected_release_jars.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
75714,jackson-annotations-2.13.3.jar
7373
374895,jackson-core-2.13.3.jar
7474
1536542,jackson-databind-2.13.3.jar
75-
46613,jakarta.activation-api-1.2.2.jar
75+
68453,jakarta.activation-1.2.2.jar
7676
142391,jcharts-0.7.5.jar
7777
16555,jcl-over-slf4j-1.7.36.jar
7878
490571,jmespath-core-0.5.1.jar

src/protocol/build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,11 @@ project("mail") {
177177
api("javax.mail:mail") {
178178
exclude("javax.activation", "activation")
179179
}
180-
implementation("jakarta.activation:jakarta.activation-api")
180+
// Runtime dependency is different from compile time
181+
runtimeOnly("com.sun.activation:jakarta.activation")
182+
// This is an API-only jar. javax.activation is present in Java 8,
183+
// however it is not there in Java 9
184+
compileOnly("jakarta.activation:jakarta.activation-api")
181185
implementation("org.apache.commons:commons-lang3") {
182186
because("StringUtils")
183187
}

xdocs/changes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Summary
101101

102102
<ch_section>Non-functional changes</ch_section>
103103
<ul>
104-
<li><issue>5720</issue>Replace javax.activation 1.2.0 with jakarta.activation-api 1.2.2</li>
104+
<li><issue>5720</issue>Replace <code>javax.activation</code> 1.2.0 with <code>jakarta.activation</code> 1.2.2</li>
105105
</ul>
106106

107107
<!-- =================== Bug fixes =================== -->

0 commit comments

Comments
 (0)