Skip to content

Conversation

CrazyHZM
Copy link
Member

@CrazyHZM CrazyHZM commented Jan 15, 2025

JIRA Issue: [MNG-8524]

@gnodet
Copy link
Contributor

gnodet commented Jan 15, 2025

I'm not sure we want to change the maven 3 code base too much. I've tried to revert most changes to get back into a compatible state, so if we add a constructor, it might break something. And for not much value, as this code is not really used.

@cstamas
Copy link
Member

cstamas commented Jan 15, 2025

Agreed, the compat/maven-embedder changes should be undone.

@cstamas cstamas added this to the 4.0.0-rc-3 milestone Jan 15, 2025
@CrazyHZM
Copy link
Member Author

@gnodet @cstamas I also agree with this and have reverted the compatibility logic of maven3.

@gnodet
Copy link
Contributor

gnodet commented Jan 17, 2025

There are two references to new DefaultInterpolator() that can be easily removed:

We can simply inline those constructors, as they are only used in a few tests. This will move the references to the implementation to the tests instead of the main code.

@CrazyHZM
Copy link
Member Author

There are two references to new DefaultInterpolator() that can be easily removed:

We can simply inline those constructors, as they are only used in a few tests. This will move the references to the implementation to the tests instead of the main code.

@gnodet Done.

private final CoreExtensionEntry extension;
private final UnaryOperator<String> callback;

private final DefaultInterpolator interpolator = new DefaultInterpolator();
Copy link
Member

Choose a reason for hiding this comment

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

What about this one?

Copy link
Contributor

Choose a reason for hiding this comment

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

This component is loaded very early without the full container afaik. This would require an Interpolator to be bound to the ProtoSession and ProtoLookup. Currently the only component added is ClassWorld.

# Conflicts:
#	impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java
#	impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsBuilder.java
#	impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionProfileActivator.java
@CrazyHZM CrazyHZM merged commit dda614d into apache:master Jan 25, 2025
13 checks passed
@CrazyHZM CrazyHZM deleted the MNG-8524 branch January 25, 2025 12:25
@jira-importer
Copy link

Resolve #9918

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.

4 participants