Skip to content

M
matrix
Commit 1a505705 by QIANGLU
Options

Merge branch 'master' into dev

parents 9230979a 71a5acc1
Showing with 29 additions and 29 deletions
pom.xml
...@@ -186,30 +186,40 @@ ...@@ -186,30 +186,40 @@
</dependency> </dependency>
<!--swagger--> <!--swagger-->
<dependency> <dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.5.22</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId> <artifactId>swagger-bootstrap-ui</artifactId>
<version>1.9.3</version> <version>1.9.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>com.deepoove</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>swagger-dubbo</artifactId>
<version>2.8.0</version> <version>2.0.1</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.8.0</version>
</dependency> </dependency>
<!-- <dependency>--> <!--spring cloud-->
<!-- <groupId>com.deepoove</groupId>-->
<!-- <artifactId>swagger-dubbo</artifactId>-->
<!-- <version>2.0.1</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<!-- Import dependency management from Spring Boot --> <groupId>org.springframework.cloud</groupId>
<groupId>org.springframework.boot</groupId> <artifactId>spring-cloud-dependencies</artifactId>
<artifactId>spring-boot-dependencies</artifactId> <version>Greenwich.RELEASE</version>
<version>2.1.5.RELEASE</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
......
web-starter/pom.xml
...@@ -20,17 +20,6 @@ ...@@ -20,17 +20,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
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