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:19 UTC
[2/4] incubator-brooklyn git commit: Upgrade testng+surefire+mockito
Upgrade testng+surefire+mockito
- testng to 6.8.8 from 6.8
- surefire to 2.18 from 2.17
- mockito to 1.10.8 from 1.9.5
- use org.testng.Assert instead of org.junit.Assert
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0e1bdb57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0e1bdb57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0e1bdb57
Branch: refs/heads/master
Commit: 0e1bdb5735a2257b2baec1adf97328de4e9732ca
Parents: af16c47
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 11 23:18:27 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 11 23:20:44 2014 +0000
----------------------------------------------------------------------
core/src/test/java/brooklyn/util/task/ValueResolverTest.java | 2 +-
pom.xml | 6 +++---
usage/downstream-parent/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0e1bdb57/core/src/test/java/brooklyn/util/task/ValueResolverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/task/ValueResolverTest.java b/core/src/test/java/brooklyn/util/task/ValueResolverTest.java
index 9f4b2e1..324c9f1 100644
--- a/core/src/test/java/brooklyn/util/task/ValueResolverTest.java
+++ b/core/src/test/java/brooklyn/util/task/ValueResolverTest.java
@@ -20,7 +20,7 @@ package brooklyn.util.task;
import java.util.concurrent.Callable;
-import org.junit.Assert;
+import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0e1bdb57/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9d66fcd..27d8d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<!-- Testing -->
<cobertura.version>1.9.4.1</cobertura.version>
- <surefire.version>2.17</surefire.version>
+ <surefire.version>2.18</surefire.version>
<plantuml.version>6121</plantuml.version>
<ant.version>1.8.4</ant.version>
<includedTestGroups />
@@ -127,8 +127,8 @@
<guava.version>17.0</guava.version>
<groovy.version>1.8.6</groovy.version>
<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 -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0e1bdb57/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 1eb6a94..5c23ea4 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -38,8 +38,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Testing -->
- <testng.version>6.8</testng.version>
- <surefire.version>2.17</surefire.version>
+ <testng.version>6.8.8</testng.version>
+ <surefire.version>2.18</surefire.version>
<includedTestGroups />
<excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP</excludedTestGroups>