Merge branch 'main' into pin-autovalue

googleapis · Apr 17, 2024 · 7fd85fc · 7fd85fc
2 parents 1d5c34e + a30f02d
commit 7fd85fc
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 16 deletions.
diff --git a/.cloudbuild/cloudbuild-test-a.yaml b/.cloudbuild/cloudbuild-test-a.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _JAVA_SHARED_CONFIG_VERSION: '1.7.6' # {x-version-update:google-cloud-shared-config:current}
+  _JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current}
 
 steps:
   # GraalVM A build

diff --git a/.cloudbuild/cloudbuild-test-b.yaml b/.cloudbuild/cloudbuild-test-b.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _JAVA_SHARED_CONFIG_VERSION: '1.7.6' # {x-version-update:google-cloud-shared-config:current}
+  _JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current}
 
 steps:
   # GraalVM B build

diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/cloudbuild.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _JAVA_SHARED_CONFIG_VERSION: '1.7.6' # {x-version-update:google-cloud-shared-config:current}
+  _JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current}
 steps:
   # GraalVM A build
   - name: gcr.io/cloud-builders/docker

diff --git a/.cloudbuild/graalvm-a.Dockerfile b/.cloudbuild/graalvm-a.Dockerfile
@@ -37,6 +37,8 @@ ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin
 RUN yum install -y docker-engine docker-cli
 
 # Install terraform
+# See also https://www.hashicorp.com/official-packaging-guide
+COPY hashicorp.repo /etc/yum.repos.d/hashicorp.repo
 RUN yum -y install terraform
 
 # Install jq

diff --git a/.cloudbuild/graalvm-b.Dockerfile b/.cloudbuild/graalvm-b.Dockerfile
@@ -37,6 +37,8 @@ ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin
 RUN yum install -y docker-engine docker-cli
 
 # Install terraform
+# See also https://www.hashicorp.com/official-packaging-guide
+COPY hashicorp.repo /etc/yum.repos.d/hashicorp.repo
 RUN yum -y install terraform
 
 # Install jq

diff --git a/.cloudbuild/hashicorp.repo b/.cloudbuild/hashicorp.repo
@@ -0,0 +1,13 @@
+[hashicorp]
+name=Hashicorp Stable - $basearch
+baseurl=https://rpm.releases.hashicorp.com/RHEL/7/$basearch/stable
+enabled=1
+gpgcheck=1
+gpgkey=https://rpm.releases.hashicorp.com/gpg
+
+[hashicorp-test]
+name=Hashicorp Test - $basearch
+baseurl=https://rpm.releases.hashicorp.com/RHEL/7/$basearch/test
+enabled=0
+gpgcheck=1
+gpgkey=https://rpm.releases.hashicorp.com/gpg
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:6f431774e11cc46619cf093fd1481193c4024031073697fa18f0099b943aab88
-# created: 2023-12-01T19:50:20.444857406Z
+  digest: sha256:dc11e2119c854b57b7f7ed9962391decf002454700020a52b5d0d46c40b80a7e
+# created: 2024-04-15T22:37:28.944513098Z
diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml
@@ -0,0 +1,25 @@
+name: Renovate Bot Config Validation
+
+on:
+  pull_request:
+    paths:
+      - 'renovate.json'
+
+jobs:
+  renovate_bot_config_validation:
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '20'
+
+    - name: Install Renovate and Config Validator
+      run: |
+        npm install -g npm@latest
+        npm install --global renovate
+        renovate-config-validator
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [1.7.7](https://github.com/googleapis/java-shared-config/compare/v1.7.6...v1.7.7) (2024-04-17)
+
+
+### Bug Fixes
+
+* Graalvm image terraform install ([#806](https://github.com/googleapis/java-shared-config/issues/806)) ([96589ef](https://github.com/googleapis/java-shared-config/commit/96589efd2d4abbda8623c855c92be092293133ce))
+
+
+### Dependencies
+
+* Update dependency com.puppycrawl.tools:checkstyle to v10.15.0 ([#792](https://github.com/googleapis/java-shared-config/issues/792)) ([984f434](https://github.com/googleapis/java-shared-config/commit/984f434ddbb9ddbf60d80d14dae6a92d8639596a))
+* Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.13.0 ([8136d33](https://github.com/googleapis/java-shared-config/commit/8136d33b21a7492bee3673836db035be14240c44))
+* Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.3 ([e485b45](https://github.com/googleapis/java-shared-config/commit/e485b45aff22a0528feabfa9348152c20a146560))
+* Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.0 ([567ba39](https://github.com/googleapis/java-shared-config/commit/567ba397399c67fbbad3558358a7d86f30e8b3e7))
+* Update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.1 ([8b625c0](https://github.com/googleapis/java-shared-config/commit/8b625c0c05f90c0df5fa5f2e11da8e8b8067ce85))
+* Update dependency org.jacoco:jacoco-maven-plugin to v0.8.12 ([15870f4](https://github.com/googleapis/java-shared-config/commit/15870f491eba6132ae60239eda1ebec5b307b4e6))
+
 ## [1.7.6](https://github.com/googleapis/java-shared-config/compare/v1.7.5...v1.7.6) (2024-03-14)
 
 

diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml
@@ -6,7 +6,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-shared-config</artifactId>
   <packaging>pom</packaging>
-  <version>1.7.6</version><!-- {x-version-update:google-cloud-shared-config:current} -->
+  <version>1.7.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-config:current} -->
   <name>Google Cloud Shared Config</name>
   <url>https://github.com/googleapis/java-shared-config</url>
   <description>
@@ -16,7 +16,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>native-image-shared-config</artifactId>
-    <version>1.7.6</version><!-- {x-version-update:google-cloud-shared-config:current} -->
+    <version>1.7.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-config:current} -->
     <relativePath>../native-image-shared-config</relativePath>
   </parent>
 
@@ -94,7 +94,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.4.0</version>
           <configuration>
             <archive>
               <addMavenDescriptor>true</addMavenDescriptor>
@@ -114,7 +114,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.12.1</version>
+          <version>3.13.0</version>
           <configuration>
             <source>1.8</source>
             <target>1.8</target>
@@ -135,7 +135,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -521,7 +521,7 @@
               <dependency>
                 <groupId>com.puppycrawl.tools</groupId>
                 <artifactId>checkstyle</artifactId>
-                <version>10.14.1</version>
+                <version>10.15.0</version>
               </dependency>
             </dependencies>
             <executions>

diff --git a/native-image-shared-config/pom.xml b/native-image-shared-config/pom.xml
@@ -6,7 +6,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>native-image-shared-config</artifactId>
   <packaging>pom</packaging>
-  <version>1.7.6</version><!-- {x-version-update:google-cloud-shared-config:current} -->
+  <version>1.7.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-config:current} -->
   <name>Native Image Shared Config</name>
   <url>https://github.com/googleapis/java-shared-config</url>
   <description>
@@ -109,7 +109,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.0</version>
+            <version>3.3.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -138,7 +138,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.3</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>

diff --git a/versions.txt b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-shared-config:1.7.6:1.7.6
+google-cloud-shared-config:1.7.7:1.7.8-SNAPSHOT