diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2016-10-07 21:45:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 21:45:59 +0200 |
| commit | ba0df7f91706f52a923576bb39b5184633a2cb4e (patch) | |
| tree | 5904b5178b8e049f40bb46c0bfdae5bbfdf8c887 | |
| parent | 0f0d40c5a3ee507adf08559f548d7c007cde274b (diff) | |
| parent | b98c9a42a515fb91375664fd6c584c80aaf4925d (diff) | |
Merge pull request #818 from yahoo/gjoranv/jersey-2.16
Upgrade jersey to 2.16
| -rw-r--r-- | container-disc/pom.xml | 7 | ||||
| -rw-r--r-- | pom.xml | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 2989af2e309..de08b6fd8a3 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -132,9 +132,10 @@ <!-- end WARNING --> </dependencies> <properties> - <!-- hk2 version must be the one used by current jersey version. This is just to avoid duplicating it below. + <!-- hk2 version must be the one used by current jersey version. + This is just to avoid duplicating it below, _not_ to enforce a particular version of hk2. Do not move this to the root pom! --> - <hk2.version>2.4.0-b06</hk2.version> + <hk2.version>2.4.0-b09</hk2.version> </properties> <build> <plugins> @@ -187,7 +188,9 @@ jersey-common-${jersey2.version}.jar, jersey-container-servlet-${jersey2.version}.jar, jersey-container-servlet-core-${jersey2.version}.jar, + jersey-entity-filtering-${jersey2.version}.jar, <!-- new feature from 2.16, provided for convenience --> jersey-guava-${jersey2.version}.jar, + jersey-media-jaxb-${jersey2.version}.jar, jersey-media-json-jackson-${jersey2.version}.jar, jersey-media-multipart-${jersey2.version}.jar, mimepull-1.9.3.jar, <!-- needed by media-multipart --> @@ -1082,7 +1082,7 @@ <asm-debug-all.version>5.0.3</asm-debug-all.version> <curator.version>2.9.1</curator.version> <jackson2.version>2.8.3</jackson2.version> - <jersey2.version>2.14</jersey2.version> + <jersey2.version>2.16</jersey2.version> <jetty.version>9.3.12.v20160915</jetty.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <test.hide>true</test.hide> |