-
Notifications
You must be signed in to change notification settings - Fork 193
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
tycho-versions-plugin: Support ci-friendly versions #3900
Conversation
tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/pom/PomFile.java
Outdated
Show resolved
Hide resolved
tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/pom/PomFile.java
Outdated
Show resolved
Hide resolved
tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/pom/PomFile.java
Outdated
Show resolved
Hide resolved
31fec6c
to
19c4722
Compare
tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/pom/PomFile.java
Outdated
Show resolved
Hide resolved
In PomFile#getVersion(), resolve properties used in the raw version of the project. This is necessary so that downstream manipulators (MANIFEST.MF, feature.xml, category.xml, ...) can see the actual version and act on it. Fixes eclipse-tycho#3744.
19c4722
to
1746be2
Compare
I refactored things a bit more. In fact, the utility is not specific to versions, but just deals with properties in general. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks very good, thank you!
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation and see the Github Action logs for details |
@sratz is it possible that the back-port of this has broken P2's use of version variables/ci-friendly versions? Since Tycho 4.0.9 the
I verified it locally that it works with Tycho 4.0.8 and we had corresponding release preparation PRs for p2 in the past. |
Verified locally that reverting this for tycho 4.0.x makes the p2 case work again: |
I think it brought to light a hidden problem that already existed before:
Is this assumption correct, @laeubi?
|
@sratz thats was at least the idea of it, but we can of course change things if it performs better. |
@laeubi I am trying to understand the original intention of the Assuming the following directory structure:
The result is:
Versions have essentially changed everywhere, even outside of the current directory. Is this really the intention of the mojo? |
The actual regression and IllegalArgumentException is fixed with #4453. Although I still think the |
In PomFile#getVersion(), resolve properties used in the raw version of the project. This is necessary so that downstream manipulators (MANIFEST.MF, feature.xml, category.xml, ...) can see the actual version and act on it.
Fixes #3744.