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 maven pom inheritance #32943

Merged
merged 4 commits into from
Dec 25, 2024
Merged

Fix maven pom inheritance #32943

merged 4 commits into from
Dec 25, 2024

Conversation

wxiaoguang
Copy link
Contributor

Fix #30568

At the moment, here only GroupID (no Version) is parsed & used

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 22, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 22, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Dec 22, 2024
@wxiaoguang wxiaoguang added the backport/v1.23 This PR should be backported to Gitea 1.23 label Dec 22, 2024
@github-actions github-actions bot added the modifies/api This PR adds API routes or modifies them label Dec 22, 2024
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Dec 22, 2024
@JSchlarb
Copy link

Just a quick remark from my side: This appears very similar to the fix from Forgejo. Since versions are determined via the path parameter and not from the XML property, there doesn't seem to be a need to inherit the version from the parent. How would you handle parsing something like this: <version>${revision}${changelist}${sha1}</version>?

@wxiaoguang
Copy link
Contributor Author

Since versions are determined via the path parameter and not from the XML property, there doesn't seem to be a need to inherit the version from the parent. How would you handle parsing something like this: <version>${revision}${changelist}${sha1}</version>?

Not supported yet?

@JSchlarb
Copy link

It's totally okay to rely on the version provided by Maven as a path parameter, as it can contain parameters and be overridden by Maven using command-line options, such as mvn deploy -Dsha1=f75ed7510f.

https://maven.apache.org/maven-ci-friendly.html

@wxiaoguang wxiaoguang requested a review from Zettat123 December 23, 2024 03:07
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 25, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) December 25, 2024 04:02
@wxiaoguang wxiaoguang added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 25, 2024
@wxiaoguang wxiaoguang merged commit 973363f into go-gitea:main Dec 25, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone Dec 25, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 25, 2024
@wxiaoguang wxiaoguang deleted the fix-pom-parent branch December 25, 2024 04:29
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Dec 25, 2024
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Dec 25, 2024
wxiaoguang added a commit that referenced this pull request Dec 25, 2024
Backport #32943 by wxiaoguang

Fix  #30568

At the moment, here only `GroupID` (no `Version`) is parsed & used

Co-authored-by: wxiaoguang <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 25, 2024
* giteaofficial/main:
  demilestone should not include milestone (go-gitea#32923)
  fix textarea newline handle (go-gitea#32966)
  Fix Azure blob object `Seek`  (go-gitea#32974)
  Fix maven pom inheritance (go-gitea#32943)
  Refactor arch route handlers (go-gitea#32972)
  [skip ci] Updated translations via Crowdin
  Refactor tmpl and blob_excerpt (go-gitea#32967)
  Clarify path param naming (go-gitea#32969)
  Refactor getpatch/getdiff functions and remove unnecessary fallback (go-gitea#32817)
  Refactor request context (go-gitea#32956)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/done All backports for this PR have been created backport/v1.23 This PR should be backported to Gitea 1.23 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing groupId in maven packages (<parent> section in pom.xml files not consulted for groupId or version)
5 participants