diff --git a/mall-admin/pom.xml b/mall-admin/pom.xml index af68190..339d3b1 100644 --- a/mall-admin/pom.xml +++ b/mall-admin/pom.xml @@ -41,7 +41,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/mall-common/pom.xml b/mall-common/pom.xml index 7d96abb..4c15f76 100644 --- a/mall-common/pom.xml +++ b/mall-common/pom.xml @@ -41,11 +41,7 @@ io.springfox - springfox-swagger2 - - - io.springfox - springfox-swagger-ui + springfox-boot-starter org.springframework.boot diff --git a/mall-portal/pom.xml b/mall-portal/pom.xml index 33546ce..0e08369 100644 --- a/mall-portal/pom.xml +++ b/mall-portal/pom.xml @@ -50,7 +50,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/mall-search/pom.xml b/mall-search/pom.xml index c242692..19b2462 100644 --- a/mall-search/pom.xml +++ b/mall-search/pom.xml @@ -35,7 +35,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pom.xml b/pom.xml index 2321483..26ed2bc 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.7.0 @@ -31,23 +31,23 @@ UTF-8 1.8 true - http://192.168.3.101:2375 - 1.2.2 - 1.3.0 - 5.2.0 - 1.1.23 - 5.4.0 - 2.9.2 + http://192.168.3.105:2375 + 0.40.0 + 1.4.2 + 5.3.0 + 1.2.9 + 5.8.0 + 3.0.0 1.6.0 1.6.0 - 1.4.0 - 3.5.5 - 8.0.20 - 2.3.0.RELEASE - 0.9.0 + 1.4.1 + 3.5.9 + 8.0.29 + 2.7.0 + 0.9.1 2.5.0 - 5.3 - 7.1.0 + 7.2 + 8.4.1 1.0-SNAPSHOT 1.0-SNAPSHOT 1.0-SNAPSHOT @@ -129,15 +129,10 @@ io.springfox - springfox-swagger2 - ${swagger2.version} + springfox-boot-starter + ${springfox-swagger.version} - - io.springfox - springfox-swagger-ui - ${swagger2.version} - - + io.swagger swagger-models @@ -207,33 +202,50 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin ${docker.maven.plugin.version} - - - - - - - - - + + + + build-image + package + + build + + + - mall/${project.artifactId}:${project.version} + ${docker.host} - java:8 - ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] - - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - + + + + mall/${project.name}:${project.version} + + + + java:8 + + ${project.build.finalName}.jar + + + + + / + + artifact + + + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + macrozheng + + + +