From 25084b6c697be76fdb039ccb423ee97088f25fb5 Mon Sep 17 00:00:00 2001 From: "HS.Zhang" Date: Mon, 8 Jul 2024 16:18:19 +0800 Subject: [PATCH 1/2] Update the Composing builds section in contributing.md (discussions/#6551) --- CONTRIBUTING.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0eac89cb75d..b0205c9ef45 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -250,13 +250,18 @@ Example usage could be as follows: } ``` + Please confirm whether the local opentelemetry-java version is consistent with the + opentelemetry-java version declared in the project that relies on opentelemetry-java. + If it is inconsistent, `dependencySubstitution` may not take effect. + See [the Gradle documentation](https://docs.gradle.org/current/userguide/composite_builds.html#included_build_declaring_substitutions) for more information. - 4. If you now build your project, it will use the included build to supply the opentelemetry-java artifacts, ignoring any version declarations. Use the prefix `:DIRECTORY:` to refer to tasks/projects within the included build, where DIRECTORY is the name of the directory in the included build (only the part after the last `/`). +5. Here are some issues and solutions ([discussions/6551](https://github.com/open-telemetry/opentelemetry-java/discussions/6551)) + you may encounter that may be helpful to you. ### Updating the OTLP protobufs From 6e789a82e2f25bc8bcaf8e30120e6c055221ca94 Mon Sep 17 00:00:00 2001 From: "HS.Zhang" Date: Mon, 8 Jul 2024 16:35:28 +0800 Subject: [PATCH 2/2] fix spotlessMiscCheck problom --- CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b0205c9ef45..c8285b218e7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -250,17 +250,17 @@ Example usage could be as follows: } ``` - Please confirm whether the local opentelemetry-java version is consistent with the - opentelemetry-java version declared in the project that relies on opentelemetry-java. + Please confirm whether the local opentelemetry-java version is consistent with the + opentelemetry-java version declared in the project that relies on opentelemetry-java. If it is inconsistent, `dependencySubstitution` may not take effect. - + See [the Gradle documentation](https://docs.gradle.org/current/userguide/composite_builds.html#included_build_declaring_substitutions) for more information. 4. If you now build your project, it will use the included build to supply the opentelemetry-java artifacts, ignoring any version declarations. Use the prefix `:DIRECTORY:` to refer to tasks/projects within the included build, where DIRECTORY is the name of the directory in the included build (only the part after the last `/`). -5. Here are some issues and solutions ([discussions/6551](https://github.com/open-telemetry/opentelemetry-java/discussions/6551)) +5. Here are some issues and solutions ([discussions/6551](https://github.com/open-telemetry/opentelemetry-java/discussions/6551)) you may encounter that may be helpful to you. ### Updating the OTLP protobufs