Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions checksum.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
<trusted-key id='aa49c633b4734832' group='com.pinterest.ktlint' />
<trusted-key id='1063fe98bcecb758' group='com.puppycrawl.tools' />
<trusted-key id='6425559c47cc79c4' group='com.sun.activation' />
<trusted-key id='d908a43fb7ec07ac' group='com.sun.activation' />
<trusted-key id='1b2718089ce964b8' group='com.thoughtworks.qdox' />
<trusted-key id='602ec18d20c4661c' group='com.thoughtworks.xstream' />
<trusted-key id='1861c322c56014b2' group='commons-beanutils' />
Expand Down Expand Up @@ -91,6 +92,7 @@
<trusted-key id='a6ea2e2bf22e0543' group='io.github.java-diff-utils' />
<trusted-key id='67631bc0568801c3' group='io.github.microutils' />
<trusted-key id='602ec18d20c4661c' group='io.github.x-stream' />
<trusted-key id='d908a43fb7ec07ac' group='jakarta.activation' />
<trusted-key id='6425559c47cc79c4' group='javax.activation' />
<trusted-key id='6425559c47cc79c4' group='javax.mail' />
<trusted-key id='6425559c47cc79c4' group='javax.servlet' />
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ httpcore.version=4.4.15
httpmime.version=4.5.13
jackson.version=2.13.3
jackson-databind.version=2.13.2.2
javax.activation.version=1.2.0
jakarta.activation.version=1.2.2
jcharts.version=0.7.5
jdom.version=1.1.3
jetbrains-annotations.version=23.0.0
Expand Down
4 changes: 2 additions & 2 deletions src/bom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ dependencies {
apiv("com.jayway.jsonpath:json-path")
apiv("com.miglayout:miglayout-core", "miglayout")
apiv("com.miglayout:miglayout-swing", "miglayout")
apiv("com.sun.activation:javax.activation", "javax.activation")
apiv("com.sun.activation:jakarta.activation", "jakarta.activation")
apiv("com.thoughtworks.xstream:xstream")
apiv("commons-codec:commons-codec")
apiv("commons-collections:commons-collections")
Expand All @@ -96,7 +96,7 @@ dependencies {
apiv("dnsjava:dnsjava")
apiv("io.burt:jmespath-core")
apiv("io.burt:jmespath-jackson")
apiv("javax.activation:javax.activation-api", "javax.activation")
apiv("jakarta.activation:jakarta.activation-api", "jakarta.activation")
apiv("javax.mail:mail")
apiv("jcharts:jcharts")
apiv("junit:junit", "junit4")
Expand Down
6 changes: 3 additions & 3 deletions src/components/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ dependencies {
api("javax.mail:mail") {
exclude("javax.activation", "activation")
}
// There's no javax.activation:activation:1.2.0, so we use com.sun...
runtimeOnly("com.sun.activation:javax.activation")
// The runtime dependency for jakarta.activation is different from the compile time
runtimeOnly("com.sun.activation:jakarta.activation")
// This is an API-only jar. javax.activation is present in Java 8,
// however it is not there in Java 9
compileOnly("javax.activation:javax.activation-api")
compileOnly("jakarta.activation:jakarta.activation-api")
implementation("com.github.ben-manes.caffeine:caffeine")
implementation("io.burt:jmespath-core")
implementation("io.burt:jmespath-jackson")
Expand Down
2 changes: 1 addition & 1 deletion src/dist/src/dist/expected_release_jars.csv
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
75714,jackson-annotations-2.13.3.jar
374895,jackson-core-2.13.3.jar
1536542,jackson-databind-2.13.3.jar
78030,javax.activation-1.2.0.jar
68453,jakarta.activation-1.2.2.jar
142391,jcharts-0.7.5.jar
16555,jcl-over-slf4j-1.7.36.jar
490571,jmespath-core-0.5.1.jar
Expand Down
8 changes: 4 additions & 4 deletions src/protocol/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ project("http") {
because("HTTPResultConverter uses XStream in public API")
}

compileOnly("javax.activation:javax.activation-api") {
compileOnly("jakarta.activation:jakarta.activation-api") {
because("ParseCurlCommandAction uses new MimetypesFileTypeMap()")
}

Expand Down Expand Up @@ -177,11 +177,11 @@ project("mail") {
api("javax.mail:mail") {
exclude("javax.activation", "activation")
}
// There's no javax.activation:activation:1.2.0, so we use com.sun...
runtimeOnly("com.sun.activation:javax.activation")
// Runtime dependency is different from compile time
runtimeOnly("com.sun.activation:jakarta.activation")
// This is an API-only jar. javax.activation is present in Java 8,
// however it is not there in Java 9
compileOnly("javax.activation:javax.activation-api")
compileOnly("jakarta.activation:jakarta.activation-api")
implementation("org.apache.commons:commons-lang3") {
because("StringUtils")
}
Expand Down
1 change: 1 addition & 0 deletions xdocs/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ Summary
<li><pr>5710</pr>Add GitHub Issue templates</li>
<li><pr>5713</pr>Update Spock to 2.2-groovy-3.0 (from 2.1-groovy-3.0)</li>
<li><issue>5718</issue>Update Apache commons-text to 1.10.0 (from 1.9)</li>
<li><pr>5721</pr><issue>5720</issue>Replace <code>javax.activation</code> 1.2.0 with <code>jakarta.activation</code> 1.2.2</li>
</ul>

<!-- =================== Bug fixes =================== -->
Expand Down