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:41 UTC
[1/2] incubator-brooklyn git commit: Upgrade groovy to 2.3.4 from
1.8.6
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 10b650480 -> 27df750fa
Upgrade groovy to 2.3.4 from 1.8.6
- And groovy-eclipse-compiler to 2.9.0-01 from 2.7.0-01
- And groovy-eclipse-batch to 2.3.4-01 from 1.8.6-01
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/fba96e34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fba96e34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fba96e34
Branch: refs/heads/master
Commit: fba96e34336e49a29e9f16d3b4795d33acaa5709
Parents: 235afd0
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 11 14:48:58 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Nov 12 12:25:26 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/fba96e34/core/src/test/java/brooklyn/util/internal/RepeaterTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/internal/RepeaterTest.groovy b/core/src/test/java/brooklyn/util/internal/RepeaterTest.groovy
index c14b0cf..65976e1 100644
--- a/core/src/test/java/brooklyn/util/internal/RepeaterTest.groovy
+++ b/core/src/test/java/brooklyn/util/internal/RepeaterTest.groovy
@@ -21,6 +21,7 @@ package brooklyn.util.internal
import static java.util.concurrent.TimeUnit.*
import static org.testng.Assert.*
+import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit
import org.testng.annotations.Test
@@ -66,7 +67,7 @@ public class RepeaterTest {
@Test(expectedExceptions = [ NullPointerException.class ])
public void repeatFailsIfClosureIsNull() {
- new Repeater("repeatFailsIfClosureIsNull").repeat(null);
+ new Repeater("repeatFailsIfClosureIsNull").repeat((Callable<?>)null);
fail "Expected exception was not thrown"
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fba96e34/docs/dev/build/eclipse.include.md
----------------------------------------------------------------------
diff --git a/docs/dev/build/eclipse.include.md b/docs/dev/build/eclipse.include.md
index e0dc3c0..b1cf5ea 100644
--- a/docs/dev/build/eclipse.include.md
+++ b/docs/dev/build/eclipse.include.md
@@ -9,7 +9,7 @@
[dist.springsource.org/release/GRECLIPSE/e4.3](http://dist.springsource.org/release/GRECLIPSE/e4.3)
(or for Eclipse [4.2](http://dist.springsource.org/release/GRECLIPSE/e4.2)
or [3.7](http://dist.springsource.org/release/GRECLIPSE/e3.7)).
- Be sure to include Groovy 1.8.6 compiler support and Maven-Eclipse (m2e) support.
+ Be sure to include Groovy 2.3.4 compiler support and Maven-Eclipse (m2e) support.
More details are at the [groovy update site](http://groovy.codehaus.org/Eclipse+Plugin).
- TestNG Plugin: beust TestNG from [beust.com/eclipse](http://beust.com/eclipse)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fba96e34/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2bc84a9..97f3a36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<jclouds.groupId>org.apache.jclouds</jclouds.groupId>
<jclouds.version>1.8.0</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>
@@ -1118,12 +1118,12 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.7.0-01</version>
+ <version>2.9.0-01</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>1.8.6-01</version>
+ <version>2.3.4-01</version>
</dependency>
</dependencies>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fba96e34/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
index 8dc348a..8c7185e 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -195,12 +195,12 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.6.0-01</version>
+ <version>2.9.0-01</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>1.8.6-01</version>
+ <version>2.3.4-01</version>
</dependency>
</dependencies>
</plugin>
[2/2] incubator-brooklyn git commit: This closes #319
Posted by gr...@apache.org.
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 -->