summaryrefslogtreecommitdiffstats
path: root/container-dependency-versions
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-06-11 16:26:25 +0200
committerGitHub <noreply@github.com>2018-06-11 16:26:25 +0200
commit8ec25d827c1cefa65d23b34a00284e1558bb1164 (patch)
treeacef28cfce609a0e9c4a45fc8263ef8b9bb1a2bf /container-dependency-versions
parentca6f202e9c7383542808127563a63bfe2ab3b143 (diff)
parent762ed224987a4d228d71368e47ea6733a8640912 (diff)
Merge pull request #6165 from vespa-engine/revert-6158-gv/jersey-2.25
Revert "Upgrade Jersey to 2.25 and Jackson to 2.8.4"
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 90836b1c07f..f546a4e36d2 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -470,16 +470,15 @@
<!-- These must be kept in sync with version used by current jersey2.version. -->
<!-- MUST be updated each time jersey2 is upgraded! -->
- <!-- Check versions in the properties section of the pom for org/glassfish/jersey/project/ -->
- <!-- and then verify by doing: ' ls -l vespa/vespa_jersey2/target/dependency' -->
- <hk2.version>2.5.0-b32</hk2.version>
+ <!-- Check versions by doing: ' ls -l vespa/vespa_jersey2/target/dependency' -->
+ <hk2.version>2.5.0-b05</hk2.version>
<hk2.osgi-resource-locator.version>1.0.1</hk2.osgi-resource-locator.version>
- <jackson2.version>2.8.4</jackson2.version>
+ <jackson2.version>2.8.3</jackson2.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>
<javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version>
- <jersey2.version>2.25</jersey2.version>
+ <jersey2.version>2.23.2</jersey2.version>
<mimepull.version>1.9.6</mimepull.version>
</properties>