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.

Sign up for GitHub

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

Jump to bottom

fix #2877 #2878

Merged
merged 6 commits into from
Oct 28, 2023
Merged

fix #2877 #2878

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8668914
fix #2877
mlehmannm Oct 2, 2023
c610c26
Retain .qualifier/-SNAPSHOT on version bump
mlehmannm Oct 2, 2023
fc8c8df
Retain .qualifier/-SNAPSHOT on version bump
mlehmannm Oct 2, 2023
4b79f17
Retain .qualifier/-SNAPSHOT on version bump
mlehmannm Oct 2, 2023
15675d0
Merge branch 'eclipse-tycho:master' into issue_2877
mlehmannm Oct 24, 2023
1afc459
Merge branch 'eclipse-tycho:master' into issue_2877
mlehmannm Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/VersionBumpBuildListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ public void buildEnded(MavenSession session) {
String newVersion = suggestedVersion.map(String::valueOf)
.orElseGet(() -> Versions.incrementVersion(currentVersion,
VersionBumpMojo.getIncrement(session, project, projectHelper)));
boolean isSnapshot = currentVersion.endsWith(Versions.SUFFIX_SNAPSHOT);
if (isSnapshot) {
newVersion += Versions.SUFFIX_SNAPSHOT;
}
logger.info(project.getId() + " requires a version bump from " + currentVersion + " => "
+ newVersion);
engine.setProjects(metadataReader.getProjects());
Expand Down
4 changes: 2 additions & 2 deletions tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/engine/Versions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.


private static final String SUFFIX_SNAPSHOT = "-SNAPSHOT";
public static final String SUFFIX_SNAPSHOT = "-SNAPSHOT";

public static String toCanonicalVersion(String version) {
if (version == null) {
Expand Down
Loading