diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index fb18c86c8..23c7e5999 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -15,4 +15,5 @@ # specific language governing permissions and limitations # under the License. wrapperVersion=3.3.2 -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip diff --git a/agent/pom.xml b/agent/pom.xml index 636fff2a9..c40734ad4 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -31,12 +31,10 @@ Maven Daemon - Agent - org.javassist javassist - diff --git a/build-plugin/pom.xml b/build-plugin/pom.xml index 922fbc353..854ba1664 100644 --- a/build-plugin/pom.xml +++ b/build-plugin/pom.xml @@ -30,31 +30,6 @@ maven-plugin Maven Daemon - Documentation Maven Plugin - - 11 - 11 - - 2.29.0.Final - 3.9.6 - 3.13.0 - - - - - - org.apache.maven - maven-plugin-api - ${maven.version} - - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${maven.plugin-tools.version} - - - - - org.apache.maven @@ -70,9 +45,7 @@ org.jboss.forge.roaster roaster-jdt - ${roaster.version} - @@ -81,7 +54,6 @@ org.apache.maven.plugins maven-plugin-plugin - ${maven.plugin-tools.version} diff --git a/common/pom.xml b/common/pom.xml index fbc261d66..c16436d68 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -36,7 +36,6 @@ - org.jline jline-terminal @@ -68,7 +67,6 @@ org.apache.maven.daemon mvnd-build-maven-plugin - ${project.version} @@ -78,6 +76,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + true + + -XDignore.symbol.file + + + org.apache.maven.plugins maven-jar-plugin @@ -92,112 +100,4 @@ - - - jdk11-15 - - [11,15) - - - - - maven-compiler-plugin - - - default-compile - - compile - - - true - - -XDignore.symbol.file - - - - - jdk11 - - compile - - - true - - -XDignore.symbol.file - - 11 - true - - ${project.basedir}/src/main/java11 - - - - - - - - - - jdk16+ - - [16,) - - - - - maven-compiler-plugin - - - default-compile - - compile - - - true - - -XDignore.symbol.file - - - - - jdk11 - - compile - - - true - - -XDignore.symbol.file - - 11 - true - - ${project.basedir}/src/main/java11 - - - - - jdk16 - - compile - - - true - - -XDignore.symbol.file - - 16 - true - - ${project.basedir}/src/main/java16 - - - - - - - - - - diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/InterpolationHelper.java b/common/src/main/java/org/mvndaemon/mvnd/common/InterpolationHelper.java index 138b0cbde..e8301a894 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/InterpolationHelper.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/InterpolationHelper.java @@ -75,7 +75,7 @@ public static void performSubstitution( *

