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:18 UTC
[1/4] incubator-brooklyn git commit: Upgrade jclouds to 1.8.1 from
1.8.0
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master f6e3f8ff9 -> 10b650480
Upgrade jclouds to 1.8.1 from 1.8.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/af16c477
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/af16c477
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/af16c477
Branch: refs/heads/master
Commit: af16c4777b97f4974b0b4f5f0cc090ed2ee86222
Parents: 235afd0
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 11 23:10:07 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 11 23:20:43 2014 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
usage/downstream-parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/af16c477/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2bc84a9..9d66fcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
<!-- 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>
<logback.version>1.0.7</logback.version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/af16c477/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 251f5b2..1eb6a94 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -46,7 +46,7 @@
<!-- Dependencies -->
<brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
<!-- versions should match those used by Brooklyn, to avoid conflicts -->
- <jclouds.version>1.8.0</jclouds.version>
+ <jclouds.version>1.8.1</jclouds.version>
<logback.version>1.0.7</logback.version>
<guava.version>17.0</guava.version>
<xstream.version>1.4.7</xstream.version>
[4/4] incubator-brooklyn git commit: This closes #321
Posted by gr...@apache.org.
This closes #321
* github/pr/321:
Delete greenhousedata jclouds tests
Upgrade testng+surefire+mockito
Upgrade jclouds to 1.8.1 from 1.8.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/10b65048
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/10b65048
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/10b65048
Branch: refs/heads/master
Commit: 10b650480b09f45cc532f560895634bd4c1101fa
Parents: f6e3f8f 2040c67
Author: Andrew Kennedy <gr...@apache.org>
Authored: Wed Nov 12 13:48:13 2014 +0000
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Wed Nov 12 13:48:13 2014 +0000
----------------------------------------------------------------------
.../brooklyn/util/task/ValueResolverTest.java | 2 +-
.../GreenhouseDataLocationLiveTest.groovy | 59 --------------------
pom.xml | 8 +--
usage/downstream-parent/pom.xml | 6 +-
4 files changed, 8 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-brooklyn git commit: Upgrade testng+surefire+mockito
Posted by gr...@apache.org.
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>
[3/4] incubator-brooklyn git commit: Delete greenhousedata jclouds
tests
Posted by gr...@apache.org.
Delete greenhousedata jclouds tests
- Greenhouse-element-vcloud was deleted in jclouds 1.8.1,
see JCLOUDS-743
- The test included the comment “FIXME get Greenhouse working”!
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2040c670
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2040c670
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2040c670
Branch: refs/heads/master
Commit: 2040c670dc1b18205bfc661cfae89570b15e1668
Parents: 0e1bdb5
Author: Aled Sage <al...@gmail.com>
Authored: Wed Nov 12 12:06:52 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Nov 12 12:06:52 2014 +0000
----------------------------------------------------------------------
.../GreenhouseDataLocationLiveTest.groovy | 59 --------------------
1 file changed, 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2040c670/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/GreenhouseDataLocationLiveTest.groovy
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/GreenhouseDataLocationLiveTest.groovy b/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/GreenhouseDataLocationLiveTest.groovy
deleted file mode 100644
index 7ea5152..0000000
--- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/GreenhouseDataLocationLiveTest.groovy
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.location.jclouds.provider;
-
-import org.testng.annotations.DataProvider
-import org.testng.annotations.Test
-
-//FIXME get Greenhouse working
-
-class GreenhouseDataLocationLiveTest extends AbstractJcloudsLocationTest {
-
- private static final String PROVIDER = "greenhousedata-element-vcloud"
- private static final String REGION_NAME = null
- private static final String IMAGE_ID = "1"
- private static final String IMAGE_OWNER = null
- private static final String IMAGE_PATTERN = ".*Ubuntu_Server_x64.*"
-
- public GreenhouseDataLocationLiveTest() {
- super(PROVIDER)
- }
-
- @Override
- @DataProvider(name = "fromImageId")
- public Object[][] cloudAndImageIds() {
- return [ [ REGION_NAME, IMAGE_ID, IMAGE_OWNER ] ]
- }
-
- @Override
- @DataProvider(name = "fromImageDescriptionPattern")
- public Object[][] cloudAndImageDescriptionPatterns() {
- return [ [ REGION_NAME, IMAGE_PATTERN, IMAGE_OWNER ] ]
- }
-
- @Override
- @DataProvider(name = "fromImageNamePattern")
- public Object[][] cloudAndImageNamePatterns() {
- return []
- }
-
- @Test(enabled = false)
- public void noop() { /* just exists to let testNG IDE run the test */ }
-
-}