From 0fe7fc3298254b3bb2994c9c04d48026a500b0ff Mon Sep 17 00:00:00 2001 From: elharo Date: Thu, 30 Jul 2026 16:46:39 +0000 Subject: [PATCH 1/6] docs: fix text quality issues in configuring.md and cache-configuration.md - Update phrasing from 'Contrary to... those files' to 'Unlike... these files' - Remove possessive from 'Maven's DefaultRequestCache' for consistency - Populate empty sections for Settings and Extensions with factual content --- src/site/markdown/cache-configuration.md | 2 +- src/site/markdown/configuring.md | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/site/markdown/cache-configuration.md b/src/site/markdown/cache-configuration.md index 657d4ba60951..814d858521b8 100644 --- a/src/site/markdown/cache-configuration.md +++ b/src/site/markdown/cache-configuration.md @@ -18,7 +18,7 @@ under the License. --> # Maven Cache Configuration Enhancement -This document describes the enhanced cache configuration functionality in Maven's DefaultRequestCache. +This document describes the enhanced cache configuration functionality in DefaultRequestCache. ## Overview diff --git a/src/site/markdown/configuring.md b/src/site/markdown/configuring.md index d0b4470ed8d8..b2c6ef347eda 100644 --- a/src/site/markdown/configuring.md +++ b/src/site/markdown/configuring.md @@ -51,8 +51,8 @@ various parts of the system. The main entry point is the `${maven.home}/conf/maven.properties` properties file. This file, along with any other files loaded from it (see below) are called _Maven properties files_ and are Java properties files with a -few enhancements. Contrary to standard properties file, those files -are UTF-8 encoded. +few enhancements. Unlike standard properties files, these files are +UTF-8 encoded. ### File Inclusion @@ -90,8 +90,16 @@ from `${session.rootDirectory}/.mvn/maven-user.properties`. ## Settings +Settings are configured in the `~/.m2/settings.xml` file (user level) +and `${maven.conf}/settings.xml` (Maven installation level). See +[Settings Reference](./api/maven-api-settings/settings.html) for details. + ## Extensions +Extensions allow you to add additional functionality to Maven. They are +configured in the `~/.m2/extensions.xml` file (user level) and +`${maven.conf}/extensions.xml` (Maven installation level). + ## Maven Command Line Arguments Maven is a command line tool, and, as such, accepts various command From 1964e797ab5cbbe2d7996df2a275fd8d735adda5 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 30 Jul 2026 17:18:34 +0000 Subject: [PATCH 2/6] Fix configuration paths and environment variable name Corrected the reference to the Maven installation configuration path and updated the environment variable terminology. --- src/site/markdown/configuring.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/site/markdown/configuring.md b/src/site/markdown/configuring.md index b2c6ef347eda..88c84179d6d2 100644 --- a/src/site/markdown/configuring.md +++ b/src/site/markdown/configuring.md @@ -91,20 +91,20 @@ from `${session.rootDirectory}/.mvn/maven-user.properties`. ## Settings Settings are configured in the `~/.m2/settings.xml` file (user level) -and `${maven.conf}/settings.xml` (Maven installation level). See +and `${maven.installation.conf}/settings.xml` (Maven installation level). See [Settings Reference](./api/maven-api-settings/settings.html) for details. ## Extensions Extensions allow you to add additional functionality to Maven. They are configured in the `~/.m2/extensions.xml` file (user level) and -`${maven.conf}/extensions.xml` (Maven installation level). +`${maven.installation.conf}/extensions.xml` (Maven installation level). ## Maven Command Line Arguments Maven is a command line tool, and, as such, accepts various command -line arguments. The `MAVEN_ARGS` environment value is used to -provide additional arguments to Maven. Those arguments will be +line arguments. The `MAVEN_ARGS` environment variable is used to +provide additional arguments to Maven. These arguments will be prepended to the actual list of command line arguments. For example, options and goals could be defined with the value From 7564f5253c6594f68cf59edd3594aadc3ce04d52 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 30 Jul 2026 19:33:19 +0000 Subject: [PATCH 3/6] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/site/markdown/configuring.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/site/markdown/configuring.md b/src/site/markdown/configuring.md index 88c84179d6d2..190a61455702 100644 --- a/src/site/markdown/configuring.md +++ b/src/site/markdown/configuring.md @@ -96,9 +96,9 @@ and `${maven.installation.conf}/settings.xml` (Maven installation level). See ## Extensions -Extensions allow you to add additional functionality to Maven. They are -configured in the `~/.m2/extensions.xml` file (user level) and -`${maven.installation.conf}/extensions.xml` (Maven installation level). +Extensions allow you to add additional functionality to Maven. They are +configured in the `~/.m2/extensions.xml` file (user level), +`${session.rootDirectory}/.mvn/extensions.xml` (project level) and `${maven.installation.conf}/extensions.xml` (Maven installation level). ## Maven Command Line Arguments From 10f2dc1c8f6f0d14c5b28dcd149091ce74fa65f8 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 30 Jul 2026 19:33:28 +0000 Subject: [PATCH 4/6] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/site/markdown/configuring.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/site/markdown/configuring.md b/src/site/markdown/configuring.md index 190a61455702..2ca679ea0b16 100644 --- a/src/site/markdown/configuring.md +++ b/src/site/markdown/configuring.md @@ -90,9 +90,9 @@ from `${session.rootDirectory}/.mvn/maven-user.properties`. ## Settings -Settings are configured in the `~/.m2/settings.xml` file (user level) -and `${maven.installation.conf}/settings.xml` (Maven installation level). See -[Settings Reference](./api/maven-api-settings/settings.html) for details. +Settings are configured in the `~/.m2/settings.xml` file (user level), +`${session.rootDirectory}/.mvn/settings.xml` (project level) and +`${maven.installation.conf}/settings.xml` (Maven installation level). See [Settings Reference](./api/maven-api-settings/settings.html) for details. ## Extensions From 5598541873221e75e8fa07c45b367add1995f759 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 30 Jul 2026 19:33:39 +0000 Subject: [PATCH 5/6] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/site/markdown/cache-configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/markdown/cache-configuration.md b/src/site/markdown/cache-configuration.md index 814d858521b8..8014d8401d70 100644 --- a/src/site/markdown/cache-configuration.md +++ b/src/site/markdown/cache-configuration.md @@ -18,7 +18,7 @@ under the License. --> # Maven Cache Configuration Enhancement -This document describes the enhanced cache configuration functionality in DefaultRequestCache. +This document describes the enhanced cache configuration functionality in `DefaultRequestCache`. ## Overview From dbc763387ce829b171f09c2bc2a625568e80f67e Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 30 Jul 2026 19:34:27 +0000 Subject: [PATCH 6/6] oxford comma --- src/site/markdown/configuring.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/site/markdown/configuring.md b/src/site/markdown/configuring.md index 2ca679ea0b16..e888345c6b79 100644 --- a/src/site/markdown/configuring.md +++ b/src/site/markdown/configuring.md @@ -91,14 +91,14 @@ from `${session.rootDirectory}/.mvn/maven-user.properties`. ## Settings Settings are configured in the `~/.m2/settings.xml` file (user level), -`${session.rootDirectory}/.mvn/settings.xml` (project level) and +`${session.rootDirectory}/.mvn/settings.xml` (project level), and `${maven.installation.conf}/settings.xml` (Maven installation level). See [Settings Reference](./api/maven-api-settings/settings.html) for details. ## Extensions Extensions allow you to add additional functionality to Maven. They are configured in the `~/.m2/extensions.xml` file (user level), -`${session.rootDirectory}/.mvn/extensions.xml` (project level) and `${maven.installation.conf}/extensions.xml` (Maven installation level). +`${session.rootDirectory}/.mvn/extensions.xml` (project level), and `${maven.installation.conf}/extensions.xml` (Maven installation level). ## Maven Command Line Arguments