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

[MNG-5726] Support regular expression matching in profile activation for #1421

Merged
merged 1 commit into from
Feb 28, 2024

Conversation

kwin
Copy link
Member

@kwin kwin commented Feb 23, 2024

OS version

This requires using the reserved prefix "regex:" in the version element.

Following this checklist to help us incorporate your
contribution quickly and easily:

  • Make sure there is a JIRA issue filed
    for the change (usually before you start working on it). Trivial changes like typos do not
    require a JIRA issue. Your pull request should address just this issue, without
    pulling in other changes.
  • Each commit in the pull request should have a meaningful subject line and body.
  • Format the pull request title like [MNG-XXX] SUMMARY,
    where you replace MNG-XXX and SUMMARY with the appropriate JIRA issue.
  • Also format the first line of the commit message like [MNG-XXX] SUMMARY.
    Best practice is to use the JIRA issue title in both the pull request title and in the first line of the commit message.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Run mvn clean verify to make sure basic checks pass. A more thorough check will
    be performed on your pull request automatically.
  • You have run the Core IT successfully.

If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.

To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.

OS version

This requires using the reserved prefix "regex:" in the version element.
@kwin kwin force-pushed the feature/MNG-5726-regex-os-version-matching branch from 8e79ecc to d3a54ee Compare February 24, 2024 11:14
@michael-o michael-o removed their request for review February 27, 2024 10:53
@gnodet
Copy link
Contributor

gnodet commented Feb 27, 2024

Would it make sense to also support the easier glob: syntax then ?

@kwin
Copy link
Member Author

kwin commented Feb 27, 2024

@gnodet Is there general support for matching globs built into Java (apart from Files NIO)? I haven't found anything and quick googling revealed https://stackoverflow.com/questions/1247772/is-there-an-equivalent-of-java-util-regex-for-glob-type-patterns. So I would say, regex is good enough for now.

(I don't want to rely on external libraries like plexus-utils or maven-utils for such stuff TBH)

@gnodet
Copy link
Contributor

gnodet commented Feb 28, 2024

@gnodet Is there general support for matching globs built into Java (apart from Files NIO)? I haven't found anything and quick googling revealed https://stackoverflow.com/questions/1247772/is-there-an-equivalent-of-java-util-regex-for-glob-type-patterns. So I would say, regex is good enough for now.

(I don't want to rely on external libraries like plexus-utils or maven-utils for such stuff TBH)

Fwiw, a workaround is already used in maven: https://github.com/apache/maven/blob/master/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java
Maybe we can move the code in its own class in maven-core and reuse it ?

@kwin
Copy link
Member Author

kwin commented Feb 28, 2024

@gnodet Interesting. We can support glob: later once that refactoring is done. For now I would go with just regex:. Any concerns with that?

@gnodet
Copy link
Contributor

gnodet commented Feb 28, 2024

@gnodet Interesting. We can support glob: later once that refactoring is done. For now I would go with just regex:. Any concerns with that?

None...

@@ -53,17 +57,21 @@ public boolean isActive(Profile profile, ProfileActivationContext context, Model

boolean active = ensureAtLeastOneNonNull(os);

String actualOsName = context.getSystemProperties().get("os.name").toLowerCase(Locale.ENGLISH);
Copy link
Contributor

@gnodet gnodet Feb 28, 2024

Choose a reason for hiding this comment

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

Why not Os.OS_NAME and related ? @kwin

Copy link
Member Author

Choose a reason for hiding this comment

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

To streamline the testing approach with the other activators. Os.OS_NAME cannot be easily overwritten.

Copy link
Member Author

Choose a reason for hiding this comment

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

@kwin kwin merged commit cf60940 into master Feb 28, 2024
36 checks passed
@kwin kwin deleted the feature/MNG-5726-regex-os-version-matching branch February 28, 2024 18:05
This pull request was closed.
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