Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop using servicetalk-dependencies internally #3055

Merged
merged 1 commit into from
Sep 9, 2024

Conversation

idelpivnitskiy
Copy link
Member

Motivation:

Gradle interprets *.module files differently than the pom.xml. Because every module currently depends on servicetalk-dependencies, users pulled its dependencyConstraints in their build configurations with any servicetalk module as transitive dependency and got unintended changes for other dependencies.

For example, servicetalk-annotations that has only jsr305 as a 3-party dependency still forces upgrade of jackson, protobuf, log4j, netty, and jersey for users because it depends on servicetalk-dependencies.

Modifications:

  • Remove servicetalk-dependencies from every module, instead define every necessary dependency by its version number or import only required boms;
  • Update servicetalk-dependencies to include missed dependencies: opentelemetry, instrumentation, resilience4j;
  • Correct dependencies for all -jersery3 modules to keep only what they use;
  • Move all platform dependencies from the top to their corresponding scope;
  • Regenerate lock files;

Result:

Users don't get unintended dependency upgrades because of the *.module file handling.

Motivation:

Gradle interprets `*.module` files differently than the `pom.xml`.
Because every module currently depends on `servicetalk-dependencies`,
users pulled its `dependencyConstraints` in their build configurations
with any servicetalk module as transitive dependency and got unintended
changes for other dependencies.

For example, `servicetalk-annotations` that has only jsr305 as a 3-party
dependency still forces upgrade of jackson, protobuf, log4j, netty, and
jersey for users because it depends on `servicetalk-dependencies`.

Modifications:

- Remove `servicetalk-dependencies` from every module, instead define
every necessary dependency by its version number or import only
required boms;
- Update `servicetalk-dependencies` to include missed dependencies:
opentelemetry, instrumentation, resilience4j;
- Correct dependencies for all `-jersery3` modules to keep only what
they use;
- Move all `platform` dependencies from the top to their corresponding
scope;
- Regenerate lock files;

Result:

Users don't get unintended dependency upgrades because of the `*.module`
file handling.
Copy link
Contributor

@daschl daschl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall lgtm, couple small questions

servicetalk-benchmarks/build.gradle Show resolved Hide resolved
servicetalk-annotations/build.gradle Show resolved Hide resolved
servicetalk-buffer-netty/build.gradle Show resolved Hide resolved
@idelpivnitskiy idelpivnitskiy merged commit 9e310cc into apple:main Sep 9, 2024
11 checks passed
@idelpivnitskiy idelpivnitskiy deleted the dependencies branch September 9, 2024 19:09
@idelpivnitskiy idelpivnitskiy self-assigned this Sep 9, 2024
idelpivnitskiy added a commit to idelpivnitskiy/servicetalk that referenced this pull request Oct 15, 2024
Motivation:

Maven helped to identify that after apple#3055 generated pom.xml files are
invalid. We forgot to include `netty-bom` in some modules that depend
on `io.netty` without specifying netty version.
Also, noticed that some of our modules that use `io.netty` do not list
all used netty dependencies as needed.

Modifications:

- For all modules that contain `-netty` in their names add missed
`netty-bom` and some other netty dependencies that are used explicitly;
- `servicetalk-buffer-netty`: add missed `netty-common` dependency;
- `servicetalk-transport-netty`: remove unused `netty-common` dependency;

Result:

Gradle generates valid pom.xml files.
idelpivnitskiy added a commit that referenced this pull request Oct 15, 2024
Motivation:

Maven helped to identify that after #3055 generated pom.xml files are
invalid. We forgot to include `netty-bom` in some modules that depend
on `io.netty` without specifying netty version.
Also, noticed that some of our modules that use `io.netty` do not list
all used netty dependencies as needed.

Modifications:

- For all modules that contain `-netty` in their names add missed
`netty-bom` and some other netty dependencies that are used explicitly;
- `servicetalk-buffer-netty`: add missed `netty-common` dependency;
- `servicetalk-transport-netty`: remove unused `netty-common` dependency;

Result:

Gradle generates valid pom.xml files.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants