apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-27 07:55:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix extension resolution that use jdk activation, fixes #300

Browse Source
This commit is contained in:
Guillaume Nodet
2021-01-06 15:26:01 +01:00
parent 945ad3ef2a
commit f84f1e0c4b
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
View File

@@ -541,6 +541,7 @@ public class DaemonMavenCli {
final Map<String, ConfigurationProcessor> configurationProcessors = container final Map<String, ConfigurationProcessor> configurationProcessors = container
.lookupMap(ConfigurationProcessor.class); .lookupMap(ConfigurationProcessor.class);
final EventSpyDispatcher eventSpyDispatcher = container.lookup(EventSpyDispatcher.class); final EventSpyDispatcher eventSpyDispatcher = container.lookup(EventSpyDispatcher.class);
properties(cliRequest);
configure(cliRequest, eventSpyDispatcher, configurationProcessors); configure(cliRequest, eventSpyDispatcher, configurationProcessors);
populateRequest(cliRequest, cliRequest.request, slf4jLogger, eventSpyDispatcher, populateRequest(cliRequest, cliRequest.request, slf4jLogger, eventSpyDispatcher,
container.lookup(ModelProcessor.class), createTransferListener(cliRequest), loggingSpy); container.lookup(ModelProcessor.class), createTransferListener(cliRequest), loggingSpy);

3
integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExtensionsNativeIT.java
View File

@@ -49,7 +49,8 @@ public class ExtensionsNativeIT {
client.execute(o, "-v").assertSuccess(); client.execute(o, "-v").assertSuccess();
assertDaemonRegistrySize(1); assertDaemonRegistrySize(1);
DaemonInfo daemon = registry.getAll().iterator().next(); DaemonInfo daemon = registry.getAll().iterator().next();
assertTrue(daemon.getOptions().contains("mvnd.coreExtensions=io.takari.aether:takari-local-repository:[0.11.3,)")); assertTrue(daemon.getOptions().contains(
"mvnd.coreExtensions=io.takari.aether:takari-local-repository:[0.11.3,);fr.jcgay.maven:maven-profiler:3.0"));
registry.awaitIdle(daemon.getUid()); registry.awaitIdle(daemon.getUid());

5
integration-tests/src/test/projects/extensions/.mvn/extensions.xml
View File

@@ -22,4 +22,9 @@
<artifactId>takari-local-repository</artifactId> <artifactId>takari-local-repository</artifactId>
<version>[0.11.3,)</version> <version>[0.11.3,)</version>
</extension> </extension>
<extension>
<groupId>fr.jcgay.maven</groupId>
<artifactId>maven-profiler</artifactId>
<version>3.0</version>
</extension>
</extensions> </extensions>