You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/11/12 14:48:42 UTC

[2/2] incubator-brooklyn git commit: This closes #319

This closes #319

* github/pr/319:
  Upgrade groovy to 2.3.4 from 1.8.6


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

Branch: refs/heads/master
Commit: 27df750fab0d6c25571a47b01663dbff293f2fee
Parents: 10b6504 fba96e3
Author: Andrew Kennedy <gr...@apache.org>
Authored: Wed Nov 12 13:48:36 2014 +0000
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Wed Nov 12 13:48:36 2014 +0000

----------------------------------------------------------------------
 core/src/test/java/brooklyn/util/internal/RepeaterTest.groovy | 3 ++-
 docs/dev/build/eclipse.include.md                             | 2 +-
 pom.xml                                                       | 6 +++---
 usage/archetypes/quickstart/src/brooklyn-sample/pom.xml       | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/27df750f/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 27d8d5c,97f3a36..07d4e4b
--- a/pom.xml
+++ b/pom.xml
@@@ -123,12 -123,12 +123,12 @@@
          <!-- Dependencies -->
          <brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version>  <!-- BROOKLYN_VERSION -->
          <jclouds.groupId>org.apache.jclouds</jclouds.groupId>
 -        <jclouds.version>1.8.0</jclouds.version>
 +        <jclouds.version>1.8.1</jclouds.version>
          <guava.version>17.0</guava.version>
-         <groovy.version>1.8.6</groovy.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 -->
          <logback.version>1.0.7</logback.version>
 -        <testng.version>6.8</testng.version>
 -        <mockito.version>1.9.5</mockito.version>
 +        <testng.version>6.8.8</testng.version>
 +        <mockito.version>1.10.8</mockito.version>
          <slf4j.version>1.6.6</slf4j.version>  <!-- used for java.util.logging jul-to-slf4j interception -->
          <xstream.version>1.4.7</xstream.version>
          <jackson.version>1.9.13</jackson.version>  <!-- codehaus jackson, used by brooklyn rest server -->