Skip to content

Commit 66eca10

Browse files
committed
Update Google BOM to 26.79.0
1 parent e7a97c2 commit 66eca10

Some content is hidden

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

51 files changed

+7948
-6
lines changed

buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -608,14 +608,14 @@ class BeamModulePlugin implements Plugin<Project> {
608608
def dbcp2_version = "2.9.0"
609609
def errorprone_version = "2.31.0"
610610
// [bomupgrader] determined by: com.google.api:gax, consistent with: google_cloud_platform_libraries_bom
611-
def gax_version = "2.74.1"
611+
def gax_version = "2.76.0"
612612
def google_ads_version = "33.0.0"
613613
def google_clients_version = "2.0.0"
614614
def google_cloud_bigdataoss_version = "2.2.26"
615615
def google_code_gson_version = "2.10.1"
616616
def google_oauth_clients_version = "1.34.1"
617617
// [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom
618-
def grpc_version = "1.76.2"
618+
def grpc_version = "1.76.3"
619619
def guava_version = "33.1.0-jre"
620620
def hadoop_version = "3.4.2"
621621
def hamcrest_version = "2.1"
@@ -743,7 +743,7 @@ class BeamModulePlugin implements Plugin<Project> {
743743
google_api_services_dataflow : "com.google.apis:google-api-services-dataflow:v1b3-rev20260118-$google_clients_version",
744744
google_api_services_healthcare : "com.google.apis:google-api-services-healthcare:v1-rev20240130-$google_clients_version",
745745
google_api_services_pubsub : "com.google.apis:google-api-services-pubsub:v1-rev20220904-$google_clients_version",
746-
google_api_services_storage : "com.google.apis:google-api-services-storage:v1-rev20251118-2.0.0", // [bomupgrader] sets version
746+
google_api_services_storage : "com.google.apis:google-api-services-storage:v1-rev20260204-2.0.0", // [bomupgrader] sets version
747747
google_auth_library_credentials : "com.google.auth:google-auth-library-credentials", // google_cloud_platform_libraries_bom sets version
748748
google_auth_library_oauth2_http : "com.google.auth:google-auth-library-oauth2-http", // google_cloud_platform_libraries_bom sets version
749749
google_cloud_bigquery : "com.google.cloud:google-cloud-bigquery", // google_cloud_platform_libraries_bom sets version
@@ -755,13 +755,13 @@ class BeamModulePlugin implements Plugin<Project> {
755755
google_cloud_core_grpc : "com.google.cloud:google-cloud-core-grpc", // google_cloud_platform_libraries_bom sets version
756756
google_cloud_datacatalog_v1beta1 : "com.google.cloud:google-cloud-datacatalog", // google_cloud_platform_libraries_bom sets version
757757
google_cloud_dataflow_java_proto_library_all: "com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304",
758-
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.34.0", // [bomupgrader] sets version
758+
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.37.0", // [bomupgrader] sets version
759759
google_cloud_firestore : "com.google.cloud:google-cloud-firestore", // google_cloud_platform_libraries_bom sets version
760760
google_cloud_kms : "com.google.cloud:google-cloud-kms", // google_cloud_platform_libraries_bom sets version
761761
google_cloud_pubsub : "com.google.cloud:google-cloud-pubsub", // google_cloud_platform_libraries_bom sets version
762762
// [bomupgrader] the BOM version is set by scripts/tools/bomupgrader.py. If update manually, also update
763763
// libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml
764-
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.76.0",
764+
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.79.0",
765765
google_cloud_secret_manager : "com.google.cloud:google-cloud-secretmanager", // google_cloud_platform_libraries_bom sets version
766766
google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version
767767
google_cloud_storage : "com.google.cloud:google-cloud-storage", // google_cloud_platform_libraries_bom sets version

build_output.log

Lines changed: 280 additions & 0 deletions
Large diffs are not rendered by default.

build_output.txt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
WARNING: A restricted method in java.lang.System has been called
2+
WARNING: java.lang.System::load has been called by net.rubygrapefruit.platform.internal.NativeLibraryLoader in an unnamed module (file:/usr/local/google/home/klk/.gradle/wrapper/dists/gradle-8.14.3-bin/cv11ve7ro1n3o1j4so8xd9n66/gradle-8.14.3/lib/native-platform-0.22-milestone-28.jar)
3+
WARNING: Use --enable-native-access=ALL-UNNAMED to avoid a warning for callers in this module
4+
WARNING: Restricted methods will be blocked in a future release unless native access is enabled
5+
6+
To honour the JVM settings for this build a single-use Daemon process will be forked. For more on this, please refer to https://docs.gradle.org/8.14.3/userguide/gradle_daemon.html#sec:disabling_the_daemon in the Gradle documentation.
7+
Daemon will be stopped at the end of the build
8+
Configuration on demand is an incubating feature.
9+
10+
FAILURE: Build failed with an exception.
11+
12+
* What went wrong:
13+
25.0.1
14+
15+
* Try:
16+
> Run with --stacktrace option to get the stack trace.
17+
> Run with --info or --debug option to get more log output.
18+
> Run with --scan to get full insights.
19+
> Get more help at https://help.gradle.org.
20+
21+
BUILD FAILED in 4s

clean_nullness.py

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
import os
2+
import re
3+
4+
directory = "/usr/local/google/home/klk/GitHub/apache/beam/sdks/java/core/src/main/java/org/apache/beam/sdk/util/construction/"
5+
6+
def process_file(filepath):
7+
with open(filepath, 'r') as f:
8+
content = f.read()
9+
10+
original_content = content
11+
12+
# 1. Handle arrays: @SuppressWarnings({ "nullness", "other" }) or similar.
13+
# We will find "nullness" (with optional comment) and remove it.
14+
# Pattern to match: "nullness" optionally followed by // TODO... up to the end of the line
15+
# optionally preceded or followed by a comma
16+
17+
# Let's replace line-by-line for easier multiline handling of array elements
18+
lines = content.split('\n')
19+
new_lines = []
20+
in_suppress = False
21+
22+
for line in lines:
23+
if '@SuppressWarnings' in line:
24+
in_suppress = True
25+
26+
if in_suppress:
27+
# If line has "nullness", strip it out
28+
if '"nullness"' in line:
29+
# Remove "nullness" and any trailing comma or comment
30+
line = re.sub(r'"nullness"\s*,?\s*(//.*)?', '', line)
31+
# If the line becomes just empty spaces or just a comma, handle it
32+
if line.strip() == '' or line.strip() == ',':
33+
continue # Skip this line
34+
# if line is just '@SuppressWarnings({"nullness"})' -> '@SuppressWarnings({})'
35+
# which we will clean up next
36+
37+
if ')' in line and in_suppress and not '@SuppressWarnings' in line:
38+
# simplistic: if we see closing parens, we might end suppression block (heuristics)
39+
pass
40+
41+
new_lines.append(line)
42+
43+
content = '\n'.join(new_lines)
44+
45+
# 2. Cleanup empty suppressions:
46+
# @SuppressWarnings({}) or @SuppressWarnings({ }) or @SuppressWarnings()
47+
content = re.sub(r'@SuppressWarnings\(\s*\{\s*\}\s*\)\n?', '', content)
48+
content = re.sub(r'@SuppressWarnings\(\s*\)\n?', '', content)
49+
50+
# 3. Cleanup trailing commas in arrays: {"rawtypes", } -> {"rawtypes"}
51+
content = re.sub(r',\s*\}', '}', content)
52+
content = re.sub(r'\{\s*,', '{', content)
53+
54+
# Also handle single value @SuppressWarnings("nullness")
55+
content = re.sub(r'@SuppressWarnings\(\s*"nullness"\s*\)\s*(//.*)?\n', '', content)
56+
57+
if content != original_content:
58+
with open(filepath, 'w') as f:
59+
f.write(content)
60+
print(f"Cleaned {filepath}")
61+
62+
for root, _, files in os.walk(directory):
63+
for file in files:
64+
if file.endswith(".java"):
65+
process_file(os.path.join(root, file))

compile_after_auto_suppress.txt

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
To honour the JVM settings for this build a single-use Daemon process will be forked. For more on this, please refer to https://docs.gradle.org/8.14.3/userguide/gradle_daemon.html#sec:disabling_the_daemon in the Gradle documentation.
2+
Daemon will be stopped at the end of the build
3+
Configuration on demand is an incubating feature.
4+
Did not find udev library in operating system. Some features may not work.
5+
Disk Store information requires libudev, which is not present.
6+
> Task :buildSrc:compileJava NO-SOURCE
7+
> Task :buildSrc:compileGroovy UP-TO-DATE
8+
> Task :buildSrc:pluginDescriptors UP-TO-DATE
9+
> Task :buildSrc:processResources UP-TO-DATE
10+
> Task :buildSrc:classes UP-TO-DATE
11+
> Task :buildSrc:jar UP-TO-DATE
12+
> Task :model:fn-execution:createCheckerFrameworkManifest UP-TO-DATE
13+
> Task :model:job-management:createCheckerFrameworkManifest UP-TO-DATE
14+
> Task :model:pipeline:createCheckerFrameworkManifest UP-TO-DATE
15+
> Task :sdks:java:transform-service:launcher:createCheckerFrameworkManifest UP-TO-DATE
16+
> Task :sdks:java:core:createCheckerFrameworkManifest UP-TO-DATE
17+
> Task :model:fn-execution:extractProto UP-TO-DATE
18+
> Task :model:job-management:extractProto UP-TO-DATE
19+
> Task :model:fn-execution:processResources UP-TO-DATE
20+
> Task :model:job-management:processResources UP-TO-DATE
21+
> Task :sdks:java:core:generateGrammarSource UP-TO-DATE
22+
> Task :model:pipeline:extractIncludeProto UP-TO-DATE
23+
> Task :model:pipeline:extractProto UP-TO-DATE
24+
> Task :sdks:java:transform-service:launcher:compileJava UP-TO-DATE
25+
> Task :sdks:java:transform-service:launcher:processResources UP-TO-DATE
26+
> Task :sdks:java:transform-service:launcher:classes UP-TO-DATE
27+
> Task :sdks:java:transform-service:launcher:jar UP-TO-DATE
28+
> Task :model:pipeline:generateProto UP-TO-DATE
29+
> Task :model:pipeline:compileJava UP-TO-DATE
30+
> Task :model:pipeline:processResources UP-TO-DATE
31+
> Task :model:pipeline:classes UP-TO-DATE
32+
> Task :model:pipeline:jar UP-TO-DATE
33+
> Task :model:job-management:extractIncludeProto UP-TO-DATE
34+
> Task :model:fn-execution:extractIncludeProto UP-TO-DATE
35+
> Task :model:pipeline:shadowJar UP-TO-DATE
36+
> Task :model:fn-execution:generateProto UP-TO-DATE
37+
> Task :model:job-management:generateProto UP-TO-DATE
38+
> Task :model:job-management:compileJava UP-TO-DATE
39+
> Task :model:fn-execution:compileJava UP-TO-DATE
40+
> Task :model:fn-execution:classes UP-TO-DATE
41+
> Task :model:job-management:classes UP-TO-DATE
42+
> Task :model:job-management:shadowJar UP-TO-DATE
43+
> Task :model:fn-execution:shadowJar UP-TO-DATE
44+
45+
> Task :sdks:java:core:compileJava
46+
/usr/local/google/home/klk/GitHub/apache/beam/sdks/java/core/src/main/java/org/apache/beam/sdk/util/construction/graph/Networks.java:67: error: SuppressWarnings is not a repeatable annotation interface
47+
@SuppressWarnings("nullness")
48+
^
49+
Note: Some input files use or override a deprecated API.
50+
Note: Recompile with -Xlint:deprecation for details.
51+
Note: Some input files use unchecked or unsafe operations.
52+
Note: Recompile with -Xlint:unchecked for details.
53+
1 error
54+
55+
> Task :sdks:java:core:compileJava FAILED
56+
57+
[Incubating] Problems report is available at: file:///usr/local/google/home/klk/GitHub/apache/beam/build/reports/problems/problems-report.html
58+
59+
FAILURE: Build failed with an exception.
60+
61+
* What went wrong:
62+
Execution failed for task ':sdks:java:core:compileJava'.
63+
> Compilation failed; see the compiler output below.
64+
/usr/local/google/home/klk/GitHub/apache/beam/sdks/java/core/src/main/java/org/apache/beam/sdk/util/construction/graph/Networks.java:67: error: SuppressWarnings is not a repeatable annotation interface
65+
@SuppressWarnings("nullness")
66+
^
67+
1 error
68+
69+
* Try:
70+
> Check your code and dependencies to fix the compilation error(s)
71+
72+
Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0.
73+
74+
You can use '--warning-mode all' to show the individual deprecation warnings and determine if they come from your own scripts or plugins.
75+
76+
For more on this, please refer to https://docs.gradle.org/8.14.3/userguide/command_line_interface.html#sec:command_line_warnings in the Gradle documentation.
77+
78+
BUILD FAILED in 20s
79+
33 actionable tasks: 1 executed, 32 up-to-date

0 commit comments

Comments
 (0)