This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 5d84253b23 [KARAF-7748] Update to JAXB 2.3.8 and jaxb-bom
new 041c72cd40 Merge pull request #1768 from mattrpav/KARAF-7748
5d84253b23 is described below
commit 5d84253b236395ed97c01485a6d1484f26511235
Author: Matt Pavlovich <m...@hyte.io>
AuthorDate: Thu Sep 7 11:42:52 2023 -0500
[KARAF-7748] Update to JAXB 2.3.8 and jaxb-bom
---
bom/pom.xml | 27 +++++++--------------------
pom.xml | 2 +-
2 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 0eb5cc2487..97f6c58ca6 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -34,6 +34,13 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-bom</artifactId>
+ <version>${jaxb-bom.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
@@ -1579,26 +1586,6 @@
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<version>1.2</version>
</dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>txw2</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.istack</groupId>
- <artifactId>istack-commons-runtime</artifactId>
- <version>3.0.10</version>
- </dependency>
<!-- specs -->
<dependency>
diff --git a/pom.xml b/pom.xml
index b28ce11375..da75f4321c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@
<cxf.version>3.5.5</cxf.version>
<jackson.version>2.14.1</jackson.version>
<jna.version>5.13.0</jna.version>
- <jaxb.version>2.3.3</jaxb.version>
+ <jaxb-bom.version>2.3.8</jaxb-bom.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-codec.version>1.15</commons-codec.version>
<commons-compress.version>1.23.0</commons-compress.version>
