Skip to content

Conversation

@elharo
Copy link
Contributor

@elharo elharo commented Jul 21, 2025

fixes #10973

@elharo elharo marked this pull request as ready for review July 21, 2025 12:53
@elharo elharo requested a review from gnodet July 21, 2025 12:54
@elharo elharo merged commit 109ba22 into master Jul 21, 2025
21 checks passed
@elharo elharo deleted the settings branch July 21, 2025 17:09
@github-actions
Copy link

@elharo Please assign appropriate label to PR according to the type of change.

@github-actions github-actions bot added this to the 4.1.0 milestone Jul 21, 2025
@elharo elharo added the skip-changelog Skip this PR from automatically changelog generation label Jul 21, 2025
gnodet added a commit to gnodet/maven that referenced this pull request Jul 21, 2025
Resolved conflicts by accepting deletion of documentation files that were
moved/reorganized in master:
- src/site/markdown/configuration.properties
- src/site/markdown/configuration.yaml
- src/site/markdown/maven-configuration.md

These files were moved to src/configuration-templates/ in master.

Merged changes include:
- Fix doap_Maven.rdf
- Add PathMatcherFactory.includesAll() (apache#10964)
- Generating configuration documentation during site build (apache#10961)
- Use correct namespace in settings.xml (apache#10974)
- Make error message less awkward (apache#10953)

All plugin migration changes preserved and compatible with latest master.
gnodet pushed a commit to gnodet/maven that referenced this pull request Jul 24, 2025
* use correct namespace in settings.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-changelog Skip this PR from automatically changelog generation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

settings.xml is missing namespace

2 participants