From 18b94ad314957f0253c324c7c6b2954a9f275d47 Mon Sep 17 00:00:00 2001 From: Felix Schumacher Date: Fri, 28 Oct 2022 12:52:17 +0200 Subject: [PATCH 1/3] Replace javax.activation with jakarta.activation-api (from version 1.2.0 to 1.2.2) --- checksum.xml | 1 + gradle.properties | 2 +- src/bom/build.gradle.kts | 3 +-- src/components/build.gradle.kts | 6 +----- src/dist/src/dist/expected_release_jars.csv | 2 +- src/protocol/build.gradle.kts | 8 ++------ xdocs/changes.xml | 1 + 7 files changed, 8 insertions(+), 15 deletions(-) diff --git a/checksum.xml b/checksum.xml index 9b5bbf4ab28..86bced8b3ea 100644 --- a/checksum.xml +++ b/checksum.xml @@ -91,6 +91,7 @@ + diff --git a/gradle.properties b/gradle.properties index 4c810271a8b..fdfc11f1882 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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-api.version=1.2.2 jcharts.version=0.7.5 jdom.version=1.1.3 jetbrains-annotations.version=23.0.0 diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts index 79e4e4c548f..6ee2a716c70 100644 --- a/src/bom/build.gradle.kts +++ b/src/bom/build.gradle.kts @@ -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("jakarta.activation:jakarta.activation-api") apiv("com.thoughtworks.xstream:xstream") apiv("commons-codec:commons-codec") apiv("commons-collections:commons-collections") @@ -96,7 +96,6 @@ dependencies { apiv("dnsjava:dnsjava") apiv("io.burt:jmespath-core") apiv("io.burt:jmespath-jackson") - apiv("javax.activation:javax.activation-api", "javax.activation") apiv("javax.mail:mail") apiv("jcharts:jcharts") apiv("junit:junit", "junit4") diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts index 2d1bdb5dac3..926dd676c81 100644 --- a/src/components/build.gradle.kts +++ b/src/components/build.gradle.kts @@ -32,11 +32,7 @@ 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") - // 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") + implementation("jakarta.activation:jakarta.activation-api") implementation("com.github.ben-manes.caffeine:caffeine") implementation("io.burt:jmespath-core") implementation("io.burt:jmespath-jackson") diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index be292924c50..b151d3331b2 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -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 +46613,jakarta.activation-api-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 diff --git a/src/protocol/build.gradle.kts b/src/protocol/build.gradle.kts index acedf564141..8ac56278662 100644 --- a/src/protocol/build.gradle.kts +++ b/src/protocol/build.gradle.kts @@ -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()") } @@ -177,11 +177,7 @@ 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") - // 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") + implementation("jakarta.activation:jakarta.activation-api") implementation("org.apache.commons:commons-lang3") { because("StringUtils") } diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 19b13dceb0b..a875a3600ec 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -105,6 +105,7 @@ Summary
  • 5710Add GitHub Issue templates
  • 5713Update Spock to 2.2-groovy-3.0 (from 2.1-groovy-3.0)
  • 5718Update Apache commons-text to 1.10.0 (from 1.9)
    • +
  • 5720Replace javax.activation 1.2.0 with jakarta.activation-api 1.2.2
    • From 9a436f183110d3b35801e0be0c60d379a8ca16fd Mon Sep 17 00:00:00 2001 From: Felix Schumacher Date: Fri, 28 Oct 2022 16:01:57 +0200 Subject: [PATCH 2/3] We need to include the jar jakarta.activation instead of jakarta.activation-api Relates to #5720 --- checksum.xml | 1 + gradle.properties | 2 +- src/bom/build.gradle.kts | 3 ++- src/components/build.gradle.kts | 6 +++++- src/dist/src/dist/expected_release_jars.csv | 2 +- src/protocol/build.gradle.kts | 6 +++++- xdocs/changes.xml | 1 + 7 files changed, 16 insertions(+), 5 deletions(-) diff --git a/checksum.xml b/checksum.xml index 86bced8b3ea..b6e6172bd21 100644 --- a/checksum.xml +++ b/checksum.xml @@ -60,6 +60,7 @@ + diff --git a/gradle.properties b/gradle.properties index fdfc11f1882..b325cd9d96e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 -jakarta.activation-api.version=1.2.2 +jakarta.activation.version=1.2.2 jcharts.version=0.7.5 jdom.version=1.1.3 jetbrains-annotations.version=23.0.0 diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts index 6ee2a716c70..651ca8d13d6 100644 --- a/src/bom/build.gradle.kts +++ b/src/bom/build.gradle.kts @@ -85,7 +85,7 @@ dependencies { apiv("com.jayway.jsonpath:json-path") apiv("com.miglayout:miglayout-core", "miglayout") apiv("com.miglayout:miglayout-swing", "miglayout") - apiv("jakarta.activation:jakarta.activation-api") + apiv("com.sun.activation:jakarta.activation", "jakarta.activation") apiv("com.thoughtworks.xstream:xstream") apiv("commons-codec:commons-codec") apiv("commons-collections:commons-collections") @@ -96,6 +96,7 @@ dependencies { apiv("dnsjava:dnsjava") apiv("io.burt:jmespath-core") apiv("io.burt:jmespath-jackson") + apiv("jakarta.activation:jakarta.activation-api", "jakarta.activation") apiv("javax.mail:mail") apiv("jcharts:jcharts") apiv("junit:junit", "junit4") diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts index 926dd676c81..f5ccf9a8029 100644 --- a/src/components/build.gradle.kts +++ b/src/components/build.gradle.kts @@ -32,7 +32,11 @@ dependencies { api("javax.mail:mail") { exclude("javax.activation", "activation") } - implementation("jakarta.activation:jakarta.activation-api") + // 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("jakarta.activation:jakarta.activation-api") implementation("com.github.ben-manes.caffeine:caffeine") implementation("io.burt:jmespath-core") implementation("io.burt:jmespath-jackson") diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index b151d3331b2..0cc9843e54f 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -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 -46613,jakarta.activation-api-1.2.2.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 diff --git a/src/protocol/build.gradle.kts b/src/protocol/build.gradle.kts index 8ac56278662..a23c5c3894f 100644 --- a/src/protocol/build.gradle.kts +++ b/src/protocol/build.gradle.kts @@ -177,7 +177,11 @@ project("mail") { api("javax.mail:mail") { exclude("javax.activation", "activation") } - implementation("jakarta.activation:jakarta.activation-api") + // 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("jakarta.activation:jakarta.activation-api") implementation("org.apache.commons:commons-lang3") { because("StringUtils") } diff --git a/xdocs/changes.xml b/xdocs/changes.xml index a875a3600ec..fb670c12da1 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -106,6 +106,7 @@ Summary
  • 5713Update Spock to 2.2-groovy-3.0 (from 2.1-groovy-3.0)
  • 5718Update Apache commons-text to 1.10.0 (from 1.9)
  • 5720Replace javax.activation 1.2.0 with jakarta.activation-api 1.2.2
    • +
  • 5720Replace javax.activation 1.2.0 with jakarta.activation 1.2.2
    • From 4d04a1ad2cc865320555afcf4db66112440eefce Mon Sep 17 00:00:00 2001 From: Felix Schumacher Date: Fri, 28 Oct 2022 16:06:07 +0200 Subject: [PATCH 3/3] Add PR number to changelog and rebase from master --- xdocs/changes.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xdocs/changes.xml b/xdocs/changes.xml index fb670c12da1..319a7f13bcc 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -105,8 +105,7 @@ Summary
  • 5710Add GitHub Issue templates
  • 5713Update Spock to 2.2-groovy-3.0 (from 2.1-groovy-3.0)
  • 5718Update Apache commons-text to 1.10.0 (from 1.9)
    • -
  • 5720Replace javax.activation 1.2.0 with jakarta.activation-api 1.2.2
    • -
  • 5720Replace javax.activation 1.2.0 with jakarta.activation 1.2.2
    • +
  • 57215720Replace javax.activation 1.2.0 with jakarta.activation 1.2.2