Skip to content

Commit 4f3f826

Browse files
authored
Merge branch 'main' into renovate/com.google.cloud-libraries-bom-26.x
2 parents 4f21748 + 3b37a5e commit 4f3f826

File tree

4 files changed

+26
-5
lines changed

4 files changed

+26
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
4141
<dependency>
4242
<groupId>com.google.cloud</groupId>
4343
<artifactId>google-cloud-datastore</artifactId>
44-
<version>2.28.1</version>
44+
<version>2.29.1</version>
4545
</dependency>
4646

4747
```

generation_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
gapic_generator_version: 2.59.0
2-
googleapis_commitish: ad56690468e8f6ea87207d054bd6ad6adceaf0d3
2+
googleapis_commitish: 4cdc2aa1af11046c38ee1a4b1f6f4b20f0d49e2b
33
libraries_bom_version: 26.61.0
44
libraries:
55
- api_shortname: datastore

pom.xml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<dependency>
185185
<groupId>com.google.cloud</groupId>
186186
<artifactId>google-cloud-datastore-utils</artifactId>
187-
<version>2.28.1</version><!-- {x-version-update:google-cloud-datastore-utils:current} -->
187+
<version>2.29.1</version><!-- {x-version-update:google-cloud-datastore-utils:current} -->
188188
</dependency>
189189
<dependency>
190190
<groupId>com.google.cloud.datastore</groupId>
@@ -232,10 +232,31 @@
232232
</build>
233233

234234
<profiles>
235+
<profile>
236+
<!-- the current errorprone version does not support JDK 24 onwards -->
237+
<id>no-errorprone-jdk-24-onwards</id>
238+
<activation>
239+
<jdk>[24,)</jdk>
240+
</activation>
241+
<build>
242+
<plugins>
243+
<plugin>
244+
<artifactId>maven-compiler-plugin</artifactId>
245+
<configuration>
246+
<fork>true</fork>
247+
<compilerArgs combine.children="append">
248+
<!-- we only use the basic compilation flags without activating errorprone -->
249+
<arg>-XDcompilePolicy=simple</arg>
250+
</compilerArgs>
251+
</configuration>
252+
</plugin>
253+
</plugins>
254+
</build>
255+
</profile>
235256
<profile>
236257
<id>java9</id>
237258
<activation>
238-
<jdk>[9,)</jdk>
259+
<jdk>[9,24)</jdk>
239260
</activation>
240261
<build>
241262
<plugins>

samples/install-without-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.google.cloud</groupId>
3131
<artifactId>google-cloud-datastore</artifactId>
32-
<version>2.28.1</version>
32+
<version>2.29.1</version>
3333
</dependency>
3434
<!-- [END datastore_install_without_bom] -->
3535

0 commit comments

Comments
 (0)