You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/02/05 12:53:53 UTC

[1/3] incubator-brooklyn git commit: Forbid imports from com.google.api.client.repackaged

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 4b1b5bdcc -> ddf0a44c8


Forbid imports from com.google.api.client.repackaged

They're - currently - never intended and are confusing when you come to
list your bundle dependecies in a catalogue entry.

If we start using com.google.api.client... we can drop this check.


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

Branch: refs/heads/master
Commit: 8b44d76c6d5d64fa46da49eaf936943c2fd8d6fc
Parents: 41b2805
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Feb 4 17:08:07 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Feb 4 17:08:07 2015 +0000

----------------------------------------------------------------------
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8b44d76c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a1dd7eb..402ba2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1059,6 +1059,11 @@
                             <module name="FileTabCharacter">
                                 <property name="eachLine" value="true" />
                             </module>
+                            <module name="TreeWalker">
+                                <module name="IllegalImport">
+                                    <property name="illegalPkgs" value="com.google.api.client.repackaged"/>
+                                </module>
+                            </module>
                         </module>
                     </checkstyleRules>
                 </configuration>


[2/3] incubator-brooklyn git commit: BindDnsServerByonLiveTest.testDns locationSpec argument is optional

Posted by he...@apache.org.
BindDnsServerByonLiveTest.testDns locationSpec argument is optional


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

Branch: refs/heads/master
Commit: c857845acc97180dd7e0dd9faab8d3f427ca45cf
Parents: 8b44d76
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Feb 4 17:08:25 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Feb 4 17:08:25 2015 +0000

----------------------------------------------------------------------
 .../brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c857845a/software/network/src/test/java/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java
----------------------------------------------------------------------
diff --git a/software/network/src/test/java/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java b/software/network/src/test/java/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java
index a0846ae..1eed359 100644
--- a/software/network/src/test/java/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java
+++ b/software/network/src/test/java/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java
@@ -20,6 +20,7 @@ package brooklyn.entity.network.bind;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.annotations.Optional;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
 
@@ -33,7 +34,7 @@ public class BindDnsServerByonLiveTest extends BrooklynAppLiveTestSupport {
 
     @Test(groups = "Live")
     @Parameters({"locationSpec"})
-    public void testDns(String locationSpec) throws Exception {
+    public void testDns(@Optional String locationSpec) throws Exception {
         if (Strings.isBlank(locationSpec)) {
             LOG.info("{} got no spec, skipping test", this);
         } else {


[3/3] incubator-brooklyn git commit: This closes #504

Posted by he...@apache.org.
This closes #504


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

Branch: refs/heads/master
Commit: ddf0a44c869d4d31866039499e973029ed785a54
Parents: 4b1b5bd c857845
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Feb 5 11:53:39 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Feb 5 11:53:39 2015 +0000

----------------------------------------------------------------------
 pom.xml                                                         | 5 +++++
 .../brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------