diff options
| -rw-r--r-- | container-dependency-versions/pom.xml | 14 | ||||
| -rw-r--r-- | container-disc/pom.xml | 4 | ||||
| -rw-r--r-- | parent/pom.xml | 12 |
3 files changed, 14 insertions, 16 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 5e4a45074ae..62054049be7 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -165,18 +165,6 @@ <artifactId>javax.activation</artifactId> <version>1.2.0</version> </dependency> - <dependency> - <!-- Needed by jackson-module-jaxb-annotations --> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - <version>${jakarta-xml-bind-api.version}</version> - </dependency> - <dependency> - <!-- Needed by jackson-module-jaxb-annotations --> - <groupId>jakarta.activation</groupId> - <artifactId>jakarta.activation-api</artifactId> - <version>${jakarta-activation-api.version}</version> - </dependency> <!-- jaxb end --> <dependency> @@ -407,8 +395,6 @@ <hk2.osgi-resource-locator.version>1.0.1</hk2.osgi-resource-locator.version> <jackson2.version>2.12.1</jackson2.version> <jackson-databind.version>${jackson2.version}</jackson-databind.version> - <jakarta-activation-api.version>1.2.1</jakarta-activation-api.version> - <jakarta-xml-bind-api.version>2.3.2</jakarta-xml-bind-api.version> <javassist.version>3.20.0-GA</javassist.version> <javax.annotation-api.version>1.2</javax.annotation-api.version> <javax.validation-api.version>1.1.0.Final</javax.validation-api.version> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index e537b8f1c35..f87148fabaa 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -220,8 +220,8 @@ jackson-jaxrs-base-${jackson2.version}.jar, jackson-jaxrs-json-provider-${jackson2.version}.jar, jackson-module-jaxb-annotations-${jackson2.version}.jar, - jakarta.activation-api-${jakarta-activation-api.version}.jar, - jakarta.xml.bind-api-${jakarta-xml-bind-api.version}.jar, + jakarta.activation-api-1.2.1.jar, + jakarta.xml.bind-api-2.3.2.jar, javassist-${javassist.version}.jar, javax.ws.rs-api-${javax.ws.rs-api.version}.jar, jersey-client-${jersey2.version}.jar, diff --git a/parent/pom.xml b/parent/pom.xml index 322548194d9..3cca46c8a59 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -537,6 +537,18 @@ <version>${prometheus.client.version}</version> </dependency> <dependency> + <!-- TODO: Try to remove, as this overlaps with javax.activation. --> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + <version>1.2.1</version> + </dependency> + <dependency> + <!-- TODO: Try to remove, as this conflicts with javax.xml.bind:jaxb-api --> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>2.3.2</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.12</version> |