Update Guava to 30.1-jre and Jib-Core to 0.18.0 (#1475)

Signed-off-by: Rohan Kumar <rohaan@redhat.com>
fabric8io · May 23, 2021 · eb89183 · eb89183
1 parent a05bcd1
commit eb89183
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -37,7 +37,7 @@
     <maven.version>3.3.9</maven.version>
     <jmockit.version>1.43</jmockit.version>
     <surefire.version>3.0.0-M2</surefire.version>
-    <jib-core.version>0.15.0</jib-core.version>
+    <jib-core.version>0.18.0</jib-core.version>
     <httpclient.version>4.5.10</httpclient.version>
     <excludedGroups>io.fabric8.maven.docker.UnixOnlyTests</excludedGroups>
     <project.build.outputTimestamp>2020-11-14T11:57:00Z</project.build.outputTimestamp>
@@ -176,7 +176,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>29.0-jre</version>
+      <version>30.1-jre</version>
     </dependency>
 
     <dependency>

diff --git a/samples/spring-boot-with-jib/pom.xml b/samples/spring-boot-with-jib/pom.xml
@@ -11,7 +11,6 @@
     </parent>
 
     <artifactId>dmp-sample-spring-boot-jib</artifactId>
-    <version>0.33-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <description>Docker Maven Plugin Example with Spring Boot With Build Mode JIB</description>
@@ -34,6 +33,7 @@
         <docker.build.jib>true</docker.build.jib>
         <docker.user>fabric8</docker.user>
         <spring.version>2.3.3.RELEASE</spring.version>
+        <dmp.version>${project.version}</dmp.version>
     </properties>
 
     <dependencies>
@@ -84,7 +84,7 @@
             <plugin>
               <groupId>io.fabric8</groupId>
               <artifactId>docker-maven-plugin</artifactId>
-              <version>0.33-SNAPSHOT</version>
+              <version>${dmp.version}</version>
               <configuration>
                 <images>
                   <image>

diff --git 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();
     }
-}
+}