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

fix #2877 #2878

Merged
merged 6 commits into from
Oct 28, 2023
Merged

fix #2877 #2878

merged 6 commits into from
Oct 28, 2023

Conversation

mlehmannm
Copy link
Contributor

No description provided.

@@ -17,9 +17,9 @@
import org.osgi.framework.Version;

public class Versions {
private static final String SUFFIX_QUALIFIER = ".qualifier";
public static final String SUFFIX_QUALIFIER = ".qualifier";
Copy link
Member

Choose a reason for hiding this comment

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

We probably should move those constants to the TychoConstants class.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can do this in another PR. Would you backport this PR to 4.0.x first?

Copy link
Member

Choose a reason for hiding this comment

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

Just add it to this pr no need for several ones. It would also be good to improve the commit message a bit (e.g. describe what is the problem and what was changed).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do.

@laeubi laeubi added the backport-to-tycho-4.0.x Can be added to a PR to trigger an automatic backport of the change label Oct 2, 2023
Copy link
Member

@laeubi laeubi left a comment

Choose a reason for hiding this comment

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

Looks good, a testcase would be good to ensure this will not breakin the future.

@mlehmannm
Copy link
Contributor Author

Looks good, a testcase would be good to ensure this will not breakin the future.

Where is a good place to add a testcase?

@laeubi
Copy link
Member

laeubi commented Oct 2, 2023

@github-actions
Copy link

github-actions bot commented Oct 2, 2023

Test Results

   564 files  ±0     564 suites  ±0   5h 15m 17s ⏱️ + 27m 9s
   368 tests ±0     362 ✔️ +2    6 💤 ±0  0 ±0 
1 104 runs  ±0  1 085 ✔️ +3  19 💤 ±0  0 ±0 

Results for commit 1afc459. ± Comparison against base commit 69acea4.

♻️ This comment has been updated with latest results.

@mlehmannm
Copy link
Contributor Author

Providing a testcase is really hard, because one would need a repository with at least an eclipse-plugin and the same eclipse-plugin as source with changes so that the baseline-mojo needs to increment the version of that eclipse-plugin.

@laeubi
Copy link
Member

laeubi commented Oct 4, 2023

You might want to take a look at the BaselineMojoTest that creates a baseline repo first (you might even want to add your testcase there) and then modify the source sightly to generate a baseline error.

@mlehmannm
Copy link
Contributor Author

I'll try to add a test to BaselineMojoTest next week.

@laeubi
Copy link
Member

laeubi commented Oct 22, 2023

@mlehmannm whats the status here? I plan to publish a bugfix of Tycho4 soon and it seems good to have your fix included.

@mlehmannm
Copy link
Contributor Author

Sorry for the delay. I was on vacation and had a busy week afterwards. I plan to provide a test for the fix, but it might take some time, but I think you can include that fix as it is mostly trivial.

@laeubi laeubi merged commit 3b42036 into eclipse-tycho:master Oct 28, 2023
10 checks passed
@github-actions
Copy link

💚 All backports created successfully

Status Branch Result
tycho-4.0.x

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

github-actions bot pushed a commit that referenced this pull request Oct 28, 2023
Retain .qualifier/-SNAPSHOT on version bump

fix #2877

(cherry picked from commit 3b42036)
laeubi pushed a commit that referenced this pull request Oct 28, 2023
Retain .qualifier/-SNAPSHOT on version bump

fix #2877

(cherry picked from commit 3b42036)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-to-tycho-4.0.x Can be added to a PR to trigger an automatic backport of the change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants