brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreatu...@apache.org
Subject [1/2] brooklyn-server git commit: Remove unused dependency
Date Fri, 12 Feb 2016 16:49:15 GMT
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 0a5f3e11c -> 495b1d335


Remove unused dependency

The code already is refactored to use fasterxml jackson provider, remove leftover dependency.


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

Branch: refs/heads/master
Commit: d863aabf178aad37e21c4559dbbee68ae8226540
Parents: 0a5f3e1
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Fri Feb 12 17:24:43 2016 +0200
Committer: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Committed: Fri Feb 12 17:24:43 2016 +0200

----------------------------------------------------------------------
 camp/camp-server/pom.xml                                  | 10 ----------
 .../org/apache/brooklyn/camp/server/dto/ApiErrorDto.java  |  3 +--
 2 files changed, 1 insertion(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d863aabf/camp/camp-server/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index 1ef149d..534a6cb 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -81,16 +81,6 @@
             <artifactId>jersey-servlet</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-              <exclusions>
-                <exclusion>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                </exclusion>
-            </exclusions>               
-        </dependency>
-        <dependency>
             <groupId>com.sun.jersey.contribs</groupId>
             <artifactId>jersey-multipart</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d863aabf/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ApiErrorDto.java
----------------------------------------------------------------------
diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ApiErrorDto.java
b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ApiErrorDto.java
index a65dbe1..c938b96 100644
--- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ApiErrorDto.java
+++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ApiErrorDto.java
@@ -20,8 +20,7 @@ package org.apache.brooklyn.camp.server.dto;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;


Mime
View raw message