This is an automated email from the ASF dual-hosted git repository.
Abacn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new b2d0ef66aa9 Fix pom involving maven-archetype and opentelemetry
(#38518)
b2d0ef66aa9 is described below
commit b2d0ef66aa93651825ee8252515e0b351fdad041
Author: Yi Hu <[email protected]>
AuthorDate: Fri May 15 17:00:35 2026 -0400
Fix pom involving maven-archetype and opentelemetry (#38518)
* Fix opentelemetry version
* Fix target platform version to be 11
---
.../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 10 +++++-----
.../build-tools/src/main/resources/beam/beam-codestyle.xml | 6 +++---
.../src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +-
.../src/test/resources/projects/basic/archetype.properties | 2 +-
.../src/test/resources/projects/basic/archetype.properties | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 92e9c351945..733f32c6b57 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -859,13 +859,13 @@ class BeamModulePlugin implements Plugin<Project> {
netty_tcnative_boringssl_static :
"io.netty:netty-tcnative-boringssl-static:2.0.52.Final",
netty_transport :
"io.netty:netty-transport:$netty_version",
netty_transport_native_epoll :
"io.netty:netty-transport-native-epoll:$netty_version",
- opentelemetry_api :
"io.opentelemetry:opentelemetry-api", // google_cloud_platform_libraries_bom
sets version
+ opentelemetry_api :
"io.opentelemetry:opentelemetry-api", // opentelemetry-bom sets version
opentelemetry_bom :
"io.opentelemetry:opentelemetry-bom-alpha:$opentelemetry_version-alpha", //
alpha required by extensions
- opentelemetry_context :
"io.opentelemetry:opentelemetry-context", //
google_cloud_platform_libraries_bom sets version
+ opentelemetry_context :
"io.opentelemetry:opentelemetry-context:$opentelemetry_version", // Set version
explicitly as it's standalone runtime dep for Beam modules
opentelemetry_gcp_auth :
"io.opentelemetry.contrib:opentelemetry-gcp-auth-extension:$opentelemetry_contrib_version-alpha",
- opentelemetry_sdk :
"io.opentelemetry:opentelemetry-sdk", // google_cloud_platform_libraries_bom
sets version
- opentelemetry_exporter_otlp :
"io.opentelemetry:opentelemetry-exporter-otlp", //
google_cloud_platform_libraries_bom sets version
- opentelemetry_extension_autoconfigure :
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", //
google_cloud_platform_libraries_bom sets version
+ opentelemetry_sdk :
"io.opentelemetry:opentelemetry-sdk", // opentelemetry-bom sets version
+ opentelemetry_exporter_otlp :
"io.opentelemetry:opentelemetry-exporter-otlp", // opentelemetry-bom sets
version
+ opentelemetry_extension_autoconfigure :
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", //
opentelemetry-bom sets version
postgres :
"org.postgresql:postgresql:$postgres_version",
protobuf_java :
"com.google.protobuf:protobuf-java:$protobuf_version",
protobuf_java_util :
"com.google.protobuf:protobuf-java-util:$protobuf_version",
diff --git a/sdks/java/build-tools/src/main/resources/beam/beam-codestyle.xml
b/sdks/java/build-tools/src/main/resources/beam/beam-codestyle.xml
index f722a0e2e52..3f913778ab7 100644
--- a/sdks/java/build-tools/src/main/resources/beam/beam-codestyle.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/beam-codestyle.xml
@@ -192,7 +192,7 @@
<setting
id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause"
value="common_lines"/>
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation"
value="16"/>
<setting
id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column"
value="false"/>
- <setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+ <setting id="org.eclipse.jdt.core.compiler.source" value="11"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size"
value="2"/>
@@ -214,7 +214,7 @@
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator"
value="false"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement"
value="do not insert"/>
- <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform"
value="1.8"/>
+ <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform"
value="11"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch"
value="end_of_line"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters"
value="insert"/>
@@ -284,7 +284,7 @@
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch"
value="do not insert"/>
- <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+ <setting id="org.eclipse.jdt.core.compiler.compliance" value="11"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments"
value="do not insert"/>
diff --git
a/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml
b/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml
index 0c95fd85725..532d84922ba 100644
---
a/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml
+++
b/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -23,7 +23,7 @@
<requiredProperties>
<requiredProperty key="targetPlatform">
- <defaultValue>1.8</defaultValue>
+ <defaultValue>11</defaultValue>
</requiredProperty>
</requiredProperties>
diff --git
a/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties
b/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties
index ee81f8fbc5a..5d442ba1a2c 100644
---
a/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties
+++
b/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties
@@ -18,4 +18,4 @@ package=it.pkg
version=0.1
groupId=archetype.it
artifactId=basic
-targetPlatform=1.8
+targetPlatform=11
diff --git
a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties
b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties
index ee81f8fbc5a..5d442ba1a2c 100644
---
a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties
+++
b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties
@@ -18,4 +18,4 @@ package=it.pkg
version=0.1
groupId=archetype.it
artifactId=basic
-targetPlatform=1.8
+targetPlatform=11
