Merge branch 'main' into owl-bot-update-lock-31aa2ef27b071c2e7844b0eb…

…1d5a24254daff06615b1b138b994dd6345c0b0ea
googleapis · May 29, 2024 · 74c2ea0 · 74c2ea0
2 parents 7054245 + b0c9e75
commit 74c2ea0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/cloudbuild.yaml
@@ -18,7 +18,10 @@ substitutions:
 steps:
   # GraalVM A build
   - name: gcr.io/cloud-builders/docker
-    args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-a.Dockerfile", "."]
+    args: ["build",
+           "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}",
+           "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:infrastructure-public-image-$SHORT_SHA",
+           "--file", "graalvm-a.Dockerfile", "."]
     dir: .cloudbuild
     id: graalvm-a-build
     waitFor: ["-"]
@@ -29,7 +32,9 @@ steps:
 
   # GraalVM B build
   - name: gcr.io/cloud-builders/docker
-    args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-b.Dockerfile", "." ]
+    args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}",
+            "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:infrastructure-public-image-$SHORT_SHA",
+            "--file", "graalvm-b.Dockerfile", "." ]
     dir: .cloudbuild
     id: graalvm-b-build
     waitFor: [ "-" ]
@@ -42,3 +47,5 @@ steps:
 images:
   - gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}
   - gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}
+  - gcr.io/cloud-devrel-public-resources/graalvm_a:infrastructure-public-image-$SHORT_SHA
+  - gcr.io/cloud-devrel-public-resources/graalvm_b:infrastructure-public-image-$SHORT_SHA
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -14,4 +14,4 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
   digest: sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea
-# created: 2024-05-17T15:15:57.6714113Z
+# created: 2024-05-17T15:15:57.6714113Z
diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml
@@ -61,7 +61,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>exec-maven-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.0</version>
           <configuration>
             <!-- to get rid of the warning: [WARNING] Warning: killAfter is now deprecated. Do you need it ?
                  Please comment on MEXEC-6. see: method execute() in
@@ -160,7 +160,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>3.5.0</version>
+          <version>3.6.0</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -521,7 +521,7 @@
               <dependency>
                 <groupId>com.puppycrawl.tools</groupId>
                 <artifactId>checkstyle</artifactId>
-                <version>10.16.0</version>
+                <version>10.17.0</version>
               </dependency>
             </dependencies>
             <executions>

diff --git a/native-image-shared-config/pom.xml b/native-image-shared-config/pom.xml
@@ -60,7 +60,7 @@
   <properties>
     <surefire.version>3.2.5</surefire.version>
     <graal-sdk.version>22.3.5</graal-sdk.version>
-    <native-maven-plugin.version>0.10.1</native-maven-plugin.version>
+    <native-maven-plugin.version>0.10.2</native-maven-plugin.version>
     <junit-vintage-engine.version>5.10.2</junit-vintage-engine.version>
     <opentest4j.version>1.3.0</opentest4j.version>
   </properties>
@@ -81,7 +81,7 @@
         <plugin>
           <groupId>org.sonatype.plugins</groupId>
           <artifactId>nexus-staging-maven-plugin</artifactId>
-          <version>1.6.13</version>
+          <version>1.7.0</version>
           <extensions>true</extensions>
           <configuration>
             <serverId>ossrh</serverId>

diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
             <!-- The root project runs nexus-staging:release task -->
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.13</version>
+            <version>1.7.0</version>
             <extensions>true</extensions>
             <configuration>
               <serverId>sonatype-nexus-staging</serverId>