apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-10-14 06:07:33 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Bug: extension handling (#1282)

Browse Source 
mvnd still had mvn3 like code, just drop it and let base parser
do the work. All the mvnd needs is filtering.

Discriminating based on XML file hashes.

Fixes #1280
This commit is contained in:
Tamas Cservenak
2025-03-07 19:02:57 +01:00
committed by GitHub
parent bb1191e4c6
commit c4b5656d19
3 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
daemon/src/main/java/org/apache/maven/cli/DaemonMavenParser.java
View File

@@ -18,13 +18,7 @@
*/
package org.apache.maven.cli;
import javax.xml.stream.XMLStreamException;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -35,7 +29,6 @@ import java.util.stream.Collectors;
import org.apache.commons.cli.ParseException;
import org.apache.maven.api.cli.extensions.CoreExtension;
import org.apache.maven.api.cli.mvn.MavenOptions;
import org.apache.maven.cling.internal.extension.io.CoreExtensionsStaxReader;
import org.apache.maven.cling.invoker.mvn.MavenParser;
import org.mvndaemon.mvnd.common.Environment;
@@ -57,34 +50,14 @@ public class DaemonMavenParser extends MavenParser {
}
@Override
protected List<CoreExtension> readCoreExtensionsDescriptor(LocalContext context) {
String coreExtensionsFilePath = Environment.MVND_CORE_EXTENSIONS_FILE_PATH.asString();
if (!coreExtensionsFilePath.isEmpty()) {
try {
return readCoreExtensionsDescriptor(Path.of(coreExtensionsFilePath));
} catch (Exception e) {
throw new RuntimeException(e);
}
} else {
return new ArrayList<>();
}
protected List<CoreExtension> readCoreExtensionsDescriptorFromFile(Path extensionsFile) {
return filterCoreExtensions(super.readCoreExtensionsDescriptorFromFile(extensionsFile));
}
private List<CoreExtension> readCoreExtensionsDescriptor(Path extensionsFile)
throws IOException, XMLStreamException {
CoreExtensionsStaxReader parser = new CoreExtensionsStaxReader();
List<CoreExtension> extensions;
try (InputStream is = Files.newInputStream(extensionsFile)) {
extensions = parser.read(is).getExtensions();
}
return filterCoreExtensions(extensions);
}
private static List<CoreExtension> filterCoreExtensions(List<CoreExtension> coreExtensions) {
protected static List<CoreExtension> filterCoreExtensions(List<CoreExtension> coreExtensions) {
String exclusionsString = Environment.MVND_CORE_EXTENSIONS_EXCLUDE.asString();
Set<String> exclusions = Arrays.stream(exclusionsString.split(","))
.filter(e -> e != null && !e.trim().isEmpty())
.filter(e -> !e.trim().isEmpty())
.collect(Collectors.toSet());
if (!exclusions.isEmpty()) {
return coreExtensions.stream()