Mentions légales du service

Skip to content
Snippets Groups Projects
Commit f1e53784 authored by Sébastian Le Merdy's avatar Sébastian Le Merdy
Browse files

upgrade dependencies

parent f4a4bbe6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 25 deletions
elevator-core/pom.xml
+ 4
− 4
View file @ f1e53784
......@@ -16,19 +16,19 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>1.6.1</version>
<version>3.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
</dependencies>
......
elevator-core/src/test/java/elevator/engine/assertions/BuildingAssert.java
+ 3
− 2
View file @ f1e53784
......@@ -2,8 +2,9 @@ package elevator.engine.assertions;
import elevator.Building;
import elevator.Door;
import elevator.user.User;
import org.assertj.core.api.AbstractIterableAssert;
import org.assertj.core.api.AbstractObjectAssert;
import org.assertj.core.api.IterableAssert;
import static org.assertj.core.api.Assertions.assertThat;
......@@ -12,7 +13,7 @@ public class BuildingAssert extends AbstractObjectAssert<BuildingAssert, Buildin
super(actual, BuildingAssert.class);
}
public IterableAssert users() {
public AbstractIterableAssert<?, ? extends Iterable<? extends User>, User> users() {
return assertThat(actual.users()).as("building users (delivered users are gone)");
}
......
elevator-participant/pom.xml
+ 3
− 3
View file @ f1e53784
......@@ -19,19 +19,19 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>1.6.1</version>
<version>3.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
</dependencies>
......
elevator-server/pom.xml
+ 12
− 12
View file @ f1e53784
......@@ -33,18 +33,18 @@
<!-- needed by web.xml to instantiate org.glassfish.jersey.servlet.ServletContainer -->
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
<version>2.12</version>
<version>2.23.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>2.12</version>
<version>2.23.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>2.12</version>
<version>2.23.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
......@@ -57,36 +57,36 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>1.9.13</version>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.7.4</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.4</version>
<version>2.9.4</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
<version>19.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>1.6.1</version>
<version>3.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
......
elevator-server/src/main/java/elevator/server/ElevatorApplication.java
+ 1
− 1
View file @ f1e53784
package elevator.server;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import com.google.common.collect.Sets;
import elevator.server.security.AdminAuthenticationFilter;
import elevator.server.security.UserAuthenticationFilter;
import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
import javax.ws.rs.core.Application;
......
elevator-server/src/main/java/elevator/server/WebResource.java
+ 2
− 1
View file @ f1e53784
......@@ -74,7 +74,7 @@ public class WebResource {
@GET
@Path("/players.csv")
@Produces("text/csv; charset=UTF-8")
@Produces("text/csv;charset=UTF-8")
@AdminAuthentication
public String players() {
return on('\n').join(from(server.getUnmodifiableElevatorGames()).transform(input -> on(',').join(newArrayList(
......@@ -87,6 +87,7 @@ public class WebResource {
@POST
@Path("/players.csv")
@Consumes(MULTIPART_FORM_DATA)
@Produces(APPLICATION_JSON)
@AdminAuthentication
public Map<String, Collection<String>> importPlayers(
@FormDataParam("players") InputStream uploadedInputStream) throws IOException {
......
elevator-server/src/test/java/elevator/server/WebResourceTest.java
+ 1
− 1
View file @ f1e53784
......@@ -178,7 +178,7 @@ public class WebResourceTest {
.header(AUTHORIZATION, credentials("", "admin"))
.buildGet().invoke();
assertThat(playerAsCSV.getHeaderString(CONTENT_TYPE)).isEqualTo("text/csv; charset=UTF-8");
assertThat(playerAsCSV.getHeaderString(CONTENT_TYPE)).isEqualTo("text/csv;charset=UTF-8");
assertThat(playerAsCSV.readEntity(String.class)).isEqualTo("\"player1@provider.com\",\"player1\",\"http://localhost:8081\",0\n\"player2@provider.com\",\"player2\",\"http://localhost:8082\",0");
} finally {
if (passwordPlayerOne != null) {
......
pom.xml
+ 1
− 1
View file @ f1e53784
......@@ -12,7 +12,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>9.2.3.v20140905</jetty.version>
<jetty.version>9.3.9.v20160517</jetty.version>
</properties>
<modules>
<module>elevator-core</module>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment