From 4bb5c5d5b533938d7710eeb08ac1aff5800e29d5 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 14 Dec 2021 18:20:34 +0100 Subject: [PATCH] Fix resident extensions (#531) --- .../org/apache/maven/cli/DaemonMavenCli.java | 3 + .../mvnd/it/ResidentExtensionsTest.java | 72 +++++++++++++++ .../mvndaemon/mvnd/junit/TestParameters.java | 4 + .../project1/.mvn/maven.config | 3 + .../resident-extensions/project1/pom.xml | 87 +++++++++++++++++++ .../project2/.mvn/maven.config | 3 + .../resident-extensions/project2/pom.xml | 80 +++++++++++++++++ 7 files changed, 252 insertions(+) create mode 100644 integration-tests/src/test/java/org/mvndaemon/mvnd/it/ResidentExtensionsTest.java create mode 100644 integration-tests/src/test/projects/resident-extensions/project1/.mvn/maven.config create mode 100644 integration-tests/src/test/projects/resident-extensions/project1/pom.xml create mode 100644 integration-tests/src/test/projects/resident-extensions/project2/.mvn/maven.config create mode 100644 integration-tests/src/test/projects/resident-extensions/project2/pom.xml diff --git a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java index 18fa1387..90975e84 100644 --- a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java +++ b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java @@ -227,7 +227,9 @@ public class DaemonMavenCli { public int doMain(CliRequest cliRequest, Map clientEnv) throws Exception { Properties props = (Properties) System.getProperties().clone(); + ClassLoader tccl = Thread.currentThread().getContextClassLoader(); try { + Thread.currentThread().setContextClassLoader(container.getContainerRealm()); initialize(cliRequest); environment(cliRequest.workingDirectory, clientEnv); cli(cliRequest); @@ -247,6 +249,7 @@ public class DaemonMavenCli { } finally { System.setProperties(props); eventSpyDispatcher.close(); + Thread.currentThread().setContextClassLoader(tccl); } } diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ResidentExtensionsTest.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ResidentExtensionsTest.java new file mode 100644 index 00000000..58fd27c7 --- /dev/null +++ b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ResidentExtensionsTest.java @@ -0,0 +1,72 @@ +/* + * Copyright 2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.mvndaemon.mvnd.it; + +import java.io.IOException; +import java.nio.file.Path; +import javax.inject.Inject; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mvndaemon.mvnd.assertj.TestClientOutput; +import org.mvndaemon.mvnd.junit.ClientFactory; +import org.mvndaemon.mvnd.junit.MvndTest; +import org.mvndaemon.mvnd.junit.TestParameters; +import org.mvndaemon.mvnd.junit.TestRegistry; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@MvndTest(projectDir = "src/test/projects/resident-extensions") +public class ResidentExtensionsTest { + + @Inject + ClientFactory clientFactory; + + @Inject + TestRegistry registry; + + @Inject + TestParameters parameters; + + @Test + void verify() throws IOException, InterruptedException { + TestClientOutput o1 = new TestClientOutput(); + Path prj1 = parameters.getTestDir().resolve("project/project1"); + clientFactory + .newClient(parameters.withMavenMultiModuleProjectDirectory(prj1).cd(prj1)) + .execute(o1, "verify", "-X", "-B").assertSuccess(); + assertTrue(o1.getMessages().stream() + .map(Object::toString) + .anyMatch(s -> s.contains("Writing maven timeline"))); + assertDaemonRegistrySize(1); + + TestClientOutput o2 = new TestClientOutput(); + Path prj2 = parameters.getTestDir().resolve("project/project2"); + clientFactory + .newClient(parameters.withMavenMultiModuleProjectDirectory(prj2).cd(prj2)) + .execute(o2, "verify", "-e", "-B").assertSuccess(); + assertFalse(o2.getMessages().stream() + .map(Object::toString) + .anyMatch(s -> s.contains("Writing maven timeline"))); + assertDaemonRegistrySize(1); + } + + private void assertDaemonRegistrySize(int size) { + Assertions.assertThat(registry.getAll().size()) + .as("Daemon registry size should be " + size) + .isEqualTo(size); + } +} diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestParameters.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestParameters.java index 309a8ae4..523aff02 100644 --- a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestParameters.java +++ b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestParameters.java @@ -49,6 +49,10 @@ public class TestParameters extends DaemonParameters { return derive(b -> b.put(Environment.MAVEN_MULTIMODULE_PROJECT_DIRECTORY, null)); } + public DaemonParameters withMavenMultiModuleProjectDirectory(Path dir) { + return derive(b -> b.put(Environment.MAVEN_MULTIMODULE_PROJECT_DIRECTORY, dir.toString())); + } + public Path getTestDir() { return testDir; } diff --git a/integration-tests/src/test/projects/resident-extensions/project1/.mvn/maven.config b/integration-tests/src/test/projects/resident-extensions/project1/.mvn/maven.config new file mode 100644 index 00000000..4230c241 --- /dev/null +++ b/integration-tests/src/test/projects/resident-extensions/project1/.mvn/maven.config @@ -0,0 +1,3 @@ +-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 +-Dmaven.wagon.http.retryHandler.requestSentEnabled=true +-Dmaven.wagon.http.retryHandler.count=10 diff --git a/integration-tests/src/test/projects/resident-extensions/project1/pom.xml b/integration-tests/src/test/projects/resident-extensions/project1/pom.xml new file mode 100644 index 00000000..d207a037 --- /dev/null +++ b/integration-tests/src/test/projects/resident-extensions/project1/pom.xml @@ -0,0 +1,87 @@ + + + + 4.0.0 + org.mvndaemon.mvnd.test.resident-extensions + project1 + 0.0.1-SNAPSHOT + jar + + + UTF-8 + 1.8 + 1.8 + + 2.5 + 3.8.0 + 2.4 + 2.6 + 2.22.2 + + + + + org.junit.jupiter + junit-jupiter-engine + 5.6.2 + test + + + + + + + io.takari.maven + maven-timeline + 1.6 + + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + \ No newline at end of file diff --git a/integration-tests/src/test/projects/resident-extensions/project2/.mvn/maven.config b/integration-tests/src/test/projects/resident-extensions/project2/.mvn/maven.config new file mode 100644 index 00000000..4230c241 --- /dev/null +++ b/integration-tests/src/test/projects/resident-extensions/project2/.mvn/maven.config @@ -0,0 +1,3 @@ +-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 +-Dmaven.wagon.http.retryHandler.requestSentEnabled=true +-Dmaven.wagon.http.retryHandler.count=10 diff --git a/integration-tests/src/test/projects/resident-extensions/project2/pom.xml b/integration-tests/src/test/projects/resident-extensions/project2/pom.xml new file mode 100644 index 00000000..7b4a1a90 --- /dev/null +++ b/integration-tests/src/test/projects/resident-extensions/project2/pom.xml @@ -0,0 +1,80 @@ + + + + 4.0.0 + org.mvndaemon.mvnd.test.resident-extensions + project2 + 0.0.1-SNAPSHOT + jar + + + UTF-8 + 1.8 + 1.8 + + 2.5 + 3.8.0 + 2.4 + 2.6 + 2.22.2 + + + + + org.junit.jupiter + junit-jupiter-engine + 5.6.2 + test + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + \ No newline at end of file