diff --git a/doc/changelog.md b/doc/changelog.md index 3187fad7d..2d903c165 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -7,6 +7,7 @@ - A placeholder in docker.image.tag isn't replaced by the final result when used during docker:build ([1468](https://github.com/fabric8io/docker-maven-plugin/issues/1468)) - Add a property(`outputFile`) to dump the output of Docker commands to file ([1472]https://github.com/fabric8io/docker-maven-plugin/pull/1472) - Add pulling of `cacheFrom` images during build ([1457](https://github.com/fabric8io/docker-maven-plugin/issues/1457)) + - Update Guava to 30.1-jre and Jib-Core to 0.18.0 ([1475](https://github.com/fabric8io/docker-maven-plugin/pull/1475)) * **0.35.0** (2021-04-04) - Building 'spring-boot-with-jib' sample fails with NoSuchMethodError ([1384](https://github.com/fabric8io/docker-maven-plugin/issues/1384)) diff --git a/pom.xml b/pom.xml index bad43f255..343463682 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 3.3.9 1.43 3.0.0-M2 - 0.15.0 + 0.18.0 4.5.10 io.fabric8.maven.docker.UnixOnlyTests 2020-11-14T11:57:00Z @@ -176,7 +176,7 @@ com.google.guava guava - 29.0-jre + 30.1-jre diff --git a/samples/spring-boot-with-jib/pom.xml b/samples/spring-boot-with-jib/pom.xml index 7188ed13d..631e4b4ea 100644 --- a/samples/spring-boot-with-jib/pom.xml +++ b/samples/spring-boot-with-jib/pom.xml @@ -11,7 +11,6 @@ dmp-sample-spring-boot-jib - 0.33-SNAPSHOT jar Docker Maven Plugin Example with Spring Boot With Build Mode JIB @@ -34,6 +33,7 @@ true fabric8 2.3.3.RELEASE + ${project.version} @@ -84,7 +84,7 @@ io.fabric8 docker-maven-plugin - 0.33-SNAPSHOT + ${dmp.version} diff --git a/src/main/java/io/fabric8/maven/docker/util/JibServiceUtil.java b/src/main/java/io/fabric8/maven/docker/util/JibServiceUtil.java index b5bcbe4b2..abb577bf7 100644 --- a/src/main/java/io/fabric8/maven/docker/util/JibServiceUtil.java +++ b/src/main/java/io/fabric8/maven/docker/util/JibServiceUtil.java @@ -211,7 +211,7 @@ static ImageFormat getImageFormat(String jibImageFormat) { } private static void submitPushToJib(TarImage baseImage, RegistryImage targetImage, ExecutorService jibBuildExecutor, Logger logger) throws InterruptedException, ExecutionException, RegistryException, CacheDirectoryCreationException, IOException { - Jib.from(baseImage).containerize(Containerizer.to(targetImage) + Jib.from(baseImage).setCreationTime(Instant.now()).containerize(Containerizer.to(targetImage) .setAllowInsecureRegistries(true) .setExecutorService(jibBuildExecutor) .addEventHandler(LogEvent.class, log(logger)) @@ -357,4 +357,4 @@ private static String generateProgressBar(double progress) { .append("% complete") .toString(); } -} \ No newline at end of file +}