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/09/27 16:55:30 UTC
[1/5] brooklyn-server git commit: Updated jackson version
Repository: brooklyn-server
Updated Branches:
refs/heads/master 89eb50cf4 -> d9e4bac32
Updated jackson version
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/de125b71
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/de125b71
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/de125b71
Branch: refs/heads/master
Commit: de125b71bf3d31089d705ac656d29e52e40741b1
Parents: dfcd885
Author: graeme.miller <gr...@cloudsoftcorp.com>
Authored: Mon Sep 19 09:45:47 2016 +0100
Committer: graeme.miller <gr...@cloudsoftcorp.com>
Committed: Mon Sep 26 13:03:23 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/de125b71/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 574498a..ae70272 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
<xpp3.servicemix.version>1.1.4c_7</xpp3.servicemix.version>
<kxml2.servicemix.version>2.3.0_3</kxml2.servicemix.version>
<!-- double-check downstream projects before changing jackson version -->
- <fasterxml.jackson.version>2.4.5</fasterxml.jackson.version>
+ <fasterxml.jackson.version>2.7.5</fasterxml.jackson.version>
<cxf.version>3.1.4</cxf.version>
<httpclient.version>4.4.1</httpclient.version>
<commons-lang3.version>3.3.2</commons-lang3.version>
[4/5] brooklyn-server git commit: Added Jackson dependencies to
swagger
Posted by al...@apache.org.
Added Jackson dependencies to swagger
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6453a6f1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6453a6f1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/6453a6f1
Branch: refs/heads/master
Commit: 6453a6f1c725aefd48d9286869b8ec33e2c86ca5
Parents: b214d37
Author: graeme.miller <gr...@cloudsoftcorp.com>
Authored: Tue Sep 27 15:02:42 2016 +0100
Committer: graeme.miller <gr...@cloudsoftcorp.com>
Committed: Tue Sep 27 15:02:42 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 15 +++++++++++++++
utils/rest-swagger/pom.xml | 25 +++++++++++++++++++++++++
2 files changed, 40 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6453a6f1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b64107c..9fdc1c9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -212,6 +212,21 @@
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-joda</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger.version}</version>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6453a6f1/utils/rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml
index 9e7866b..db23f1b 100644
--- a/utils/rest-swagger/pom.xml
+++ b/utils/rest-swagger/pom.xml
@@ -64,6 +64,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
@@ -89,6 +90,30 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-joda</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </dependency>
</dependencies>
</project>
[2/5] brooklyn-server git commit: Replace MultimapSerializer with
jackson-datatype-guava library
Posted by al...@apache.org.
Replace MultimapSerializer with jackson-datatype-guava library
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/53778394
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/53778394
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/53778394
Branch: refs/heads/master
Commit: 53778394ac9eee9d62fca9535f3c49b8f54f8adf
Parents: de125b7
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Sep 1 21:36:14 2016 +0300
Committer: graeme.miller <gr...@cloudsoftcorp.com>
Committed: Mon Sep 26 13:06:28 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 4 ++
.../core/json/BrooklynObjectsJsonMapper.java | 6 +-
.../util/core/json/MultimapSerializer.java | 64 --------------------
karaf/features/src/main/feature/feature.xml | 1 +
parent/pom.xml | 5 ++
5 files changed, 13 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/53778394/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c2be055..004364e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -151,6 +151,10 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/53778394/core/src/main/java/org/apache/brooklyn/util/core/json/BrooklynObjectsJsonMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/json/BrooklynObjectsJsonMapper.java b/core/src/main/java/org/apache/brooklyn/util/core/json/BrooklynObjectsJsonMapper.java
index 1a2972e..175e62a 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/json/BrooklynObjectsJsonMapper.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/json/BrooklynObjectsJsonMapper.java
@@ -20,6 +20,7 @@ import org.apache.brooklyn.api.mgmt.ManagementContext;
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.guava.GuavaModule;
public class BrooklynObjectsJsonMapper {
public static ObjectMapper newMapper(ManagementContext mgmt) {
@@ -28,7 +29,7 @@ public class BrooklynObjectsJsonMapper {
ObjectMapper mapper = new ObjectMapper();
mapper.setSerializerProvider(sp);
- mapper.setVisibilityChecker(new PossiblyStrictPreferringFieldsVisibilityChecker());
+ mapper.setVisibility(new PossiblyStrictPreferringFieldsVisibilityChecker());
SimpleModule mapperModule = new SimpleModule("Brooklyn", new Version(0, 0, 0, "ignored", null, null));
@@ -36,8 +37,7 @@ public class BrooklynObjectsJsonMapper {
new BidiSerialization.EntitySerialization(mgmt).install(mapperModule);
new BidiSerialization.LocationSerialization(mgmt).install(mapperModule);
- mapperModule.addSerializer(new MultimapSerializer());
- mapper.registerModule(mapperModule);
+ mapper.registerModule(new GuavaModule()).registerModule(mapperModule);
return mapper;
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/53778394/core/src/main/java/org/apache/brooklyn/util/core/json/MultimapSerializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/json/MultimapSerializer.java b/core/src/main/java/org/apache/brooklyn/util/core/json/MultimapSerializer.java
deleted file mode 100644
index d825e3e..0000000
--- a/core/src/main/java/org/apache/brooklyn/util/core/json/MultimapSerializer.java
+++ /dev/null
@@ -1,64 +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 org.apache.brooklyn.util.core.json;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-
-import com.google.common.annotations.Beta;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-
-/**
- * Provides a serializer for {@link Multimap} instances.
- * <p>
- * When Brooklyn's Jackson dependency is updated from org.codehaus.jackson:1.9.13 to
- * com.fasterxml.jackson:2.3+ then this class should be replaced with a dependency on
- * jackson-datatype-guava and a GuavaModule registered with Brooklyn's ObjectMapper.
- * Check the guava version when doing the switch as it could be incompatible with the
- * version used by Brooklyn.
- */
-@Beta
-public class MultimapSerializer extends StdSerializer<Multimap<?, ?>> {
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- protected MultimapSerializer() {
- super((Class<Multimap<?, ?>>) (Class) Multimap.class);
- }
-
- @Override
- public void serialize(Multimap<?, ?> value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
- jgen.writeStartObject();
- writeEntries(value, jgen, provider);
- jgen.writeEndObject();
- }
-
- private void writeEntries(Multimap<?, ?> value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
- for (Map.Entry<?, ? extends Collection<?>> entry : value.asMap().entrySet()) {
- provider.findKeySerializer(provider.constructType(String.class), null)
- .serialize(entry.getKey(), jgen, provider);
- provider.defaultSerializeValue(Lists.newArrayList(entry.getValue()), jgen);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/53778394/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index f8230aa..7bf9655 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -196,6 +196,7 @@
<feature>cxf-jaxrs</feature>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-guava/${fasterxml.jackson.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
<!-- should be deps of jax-rs-2.0 rest-api project -->
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/53778394/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 55005bd..5967412 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -176,6 +176,11 @@
<artifactId>jetty-schemas</artifactId>
<version>${jetty-schemas.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-guava</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
[3/5] brooklyn-server git commit: Added exclusions such that swagger
no longer pulls in jackson
Posted by al...@apache.org.
Added exclusions such that swagger no longer pulls in jackson
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b214d37a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b214d37a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b214d37a
Branch: refs/heads/master
Commit: b214d37a2f0db5163612a3b63efe61ae9676df82
Parents: 5377839
Author: graeme.miller <gr...@cloudsoftcorp.com>
Authored: Mon Sep 26 13:46:44 2016 +0100
Committer: graeme.miller <gr...@cloudsoftcorp.com>
Committed: Mon Sep 26 13:46:44 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b214d37a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5967412..b64107c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -225,12 +225,43 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-joda</artifactId>
+ </exclusion>
+
</exclusions>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
<version>${swagger.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
[5/5] brooklyn-server git commit: This closes #339
Posted by al...@apache.org.
This closes #339
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d9e4bac3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d9e4bac3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d9e4bac3
Branch: refs/heads/master
Commit: d9e4bac32c9b0fd8f897d7d27cc2fc75402e77c6
Parents: 89eb50c 6453a6f
Author: Aled Sage <al...@gmail.com>
Authored: Tue Sep 27 17:55:09 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Sep 27 17:55:09 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 4 ++
.../core/json/BrooklynObjectsJsonMapper.java | 6 +-
.../util/core/json/MultimapSerializer.java | 64 --------------------
karaf/features/src/main/feature/feature.xml | 1 +
parent/pom.xml | 51 ++++++++++++++++
pom.xml | 2 +-
utils/rest-swagger/pom.xml | 25 ++++++++
7 files changed, 85 insertions(+), 68 deletions(-)
----------------------------------------------------------------------