* This method performs property variable substitution on the * specified value. If the specified value contains the syntax - * ${<prop-name>}, where <prop-name> + * {@code ${prop-name}}, where {@code prop-name} * refers to either a configuration property or a system property, * then the corresponding property value is substituted for the variable * placeholder. Multiple variable placeholders may exist in the diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java b/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java index 0c591d676..460b9aa9e 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java @@ -138,7 +138,7 @@ private static void exec(String[] cmd, final List output) { /** * A simple wrapper over {@link Process} that manages its destroying and offers Java 8-like - * {@link #waitFor(long, TimeUnit, String[])} with timeout. + * {@link #waitFor(long)} with timeout. */ public static class CommandProcess implements AutoCloseable { public static final int TIMEOUT_EXIT_CODE = Integer.MIN_VALUE + 42; diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/ProcessHelper.java b/common/src/main/java/org/mvndaemon/mvnd/common/ProcessHelper.java index 97bbd7fa5..875bbda48 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/ProcessHelper.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/ProcessHelper.java @@ -20,5 +20,7 @@ public class ProcessHelper { - public static void killChildrenProcesses() {} + public static void killChildrenProcesses() { + ProcessHandle.current().descendants().forEach(ProcessHandle::destroy); + } } diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/SocketHelper.java b/common/src/main/java/org/mvndaemon/mvnd/common/SocketHelper.java index 96b1dbbcd..e5671f900 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/SocketHelper.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/SocketHelper.java @@ -20,20 +20,22 @@ import java.io.IOException; import java.net.SocketAddress; +import java.net.StandardProtocolFamily; +import java.net.UnixDomainSocketAddress; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; public class SocketHelper { public static SocketChannel openUnixSocket() throws IOException { - throw new UnsupportedOperationException("Unix sockets are supported only on JDK >= 16"); + return SocketChannel.open(StandardProtocolFamily.UNIX); } public static ServerSocketChannel openUnixServerSocket() throws IOException { - throw new UnsupportedOperationException("Unix sockets are supported only on JDK >= 16"); + return ServerSocketChannel.open(StandardProtocolFamily.UNIX).bind(null, 0); } public static SocketAddress unixSocketAddressOf(String s) { - throw new UnsupportedOperationException("Unix sockets are supported only on JDK >= 16"); + return UnixDomainSocketAddress.of(s); } } diff --git a/common/src/main/java11/org/mvndaemon/mvnd/common/ProcessHelper.java b/common/src/main/java11/org/mvndaemon/mvnd/common/ProcessHelper.java deleted file mode 100644 index 875bbda48..000000000 --- a/common/src/main/java11/org/mvndaemon/mvnd/common/ProcessHelper.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.common; - -public class ProcessHelper { - - public static void killChildrenProcesses() { - ProcessHandle.current().descendants().forEach(ProcessHandle::destroy); - } -} diff --git a/common/src/main/java16/org/mvndaemon/mvnd/common/SocketHelper.java b/common/src/main/java16/org/mvndaemon/mvnd/common/SocketHelper.java deleted file mode 100644 index e5671f900..000000000 --- a/common/src/main/java16/org/mvndaemon/mvnd/common/SocketHelper.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.common; - -import java.io.IOException; -import java.net.SocketAddress; -import java.net.StandardProtocolFamily; -import java.net.UnixDomainSocketAddress; -import java.nio.channels.ServerSocketChannel; -import java.nio.channels.SocketChannel; - -public class SocketHelper { - - public static SocketChannel openUnixSocket() throws IOException { - return SocketChannel.open(StandardProtocolFamily.UNIX); - } - - public static ServerSocketChannel openUnixServerSocket() throws IOException { - return ServerSocketChannel.open(StandardProtocolFamily.UNIX).bind(null, 0); - } - - public static SocketAddress unixSocketAddressOf(String s) { - return UnixDomainSocketAddress.of(s); - } -} diff --git a/daemon/pom.xml b/daemon/pom.xml index 2575fd01a..122952490 100644 --- a/daemon/pom.xml +++ b/daemon/pom.xml @@ -94,14 +94,11 @@ org.eclipse.sisu org.eclipse.sisu.inject - ${sisu.version} - compile com.google.inject guice - 6.0.0 diff --git a/dist/pom.xml b/dist/pom.xml index cdf46b1cd..c88c3e5ee 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -59,7 +59,6 @@ com.google.inject guice - 6.0.0 provided diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index cec7352f4..e0d19b486 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -40,8 +40,6 @@ org/junit/platform/junit-platform-commons/${junit-platform-launcher.version} org/junit/jupiter/junit-jupiter/${junit.jupiter.version} org/junit/jupiter/junit-jupiter-api/${junit.jupiter.version} - - 1.19.8 @@ -85,13 +83,11 @@ org.testcontainers testcontainers - ${testcontainers.version} test org.testcontainers junit-jupiter - ${testcontainers.version} test diff --git a/logging/pom.xml b/logging/pom.xml index ad76eed16..960153dfd 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -97,7 +97,6 @@ org.codehaus.mojo build-helper-maven-plugin - 3.6.0 add-unpacked-source-dir diff --git a/native/pom.xml b/native/pom.xml index 63032e03a..cc7cd9589 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -28,10 +28,6 @@ jar Maven Daemon - Native Library - - 4.7.6 - - org.junit.jupiter @@ -46,7 +42,6 @@ info.picocli picocli-codegen - ${picocli.version} test diff --git a/pom.xml b/pom.xml index a6d42918d..9aa8d4433 100644 --- a/pom.xml +++ b/pom.xml @@ -90,6 +90,7 @@ 2.0.0-alpha-11 2.0.11 0.9.0.M2 + 3.13.1 3.2.0 @@ -99,9 +100,12 @@ 1.0.25 3.30.2-GA - 1.4.20 + 4.7.6 1.3 + 2.29.0.Final 0.6.6 + 1.19.8 + 1.4.20 @@ -148,6 +152,11 @@ ${jakarta.inject.version} + + org.apache.maven + maven-plugin-api + ${maven.version} + org.apache.maven maven-model @@ -175,6 +184,11 @@ bin tar.gz + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${maven.plugin-tools.version} + org.apache.maven.resolver @@ -262,11 +276,33 @@ ${project.version} + + io.takari.maven + takari-smart-builder + ${takari-smart-builder.version} + + org.eclipse.sisu org.eclipse.sisu.inject ${sisu.version} + + org.eclipse.sisu + org.eclipse.sisu.plexus + ${sisu.version} + + + com.google.inject + guice + 6.0.0 + + + com.google.guava + guava + 33.2.1-jre + provided + org.jline @@ -289,6 +325,12 @@ ${jline.version} + + info.picocli + picocli-codegen + ${picocli.version} + + org.slf4j log4j-over-slf4j @@ -304,6 +346,11 @@ jul-to-slf4j ${slf4j.version} + + org.jboss.forge.roaster + roaster-jdt + ${roaster.version} + org.javassist @@ -323,15 +370,14 @@ - io.takari.maven - takari-smart-builder - ${takari-smart-builder.version} + org.testcontainers + testcontainers + ${testcontainers.version} - com.google.guava - guava - 33.2.0-jre - provided + org.testcontainers + junit-jupiter + ${testcontainers.version} @@ -339,6 +385,11 @@ + + org.apache.maven.daemon + mvnd-build-maven-plugin + ${project.version} + com.diffplug.spotless spotless-maven-plugin @@ -416,6 +467,26 @@ native-maven-plugin ${graalvm.plugin.version} + + + org.apache.maven.plugins + maven-dependency-plugin + 3.7.0 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.7.0 + + ${maven-dist.required.jdk} + false + + + + org.apache.maven.plugins + maven-plugin-plugin + ${maven.plugin-tools.version} + org.apache.maven.plugins maven-release-plugin @@ -435,6 +506,12 @@ maven-wrapper-plugin 3.3.2 + + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.0 + org.codehaus.mojo exec-maven-plugin