Skip to content

Conversation

@jgrassel
Copy link
Contributor

https://issues.apache.org/jira/browse/OPENJPA-2790

This change ensures that git hashes have a length of 7 (observed different default lengths between different versions of git), and restores the "M" at the end of the revision number to signify "dirty" OpenJPA builds.

@jgrassel jgrassel self-assigned this Jun 20, 2019
<exec outputproperty="git.diff.exitval" resultproperty="diff.state" failonerror="false" failifexecutionfails="false" executable="git">
<arg line="diff --quiet HEAD" />
</exec>
<condition property="uncommitted.changes" value="M">
Copy link
Contributor

Choose a reason for hiding this comment

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

How about?:

<condition property="uncommitted.changes" value="M" else="">

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That works for me too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Copy link
Contributor

@dazey3 dazey3 left a comment

Choose a reason for hiding this comment

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

LGTM

@ilgrosso ilgrosso self-requested a review June 21, 2019 07:39
Copy link
Member

@ilgrosso ilgrosso left a comment

Choose a reason for hiding this comment

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

LGTM, please go ahead and propose PRs for 2.4.x and master branches too, thanks.

This change ensures that git hashes have a length of 7 (observed different default lengths between different versions of git), and restores the "M" at the end of the revision number to signify "dirty" OpenJPA builds.

Signed-off-by: Joe Grassel <jgrassel@apache.org>
@dazey3 dazey3 merged commit fd3b509 into apache:2.2.x Jun 21, 2019
@jgrassel jgrassel deleted the 2.2.x_OJ2790 branch June 21, 2019 21:23
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.

3 participants