Skip to content

MRELEASE-1072 reuse original tag for next development version in case#86

Merged
asfgit merged 2 commits intoapache:masterfrom
kwin:bugfix/MRELEASE-1072
Oct 29, 2022
Merged

MRELEASE-1072 reuse original tag for next development version in case#86
asfgit merged 2 commits intoapache:masterfrom
kwin:bugfix/MRELEASE-1072

Conversation

@kwin
Copy link
Member

@kwin kwin commented Nov 6, 2021 •
edited by hboutemy
Loading

https://issues.apache.org/jira/browse/MRELEASE-1072
translator does not support resolving

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 [MJAVADOC-XXX] - Fixes bug in ApproximateQuantiles,
    where you replace MJAVADOC-XXX with the appropriate JIRA issue. Best practice
    is to use the JIRA issue title in 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 -Prun-its to make sure basic checks pass. A more thorough check will
    be performed on your pull request automatically.

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.

@kwin kwin force-pushed the bugfix/MRELEASE-1072 branch 3 times, most recently from 715e51b to e028fa1 Compare November 6, 2021 13:56
@michael-o
Copy link
Member

michael-o commented Jan 1, 2022

Will look into this as soon as my other open PRs are merged. @kwin Please ping me by ned of next week.

@michael-o
Copy link
Member

michael-o commented Jan 1, 2022

This causes failures with master:

[ERROR]   RewritePomsForDevelopmentPhaseTest.testRewriteBasicPomWithGitFromTag:292->AbstractReleaseTestCase.comparePomFiles:248->AbstractReleaseTestCase.comparePomFiles:254->AbstractReleaseTestCase.comparePomFiles:271->AbstractReleaseTestCase.comparePomFiles:287->AbstractReleaseTestCase.comparePomFiles:350 Check the transformed POM D:\Entwicklung\Projekte\maven-release\maven-release-manager\target\test-classes\projects\rewrite-for-development\basic-pom-with-git-from-tag\pom.xml
Expected text value 'original-label' but was 'release-label' - comparing <tag ...>original-label</tag> at /project[1]/scm[1]/tag[1]/text()[1] to <tag ...>release-label</tag> at /project[1]/scm[1]/tag[1]/text()[1]
[ERROR]   RewritePomsForDevelopmentPhaseTest.testRewriteBasicPomWithGit:271->AbstractReleaseTestCase.comparePomFiles:248->AbstractReleaseTestCase.comparePomFiles:254->AbstractReleaseTestCase.comparePomFiles:271->AbstractReleaseTestCase.comparePomFiles:287->AbstractReleaseTestCase.comparePomFiles:350 Check the transformed POM D:\Entwicklung\Projekte\maven-release\maven-release-manager\target\test-classes\projects\rewrite-for-development\basic-pom-with-git\pom.xml
Expected text value 'HEAD' but was 'release-label' - comparing <tag ...>HEAD</tag> at /project[1]/scm[1]/tag[1]/text()[1] to <tag ...>release-label</tag> at /project[1]/scm[1]/tag[1]/text()[1]

@kwin kwin force-pushed the bugfix/MRELEASE-1072 branch from e028fa1 to ff95374 Compare January 2, 2022 15:12
@kwin
Copy link
Member Author

kwin commented Jan 2, 2022 •
edited
Loading

@michael-o I rebased and fixed the test failures in 03b9776 as the failing test was relying on an explicit tag element with the default value "HEAD" (which is superfluous). I now only strip the tag with a default value for providers not supporting tag resolving.

@michael-o
Copy link
Member

michael-o commented Jan 2, 2022

Since this fix isn't really Subversion-specific, because it affects all SCMs, can you add a Git-based test too?

@kwin
Copy link
Member Author

kwin commented Jan 2, 2022

There are already some git based tests, e.g. in https://github.com/apache/maven-release/blob/master/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java#L254-L293. They also verify that my fix isn't introducing regressions for the other providers AFAIK. If you disagree, please let me know which particular aspect you want to have tested in a git-based test?

@michael-o
Copy link
Member

michael-o commented Jan 2, 2022

True, since we have those counterparts in code, would it make sense to have your new tests to match in amount, shape and naming?

@kwin
Copy link
Member Author

kwin commented Jan 2, 2022

@michael-o Done in f8825d6

michael-o
michael-o requested changes Jan 3, 2022
View reviewed changes
...ager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
scmRoot.setDeveloperConnection( scm.getDeveloperConnection() );
scmRoot.setUrl( scm.getUrl() );
scmRoot.setTag( translator.resolveTag( scm.getTag() ) );
String tag = translator.resolveTag( scm.getTag() );
Copy link
Member

@michael-o michael-o Jan 3, 2022

Choose a reason for hiding this comment

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

Still, can you take a look at CvsScmTranslator? It basically does what you do here. Can this be limited insite the Subversion translator?

Copy link
Member Author

@kwin kwin Jan 3, 2022

Choose a reason for hiding this comment

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

Why? This behavior makes sense for every ScmTranslator not supporting tag resolving. I would rather remove the handling from Cvs and return null there instead.

Copy link
Member Author

@kwin kwin May 8, 2022

Choose a reason for hiding this comment

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

@michael-o Ping. WDYT about my previous comment? Any chance to include this in the upcoming M6?

Copy link
Member

@michael-o michael-o May 8, 2022

Choose a reason for hiding this comment

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

No, not yet. I want to finish Fluido first and then go over to MRELEASE.

@kwin kwin mentioned this pull request May 25, 2022
Closed
@michael-o michael-o force-pushed the bugfix/MRELEASE-1072 branch from f8825d6 to 0615a4c Compare October 29, 2022 16:11
@michael-o michael-o self-requested a review October 29, 2022 16:12
@asfgit asfgit merged commit 0615a4c into apache:master Oct 29, 2022
@jira-importer
Copy link

jira-importer commented Jun 20, 2025

Resolve #1241

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michael-o michael-o michael-o approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@kwin @michael-o @jira-importer @asfgit