You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/11/25 02:55:17 UTC

[07/21] incubator-brooklyn git commit: [BROOKLYN-183] Bump jersey version to 1.19

[BROOKLYN-183] Bump jersey version to 1.19

jersey-core-1.18.1 suffers from the split-package problem by providing
javax.ws.rs*, which can affect OSGi bundle resolution


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f154e033
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f154e033
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f154e033

Branch: refs/heads/master
Commit: f154e0334e13077611e891a59b46c5155870b446
Parents: 094e6e4
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Wed Nov 18 00:30:31 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Wed Nov 18 00:31:45 2015 +0200

----------------------------------------------------------------------
 pom.xml                         | 2 +-
 usage/downstream-parent/pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f154e033/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3235e24..8431b13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
         <xstream.version>1.4.7</xstream.version>
         <jackson.version>1.9.13</jackson.version>  <!-- codehaus jackson, used by brooklyn rest server -->
         <fasterxml.jackson.version>2.4.5</fasterxml.jackson.version>  <!-- more recent jackson, but not compatible with old annotations! -->
-        <jersey.version>1.18.1</jersey.version>
+        <jersey.version>1.19</jersey.version>
         <httpclient.version>4.4.1</httpclient.version>
         <commons-lang3.version>3.1</commons-lang3.version>
         <groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes -->

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f154e033/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 9ce2329..6580281 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -58,8 +58,8 @@
     <guava.version>17.0</guava.version>
     <xstream.version>1.4.7</xstream.version>
     <jackson.version>1.9.13</jackson.version>  <!-- codehaus jackson, used by brooklyn rest server -->
-    <fasterxml.jackson.version>2.4.2</fasterxml.jackson.version>  <!-- more recent jackson, but not compatible with old annotations! -->
-    <jersey.version>1.18.1</jersey.version>
+    <fasterxml.jackson.version>2.4.5</fasterxml.jackson.version>  <!-- more recent jackson, but not compatible with old annotations! -->
+    <jersey.version>1.19</jersey.version>
     <httpclient.version>4.4.1</httpclient.version>
     <commons-lang3.version>3.1</commons-lang3.version>
     <groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes -->