diff --git a/pom.xml b/pom.xml index f6163aa..785eda3 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,6 @@ - ${project.artifactId}##${buildNumber} org.springframework.boot @@ -63,7 +62,7 @@ - ${buildNumber} + ${buildNumber} ${java.version} @@ -100,7 +99,7 @@ buildNumber yyyyMMdd-HHmmss - GMT+08:00 + GMT+8 @@ -109,12 +108,23 @@ + + buildNumber + + true + + + ${project.artifactId}##${buildNumber} + + + build-docker-image false + ${project.artifactId} com.google.cloud.tools @@ -131,7 +141,7 @@ svn.youshengyun.com:9923/${project.artifactId}-jib - ${project.version} + ${project.version}-${buildNumber} latest @@ -142,7 +152,7 @@ - install + package build diff --git a/src/main/java/com/example/demo/controller/MainController.java b/src/main/java/com/example/demo/controller/MainController.java index 4c17bd1..c3049bb 100644 --- a/src/main/java/com/example/demo/controller/MainController.java +++ b/src/main/java/com/example/demo/controller/MainController.java @@ -14,6 +14,6 @@ public class MainController { @GetMapping({ "", "/" }) public String index(HttpServletRequest request) { - return "hello demo-tomcat " + buildProperties.get("build.timestamp"); + return "hello demo-tomcat! buildNumber = " + buildProperties.get("buildNumber"); } }