Skip to content

Updated Maven dependencies and adjusted class path. #14

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

Open
fabiankessler wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated Maven dependencies and adjusted class path. #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2af193f
Upgraded swagger-maven-plugin version from 3.0.1-SNAPSHOT to latest s…
fabiankessler Nov 10, 2015
7b0cb5d
Updated swagger-core from 1.5.1-M2 to 1.5.4 and updated all class pat…
fabiankessler Nov 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<plugin>
<groupId>com.github.kongchen</groupId>
<artifactId>swagger-maven-plugin</artifactId>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0</version>
<configuration>
<apiSources>
<apiSource>
Expand Down Expand Up @@ -76,10 +76,10 @@
</build>
<dependencies>
<dependency>
<groupId>com.wordnik</groupId>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<scope>compile</scope>
<version>1.5.1-M2</version>
<version>1.5.4</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/kongchen/swagger/sample/wordnik/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.github.kongchen.swagger.sample.wordnik.model;

import com.wordnik.swagger.annotations.*;
import io.swagger.annotations.ApiModelProperty;

import java.util.Date;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/kongchen/swagger/sample/wordnik/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.github.kongchen.swagger.sample.wordnik.model;

import com.wordnik.swagger.annotations.*;
import io.swagger.annotations.ApiModelProperty;

import java.util.List;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/kongchen/swagger/sample/wordnik/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.github.kongchen.swagger.sample.wordnik.model;

import com.wordnik.swagger.annotations.*;
import io.swagger.annotations.ApiModelProperty;

import javax.xml.bind.annotation.*;

Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/github/kongchen/swagger/sample/wordnik/resource/PetResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,16 @@
package com.github.kongchen.swagger.sample.wordnik.resource;

import com.github.kongchen.swagger.sample.wordnik.data.PetData;
import com.wordnik.swagger.annotations.*;
import com.github.kongchen.swagger.sample.wordnik.model.Pet;
import com.wordnik.swagger.annotations.ApiResponse;
import io.swagger.annotations.*;

import javax.ws.rs.core.Response;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.*;

@Path("/pet")
@Api(value = "/pet", description = "Operations about pets", authorizations = {
@Authorization(value = "petstore_auth", type = "oauth2",
@Authorization(value = "petstore_auth",
scopes = {
@AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@AuthorizationScope(scope = "read:pets", description = "read your pets")
Expand All @@ -40,10 +39,10 @@ public class PetResource {

@GET
@Path("/{petId}")
@ApiOperation(value = "Find pet by ID",
@ApiOperation(value = "Find pet by ID",
notes = "Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions",
response = Pet.class,
authorizations = @Authorization(value = "api_key", type = "api_key")
authorizations = @Authorization(value = "api_key")
)
@ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"),
@ApiResponse(code = 404, message = "Pet not found") })
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/kongchen/swagger/sample/wordnik/resource/PetStoreResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.github.kongchen.swagger.sample.wordnik.resource;

import com.wordnik.swagger.annotations.*;
import com.github.kongchen.swagger.sample.wordnik.data.StoreData;
import com.github.kongchen.swagger.sample.wordnik.model.Order;
import com.github.kongchen.swagger.sample.wordnik.exception.NotFoundException;
import io.swagger.annotations.*;

import javax.ws.rs.core.Response;
import javax.ws.rs.*;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/kongchen/swagger/sample/wordnik/resource/UserResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.github.kongchen.swagger.sample.wordnik.resource;

import com.wordnik.swagger.annotations.*;
import com.github.kongchen.swagger.sample.wordnik.data.UserData;
import com.github.kongchen.swagger.sample.wordnik.model.User;
import com.github.kongchen.swagger.sample.wordnik.exception.ApiException;
import io.swagger.annotations.*;

import javax.ws.rs.core.Response;
import javax.ws.rs.*;
Expand Down