From 25b5117749f8276064ac68880683ea9adf31a785 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 13 Dec 2022 23:00:11 +0100 Subject: [PATCH] Clean up some warnings during the build (#750) --- .../mvnd/common/DaemonRegistryTest.java | 19 +++++ .../maven/project/CachingProjectBuilder.java | 2 +- .../mvnd/builder/DependencyGraph.java | 11 ++- .../mvndaemon/mvnd/builder/SmartBuilder.java | 3 +- .../mvnd/daemon/ClientDispatcher.java | 1 - .../mvnd/interactivity/DaemonPrompter.java | 1 + pom.xml | 77 ++----------------- 7 files changed, 35 insertions(+), 79 deletions(-) diff --git a/common/src/test/java/org/mvndaemon/mvnd/common/DaemonRegistryTest.java b/common/src/test/java/org/mvndaemon/mvnd/common/DaemonRegistryTest.java index 4f50732a..6ec7ef81 100644 --- a/common/src/test/java/org/mvndaemon/mvnd/common/DaemonRegistryTest.java +++ b/common/src/test/java/org/mvndaemon/mvnd/common/DaemonRegistryTest.java @@ -22,8 +22,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; +import java.io.PrintStream; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -34,10 +36,27 @@ import java.util.List; import java.util.Locale; import java.util.Random; import java.util.UUID; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public class DaemonRegistryTest { + private PrintStream oldSysErr; + private PrintStream newSysErr; + + @BeforeEach + void setup() { + oldSysErr = System.err; + newSysErr = new PrintStream(new ByteArrayOutputStream()); + System.setErr(newSysErr); + } + + @AfterEach + void tearDown() { + System.setErr(oldSysErr); + } + @Test public void testReadWrite() throws IOException { Path temp = File.createTempFile("reg", ".data").toPath(); diff --git a/daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java b/daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java index 6dc067bc..07c9a00b 100644 --- a/daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java +++ b/daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java @@ -652,7 +652,7 @@ public class CachingProjectBuilder implements ProjectBuilder { return noErrors; } - @SuppressWarnings("checkstyle:methodlength") + @SuppressWarnings({"checkstyle:methodlength", "deprecation"}) private void initProject( MavenProject project, Map projects, diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java b/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java index a8d7ad2f..e20aaf58 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java @@ -49,10 +49,15 @@ public class DependencyGraph { private final Map> transitiveUpstreams; private final Map> downstreams; + @SuppressWarnings("unchecked") public static DependencyGraph fromMaven(MavenSession session) { - - final ProjectDependencyGraph graph = session.getProjectDependencyGraph(); - return fromMaven(graph); + Map data = session.getRequest().getData(); + DependencyGraph graph = (DependencyGraph) data.get(DependencyGraph.class.getName()); + if (graph == null) { + graph = fromMaven(session.getProjectDependencyGraph()); + data.put(DependencyGraph.class.getName(), graph); + } + return graph; } static DependencyGraph fromMaven(ProjectDependencyGraph graph) { diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/builder/SmartBuilder.java b/daemon/src/main/java/org/mvndaemon/mvnd/builder/SmartBuilder.java index f6410f6f..fad26e32 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/builder/SmartBuilder.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/builder/SmartBuilder.java @@ -99,8 +99,7 @@ public class SmartBuilder implements Builder { session.getRepositorySession().getData().set(ReactorBuildStatus.class, reactorBuildStatus); - DependencyGraph graph = - (DependencyGraph) session.getRequest().getData().get(DependencyGraph.class.getName()); + DependencyGraph graph = DependencyGraph.fromMaven(session); // log overall build info final int degreeOfConcurrency = session.getRequest().getDegreeOfConcurrency(); diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java index eda1c5cd..b44289a0 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java @@ -53,7 +53,6 @@ public class ClientDispatcher extends BuildEventListener { final MavenSession session = event.getSession(); final int degreeOfConcurrency = session.getRequest().getDegreeOfConcurrency(); final DependencyGraph dependencyGraph = DependencyGraph.fromMaven(session); - session.getRequest().getData().put(DependencyGraph.class.getName(), dependencyGraph); final int maxThreads = degreeOfConcurrency == 1 ? 1 : dependencyGraph.computeMaxWidth(degreeOfConcurrency, 1000); diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/interactivity/DaemonPrompter.java b/daemon/src/main/java/org/mvndaemon/mvnd/interactivity/DaemonPrompter.java index 75aa0d3f..f763a6d2 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/interactivity/DaemonPrompter.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/interactivity/DaemonPrompter.java @@ -61,6 +61,7 @@ public class DaemonPrompter extends AbstractInputHandler implements Prompter, In } @Override + @SuppressWarnings("unchecked") public String prompt(String message, List possibleValues, String defaultReply) throws PrompterException { return doPrompt(message, possibleValues, defaultReply, false); } diff --git a/pom.xml b/pom.xml index ba243977..955aabbd 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,6 @@ 3.0.0 3.10.1 2.1.0 - 4.2.rc3 3.3.0 3.1.0 3.4.1 @@ -335,65 +334,6 @@ - - com.mycila - license-maven-plugin - ${license-maven-plugin.version} - - Copyright ${project.inceptionYear} 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. - - **/*.adoc - **/README.* - **/.cache/** - **/.gitkeep - **/mvnd.properties.template - **/m2.conf - **/mvnd - **/mvnDebug - **/.mvn/maven.config - **/.mvn/jvm.config - .gitattributes/ - .git-blame-ignore-revs - .mvn/maven.config - .mvn/wrapper/ - LICENSE.txt - NOTICE.txt - mvnw - mvnw.cmd - pom.xml.versionsBackup - **/*.so - **/*.dll - **/*.jnilib - **/Makefile* - **/docker/** - **/*.tpl - - - SCRIPT_STYLE - SLASHSTAR_STYLE - SLASHSTAR_STYLE - SCRIPT_STYLE - SCRIPT_STYLE - SCRIPT_STYLE - APOSTROPHE_STYLE - - true - - true - - ca.vanzyl.provisio.maven.plugins provisio-maven-plugin @@ -474,6 +414,11 @@ limitations under the License. @{project.version} + + org.apache.maven.plugins + maven-site-plugin + 3.12.1 + @@ -488,18 +433,6 @@ limitations under the License. - - com.mycila - license-maven-plugin - - - - format - - process-sources - - - org.codehaus.gmavenplus gmavenplus-plugin