upgrade dependencies

publicissapient-france · Sep 7, 2016 · 67a968d · 67a968d
1 parent e4bc10d
commit 67a968d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/elevator-core/src/test/java/elevator/engine/assertions/BuildingAssert.java b/elevator-core/src/test/java/elevator/engine/assertions/BuildingAssert.java
@@ -5,6 +5,7 @@
 import elevator.user.User;
 import org.assertj.core.api.AbstractIterableAssert;
 import org.assertj.core.api.AbstractObjectAssert;
+import org.assertj.core.api.ObjectAssert;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -13,7 +14,7 @@ public class BuildingAssert extends AbstractObjectAssert<BuildingAssert, Buildin
         super(actual, BuildingAssert.class);
     }
 
-    public AbstractIterableAssert<?, ? extends Iterable<? extends User>, User> users() {
+    public AbstractIterableAssert<?, ? extends Iterable<? extends User>, User, ObjectAssert<User>> users() {
         return assertThat(actual.users()).as("building users (delivered users are gone)");
     }
 

diff --git a/elevator-server/pom.xml b/elevator-server/pom.xml
@@ -14,7 +14,7 @@
     <packaging>war</packaging>
 
     <properties>
-        <jersey.version>2.23.1</jersey.version>
+        <jersey.version>2.23.2</jersey.version>
     </properties>
 
     <dependencies>
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>2.7.4</version>
+            <version>2.8.2</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>

diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>