Skip to content

Commit

Permalink
[2.x] Pre-release tidy-up (#1011)
Browse files Browse the repository at this point in the history 
Changes:
* no source change
* (build) expel all versions from child modules: they must be all top level depMgmt or pluginMgmt
* (build) Top POM contains GAVs while child modules GA+scope. This tremendously simplifies maintenance.
* (javadoc) fix Javadoc errors
* (build) remove obsolete profiles and mr-JARs, project is 17+

Updates:
* maven wrapper 3.3.2 w/ scripts
  • Loading branch information
@cstamas
cstamas authored Jun 13, 2024
1 parent d3cc476 commit bc61f64
Show file tree
Hide file tree
Showing 16 changed files with 107 additions and 236 deletions.
3 changes: 2 additions & 1 deletion .mvn/wrapper/maven-wrapper.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions agent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@
<name>Maven Daemon - Agent</name>

<dependencies>

<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>

</dependencies>

<build>
Expand Down
28 changes: 0 additions & 28 deletions build-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,6 @@
<packaging>maven-plugin</packaging>
<name>Maven Daemon - Documentation Maven Plugin</name>

<properties>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>

<roaster.version>2.29.0.Final</roaster.version>
<maven.version>3.9.6</maven.version>
<maven.plugin-tools.version>3.13.0</maven.plugin-tools.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>${maven.plugin-tools.version}</version>
</dependency>

</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand All @@ -70,9 +45,7 @@
<dependency>
<groupId>org.jboss.forge.roaster</groupId>
<artifactId>roaster-jdt</artifactId>
<version>${roaster.version}</version>
</dependency>

</dependencies>

<build>
Expand All @@ -81,7 +54,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>${maven.plugin-tools.version}</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
120 changes: 10 additions & 110 deletions common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
</properties>

<dependencies>

<dependency>
<groupId>org.jline</groupId>
<artifactId>jline-terminal</artifactId>
Expand Down Expand Up @@ -68,7 +67,6 @@
<plugin>
<groupId>org.apache.maven.daemon</groupId>
<artifactId>mvnd-build-maven-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -78,6 +76,16 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<fork>true</fork>
<compilerArgs>
<arg>-XDignore.symbol.file</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand All @@ -92,112 +100,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>jdk11-15</id>
<activation>
<jdk>[11,15)</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<fork>true</fork>
<compilerArgs>
<arg>-XDignore.symbol.file</arg>
</compilerArgs>
</configuration>
</execution>
<execution>
<id>jdk11</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<fork>true</fork>
<compilerArgs>
<arg>-XDignore.symbol.file</arg>
</compilerArgs>
<release>11</release>
<multiReleaseOutput>true</multiReleaseOutput>
<compileSourceRoots>
<root>${project.basedir}/src/main/java11</root>
</compileSourceRoots>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jdk16+</id>
<activation>
<jdk>[16,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<fork>true</fork>
<compilerArgs>
<arg>-XDignore.symbol.file</arg>
</compilerArgs>
</configuration>
</execution>
<execution>
<id>jdk11</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<fork>true</fork>
<compilerArgs>
<arg>-XDignore.symbol.file</arg>
</compilerArgs>
<release>11</release>
<multiReleaseOutput>true</multiReleaseOutput>
<compileSourceRoots>
<root>${project.basedir}/src/main/java11</root>
</compileSourceRoots>
</configuration>
</execution>
<execution>
<id>jdk16</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<fork>true</fork>
<compilerArgs>
<arg>-XDignore.symbol.file</arg>
</compilerArgs>
<release>16</release>
<multiReleaseOutput>true</multiReleaseOutput>
<compileSourceRoots>
<root>${project.basedir}/src/main/java16</root>
</compileSourceRoots>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion common/src/main/java/org/mvndaemon/mvnd/common/InterpolationHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public static void performSubstitution(
* <p>
* This method performs property variable substitution on the
* specified value. If the specified value contains the syntax
* <tt>${&lt;prop-name&gt;}</tt>, where <tt>&lt;prop-name&gt;</tt>
* {@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
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private static void exec(String[] cmd, final List<String> 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;
Expand Down
4 changes: 3 additions & 1 deletion common/src/main/java/org/mvndaemon/mvnd/common/ProcessHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,7 @@

public class ProcessHelper {

public static void killChildrenProcesses() {}
public static void killChildrenProcesses() {
ProcessHandle.current().descendants().forEach(ProcessHandle::destroy);
}
}
8 changes: 5 additions & 3 deletions common/src/main/java/org/mvndaemon/mvnd/common/SocketHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
26 changes: 0 additions & 26 deletions common/src/main/java11/org/mvndaemon/mvnd/common/ProcessHelper.java
View file

This file was deleted.

41 changes: 0 additions & 41 deletions common/src/main/java16/org/mvndaemon/mvnd/common/SocketHelper.java
View file

This file was deleted.

3 changes: 0 additions & 3 deletions daemon/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,11 @@
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
<version>${sisu.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>6.0.0</version>
</dependency>

<dependency>
Expand Down
1 change: 0 additions & 1 deletion dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}</preinstall.artifacts>

<testcontainers.version>1.19.8</testcontainers.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -85,13 +83,11 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion logging/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>add-unpacked-source-dir</id>
Expand Down
Loading

0 comments on commit bc61f64

Please sign in to comment.