You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/12/16 21:34:51 UTC
[maven] branch MNG-7621 updated (ce8c53d7f -> 2f9a54b02)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7621
in repository https://gitbox.apache.org/repos/asf/maven.git
omit ce8c53d7f [MNG-7621] Parameter '-f' causes ignoring any 'maven.config' (only on Windows)
add ce18c5620 [MNG-7598] Enforce binary backwards-compatibility (#874)
add 9e0cae423 Update soap with 4.x alpha releases
add 4e38415b6 [MNG-7624] Use groupId:artifactId instead of empty goal (#911)
new 2f9a54b02 [MNG-7621] Parameter '-f' causes ignoring any 'maven.config' (only on Windows)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ce8c53d7f)
\
N -- N -- N refs/heads/MNG-7621 (2f9a54b02)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
doap_Maven.rdf | 22 ++
maven-core/pom.xml | 39 ++++
.../DefaultMavenExecutionRequestPopulator.java | 2 +-
.../org/apache/maven/execution/MavenSession.java | 6 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 9 +
.../maven/graph/DefaultProjectDependencyGraph.java | 16 ++
.../maven/lifecycle/DefaultLifecycleExecutor.java | 8 +
.../apache/maven/lifecycle/DefaultLifecycles.java | 13 +-
.../CycleDetectedInPluginGraphException.java | 2 +-
.../maven/plugin/DebugConfigurationListener.java | 9 +
.../apache/maven/plugin/MavenPluginManager.java | 10 +
.../plugin/internal/DefaultMavenPluginManager.java | 6 +
.../org/apache/maven/settings/SettingsUtils.java | 242 ++-------------------
.../{SettingsUtils.java => SettingsUtilsV4.java} | 61 ++++--
.../maven/toolchain/DefaultToolchainsBuilder.java | 4 +-
.../apache/maven/toolchain/ToolchainsBuilder.java | 2 +-
.../settings/PomConstructionWithSettingsTest.java | 2 +-
.../apache/maven/settings/SettingsUtilsTest.java | 4 +-
.../SettingsXmlConfigurationProcessor.java | 2 +-
.../maven/cli/event/ExecutionEventLogger.java | 3 +
maven-plugin-api/pom.xml | 4 +
.../maven/settings/merge/MavenSettingsMerger.java | 2 +
pom.xml | 49 +++++
23 files changed, 265 insertions(+), 252 deletions(-)
copy maven-core/src/main/java/org/apache/maven/settings/{SettingsUtils.java => SettingsUtilsV4.java} (80%)
[maven] 01/01: [MNG-7621] Parameter '-f' causes ignoring any 'maven.config' (only on Windows)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7621
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 2f9a54b0298000d30ba34d44e8818b04a00f86a9
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Dec 8 15:21:40 2022 +0100
[MNG-7621] Parameter '-f' causes ignoring any 'maven.config' (only on Windows)
---
apache-maven/src/assembly/shared/init.cmd | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/apache-maven/src/assembly/shared/init.cmd b/apache-maven/src/assembly/shared/init.cmd
index 019e4b828..e41e093b2 100755
--- a/apache-maven/src/assembly/shared/init.cmd
+++ b/apache-maven/src/assembly/shared/init.cmd
@@ -64,8 +64,9 @@ exit /b
:findBaseDir
cd /d "%WDIR%"
+set "WDIR=%CD%"
:findBaseDirLoop
-if exist "%WDIR%\.mvn" goto baseDirFound
+if exist ".mvn" goto baseDirFound
cd ..
IF "%WDIR%"=="%CD%" goto baseDirNotFound
set "WDIR=%CD%"