Skip to content
GitLab
Commit b9258854 authored by macro's avatar macro
Browse files

依赖升级，支持SpringBoot 2.7.0

parent c85a650c
Hide whitespace changes
Inline Side-by-side
mall-admin/pom.xml
View file @ b9258854
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.spotify</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
mall-common/pom.xml
View file @ b9258854
...@@ -41,11 +41,7 @@ ...@@ -41,11 +41,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
mall-portal/pom.xml
View file @ b9258854
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.spotify</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
mall-search/pom.xml
View file @ b9258854
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.spotify</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
pom.xml
View file @ b9258854
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.0.RELEASE</version> <version>2.7.0</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
...@@ -31,23 +31,23 @@ ...@@ -31,23 +31,23 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<skipTests>true</skipTests> <skipTests>true</skipTests>
<docker.host>http://192.168.3.101:2375</docker.host> <docker.host>http://192.168.3.105:2375</docker.host>
<docker.maven.plugin.version>1.2.2</docker.maven.plugin.version> <docker.maven.plugin.version>0.40.0</docker.maven.plugin.version>
<pagehelper-starter.version>1.3.0</pagehelper-starter.version> <pagehelper-starter.version>1.4.2</pagehelper-starter.version>
<pagehelper.version>5.2.0</pagehelper.version> <pagehelper.version>5.3.0</pagehelper.version>
<druid.version>1.1.23</druid.version> <druid.version>1.2.9</druid.version>
<hutool.version>5.4.0</hutool.version> <hutool.version>5.8.0</hutool.version>
<swagger2.version>2.9.2</swagger2.version> <springfox-swagger.version>3.0.0</springfox-swagger.version>
<swagger-models.version>1.6.0</swagger-models.version> <swagger-models.version>1.6.0</swagger-models.version>
<swagger-annotations.version>1.6.0</swagger-annotations.version> <swagger-annotations.version>1.6.0</swagger-annotations.version>
<mybatis-generator.version>1.4.0</mybatis-generator.version> <mybatis-generator.version>1.4.1</mybatis-generator.version>
<mybatis.version>3.5.5</mybatis.version> <mybatis.version>3.5.9</mybatis.version>
<mysql-connector.version>8.0.20</mysql-connector.version> <mysql-connector.version>8.0.29</mysql-connector.version>
<spring-data-commons.version>2.3.0.RELEASE</spring-data-commons.version> <spring-data-commons.version>2.7.0</spring-data-commons.version>
<jjwt.version>0.9.0</jjwt.version> <jjwt.version>0.9.1</jjwt.version>
<aliyun-oss.version>2.5.0</aliyun-oss.version> <aliyun-oss.version>2.5.0</aliyun-oss.version>
<logstash-logback.version>5.3</logstash-logback.version> <logstash-logback.version>7.2</logstash-logback.version>
<minio.version>7.1.0</minio.version> <minio.version>8.4.1</minio.version>
<mall-common.version>1.0-SNAPSHOT</mall-common.version> <mall-common.version>1.0-SNAPSHOT</mall-common.version>
<mall-mbg.version>1.0-SNAPSHOT</mall-mbg.version> <mall-mbg.version>1.0-SNAPSHOT</mall-mbg.version>
<mall-security.version>1.0-SNAPSHOT</mall-security.version> <mall-security.version>1.0-SNAPSHOT</mall-security.version>
...@@ -129,15 +129,10 @@ ...@@ -129,15 +129,10 @@
<!--Swagger-UI API文档生产工具--> <!--Swagger-UI API文档生产工具-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-boot-starter</artifactId>
<version>${swagger2.version}</version> <version>${springfox-swagger.version}</version>
</dependency> </dependency>
<dependency> <!--解决Swagger访问主页时的NumberFormatException问题-->
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger2.version}</version>
</dependency>
<!--解决Swagger 2.9.2版本NumberFormatException-->
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId> <artifactId>swagger-models</artifactId>
...@@ -207,33 +202,50 @@ ...@@ -207,33 +202,50 @@
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.spotify</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.plugin.version}</version> <version>${docker.maven.plugin.version}</version>
<!--<executions>--> <executions>
<!--<execution>--> <!--如果想在项目打包时构建镜像添加-->
<!--<id>build-image</id>--> <execution>
<!--<phase>package</phase>--> <id>build-image</id>
<!--<goals>--> <phase>package</phase>
<!--<goal>build</goal>--> <goals>
<!--</goals>--> <goal>build</goal>
<!--</execution>--> </goals>
<!--</executions>--> </execution>
</executions>
<configuration> <configuration>
<imageName>mall/${project.artifactId}:${project.version}</imageName> <!-- Docker 远程管理地址-->
<dockerHost>${docker.host}</dockerHost> <dockerHost>${docker.host}</dockerHost>
<baseImage>java:8</baseImage> <images>
<entryPoint>["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] <image>
</entryPoint> <!--定义镜像名称-->
<resources> <name>mall/${project.name}:${project.version}</name>
<resource> <!--定义镜像构建行为-->
<targetPath>/</targetPath> <build>
<directory>${project.build.directory}</directory> <!--定义基础镜像-->
<include>${project.build.finalName}.jar</include> <from>java:8</from>
</resource> <args>
</resources> <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
</args>
<!--定义哪些文件拷贝到容器中-->
<assembly>
<!--定义拷贝到容器的目录-->
<targetDir>/</targetDir>
<!--只拷贝生成的jar包-->
<descriptorRef>artifact</descriptorRef>
</assembly>
<!--定义容器启动命令-->
<entryPoint>["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"]</entryPoint>
<!--定义维护者-->
<maintainer>macrozheng</maintainer>
</build>
</image>
</images>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
......
Supports Markdown
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