You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2015/07/23 18:07:18 UTC

[1/2] incubator-brooklyn git commit: Fix httpclient version mismatch in pom

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master efaceed3d -> d1e4fe634


Fix httpclient version mismatch in pom

In commit 3fb4d9a @andreaturli bumped the httpclient version in the
parent pom, but he didn't update the version in
brooklyn-downstream-parent pom.


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

Branch: refs/heads/master
Commit: 593d17590590c84d5def5539aed8006403607f86
Parents: d7ac3ac
Author: Richard Downer <ri...@apache.org>
Authored: Tue Jul 21 13:37:01 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Jul 21 13:37:01 2015 +0100

----------------------------------------------------------------------
 usage/downstream-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/593d1759/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 2dea7ce..0a429ec 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -58,7 +58,7 @@
     <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>
-    <httpclient.version>4.2.5</httpclient.version>
+    <httpclient.version>4.4.1</httpclient.version>
     <commons-lang3.version>3.1</commons-lang3.version>
     <groovy.version>2.3.4</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.0-Release-Notes -->
     <jsr305.version>2.0.1</jsr305.version>


[2/2] incubator-brooklyn git commit: Merge and close #759

Posted by ri...@apache.org.
Merge and close #759


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

Branch: refs/heads/master
Commit: d1e4fe6348fa23f747cc5ffc9195f8adf7041c9a
Parents: efaceed 593d175
Author: Richard Downer <ri...@apache.org>
Authored: Thu Jul 23 17:06:54 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 23 17:06:54 2015 +0100

----------------------------------------------------------------------
 usage/downstream-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------