From e72dd5be4a8e400352edef059f57ab1f03c52b38 Mon Sep 17 00:00:00 2001 From: Hitesh Date: Sat, 13 Jun 2026 19:38:51 +0530 Subject: [PATCH 1/5] MNG-11966: Update lifecycles reference to point to LifecycleRegistry --- impl/maven-core/src/site/apt/lifecycles.apt.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/impl/maven-core/src/site/apt/lifecycles.apt.vm b/impl/maven-core/src/site/apt/lifecycles.apt.vm index d5c132476af7..18d990922006 100644 --- a/impl/maven-core/src/site/apt/lifecycles.apt.vm +++ b/impl/maven-core/src/site/apt/lifecycles.apt.vm @@ -25,7 +25,7 @@ Lifecycles Reference - Maven defines 3 lifecycles in {{{./apidocs/org/apache/maven/lifecycle/providers/package-summary.html}<<>>}} package: + Maven defines 3 lifecycles, which are registered in {{{./apidocs/org/apache/maven/api/services/LifecycleRegistry.html}<<>>}}: %{toc|fromDepth=2} From 5bc436c5f20807cca90f2aa597a98f77a91af780 Mon Sep 17 00:00:00 2001 From: Hitesh Date: Sun, 14 Jun 2026 16:56:54 +0530 Subject: [PATCH 2/5] [MNG-11966] Disable remote repository filtering in Verifier helper calls --- .../src/main/java/org/apache/maven/it/Verifier.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java index 20b784a617a2..d19292141407 100644 --- a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java +++ b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java @@ -868,7 +868,10 @@ public String getArtifactPath(String gid, String aid, String version, String ext } private ExecutorRequest.Builder executorRequest() { - return ExecutorRequest.mavenBuilder().userHomeDirectory(userHomeDirectory); + return ExecutorRequest.mavenBuilder() + .userHomeDirectory(userHomeDirectory) + .argument("-Daether.remoteRepositoryFilter.groupId=false") + .argument("-Daether.remoteRepositoryFilter.prefixes=false"); } private String getSupportArtifactPath(String artifact) { From db8736bd01856df37b94fc7444c0d96060e9c2c2 Mon Sep 17 00:00:00 2001 From: Hitesh Date: Tue, 16 Jun 2026 11:32:18 +0530 Subject: [PATCH 3/5] [MNG-11966] Strip UTF-8 BOM in JvmConfigParser --- apache-maven/src/assembly/maven/bin/JvmConfigParser.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apache-maven/src/assembly/maven/bin/JvmConfigParser.java b/apache-maven/src/assembly/maven/bin/JvmConfigParser.java index 41b87569dca1..5b7a7a195b92 100644 --- a/apache-maven/src/assembly/maven/bin/JvmConfigParser.java +++ b/apache-maven/src/assembly/maven/bin/JvmConfigParser.java @@ -94,7 +94,14 @@ public static void main(String[] args) { static String parseJvmConfig(Path jvmConfigPath, String mavenProjectBasedir) throws IOException { StringBuilder result = new StringBuilder(); + boolean firstLine = true; for (String line : Files.readAllLines(jvmConfigPath, StandardCharsets.UTF_8)) { + if (firstLine) { + if (line.startsWith("\uFEFF")) { + line = line.substring(1); + } + firstLine = false; + } line = processLine(line, mavenProjectBasedir); if (line.isEmpty()) { continue; From 93e209c8d8c0bc8764bb7d3d6f2dc06d3e14fd79 Mon Sep 17 00:00:00 2001 From: Hitesh Date: Tue, 16 Jun 2026 14:06:17 +0530 Subject: [PATCH 4/5] Revert "[MNG-11966] Disable remote repository filtering in Verifier helper calls" This reverts commit 5bc436c5f20807cca90f2aa597a98f77a91af780. --- .../src/main/java/org/apache/maven/it/Verifier.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java index d19292141407..20b784a617a2 100644 --- a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java +++ b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java @@ -868,10 +868,7 @@ public String getArtifactPath(String gid, String aid, String version, String ext } private ExecutorRequest.Builder executorRequest() { - return ExecutorRequest.mavenBuilder() - .userHomeDirectory(userHomeDirectory) - .argument("-Daether.remoteRepositoryFilter.groupId=false") - .argument("-Daether.remoteRepositoryFilter.prefixes=false"); + return ExecutorRequest.mavenBuilder().userHomeDirectory(userHomeDirectory); } private String getSupportArtifactPath(String artifact) { From 191164ea3b2a045092e2f606309808f3b66e4924 Mon Sep 17 00:00:00 2001 From: Hitesh Date: Tue, 16 Jun 2026 15:20:27 +0530 Subject: [PATCH 5/5] Revert BOM stripping in JvmConfigParser.java --- apache-maven/src/assembly/maven/bin/JvmConfigParser.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/apache-maven/src/assembly/maven/bin/JvmConfigParser.java b/apache-maven/src/assembly/maven/bin/JvmConfigParser.java index 5b7a7a195b92..41b87569dca1 100644 --- a/apache-maven/src/assembly/maven/bin/JvmConfigParser.java +++ b/apache-maven/src/assembly/maven/bin/JvmConfigParser.java @@ -94,14 +94,7 @@ public static void main(String[] args) { static String parseJvmConfig(Path jvmConfigPath, String mavenProjectBasedir) throws IOException { StringBuilder result = new StringBuilder(); - boolean firstLine = true; for (String line : Files.readAllLines(jvmConfigPath, StandardCharsets.UTF_8)) { - if (firstLine) { - if (line.startsWith("\uFEFF")) { - line = line.substring(1); - } - firstLine = false; - } line = processLine(line, mavenProjectBasedir); if (line.isEmpty()) { continue;