You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/01/14 17:47:00 UTC
[1/2] incubator-brooklyn git commit: Update commons-lang3 to 3.3.2
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master a2fde1af6 -> ed289eceb
Update commons-lang3 to 3.3.2
Matches Alien4Cloud version, used by brooklyn-tosca
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4f4c4a51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4f4c4a51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4f4c4a51
Branch: refs/heads/master
Commit: 4f4c4a51c7c05649823d0ded3a9ca7b33004b502
Parents: 2864486
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Mon Jan 11 13:59:31 2016 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Mon Jan 11 13:59:31 2016 +0000
----------------------------------------------------------------------
brooklyn-server/pom.xml | 2 +-
brooklyn-server/utils/rest-swagger/pom.xml | 4 ++++
.../org/apache/brooklyn/rest/apidoc/ApiListingResource.java | 5 +++--
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4f4c4a51/brooklyn-server/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/pom.xml b/brooklyn-server/pom.xml
index d5ae3a8..59bf6b2 100644
--- a/brooklyn-server/pom.xml
+++ b/brooklyn-server/pom.xml
@@ -99,7 +99,7 @@
<fasterxml.jackson.version>2.4.5</fasterxml.jackson.version> <!-- more recent jackson, but not compatible with old annotations! -->
<jersey.version>1.19</jersey.version>
<httpclient.version>4.4.1</httpclient.version>
- <commons-lang3.version>3.1</commons-lang3.version>
+ <commons-lang3.version>3.3.2</commons-lang3.version>
<groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes -->
<jsr305.version>2.0.1</jsr305.version>
<snakeyaml.version>1.11</snakeyaml.version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4f4c4a51/brooklyn-server/utils/rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/utils/rest-swagger/pom.xml b/brooklyn-server/utils/rest-swagger/pom.xml
index 6f9a86f..83849f9 100644
--- a/brooklyn-server/utils/rest-swagger/pom.xml
+++ b/brooklyn-server/utils/rest-swagger/pom.xml
@@ -72,6 +72,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4f4c4a51/brooklyn-server/utils/rest-swagger/src/main/java/org/apache/brooklyn/rest/apidoc/ApiListingResource.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/utils/rest-swagger/src/main/java/org/apache/brooklyn/rest/apidoc/ApiListingResource.java b/brooklyn-server/utils/rest-swagger/src/main/java/org/apache/brooklyn/rest/apidoc/ApiListingResource.java
index 3edffe9..84c52f8 100644
--- a/brooklyn-server/utils/rest-swagger/src/main/java/org/apache/brooklyn/rest/apidoc/ApiListingResource.java
+++ b/brooklyn-server/utils/rest-swagger/src/main/java/org/apache/brooklyn/rest/apidoc/ApiListingResource.java
@@ -48,7 +48,8 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-import org.apache.commons.lang3.StringUtils;
+
+import org.apache.brooklyn.util.text.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -171,7 +172,7 @@ public class ApiListingResource {
@Context HttpHeaders headers,
@Context UriInfo uriInfo,
@PathParam("type") String type) {
- if (StringUtils.isNotBlank(type) && type.trim().equalsIgnoreCase("yaml")) {
+ if (Strings.isNonBlank(type) && type.trim().equalsIgnoreCase("yaml")) {
return getListingYaml(app, sc, headers, uriInfo);
} else {
return getListingJson(app, sc, headers, uriInfo);
[2/2] incubator-brooklyn git commit: This closes #1125
Posted by al...@apache.org.
This closes #1125
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ed289ece
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ed289ece
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ed289ece
Branch: refs/heads/master
Commit: ed289eceb18a480d4d729aad0bcd924594eb3550
Parents: a2fde1a 4f4c4a5
Author: Aled Sage <al...@gmail.com>
Authored: Thu Jan 14 16:46:42 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Jan 14 16:46:42 2016 +0000
----------------------------------------------------------------------
brooklyn-server/pom.xml | 2 +-
brooklyn-server/utils/rest-swagger/pom.xml | 4 ++++
.../org/apache/brooklyn/rest/apidoc/ApiListingResource.java | 5 +++--
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------