summaryrefslogtreecommitdiffstats
path: root/parent/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'parent/pom.xml')
-rw-r--r--parent/pom.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/parent/pom.xml b/parent/pom.xml
index 322548194d9..0d29ad22a59 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>
@@ -864,7 +876,7 @@
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<maven-plugin-tools.version>3.6.0</maven-plugin-tools.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
- <maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
+ <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
<maven-site-plugin.version>3.3</maven-site-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<prometheus.client.version>0.6.0</prometheus.client.version>