Skip to content

Commit 4cbe64c

Browse files
committed
Fix pom involving maven-archetype and opentelemetry (#38518)
* Fix opentelemetry version * Fix target platform version to be 11
1 parent ed66941 commit 4cbe64c

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -859,13 +859,13 @@ class BeamModulePlugin implements Plugin<Project> {
859859
netty_tcnative_boringssl_static : "io.netty:netty-tcnative-boringssl-static:2.0.52.Final",
860860
netty_transport : "io.netty:netty-transport:$netty_version",
861861
netty_transport_native_epoll : "io.netty:netty-transport-native-epoll:$netty_version",
862-
opentelemetry_api : "io.opentelemetry:opentelemetry-api", // google_cloud_platform_libraries_bom sets version
862+
opentelemetry_api : "io.opentelemetry:opentelemetry-api", // opentelemetry-bom sets version
863863
opentelemetry_bom : "io.opentelemetry:opentelemetry-bom-alpha:$opentelemetry_version-alpha", // alpha required by extensions
864-
opentelemetry_context : "io.opentelemetry:opentelemetry-context", // google_cloud_platform_libraries_bom sets version
864+
opentelemetry_context : "io.opentelemetry:opentelemetry-context:$opentelemetry_version", // Set version explicitly as it's standalone runtime dep for Beam modules
865865
opentelemetry_gcp_auth : "io.opentelemetry.contrib:opentelemetry-gcp-auth-extension:$opentelemetry_contrib_version-alpha",
866-
opentelemetry_sdk : "io.opentelemetry:opentelemetry-sdk", // google_cloud_platform_libraries_bom sets version
867-
opentelemetry_exporter_otlp : "io.opentelemetry:opentelemetry-exporter-otlp", // google_cloud_platform_libraries_bom sets version
868-
opentelemetry_extension_autoconfigure : "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", // google_cloud_platform_libraries_bom sets version
866+
opentelemetry_sdk : "io.opentelemetry:opentelemetry-sdk", // opentelemetry-bom sets version
867+
opentelemetry_exporter_otlp : "io.opentelemetry:opentelemetry-exporter-otlp", // opentelemetry-bom sets version
868+
opentelemetry_extension_autoconfigure : "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", // opentelemetry-bom sets version
869869
postgres : "org.postgresql:postgresql:$postgres_version",
870870
protobuf_java : "com.google.protobuf:protobuf-java:$protobuf_version",
871871
protobuf_java_util : "com.google.protobuf:protobuf-java-util:$protobuf_version",

sdks/java/build-tools/src/main/resources/beam/beam-codestyle.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
193193
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
194194
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
195-
<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
195+
<setting id="org.eclipse.jdt.core.compiler.source" value="11"/>
196196
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
197197
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
198198
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
@@ -214,7 +214,7 @@
214214
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
215215
<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
216216
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
217-
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
217+
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="11"/>
218218
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
219219
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
220220
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
@@ -284,7 +284,7 @@
284284
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
285285
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
286286
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
287-
<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
287+
<setting id="org.eclipse.jdt.core.compiler.compliance" value="11"/>
288288
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
289289
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
290290
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>

sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<requiredProperties>
2525
<requiredProperty key="targetPlatform">
26-
<defaultValue>1.8</defaultValue>
26+
<defaultValue>11</defaultValue>
2727
</requiredProperty>
2828
</requiredProperties>
2929

sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ package=it.pkg
1818
version=0.1
1919
groupId=archetype.it
2020
artifactId=basic
21-
targetPlatform=1.8
21+
targetPlatform=11

sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ package=it.pkg
1818
version=0.1
1919
groupId=archetype.it
2020
artifactId=basic
21-
targetPlatform=1.8
21+
targetPlatform=11

0 commit comments

Comments
 (0)