summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-07-10 12:32:26 +0200
committergjoranv <gv@oath.com>2018-07-10 17:08:16 +0200
commit330a0a097485e7a3e53e3178dabc66725975592d (patch)
tree2f368f311e221211da0a1292638930d5db1c243c
parentc0abb43b274cfec954ba99841b7483e6c3849643 (diff)
Add jaxb-core and jaxb-impl dependencies and export their packages.
- Needed for Jersey (2.23, and most likely also later versions)
-rw-r--r--container-dependencies-enforcer/pom.xml4
-rw-r--r--container-dependency-versions/pom.xml2
-rw-r--r--jdisc_core/pom.xml10
3 files changed, 14 insertions, 2 deletions
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index f693517c844..fae291e6578 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -88,7 +88,9 @@
<include>com.google.inject.extensions:guice-assistedinject:[${guice.version}]:jar:provided</include>
<include>com.google.inject.extensions:guice-multibindings:[${guice.version}]:jar:provided</include>
<include>com.google.inject:guice:[${guice.version}]:jar:provided:no_aop</include>
- <include>com.sun.activation:javax.activation:jar[1.2.0]:jar:provided</include>
+ <include>com.sun.activation:javax.activation:[1.2.0]:jar:provided</include>
+ <include>com.sun.xml.bind:jaxb-core:[${jaxb.version}]:jar:provided</include>
+ <include>com.sun.xml.bind:jaxb-impl:[${jaxb.version}]:jar:provided</include>
<include>commons-codec:commons-codec:[1.4]:jar:provided</include>
<include>commons-daemon:commons-daemon:[1.0.3]:jar:provided</include>
<include>commons-logging:commons-logging:[1.1.1]:jar:provided</include>
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index 195e66902db..ec4e9eae5fb 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -186,7 +186,7 @@
<version>${javax.ws.rs-api.version}</version>
</dependency>
- <!-- TODO: upgrade jaxb-api artifacts to >=2.3.0.
+ <!-- TODO: upgrade jaxb artifacts to >=2.3.0.
See https://stackoverflow.com/questions/50237516/proper-fix-for-java-10-complaining-about-illegal-reflection-access-by-jaxb-impl -->
<dependency>
<groupId>javax.xml.bind</groupId>
diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml
index 6b22aa4a985..efa4e62affd 100644
--- a/jdisc_core/pom.xml
+++ b/jdisc_core/pom.xml
@@ -22,6 +22,14 @@
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
</dependency>
@@ -240,6 +248,8 @@
<argument>${project.build.directory}/dependency/config-lib.jar</argument>
<argument>${project.build.directory}/dependency/yolean.jar</argument>
<argument>${project.build.directory}/dependency/jaxb-api.jar</argument>
+ <argument>${project.build.directory}/dependency/jaxb-core.jar</argument>
+ <argument>${project.build.directory}/dependency/jaxb-impl.jar</argument>
<argument>${project.build.directory}/dependency/javax.activation.jar</argument>
</arguments>
</configuration>