Temurin backporting for maven/gradle plugins (#3695)

Fixing maven/gradle plugins now
GoogleContainerTools · Jun 23, 2022 · 09d8080 · 09d8080
1 parent ce193cf
commit 09d8080
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 4 deletions.
diff --git a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/default-target/build.gradle b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/default-target/build.gradle
@@ -15,6 +15,7 @@ dependencies {
 }
 
 jib {
+  from.image = 'eclipse-temurin:8-jdk-focal'
   container {
     args = ['An argument.']
     ports = ['1000/tcp', '2000-2003/udp']

diff --git a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/empty/build.gradle b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/empty/build.gradle
@@ -13,6 +13,7 @@ repositories {
 }
 
 jib {
+  from.image = 'eclipse-temurin:8-jdk-focal'
   to {
     image = System.getProperty('_TARGET_IMAGE')
     credHelper = 'gcr'

diff --git a/...n/src/integration-test/resources/gradle/projects/simple/build-jar-containerization.gradle b/...n/src/integration-test/resources/gradle/projects/simple/build-jar-containerization.gradle
@@ -27,5 +27,6 @@ jib {
   to {
     image = System.getProperty("_TARGET_IMAGE")
   }
+  from.image = 'eclipse-temurin:11-jdk-focal'
   containerizingMode = 'packaged'
 }
diff --git a/...in/src/integration-test/resources/gradle/projects/simple/build-java11-incompatible.gradle b/...in/src/integration-test/resources/gradle/projects/simple/build-java11-incompatible.gradle
@@ -14,5 +14,5 @@ dependencies {
   compile files('libs/dependency-1.0.0.jar')
 }
 
-jib.from.image = 'gcr.io/distroless/java'
+jib.from.image = 'eclipse-temurin:8-jdk-focal'
 jib.to.image = System.getProperty("_TARGET_IMAGE")
diff --git a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-java11.gradle b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-java11.gradle
@@ -14,4 +14,5 @@ dependencies {
   compile files('libs/dependency-1.0.0.jar')
 }
 
+jib.from.image = 'eclipse-temurin:11-jdk-focal'
 jib.to.image = System.getProperty("_TARGET_IMAGE")
diff --git a/...ugin/src/integration-test/resources/gradle/projects/simple/build-timestamps-custom.gradle b/...ugin/src/integration-test/resources/gradle/projects/simple/build-timestamps-custom.gradle
@@ -15,6 +15,7 @@ dependencies {
 }
 
 jib {
+  from.image = 'eclipse-temurin:11-jdk-focal'
   to.image = System.getProperty("_TARGET_IMAGE")
   container.filesModificationTime = '2011-12-03T10:15:30+09:00'
   container.creationTime = '2013-11-05T06:29:30+09:00'

diff --git a/...e-plugin/src/integration-test/resources/gradle/projects/war_servlet25/build-tomcat.gradle b/...e-plugin/src/integration-test/resources/gradle/projects/war_servlet25/build-tomcat.gradle
@@ -27,7 +27,7 @@ war {
 }
 
 jib {
-  from.image = 'tomcat:10-jre8-temurin'
+  from.image = 'tomcat:10-jre8-temurin-focal'
   to {
     image = System.getProperty("_TARGET_IMAGE")
     credHelper = 'gcr'

diff --git a/jib-maven-plugin/src/test/resources/maven/projects/default-target/pom.xml b/jib-maven-plugin/src/test/resources/maven/projects/default-target/pom.xml
@@ -39,6 +39,9 @@
         <artifactId>jib-maven-plugin</artifactId>
         <version>${jib-maven-plugin.version}</version>
         <configuration>
+          <from>
+            <image>eclipse-temurin:8-jdk-focal</image>
+          </from>
           <container>
             <args>An argument.</args>
             <ports>

diff --git a/jib-maven-plugin/src/test/resources/maven/projects/empty/pom.xml b/jib-maven-plugin/src/test/resources/maven/projects/empty/pom.xml
@@ -29,6 +29,9 @@
         <artifactId>jib-maven-plugin</artifactId>
         <version>${jib-maven-plugin.version}</version>
         <configuration>
+          <from>
+            <image>eclipse-temurin:11-jdk-focal</image>
+          </from>
           <to>
             <image>${_TARGET_IMAGE}</image>
             <tags>${_ADDITIONAL_TAG}</tags>

diff --git a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-cred-helper-1.xml b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-cred-helper-1.xml
@@ -39,6 +39,9 @@
                 <artifactId>jib-maven-plugin</artifactId>
                 <version>${jib-maven-plugin.version}</version>
                 <configuration>
+                    <from>
+                        <image>eclipse-temurin:8-jdk-focal</image>
+                    </from>
                     <to>
                         <image>${_TARGET_IMAGE}</image>
                         <credHelper>gcr</credHelper>

diff --git a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-cred-helper-2.xml b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-cred-helper-2.xml
@@ -39,6 +39,9 @@
                 <artifactId>jib-maven-plugin</artifactId>
                 <version>${jib-maven-plugin.version}</version>
                 <configuration>
+                    <from>
+                        <image>eclipse-temurin:8-jdk-focal</image>
+                    </from>
                     <to>
                         <image>${_TARGET_IMAGE}</image>
                         <credHelper>

diff --git a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-jar-containerization.xml b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-jar-containerization.xml
@@ -52,6 +52,9 @@
         <artifactId>jib-maven-plugin</artifactId>
         <version>${jib-maven-plugin.version}</version>
         <configuration>
+          <from>
+            <image>eclipse-temurin:11-jdk-focal</image>
+          </from>
           <to>
             <image>${_TARGET_IMAGE}</image>
           </to>

diff --git a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-java11-incompatible.xml b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-java11-incompatible.xml
@@ -40,7 +40,7 @@
         <version>${jib-maven-plugin.version}</version>
         <configuration>
           <from>
-            <image>gcr.io/distroless/java</image>
+            <image>eclipse-temurin:8-jdk-focal</image>
           </from>
           <to>
             <image>${_TARGET_IMAGE}</image>

diff --git a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-java11.xml b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-java11.xml
@@ -39,6 +39,9 @@
         <artifactId>jib-maven-plugin</artifactId>
         <version>${jib-maven-plugin.version}</version>
         <configuration>
+          <from>
+            <image>eclipse-temurin:11-jdk-focal</image>
+          </from>
           <to>
             <image>${_TARGET_IMAGE}</image>
           </to>

diff --git a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-no-to-image.xml b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-no-to-image.xml
@@ -40,6 +40,11 @@
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
         <version>${jib-maven-plugin.version}</version>
+        <configuration>
+          <from>
+            <image>eclipse-temurin:11-jdk-focal</image>
+          </from>
+        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git a/jib-maven-plugin/src/test/resources/maven/projects/war_servlet25/pom-tomcat.xml b/jib-maven-plugin/src/test/resources/maven/projects/war_servlet25/pom-tomcat.xml
@@ -45,7 +45,7 @@
         <version>${jib-maven-plugin.version}</version>
         <configuration>
           <from>
-            <image>tomcat:10-jre8-temurin</image>
+            <image>tomcat:10-jre8-temurin-focal</image>
           </from>
           <to>
             <image>${_TARGET_IMAGE}</image>