Skip to content

W
warehouse-management
Commit 57efa5a0 authored by Philippe Fonzin's avatar Philippe Fonzin
Browse files
Options

fix merge conflicts

parent 0b432aa1
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 21 deletions
pom.xml
View file @ 57efa5a0
...@@ -93,17 +93,16 @@ ...@@ -93,17 +93,16 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId> <artifactId>spring-boot-starter-validation</artifactId>
</dependency> </dependency>
<!-- <dependency>-->
<dependency> <!-- <groupId>io.springfox</groupId>-->
<groupId>io.springfox</groupId> <!-- <artifactId>springfox-swagger2</artifactId>-->
<artifactId>springfox-swagger2</artifactId> <!-- <version>2.7.0</version>-->
<version>2.7.0</version> <!-- </dependency>-->
</dependency> <!-- <dependency>-->
<dependency> <!-- <groupId>io.springfox</groupId>-->
<groupId>io.springfox</groupId> <!-- <artifactId>springfox-swagger-ui</artifactId>-->
<artifactId>springfox-swagger-ui</artifactId> <!-- <version>2.7.0</version>-->
<version>2.7.0</version> <!-- </dependency>-->
</dependency>
</dependencies> </dependencies>
......
src/main/java/com/ascendfinalproject/warehouse/WarehouseApplication.java
View file @ 57efa5a0
...@@ -3,24 +3,24 @@ package com.ascendfinalproject.warehouse; ...@@ -3,24 +3,24 @@ package com.ascendfinalproject.warehouse;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import springfox.documentation.builders.RequestHandlerSelectors; //import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.spi.DocumentationType; //import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; //import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2; //import springfox.documentation.swagger2.annotations.EnableSwagger2;
@SpringBootApplication @SpringBootApplication
@EnableSwagger2 //@EnableSwagger2
public class WarehouseApplication { public class WarehouseApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(WarehouseApplication.class, args); SpringApplication.run(WarehouseApplication.class, args);
} }
@Bean // @Bean
public Docket productApi() { // public Docket productApi() {
return new Docket(DocumentationType.SWAGGER_2).select() // return new Docket(DocumentationType.SWAGGER_2).select()
.apis(RequestHandlerSelectors.basePackage("com.ascendfinalproject.warehouse")).build(); // .apis(RequestHandlerSelectors.basePackage("com.ascendfinalproject.warehouse")).build();
} // }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment