Skip to content
This repository was archived by the owner on Feb 24, 2026. It is now read-only.

Commit 11a8cd3

Browse files
cloud-java-botcloud-java-bot
committed
chore: merge main into generate-libraries-main
2 parents 7086d45 + 3be8106 commit 11a8cd3

4 files changed

Lines changed: 130 additions & 65 deletions

File tree

‎datastore-v1-proto-client/pom.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,48 @@
130130
<skipTests>true</skipTests>
131131
</properties>
132132
</profile>
133+
<profile>
134+
<id>java17</id>
135+
<activation>
136+
<jdk>[17,)</jdk>
137+
</activation>
138+
<build>
139+
<plugins>
140+
<plugin>
141+
<groupId>org.apache.maven.plugins</groupId>
142+
<artifactId>maven-compiler-plugin</artifactId>
143+
<configuration>
144+
<encoding>UTF-8</encoding>
145+
<fork>true</fork>
146+
<compilerArgs>
147+
<arg>-XDcompilePolicy=simple</arg>
148+
<arg>--should-stop=ifError=FLOW</arg>
149+
<arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*</arg>
150+
151+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
152+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
153+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
154+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
155+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
156+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
157+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
158+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
159+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
160+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
161+
</compilerArgs>
162+
<!-- Only run Error-Prone Core in handwritten modules -->
163+
<annotationProcessorPaths>
164+
<path>
165+
<groupId>com.google.errorprone</groupId>
166+
<artifactId>error_prone_core</artifactId>
167+
<version>${error-prone.version}</version>
168+
</path>
169+
</annotationProcessorPaths>
170+
</configuration>
171+
</plugin>
172+
</plugins>
173+
</build>
174+
</profile>
133175
</profiles>
134176

135177
</project>

‎google-cloud-datastore-utils/pom.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,47 @@
107107
<skipTests>true</skipTests>
108108
</properties>
109109
</profile>
110+
<profile>
111+
<id>java17</id>
112+
<activation>
113+
<jdk>[17,)</jdk>
114+
</activation>
115+
<build>
116+
<plugins>
117+
<plugin>
118+
<groupId>org.apache.maven.plugins</groupId>
119+
<artifactId>maven-compiler-plugin</artifactId>
120+
<configuration>
121+
<encoding>UTF-8</encoding>
122+
<fork>true</fork>
123+
<compilerArgs>
124+
<arg>-XDcompilePolicy=simple</arg>
125+
<arg>--should-stop=ifError=FLOW</arg>
126+
<arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*</arg>
127+
128+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
129+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
130+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
131+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
132+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
133+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
134+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
135+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
136+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
137+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
138+
</compilerArgs>
139+
<!-- Only run Error-Prone Core in handwritten modules -->
140+
<annotationProcessorPaths>
141+
<path>
142+
<groupId>com.google.errorprone</groupId>
143+
<artifactId>error_prone_core</artifactId>
144+
<version>${error-prone.version}</version>
145+
</path>
146+
</annotationProcessorPaths>
147+
</configuration>
148+
</plugin>
149+
</plugins>
150+
</build>
151+
</profile>
110152
</profiles>
111153
</project>

‎google-cloud-datastore/pom.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,5 +271,47 @@
271271
<test>com.google.cloud.datastore.it.ITDatastoreConceptsTest</test>
272272
</properties>
273273
</profile>
274+
<profile>
275+
<id>java17</id>
276+
<activation>
277+
<jdk>[17,)</jdk>
278+
</activation>
279+
<build>
280+
<plugins>
281+
<plugin>
282+
<groupId>org.apache.maven.plugins</groupId>
283+
<artifactId>maven-compiler-plugin</artifactId>
284+
<configuration>
285+
<encoding>UTF-8</encoding>
286+
<fork>true</fork>
287+
<compilerArgs>
288+
<arg>-XDcompilePolicy=simple</arg>
289+
<arg>--should-stop=ifError=FLOW</arg>
290+
<arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*</arg>
291+
292+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
293+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
294+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
295+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
296+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
297+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
298+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
299+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
300+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
301+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
302+
</compilerArgs>
303+
<!-- Only run Error-Prone Core in handwritten modules -->
304+
<annotationProcessorPaths>
305+
<path>
306+
<groupId>com.google.errorprone</groupId>
307+
<artifactId>error_prone_core</artifactId>
308+
<version>${error-prone.version}</version>
309+
</path>
310+
</annotationProcessorPaths>
311+
</configuration>
312+
</plugin>
313+
</plugins>
314+
</build>
315+
</profile>
274316
</profiles>
275317
</project>

‎pom.xml‎

Lines changed: 4 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@
143143
<github.global.server>github</github.global.server>
144144
<site.installationModule>google-cloud-datastore-parent</site.installationModule>
145145
<project.javadoc.protobufBaseURL>https://googleapis.dev/java/google-api-grpc/latest</project.javadoc.protobufBaseURL>
146-
<error-prone.version>2.31.0</error-prone.version>
146+
<!-- Error Prone Core version is not managed by shared-deps. Keep this version in sync with upstream shared-deps -->
147+
<!-- Related: https://github.com/googleapis/java-datastore/issues/1889 -->
148+
<!-- As of v2.42.0, the min JDK version needed is JDK 17+ -->
149+
<error-prone.version>2.42.0</error-prone.version>
147150
</properties>
148151

149152
<dependencyManagement>
@@ -231,70 +234,6 @@
231234
</pluginManagement>
232235
</build>
233236

234-
<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>
256-
<profile>
257-
<id>java9</id>
258-
<activation>
259-
<jdk>[9,24)</jdk>
260-
</activation>
261-
<build>
262-
<plugins>
263-
<plugin>
264-
<groupId>org.apache.maven.plugins</groupId>
265-
<artifactId>maven-compiler-plugin</artifactId>
266-
<version>3.14.0</version>
267-
<configuration>
268-
<encoding>UTF-8</encoding>
269-
<fork>true</fork>
270-
<compilerArgs>
271-
<arg>-XDcompilePolicy=simple</arg>
272-
<arg>-Xplugin:ErrorProne</arg>
273-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
274-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
275-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
276-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
277-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
278-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
279-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
280-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
281-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
282-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
283-
</compilerArgs>
284-
<annotationProcessorPaths>
285-
<path>
286-
<groupId>com.google.errorprone</groupId>
287-
<artifactId>error_prone_core</artifactId>
288-
<version>${error-prone.version}</version>
289-
</path>
290-
</annotationProcessorPaths>
291-
</configuration>
292-
</plugin>
293-
</plugins>
294-
</build>
295-
</profile>
296-
</profiles>
297-
298237
<modules>
299238
<module>google-cloud-datastore</module>
300239
<module>grpc-google-cloud-datastore-admin-v1</module>

0 commit comments

Comments
 (0)