Skip to content

Commit f5d9baa

Browse files
mpeddada1mpeddada1
authored
Merge branch 'main' into fix/parameter-doc-broken-link
2 parents 130d92a + 010ee49 commit f5d9baa

File tree

278 files changed

+5288
-370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+5288
-370
lines changed

‎.github/workflows/NativeTests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
graalvm_for_jdk_version:
3030
- 17
3131
- 21
32-
- 24
32+
- 25
3333
it:
3434
- alloydb-sample
3535
- bigquery-sample

‎.github/workflows/unitTests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
java: [17, 19, 21, 24]
25+
java: [17, 21, 25]
2626
steps:
2727
- name: Get current date
2828
id: date

‎CHANGELOG.md‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,54 @@ refer to the [commit
1414
history](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commits/main)
1515
on GitHub.
1616

17+
## [7.4.1](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/compare/v7.4.0...v7.4.1) (2025-10-27)
18+
19+
20+
### Bug Fixes
21+
22+
* **deps:** update dependency com.google.cloud:libraries-bom to v26.71.0 ([#4220](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4220)) ([3e8d945](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/3e8d9458af0ed71134d4c72cb8bafb284dc5afeb))
23+
* **deps:** update gapic-generator-java-bom.version to v2.63.0 ([#4217](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4217)) ([8cc0ff7](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/8cc0ff79d40d9699cedcc55ee58d4e87f911e1b4))
24+
25+
## [7.4.0](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/compare/v7.3.2...v7.4.0) (2025-10-10)
26+
27+
28+
### Features
29+
30+
* add script to update versions in README.adoc ([#4176](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4176)) ([1a05f04](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/1a05f04f7606b576397cb68c8cd04534436dc9ef))
31+
* Add support for configuring the Cloud SQL JDBC connection using a DNS name ([#4123](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4123)) ([e45ca49](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/e45ca49bbd37923d20fc5d374d94c5fa2a48631e)), closes [#4114](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4114)
32+
33+
34+
### Bug Fixes
35+
36+
* **deps:** update gapic-generator-java-bom.version to v2.62.3 ([#4192](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4192)) ([4d0df06](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/4d0df0652722df2a7d3b425e8345938fa50e0c18))
37+
38+
39+
### Dependencies
40+
41+
* upgrade libraries-bom to 26.70.0 ([#4188](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4188)) ([f0d3321](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/f0d33214740577139013c3749d0ea7f9d4a5a37e))
42+
43+
44+
### Documentation
45+
46+
* update latest versions in README.adoc ([#4177](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4177)) ([1acd575](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/1acd5751adc10c8011016da46815769b646db0cb))
47+
48+
## [7.3.2](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/compare/v7.3.1...v7.3.2) (2025-09-30)
49+
50+
51+
### Bug Fixes
52+
53+
* **deps:** update dependency com.google.cloud:libraries-bom to v26.69.0 ([#4172](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4172)) ([bf390ae](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/bf390ae319df14c9b7ada2bf87eb098039a07d3e))
54+
* **deps:** update gapic-generator-java-bom.version to v2.62.2 ([#4166](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4166)) ([2627d95](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/2627d953e407e5f062e602ea23dc9182fcb111e9))
55+
56+
## [7.3.1](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/compare/v7.3.0...v7.3.1) (2025-09-15)
57+
58+
59+
### Bug Fixes
60+
61+
* **deps:** update dependency com.google.cloud:libraries-bom to v26.68.0 ([#4136](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4136)) ([2335f17](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/2335f17be3a3a13010312cd333a62375a7717a32))
62+
* **deps:** update gapic-generator-java-bom.version to v2.62.1 ([#4135](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4135)) ([7010534](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/70105344e2593d8eba54f823fce2580d51b404e1))
63+
* **parametermanager:** fix invalid bean definition named 'clientFactory' ([#4127](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/4127)) ([1c98540](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/1c985408dc6bafd500b640f1cf035c8d01005ad3))
64+
1765
## [7.3.0](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/compare/v7.2.0...v7.3.0) (2025-08-29)
1866

1967

‎README.adoc‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ You can check our project website https://spring.io/projects/spring-cloud-gcp[he
1010

1111
For a deep dive into the project, refer to the Spring Framework on Google Cloud Reference documentation or Javadocs:
1212

13+
Google Cloud Reference Documentation:
1314
// {x-version-update-start:spring-cloud-gcp:released}
14-
* link:https://googlecloudplatform.github.io/spring-cloud-gcp/7.2.0/reference/html/index.html[Spring Framework on Google Cloud 7.2.0 (Latest)] - https://googleapis.dev/java/spring-cloud-gcp/7.2.0/index.html[Javadocs 7.2.0]
15+
* link:https://googlecloudplatform.github.io/spring-cloud-gcp/7.4.1/reference/html/index.html[Spring Framework on Google Cloud 7.3.0 (Latest)]
1516
// {x-version-update-end}
16-
* link:https://googlecloudplatform.github.io/spring-cloud-gcp/6.3.2/reference/html/index.html[Spring Framework on Google Cloud 6.3.2] - https://googleapis.dev/java/spring-cloud-gcp/6.3.2/index.html[Javadocs 6.3.2]
17-
* link:https://googlecloudplatform.github.io/spring-cloud-gcp/5.13.2/reference/html/index.html[Spring Framework on Google Cloud 5.13.2] - https://googleapis.dev/java/spring-cloud-gcp/5.13.2/index.html[Javadocs 5.13.2]
18-
* link:https://googlecloudplatform.github.io/spring-cloud-gcp/4.11.3/reference/html/index.html[Spring Framework on Google Cloud 4.11.3] - https://googleapis.dev/java/spring-cloud-gcp/4.11.3/index.html[Javadocs 4.11.3]
19-
* link:https://googlecloudplatform.github.io/spring-cloud-gcp/3.9.8/reference/html/index.html[Spring Framework on Google Cloud 3.9.8] - https://googleapis.dev/java/spring-cloud-gcp/3.9.8/index.html[Javadocs 3.9.8]
17+
* link:https://googlecloudplatform.github.io/spring-cloud-gcp/6.4.0/reference/html/index.html[Spring Framework on Google Cloud 6.4.0]
18+
* link:https://googlecloudplatform.github.io/spring-cloud-gcp/5.13.5/reference/html/index.html[Spring Framework on Google Cloud 5.13.5]
19+
* link:https://googlecloudplatform.github.io/spring-cloud-gcp/4.11.3/reference/html/index.html[Spring Framework on Google Cloud 4.11.3]
20+
* link:https://googlecloudplatform.github.io/spring-cloud-gcp/3.9.11/reference/html/index.html[Spring Framework on Google Cloud 3.9.11]
2021

22+
Javadocs: https://googleapis.dev/java/spring-cloud-gcp/latest/index.html
2123

2224
If you prefer to learn by doing, try taking a look at the https://github.com/GoogleCloudPlatform/spring-cloud-gcp/tree/main/spring-cloud-gcp-samples[Spring Framework on Google Cloud sample applications] or the https://codelabs.developers.google.com/spring[Spring on Google Cloud codelabs].
2325

@@ -119,7 +121,7 @@ This will allow you to not specify versions for any of the Maven dependencies an
119121
<dependency>
120122
<groupId>com.google.cloud</groupId>
121123
<artifactId>spring-cloud-gcp-dependencies</artifactId>
122-
<version>7.3.0</version>
124+
<version>7.4.1</version>
123125
<type>pom</type>
124126
<scope>import</scope>
125127
</dependency>

‎docs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<name>Spring Framework on Google Cloud Documentation</name>
1414
<groupId>com.google.cloud</groupId>
1515
<artifactId>spring-cloud-gcp-docs</artifactId>
16-
<version>7.3.1-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
16+
<version>7.4.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
1717
<packaging>pom</packaging>
1818

1919
<properties>

‎docs/src/main/asciidoc/sql.adoc‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,10 @@ However, it doesn't compromise the security of the communication because the con
167167
| `spring.cloud.gcp.sql.jdbc.enabled` | Enables or disables Cloud SQL auto-configuration for JDBC | No | `true`
168168
| `spring.cloud.gcp.sql.r2dbc.enabled` | Enables or disables Cloud SQL auto-configuration for R2DBC | No | `true`
169169
| `spring.cloud.gcp.sql.database-name` | Name of the database to connect to. | Yes |
170-
| `spring.cloud.gcp.sql.instance-connection-name` | A string containing a Google Cloud SQL instance's project ID, region and name, each separated by a colon. | Yes |
170+
| `spring.cloud.gcp.sql.instance-connection-name` | A string containing a Google Cloud SQL instance's project ID, region and name, each separated by a colon. | Yes* |
171171
For example, `my-project-id:my-region:my-instance-name`.
172+
| `spring.cloud.gcp.sql.dns-name` | A string containing the DNS for the instance. See https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/blob/main/docs/jdbc.md#using-dns-domain-names-to-identify-instances[Using DNS domain names to identify instances] | Yes* |
173+
For example, `mydb.example.com`.
172174
| `spring.cloud.gcp.sql.ip-types` | Allows you to specify a comma delimited list of preferred IP types for connecting to a Cloud SQL instance. Left unconfigured Cloud SQL Socket Factory will default it to `PUBLIC,PRIVATE`. See https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory#specifying-ip-types[Cloud SQL Socket Factory - Specifying IP Types] | No | `PUBLIC,PRIVATE`
173175
| `spring.cloud.gcp.sql.credentials.location` | File system path to the Google OAuth2 credentials private key file.
174176
Used to authenticate and authorize new connections to a Google Cloud SQL instance. | No
@@ -186,6 +188,12 @@ Used to authenticate and authorize new connections to a Google Cloud SQL instanc
186188
| `spring.cloud.gcp.sql.adminQuotaProject` | A project ID for quota and billing. | No | (empty)
187189
|===
188190

191+
*Valid configurations set exactly one of these properties:
192+
193+
- `spring.cloud.gcp.sql.dns-name`
194+
- `spring.cloud.gcp.sql.instance-connection-name`.
195+
196+
189197
=== Troubleshooting tips
190198

191199
[#connection-issues]

‎docs/update_latest_versions_in_readme.sh‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/bash
2+
3+
# This script updates the version numbers in README.adoc to the latest
4+
# released versions from Maven Central.
5+
6+
set -e
7+
8+
# Fetch the list of versions from Maven Central
9+
versions=$(curl -s https://repo.maven.apache.org/maven2/com/google/cloud/spring-cloud-gcp/maven-metadata.xml | grep '<version>' | sed -e 's/.*<version>//' -e 's/<\/version>.*//' | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | sort -V)
10+
11+
# Find the latest version for each major version
12+
latest_v6=$(echo "$versions" | grep '^6\.' | tail -n 1)
13+
latest_v5=$(echo "$versions" | grep '^5\.' | tail -n 1)
14+
latest_v4=$(echo "$versions" | grep '^4\.' | tail -n 1)
15+
latest_v3=$(echo "$versions" | grep '^3\.' | tail -n 1)
16+
17+
# Update the README.adoc file
18+
sed -i "/Spring Framework on Google Cloud 6\./s/[0-9]*\.[0-9]*\.[0-9]*/${latest_v6}/g" README.adoc
19+
sed -i "/Spring Framework on Google Cloud 5\./s/[0-9]*\.[0-9]*\.[0-9]*/${latest_v5}/g" README.adoc
20+
sed -i "/Spring Framework on Google Cloud 4\./s/[0-9]*\.[0-9]*\.[0-9]*/${latest_v4}/g" README.adoc
21+
sed -i "/Spring Framework on Google Cloud 3\./s/[0-9]*\.[0-9]*\.[0-9]*/${latest_v3}/g" README.adoc
22+
23+
echo "README.adoc updated with the latest versions:"
24+
echo "version-6: $latest_v6"
25+
echo "version-5: $latest_v5"
26+
echo "version-4: $latest_v4"
27+
echo "version-3: $latest_v3"

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.google.cloud</groupId>
77
<artifactId>spring-cloud-gcp</artifactId>
8-
<version>7.3.1-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
8+
<version>7.4.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
99
<name>Spring Framework on Google Cloud</name>
1010
<description>Spring Framework on Google Cloud</description>
1111
<url>https://spring.io/projects/spring-cloud-gcp</url>

‎spring-cloud-gcp-autoconfigure/pom.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-gcp</artifactId>
77
<groupId>com.google.cloud</groupId>
8-
<version>7.3.1-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
8+
<version>7.4.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -133,6 +133,7 @@
133133
<dependency>
134134
<groupId>com.google.cloud</groupId>
135135
<artifactId>google-cloud-parametermanager</artifactId>
136+
<optional>true</optional>
136137
</dependency>
137138

138139
<!-- Storage -->
@@ -280,10 +281,7 @@
280281
<dependency>
281282
<groupId>com.google.cloud</groupId>
282283
<artifactId>spring-cloud-gcp-parametermanager</artifactId>
283-
<!-- A few starters need this dependency to validate parameter -->
284-
<!-- using ParameterManagerSyntaxUtils. Making it optional produces runtime failures -->
285-
<!-- of the kind ClassNotFoundError. -->
286-
<optional>false</optional>
284+
<optional>true</optional>
287285
<version>${project.version}</version>
288286
</dependency>
289287

‎spring-cloud-gcp-autoconfigure/src/main/java/com/google/cloud/spring/autoconfigure/parametermanager/GcpParameterManagerAutoConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public ParameterManagerClient parameterManagerClient() throws IOException {
7272

7373
@Bean
7474
@ConditionalOnMissingBean
75-
public ParameterManagerClientFactory clientFactory(ParameterManagerClient client) {
75+
public ParameterManagerClientFactory parameterManagerClientFactory(ParameterManagerClient client) {
7676
return new DefaultParameterManagerClientFactory(this.credentialsProvider, client);
7777
}
7878

0 commit comments

Comments
 (0)