aboutsummaryrefslogtreecommitdiffstats
path: root/container-dependency-versions
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2018-06-25 15:30:33 +0200
committerGitHub <noreply@github.com>2018-06-25 15:30:33 +0200
commitef6a5975fc0534320cd9fdf5d9820eaa228cc938 (patch)
treee83084702fe52d5d6d97b752af23f1f201b24594 /container-dependency-versions
parent101fcd3df14e0c069f91f1741086e9707321741a (diff)
Revert "Gjoranv/java9 prep 12"
Diffstat (limited to 'container-dependency-versions')
-rw-r--r--container-dependency-versions/pom.xml9
1 files changed, 4 insertions, 5 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index 5330fca5a67..482c1c395de 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-api artifacts to >=2.3.0. Note that from 2.3, these are OSGi bundles.
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>
@@ -204,11 +204,10 @@
<version>${jaxb.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
</dependency>
- <!-- jaxb end -->
<dependency>
<groupId>net.jcip</groupId>
@@ -464,7 +463,7 @@
<findbugs.version>1.3.9</findbugs.version>
<guava.version>18.0</guava.version>
<guice.version>3.0</guice.version>
- <jaxb.version>2.3.0</jaxb.version>
+ <jaxb.version>2.2.7</jaxb.version>
<jetty.version>9.4.10.v20180503</jetty.version>
<scala.version>2.11.12</scala.version> <!-- When updating this, the scala.major-version in parent must also be updated! -->
<slf4j.version>1.7.5</slf4j.version>