From 4e5753ed3824164e626a6f8258f98c971a3c5fbc Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya <shinsuke@apache.org> Date: Thu, 8 Apr 2021 11:02:34 +0900 Subject: [PATCH] fix #2555 improve dependency for jakarta.activation --- pom.xml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e8dac6e1c..d000d72f6 100644 --- a/pom.xml +++ b/pom.xml @@ -1046,6 +1046,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + <version>1.2.2</version> + </dependency> <!-- logging --> <dependency> @@ -1266,6 +1271,14 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1313,8 +1326,8 @@ <version>2.6.0</version> <exclusions> <exclusion> - <groupId>jakarta.activation</groupId> - <artifactId>jakarta.activation-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </exclusion> </exclusions> </dependency> @@ -1376,6 +1389,10 @@ <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1509,6 +1526,10 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </exclusion> + <exclusion> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> -- GitLab