Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgraded dependencies #81

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgraded dependencies #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 39 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,13 @@
</scm>

<properties>
<dropwizard.version>0.8.0</dropwizard.version>
<dropwizard.version>0.9.2</dropwizard.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<file.encoding>UTF-8</file.encoding>
<jdk.version>1.7</jdk.version>
<swagger.version>1.5.1-M2</swagger.version>
<jdk.version>1.8</jdk.version>
<swagger.version>1.5.7</swagger.version>
<glassfish-jersey.version>2.22.1</glassfish-jersey.version>
</properties>

<dependencies>
Expand All @@ -77,7 +78,13 @@
<version>${dropwizard.version}</version>
</dependency>
<dependency>
<groupId>com.wordnik</groupId>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${glassfish-jersey.version}</version>
</dependency>

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
<version>${swagger.version}</version>
<exclusions>
Expand Down Expand Up @@ -176,7 +183,7 @@
<dependency>
<groupId>io.federecio</groupId>
<artifactId>dropwizard-junit</artifactId>
<version>0.6</version>
<version>0.7-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -188,7 +195,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>2.45.0</version>
<version>2.52.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -224,7 +231,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.2</version>
<version>4.3.6</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -235,6 +242,31 @@
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.13</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/io/federecio/dropwizard/swagger/SwaggerBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@

import com.fasterxml.jackson.annotation.JsonInclude;
import com.google.common.collect.ImmutableMap;
import com.wordnik.swagger.jaxrs.config.BeanConfig;
import com.wordnik.swagger.jaxrs.listing.ApiListingResource;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.jaxrs.listing.ApiListingResource;
import io.dropwizard.Configuration;
import io.dropwizard.ConfiguredBundle;
import io.dropwizard.assets.AssetsBundle;
import io.dropwizard.setup.Bootstrap;
import io.dropwizard.setup.Environment;
import io.dropwizard.views.ViewBundle;

import java.util.Map;

/**
* A {@link io.dropwizard.ConfiguredBundle} that provides hassle-free configuration of Swagger and Swagger UI
* on top of Dropwizard.
Expand All @@ -40,7 +42,7 @@ public abstract class SwaggerBundle<T extends Configuration> implements Configur
public void initialize(Bootstrap<?> bootstrap) {
bootstrap.addBundle(new ViewBundle<Configuration>() {
@Override
public ImmutableMap<String, ImmutableMap<String, String>> getViewConfiguration(final Configuration configuration) {
public Map<String, Map<String, String>> getViewConfiguration(final Configuration configuration) {
return ImmutableMap.of();
}
});
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/federecio/dropwizard/swagger/DropwizardTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.jayway.restassured.RestAssured;
import com.wordnik.swagger.jaxrs.listing.ApiListingResource;
import io.swagger.jaxrs.listing.ApiListingResource;
import org.eclipse.jetty.http.HttpStatus;
import org.hamcrest.core.StringContains;
import org.junit.Before;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/federecio/dropwizard/swagger/TestResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package io.federecio.dropwizard.swagger;

import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
Expand Down