apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-11 05:30:08 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Move client classes into a separate module

Browse Source
This commit is contained in:
Peter Palaga
2020-05-29 15:42:01 +02:00
parent 8d70da739e
commit 4f2c0fb215
49 changed files with 354 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
client/pom.xml Normal file
View File

@@ -0,0 +1,62 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.fuse.mvnd</groupId>
<artifactId>mvnd</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
<artifactId>mvnd-client</artifactId>
<packaging>jar</packaging>
<name>Maven Daemon - Client</name>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline-terminal</artifactId>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline-terminal-jansi</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>io.takari.maven.plugins</groupId>
<artifactId>takari-lifecycle-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>sisu-index</goal>
</goals>
<phase>process-classes</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/BufferCaster.java → client/src/main/java/org/jboss/fuse/mvnd/client/BufferCaster.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.nio.Buffer;

38
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Client.java → client/src/main/java/org/jboss/fuse/mvnd/client/Client.java
View File

@@ -13,9 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
package org.jboss.fuse.mvnd.client;
import java.io.IOException;
import java.io.InputStream;
@@ -28,13 +26,14 @@ import java.util.List;
import java.util.Optional;
import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import org.apache.maven.cli.CLIReportingUtils;
import org.jboss.fuse.mvnd.daemon.ClientOutput.TerminalOutput;
import org.jboss.fuse.mvnd.daemon.Message.BuildEvent;
import org.jboss.fuse.mvnd.daemon.Message.BuildException;
import org.jboss.fuse.mvnd.daemon.Message.BuildMessage;
import org.jboss.fuse.mvnd.daemon.Message.MessageSerializer;
import org.fusesource.jansi.Ansi;
import org.jboss.fuse.mvnd.client.ClientOutput.TerminalOutput;
import org.jboss.fuse.mvnd.client.Message.BuildEvent;
import org.jboss.fuse.mvnd.client.Message.BuildException;
import org.jboss.fuse.mvnd.client.Message.BuildMessage;
import org.jboss.fuse.mvnd.client.Message.MessageSerializer;
import org.jboss.fuse.mvnd.jpm.Process;
import org.jboss.fuse.mvnd.jpm.ProcessImpl;
import org.jboss.fuse.mvnd.jpm.ScriptUtils;
@@ -45,6 +44,10 @@ public class Client {
private static final Logger LOGGER = LoggerFactory.getLogger(Client.class);
public static final String DAEMON_DEBUG = "daemon.debug";
public static final String DAEMON_IDLE_TIMEOUT = "daemon.idleTimeout";
public static final int DEFAULT_IDLE_TIMEOUT = (int) TimeUnit.HOURS.toMillis(3);
public static final int DEFAULT_PERIODIC_CHECK_INTERVAL_MILLIS = 10 * 1000;
public static final int CANCEL_TIMEOUT = 10 * 1000;
private final Layout layout;
private final Optional<ClientLayout> clientLayout;
@@ -82,7 +85,7 @@ public class Client {
final List<String> args = new ArrayList<>(argv);
// Print version if needed
boolean version = args.remove("-v") || args.remove("-version") || args.remove("--version");
boolean version = args.contains("-v") || args.contains("-version") || args.contains("--version");
boolean showVersion = args.contains("-V") || args.contains("--show-version");
boolean debug = args.contains("-X") || args.contains("--debug");
if (version || showVersion || debug) {
@@ -90,13 +93,9 @@ public class Client {
try (InputStream is = Client.class.getResourceAsStream("build.properties")) {
props.load(is);
}
String v = buffer().strong("Maven Daemon " + props.getProperty("version")).toString()
+ System.getProperty("line.separator")
+ CLIReportingUtils.showVersion();
String v = Ansi.ansi().bold().a("Maven Daemon " + props.getProperty("version")).reset().toString();
output.log(v);
if (version) {
return new ClientResult<O>(argv, true, output);
}
/* Do not return, rather pass -v to the server so that the client module does not need to depend on any Maven artifacts */
}
final Path javaHome = layout.javaHome();
@@ -207,7 +206,7 @@ public class Client {
Path workingDir = layout.userDir();
String command = "";
try {
String url = ServerMain.class.getClassLoader().getResource(Server.class.getName().replace('.', '/') + ".class").toString();
String url = Client.class.getClassLoader().getResource(Client.class.getName().replace('.', '/') + ".class").toString();
String classpath = url.substring("file:jar:".length(), url.indexOf('!'));
String java = ScriptUtils.isWindows() ? "bin\\java.exe" : "bin/java";
List<String> args = new ArrayList<>();
@@ -221,8 +220,9 @@ public class Client {
args.add("-Dlogback.configurationFile=logback.xml");
args.add("-Ddaemon.uid=" + uid);
args.add("-Xmx4g");
if (System.getProperty(Server.DAEMON_IDLE_TIMEOUT) != null) {
args.add("-D" + Server.DAEMON_IDLE_TIMEOUT + "=" + System.getProperty(Server.DAEMON_IDLE_TIMEOUT));
final String timeout = System.getProperty(DAEMON_IDLE_TIMEOUT);
if (timeout != null) {
args.add("-D" + DAEMON_IDLE_TIMEOUT + "=" + timeout);
}
args.add("\"-Dmaven.multiModuleProjectDirectory=" + layout.multiModuleProjectDirectory().toString() + "\"");

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/ClientLayout.java → client/src/main/java/org/jboss/fuse/mvnd/client/ClientLayout.java
View File

@@ -1,4 +1,4 @@
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.nio.file.Path;
import java.util.Objects;

7
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/ClientOutput.java → client/src/main/java/org/jboss/fuse/mvnd/client/ClientOutput.java
View File

@@ -1,4 +1,4 @@
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.io.IOException;
import java.io.Writer;
@@ -11,8 +11,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.function.Consumer;
import org.apache.commons.cli.UnrecognizedOptionException;
import org.jboss.fuse.mvnd.daemon.Message.BuildException;
import org.jboss.fuse.mvnd.client.Message.BuildException;
import org.jline.terminal.Size;
import org.jline.terminal.Terminal;
import org.jline.terminal.TerminalBuilder;
@@ -109,7 +108,7 @@ public interface ClientOutput extends AutoCloseable {
display.update(Collections.emptyList(), 0);
final AttributedStyle s = new AttributedStyle().bold().foreground(AttributedStyle.RED);
final String msg;
if (UnrecognizedOptionException.class.getName().equals(error.getClassName())) {
if ("org.apache.commons.cli.UnrecognizedOptionException".equals(error.getClassName())) {
msg = "Unable to parse command line options: " + error.getMessage();
} else {
msg = error.getClassName() + ": " + error.getMessage();

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/ClientResult.java → client/src/main/java/org/jboss/fuse/mvnd/client/ClientResult.java
View File

@@ -1,4 +1,4 @@
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.util.ArrayList;
import java.util.List;

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonClientConnection.java → client/src/main/java/org/jboss/fuse/mvnd/client/DaemonClientConnection.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonCompatibilitySpec.java → client/src/main/java/org/jboss/fuse/mvnd/client/DaemonCompatibilitySpec.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.nio.file.Paths;

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonConnection.java → client/src/main/java/org/jboss/fuse/mvnd/client/DaemonConnection.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.io.Closeable;
import java.io.DataInputStream;

4
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonConnector.java → client/src/main/java/org/jboss/fuse/mvnd/client/DaemonConnector.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.net.InetSocketAddress;
import java.net.Socket;
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.lang.Thread.sleep;
import static org.jboss.fuse.mvnd.daemon.DaemonState.Canceled;
import static org.jboss.fuse.mvnd.client.DaemonState.Canceled;
public class DaemonConnector {

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonDiagnostics.java → client/src/main/java/org/jboss/fuse/mvnd/client/DaemonDiagnostics.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.io.BufferedReader;
import java.io.IOException;

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonException.java → client/src/main/java/org/jboss/fuse/mvnd/client/DaemonException.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
public class DaemonException extends RuntimeException {

14
client/src/main/java/org/jboss/fuse/mvnd/client/DaemonExpirationStatus.java Normal file
View File

@@ -0,0 +1,14 @@
package org.jboss.fuse.mvnd.client;
/**
* Expiration status for daemon expiration check results.
* Note that order here is important, higher ordinal statuses
* take precedent over lower ordinal statuses when aggregating
* results.
*/
public enum DaemonExpirationStatus {
DO_NOT_EXPIRE,
QUIET_EXPIRE,
GRACEFUL_EXPIRE,
IMMEDIATE_EXPIRE;
}

8
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonInfo.java → client/src/main/java/org/jboss/fuse/mvnd/client/DaemonInfo.java
View File

@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import static org.jboss.fuse.mvnd.client.DaemonState.Busy;
import static org.jboss.fuse.mvnd.client.DaemonState.Idle;
import java.util.List;
import static org.jboss.fuse.mvnd.daemon.DaemonState.Busy;
import static org.jboss.fuse.mvnd.daemon.DaemonState.Idle;
public class DaemonInfo {
private final String uid;

9
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonRegistry.java → client/src/main/java/org/jboss/fuse/mvnd/client/DaemonRegistry.java
View File

@@ -14,7 +14,10 @@
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import static org.jboss.fuse.mvnd.client.DaemonState.Canceled;
import static org.jboss.fuse.mvnd.client.DaemonState.Idle;
import java.io.File;
import java.io.IOException;
@@ -37,15 +40,11 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
import org.jboss.fuse.mvnd.daemon.DaemonExpiration.DaemonExpirationStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sun.misc.Unsafe;
import sun.nio.ch.DirectBuffer;
import static org.jboss.fuse.mvnd.daemon.DaemonState.Canceled;
import static org.jboss.fuse.mvnd.daemon.DaemonState.Idle;
/**
* Access to daemon registry files. Useful also for testing.

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonStarter.java → client/src/main/java/org/jboss/fuse/mvnd/client/DaemonStarter.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
public interface DaemonStarter {

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonState.java → client/src/main/java/org/jboss/fuse/mvnd/client/DaemonState.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
public enum DaemonState {

4
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonStopEvent.java → client/src/main/java/org/jboss/fuse/mvnd/client/DaemonStopEvent.java
View File

@@ -14,15 +14,13 @@
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.io.Serializable;
import java.text.DateFormat;
import java.util.Date;
import java.util.Objects;
import org.jboss.fuse.mvnd.daemon.DaemonExpiration.DaemonExpirationStatus;
/**
* Information regarding when and why a daemon was stopped.
*/

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Layout.java → client/src/main/java/org/jboss/fuse/mvnd/client/Layout.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.nio.file.Path;
import java.nio.file.Paths;

44
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Message.java → client/src/main/java/org/jboss/fuse/mvnd/client/Message.java
View File

@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.UTFDataFormatException;
import java.util.ArrayList;
import java.util.List;
import org.codehaus.plexus.util.ExceptionUtils;
public abstract class Message {
final long timestamp = System.nanoTime();
long timestamp() {
public long timestamp() {
return timestamp;
}
@@ -72,7 +72,13 @@ public abstract class Message {
final String stackTrace;
public BuildException(Throwable t) {
this(t.getMessage(), t.getClass().getName(), ExceptionUtils.getStackTrace(t));
this(t.getMessage(), t.getClass().getName(), getStackTrace(t));
}
static String getStackTrace(Throwable t) {
StringWriter sw = new StringWriter();
t.printStackTrace(new PrintWriter(sw, true));
return sw.toString();
}
public BuildException(String message, String className, String stackTrace) {
@@ -104,7 +110,7 @@ public abstract class Message {
}
public static class BuildEvent extends Message {
enum Type {
public enum Type {
BuildStarted, BuildStopped, ProjectStarted, ProjectStopped, MojoStarted, MojoStopped
}
final Type type;
@@ -286,7 +292,7 @@ public abstract class Message {
final int a = byteBuf[i++] & 0xff;
if (a < 0x80) {
// low bit clear
chars[charIdx ++] = (char) a;
chars[charIdx++] = (char) a;
} else if (a < 0xc0) {
throw new UTFDataFormatException(INVALID_BYTE);
} else if (a < 0xe0) {
@@ -297,11 +303,11 @@ public abstract class Message {
}
i = 0;
}
final int b = byteBuf[i ++] & 0xff;
final int b = byteBuf[i++] & 0xff;
if ((b & 0xc0) != 0x80) {
throw new UTFDataFormatException(INVALID_BYTE);
}
chars[charIdx ++] = (char) ((a & 0x1f) << 6 | b & 0x3f);
chars[charIdx++] = (char) ((a & 0x1f) << 6 | b & 0x3f);
} else if (a < 0xf0) {
if (i == cnt) {
cnt = input.read(byteBuf, 0, Math.min(UTF_BUFS_BYTE_CNT, len - charIdx));
@@ -310,7 +316,7 @@ public abstract class Message {
}
i = 0;
}
final int b = byteBuf[i ++] & 0xff;
final int b = byteBuf[i++] & 0xff;
if ((b & 0xc0) != 0x80) {
throw new UTFDataFormatException(INVALID_BYTE);
}
@@ -321,11 +327,11 @@ public abstract class Message {
}
i = 0;
}
final int c = byteBuf[i ++] & 0xff;
final int c = byteBuf[i++] & 0xff;
if ((c & 0xc0) != 0x80) {
throw new UTFDataFormatException(INVALID_BYTE);
}
chars[charIdx ++] = (char) ((a & 0x0f) << 12 | (b & 0x3f) << 6 | c & 0x3f);
chars[charIdx++] = (char) ((a & 0x0f) << 12 | (b & 0x3f) << 6 | c & 0x3f);
} else {
throw new UTFDataFormatException(INVALID_BYTE);
}
@@ -339,16 +345,16 @@ public abstract class Message {
int strIdx = 0;
int byteIdx = 0;
while (strIdx < length) {
final char c = s.charAt(strIdx ++);
final char c = s.charAt(strIdx++);
if (c > 0 && c <= 0x7f) {
byteBuf[byteIdx ++] = (byte) c;
byteBuf[byteIdx++] = (byte) c;
} else if (c <= 0x07ff) {
byteBuf[byteIdx ++] = (byte)(0xc0 | 0x1f & c >> 6);
byteBuf[byteIdx ++] = (byte)(0x80 | 0x3f & c);
byteBuf[byteIdx++] = (byte) (0xc0 | 0x1f & c >> 6);
byteBuf[byteIdx++] = (byte) (0x80 | 0x3f & c);
} else {
byteBuf[byteIdx ++] = (byte)(0xe0 | 0x0f & c >> 12);
byteBuf[byteIdx ++] = (byte)(0x80 | 0x3f & c >> 6);
byteBuf[byteIdx ++] = (byte)(0x80 | 0x3f & c);
byteBuf[byteIdx++] = (byte) (0xe0 | 0x0f & c >> 12);
byteBuf[byteIdx++] = (byte) (0x80 | 0x3f & c >> 6);
byteBuf[byteIdx++] = (byte) (0x80 | 0x3f & c);
}
if (byteIdx > UTF_BUFS_BYTE_CNT - 4) {
output.write(byteBuf, 0, byteIdx);

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Serializer.java → client/src/main/java/org/jboss/fuse/mvnd/client/Serializer.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.io.DataInputStream;
import java.io.DataOutputStream;

2
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/ServerMain.java → client/src/main/java/org/jboss/fuse/mvnd/client/ServerMain.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.jboss.fuse.mvnd.client;
import java.net.MalformedURLException;
import java.net.URL;

0
daemon/src/main/java/org/jboss/fuse/mvnd/jpm/Process.java → client/src/main/java/org/jboss/fuse/mvnd/jpm/Process.java
View File

0
daemon/src/main/java/org/jboss/fuse/mvnd/jpm/ProcessImpl.java → client/src/main/java/org/jboss/fuse/mvnd/jpm/ProcessImpl.java
View File

0
daemon/src/main/java/org/jboss/fuse/mvnd/jpm/ScriptUtils.java → client/src/main/java/org/jboss/fuse/mvnd/jpm/ScriptUtils.java
View File

0
daemon/src/main/resources/org/jboss/fuse/mvnd/daemon/build.properties → client/src/main/resources/org/jboss/fuse/mvnd/client/build.properties
View File

0
daemon/src/main/resources/org/jboss/fuse/mvnd/jpm/unix/start.sh → client/src/main/resources/org/jboss/fuse/mvnd/jpm/unix/start.sh
View File

0
daemon/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/destroy.vbs → client/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/destroy.vbs
View File

0
daemon/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/running.vbs → client/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/running.vbs
View File

0
daemon/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/start.vbs → client/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/start.vbs
View File

9
daemon/src/test/java/org/jboss/fuse/mvnd/daemon/DaemonRegistryTest.java → client/src/test/java/org/jboss/fuse/mvnd/daemon/DaemonRegistryTest.java
View File

@@ -22,10 +22,13 @@ import java.util.Arrays;
import java.util.Locale;
import java.util.Random;
import org.junit.Test;
import org.jboss.fuse.mvnd.client.DaemonInfo;
import org.jboss.fuse.mvnd.client.DaemonRegistry;
import org.jboss.fuse.mvnd.client.DaemonState;
import org.junit.jupiter.api.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class DaemonRegistryTest {

62
daemon/pom.xml
View File

@@ -14,72 +14,49 @@
<name>Maven Daemon</name>
<dependencies>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>
<artifactId>mvnd-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>io.takari.aether</groupId>
<artifactId>takari-local-repository</artifactId>
<version>${takariLocalRepositoryVersion}</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logbackVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline-terminal</artifactId>
<version>${jlineVersion}</version>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline-terminal-jansi</artifactId>
<version>${jlineVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovyVersion}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junitVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.takari.maven.plugins</groupId>
<artifactId>takari-plugin-testing</artifactId>
<version>${pluginTestingVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.takari.maven.plugins</groupId>
<artifactId>takari-plugin-integration-testing</artifactId>
<version>${pluginTestingVersion}</version>
<type>pom</type>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -95,7 +72,6 @@
<plugin>
<groupId>io.takari.maven.plugins</groupId>
<artifactId>takari-lifecycle-plugin</artifactId>
<version>${takariLifecycleVersion}</version>
<executions>
<execution>
<goals>
@@ -105,19 +81,9 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${mavenCompilerPluginVersion}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>io.takari.maven.plugins</groupId>
<artifactId>provisio-maven-plugin</artifactId>
<version>${takariProvisioVersion}</version>
<executions>
<execution>
<id>maven-distro</id>
@@ -131,22 +97,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<includes>**/*IT.java</includes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

2
daemon/src/main/distro/bin/mvnd
View File

@@ -104,7 +104,7 @@ fi
DAEMON_JAR=`echo "${MVND_HOME}"/lib/ext/*.jar "${MVND_HOME}"/lib/*.jar`
DAEMON_JAR=$(echo $DAEMON_JAR | sed -e 's/ /:/g')
DAEMON_LAUNCHER=org.jboss.fuse.mvnd.daemon.Client
DAEMON_LAUNCHER=org.jboss.fuse.mvnd.client.Client
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then

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

@@ -89,6 +89,7 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
import org.codehaus.plexus.logging.LoggerManager;
import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.transfer.TransferListener;
import org.jboss.fuse.mvnd.logging.smart.AbstractLoggingSpy;
import org.slf4j.ILoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -165,8 +166,8 @@ public class DaemonMavenCli
cli(cliRequest);
properties(cliRequest);
logging(cliRequest);
version( cliRequest );
configure(cliRequest);
version( cliRequest );
toolchains(cliRequest);
populateRequest( cliRequest );
encryption( cliRequest );
@@ -274,11 +275,6 @@ public class DaemonMavenCli
throw new ExitException( 0 );
}
if ( cliRequest.commandLine.hasOption( CLIManager.VERSION ) )
{
System.out.println( CLIReportingUtils.showVersion() );
throw new ExitException( 0 );
}
}
private CommandLine cliMerge( CommandLine mavenArgs, CommandLine mavenConfig )
@@ -391,11 +387,14 @@ public class DaemonMavenCli
}
private void version( CliRequest cliRequest )
private void version( CliRequest cliRequest ) throws ExitException
{
if ( cliRequest.debug || cliRequest.commandLine.hasOption( CLIManager.SHOW_VERSION ) )
if ( cliRequest.debug || cliRequest.commandLine.hasOption( CLIManager.VERSION ) )
{
System.out.println( CLIReportingUtils.showVersion() );
AbstractLoggingSpy.instance().append(null, CLIReportingUtils.showVersion());
if (cliRequest.commandLine.hasOption( CLIManager.VERSION )) {
throw new ExitException( 0 );
}
}
}

24
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonExpiration.java
View File

@@ -23,10 +23,15 @@ import java.util.Objects;
import java.util.function.ToLongFunction;
import java.util.stream.Collectors;
import org.jboss.fuse.mvnd.client.DaemonCompatibilitySpec;
import org.jboss.fuse.mvnd.client.DaemonExpirationStatus;
import org.jboss.fuse.mvnd.client.DaemonInfo;
import org.jboss.fuse.mvnd.client.DaemonState;
import static org.jboss.fuse.mvnd.client.DaemonExpirationStatus.DO_NOT_EXPIRE;
import static org.jboss.fuse.mvnd.client.DaemonExpirationStatus.GRACEFUL_EXPIRE;
import static org.jboss.fuse.mvnd.client.DaemonExpirationStatus.QUIET_EXPIRE;
import static org.jboss.fuse.mvnd.daemon.DaemonExpiration.DaemonExpirationResult.NOT_TRIGGERED;
import static org.jboss.fuse.mvnd.daemon.DaemonExpiration.DaemonExpirationStatus.DO_NOT_EXPIRE;
import static org.jboss.fuse.mvnd.daemon.DaemonExpiration.DaemonExpirationStatus.GRACEFUL_EXPIRE;
import static org.jboss.fuse.mvnd.daemon.DaemonExpiration.DaemonExpirationStatus.QUIET_EXPIRE;
public class DaemonExpiration {
@@ -225,17 +230,4 @@ public class DaemonExpiration {
}
}
/**
* Expiration status for daemon expiration check results.
* Note that order here is important, higher ordinal statuses
* take precedent over lower ordinal statuses when aggregating
* results.
*/
public enum DaemonExpirationStatus {
DO_NOT_EXPIRE,
QUIET_EXPIRE,
GRACEFUL_EXPIRE,
IMMEDIATE_EXPIRE;
}
}

51
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java
View File

@@ -15,6 +15,10 @@
*/
package org.jboss.fuse.mvnd.daemon;
import static org.jboss.fuse.mvnd.client.DaemonState.Busy;
import static org.jboss.fuse.mvnd.client.DaemonState.StopRequested;
import static org.jboss.fuse.mvnd.client.DaemonState.Stopped;
import java.io.IOException;
import java.lang.reflect.Field;
import java.net.InetSocketAddress;
@@ -37,31 +41,30 @@ import java.util.concurrent.locks.ReentrantLock;
import org.apache.maven.cli.CliRequest;
import org.apache.maven.cli.CliRequestBuilder;
import org.apache.maven.cli.DaemonMavenCli;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonConnection;
import org.jboss.fuse.mvnd.client.DaemonException;
import org.jboss.fuse.mvnd.client.DaemonExpirationStatus;
import org.jboss.fuse.mvnd.client.DaemonInfo;
import org.jboss.fuse.mvnd.client.DaemonRegistry;
import org.jboss.fuse.mvnd.client.DaemonState;
import org.jboss.fuse.mvnd.client.DaemonStopEvent;
import org.jboss.fuse.mvnd.client.Layout;
import org.jboss.fuse.mvnd.client.Message;
import org.jboss.fuse.mvnd.client.Message.BuildEvent;
import org.jboss.fuse.mvnd.client.Message.BuildException;
import org.jboss.fuse.mvnd.client.Message.BuildMessage;
import org.jboss.fuse.mvnd.client.Message.BuildRequest;
import org.jboss.fuse.mvnd.client.Message.MessageSerializer;
import org.jboss.fuse.mvnd.client.Message.BuildEvent.Type;
import org.jboss.fuse.mvnd.daemon.DaemonExpiration.DaemonExpirationResult;
import org.jboss.fuse.mvnd.daemon.DaemonExpiration.DaemonExpirationStatus;
import org.jboss.fuse.mvnd.daemon.DaemonExpiration.DaemonExpirationStrategy;
import org.jboss.fuse.mvnd.daemon.Message.BuildEvent;
import org.jboss.fuse.mvnd.daemon.Message.BuildEvent.Type;
import org.jboss.fuse.mvnd.daemon.Message.BuildException;
import org.jboss.fuse.mvnd.daemon.Message.BuildMessage;
import org.jboss.fuse.mvnd.daemon.Message.BuildRequest;
import org.jboss.fuse.mvnd.daemon.Message.MessageSerializer;
import org.jboss.fuse.mvnd.logging.smart.AbstractLoggingSpy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.jboss.fuse.mvnd.daemon.DaemonState.Busy;
import static org.jboss.fuse.mvnd.daemon.DaemonState.StopRequested;
import static org.jboss.fuse.mvnd.daemon.DaemonState.Stopped;
public class Server implements AutoCloseable, Runnable {
public static final String DAEMON_IDLE_TIMEOUT = "daemon.idleTimeout";
public static final int DEFAULT_IDLE_TIMEOUT = (int) TimeUnit.HOURS.toMillis(3);
public static final int DEFAULT_PERIODIC_CHECK_INTERVAL_MILLIS = 10 * 1000;
public static final int CANCEL_TIMEOUT = 10 * 1000;
private static final Logger LOGGER = LoggerFactory.getLogger(Server.class);
@@ -88,10 +91,10 @@ public class Server implements AutoCloseable, Runnable {
socket = ServerSocketChannel.open().bind(new InetSocketAddress(0));
int idleTimeout;
if (System.getProperty(DAEMON_IDLE_TIMEOUT) != null) {
idleTimeout = Integer.parseInt(System.getProperty(DAEMON_IDLE_TIMEOUT));
if (System.getProperty(Client.DAEMON_IDLE_TIMEOUT) != null) {
idleTimeout = Integer.parseInt(System.getProperty(Client.DAEMON_IDLE_TIMEOUT));
} else {
idleTimeout = DEFAULT_IDLE_TIMEOUT;
idleTimeout = Client.DEFAULT_IDLE_TIMEOUT;
}
executor = Executors.newScheduledThreadPool(1);
strategy = DaemonExpiration.master();
@@ -334,7 +337,7 @@ public class Server implements AutoCloseable, Runnable {
}
private void cancelNow() {
long time = System.currentTimeMillis() + CANCEL_TIMEOUT;
long time = System.currentTimeMillis() + Client.CANCEL_TIMEOUT;
// LOGGER.debug("Cancel requested: will wait for daemon to become idle.");
// try {
@@ -382,9 +385,9 @@ public class Server implements AutoCloseable, Runnable {
try {
LOGGER.info("Executing request");
CliRequest req = new CliRequestBuilder()
.arguments(buildRequest.args)
.workingDirectory(Paths.get(buildRequest.workingDir))
.projectDirectory(Paths.get(buildRequest.projectDir))
.arguments(buildRequest.getArgs())
.workingDirectory(Paths.get(buildRequest.getWorkingDir()))
.projectDirectory(Paths.get(buildRequest.getProjectDir()))
.build();
PriorityBlockingQueue<Message> queue = new PriorityBlockingQueue<Message>(64,

6
daemon/src/main/provisio/maven-distro.xml
View File

@@ -1,14 +1,14 @@
<assembly>
<artifactSet to="/">
<artifact id="org.apache.maven:apache-maven:tar.gz:bin:${mavenVersion}">
<artifact id="org.apache.maven:apache-maven:tar.gz:bin">
<unpack useRoot="false"
excludes="lib/slf4j*,conf/logging/*,lib/maven-slf4j-provider*"/>
</artifact>
</artifactSet>
<artifactSet to="lib">
<artifact id="org.apache.maven:maven-embedder:${mavenVersion}"/>
<artifact id="org.apache.maven:maven-embedder"/>
<artifactSet to="ext" ref="runtime.classpath"/>
</artifactSet>
@@ -16,7 +16,7 @@
<directory path="${basedir}/src/main/distro"/>
</fileSet>
<archive name="maven-distro-${mavenVersion}-${project.version}.tar.gz"
<archive name="mvnd-dist-${maven.version}-${project.version}.tar.gz"
executable="**/bin/mvn,**/bin/mvnd,**/bin/mvnDebug,**/bin/mvnyjp"/>
</assembly>

4
daemon/src/test/java/org/jboss/fuse/mvnd/builder/AbstractSmartBuilderTest.java
View File

@@ -5,11 +5,11 @@ import java.util.Collection;
import java.util.HashSet;
import org.apache.maven.project.MavenProject;
import org.junit.Assert;
import org.junit.jupiter.api.Assertions;
abstract class AbstractSmartBuilderTest {
protected void assertProjects(Collection<MavenProject> actual, MavenProject... expected) {
Assert.assertEquals(new HashSet<MavenProject>(Arrays.asList(expected)), new HashSet<>(actual));
Assertions.assertEquals(new HashSet<MavenProject>(Arrays.asList(expected)), new HashSet<>(actual));
}
protected MavenProject newProject(String artifactId) {

6
daemon/src/test/java/org/jboss/fuse/mvnd/builder/DependencyGraphTest.java
View File

@@ -20,8 +20,8 @@ import java.util.HashSet;
import java.util.stream.Collectors;
import org.apache.maven.project.MavenProject;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class DependencyGraphTest extends AbstractSmartBuilderTest {
@@ -31,7 +31,7 @@ public class DependencyGraphTest extends AbstractSmartBuilderTest {
TestProjectDependencyGraph graph = new TestProjectDependencyGraph(a, b, c);
graph.addDependency(b, a);
DependencyGraph<MavenProject> dp = DependencyGraph.fromMaven(graph, "a before c");
Assert.assertEquals(new HashSet<>(Arrays.asList(b, c)),
Assertions.assertEquals(new HashSet<>(Arrays.asList(b, c)),
dp.getDownstreamProjects(a).collect(Collectors.toSet()));
}
}

16
daemon/src/test/java/org/jboss/fuse/mvnd/builder/ProjectComparatorTest.java
View File

@@ -7,8 +7,8 @@ import java.util.Queue;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.maven.project.MavenProject;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import static org.jboss.fuse.mvnd.builder.ProjectComparator.id;
@@ -28,9 +28,9 @@ public class ProjectComparatorTest extends AbstractSmartBuilderTest {
queue.add(b);
queue.add(c);
Assert.assertEquals(a, queue.poll());
Assert.assertEquals(c, queue.poll());
Assert.assertEquals(b, queue.poll());
Assertions.assertEquals(a, queue.poll());
Assertions.assertEquals(c, queue.poll());
Assertions.assertEquals(b, queue.poll());
}
@Test
@@ -52,9 +52,9 @@ public class ProjectComparatorTest extends AbstractSmartBuilderTest {
queue.add(b);
queue.add(c);
Assert.assertEquals(c, queue.poll());
Assert.assertEquals(a, queue.poll());
Assert.assertEquals(b, queue.poll());
Assertions.assertEquals(c, queue.poll());
Assertions.assertEquals(a, queue.poll());
Assertions.assertEquals(b, queue.poll());
}
}

6
daemon/src/test/java/org/jboss/fuse/mvnd/builder/ProjectExecutorServiceTest.java
View File

@@ -11,8 +11,8 @@ import java.util.concurrent.atomic.AtomicLong;
import com.google.common.util.concurrent.Monitor;
import org.apache.maven.project.MavenProject;
import org.jboss.fuse.mvnd.builder.ProjectExecutorService.ProjectRunnable;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import static org.jboss.fuse.mvnd.builder.ProjectComparator.id;
@@ -70,7 +70,7 @@ public class ProjectExecutorServiceTest extends AbstractSmartBuilderTest {
executor.resume();
executor.awaitShutdown();
Assert.assertEquals(Arrays.asList(a, c, a, b), executed);
Assertions.assertEquals(Arrays.asList(a, c, a, b), executed);
}
// copy&paste from ThreadPoolExecutor javadoc (use of Guava is a nice touch there)

16
daemon/src/test/java/org/jboss/fuse/mvnd/builder/ReactorBuildQueueTest.java
View File

@@ -1,8 +1,8 @@
package org.jboss.fuse.mvnd.builder;
import org.apache.maven.project.MavenProject;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class ReactorBuildQueueTest extends AbstractSmartBuilderTest {
@@ -16,10 +16,10 @@ public class ReactorBuildQueueTest extends AbstractSmartBuilderTest {
ReactorBuildQueue schl = new ReactorBuildQueue(graph.getSortedProjects(), dp);
assertProjects(schl.getRootProjects(), a, c);
Assert.assertFalse(schl.isEmpty());
Assertions.assertFalse(schl.isEmpty());
assertProjects(schl.onProjectFinish(a), b);
Assert.assertTrue(schl.isEmpty());
Assertions.assertTrue(schl.isEmpty());
}
@Test
@@ -31,7 +31,7 @@ public class ReactorBuildQueueTest extends AbstractSmartBuilderTest {
ReactorBuildQueue schl = new ReactorBuildQueue(graph.getSortedProjects(), dp);
assertProjects(schl.getRootProjects(), a, b, c);
Assert.assertTrue(schl.isEmpty());
Assertions.assertTrue(schl.isEmpty());
}
@Test
@@ -45,12 +45,12 @@ public class ReactorBuildQueueTest extends AbstractSmartBuilderTest {
ReactorBuildQueue schl = new ReactorBuildQueue(graph.getSortedProjects(), dp);
assertProjects(schl.getRootProjects(), a, c);
Assert.assertFalse(schl.isEmpty());
Assertions.assertFalse(schl.isEmpty());
assertProjects(schl.onProjectFinish(a), new MavenProject[0]);
Assert.assertFalse(schl.isEmpty());
Assertions.assertFalse(schl.isEmpty());
assertProjects(schl.onProjectFinish(c), b);
Assert.assertTrue(schl.isEmpty());
Assertions.assertTrue(schl.isEmpty());
}
}

6
daemon/src/test/java/org/jboss/fuse/mvnd/builder/TestProjectDependencyGraph.java
View File

@@ -8,7 +8,7 @@ import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.project.MavenProject;
import org.junit.Assert;
import org.junit.jupiter.api.Assertions;
public class TestProjectDependencyGraph implements ProjectDependencyGraph {
@@ -36,13 +36,13 @@ public class TestProjectDependencyGraph implements ProjectDependencyGraph {
@Override
public List<MavenProject> getDownstreamProjects(MavenProject project, boolean transitive) {
Assert.assertFalse("not implemented", transitive);
Assertions.assertFalse(transitive, "not implemented");
return downstream.get(project);
}
@Override
public List<MavenProject> getUpstreamProjects(MavenProject project, boolean transitive) {
Assert.assertFalse("not implemented", transitive);
Assertions.assertFalse(transitive, "not implemented");
return upstream.get(project);
}

8
integration-tests/src/test/java/org/jboss/fuse/mvnd/it/MultiModuleTest.java
View File

@@ -10,10 +10,10 @@ import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.assertj.EqualsInOrderAmongOthers;
import org.jboss.fuse.mvnd.assertj.MatchInOrderAmongOthers;
import org.jboss.fuse.mvnd.daemon.Client;
import org.jboss.fuse.mvnd.daemon.ClientLayout;
import org.jboss.fuse.mvnd.daemon.ClientOutput;
import org.jboss.fuse.mvnd.daemon.Layout;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.ClientLayout;
import org.jboss.fuse.mvnd.client.ClientOutput;
import org.jboss.fuse.mvnd.client.Layout;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;

8
integration-tests/src/test/java/org/jboss/fuse/mvnd/it/SingleModuleTest.java
View File

@@ -9,10 +9,10 @@ import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.assertj.MatchInOrderAmongOthers;
import org.jboss.fuse.mvnd.daemon.Client;
import org.jboss.fuse.mvnd.daemon.ClientLayout;
import org.jboss.fuse.mvnd.daemon.ClientOutput;
import org.jboss.fuse.mvnd.daemon.Layout;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.ClientLayout;
import org.jboss.fuse.mvnd.client.ClientOutput;
import org.jboss.fuse.mvnd.client.Layout;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;

10
integration-tests/src/test/java/org/jboss/fuse/mvnd/it/StopStatusTest.java
View File

@@ -10,11 +10,11 @@ import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.assertj.core.api.Condition;
import org.jboss.fuse.mvnd.assertj.MatchInOrderAmongOthers;
import org.jboss.fuse.mvnd.daemon.Client;
import org.jboss.fuse.mvnd.daemon.ClientOutput;
import org.jboss.fuse.mvnd.daemon.DaemonInfo;
import org.jboss.fuse.mvnd.daemon.DaemonRegistry;
import org.jboss.fuse.mvnd.daemon.DaemonState;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.ClientOutput;
import org.jboss.fuse.mvnd.client.DaemonInfo;
import org.jboss.fuse.mvnd.client.DaemonRegistry;
import org.jboss.fuse.mvnd.client.DaemonState;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;

12
integration-tests/src/test/java/org/jboss/fuse/mvnd/it/VersionTest.java
View File

@@ -6,8 +6,9 @@ import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.assertj.MatchInOrderAmongOthers;
import org.jboss.fuse.mvnd.daemon.Client;
import org.jboss.fuse.mvnd.daemon.ClientOutput;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.ClientOutput;
import org.jboss.fuse.mvnd.client.Layout;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
@@ -19,6 +20,9 @@ public class VersionTest {
@Inject
Client client;
@Inject
Layout layout;
@Test
void version() throws IOException {
final ClientOutput output = Mockito.mock(ClientOutput.class);
@@ -29,6 +33,8 @@ public class VersionTest {
Mockito.verify(output, Mockito.atLeast(1)).log(logMessage.capture());
Assertions.assertThat(logMessage.getAllValues())
.is(new MatchInOrderAmongOthers<>("Maven Daemon " + System.getProperty("project.version")));
.is(new MatchInOrderAmongOthers<>(
"\\QMaven Daemon " + System.getProperty("project.version") + "\\E",
"\\QMaven home: " + layout.mavenHome() + "\\E"));
}
}

10
integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java
View File

@@ -12,11 +12,11 @@ import java.util.Objects;
import java.util.Optional;
import java.util.stream.Stream;
import org.jboss.fuse.mvnd.daemon.Client;
import org.jboss.fuse.mvnd.daemon.DaemonInfo;
import org.jboss.fuse.mvnd.daemon.DaemonRegistry;
import org.jboss.fuse.mvnd.daemon.Layout;
import org.jboss.fuse.mvnd.daemon.ClientLayout;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.ClientLayout;
import org.jboss.fuse.mvnd.client.DaemonInfo;
import org.jboss.fuse.mvnd.client.DaemonRegistry;
import org.jboss.fuse.mvnd.client.Layout;
import org.jboss.fuse.mvnd.jpm.ProcessImpl;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;

111
pom.xml
View File

@@ -15,33 +15,48 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<!-- dependency versions a..z -->
<assertj.version>3.16.1</assertj.version>
<groovyVersion>3.0.0</groovyVersion>
<groovy.version>3.0.0</groovy.version>
<jakarta.inject.version>1.0</jakarta.inject.version>
<jlineVersion>3.12.1</jlineVersion>
<junitVersion>4.12</junitVersion>
<jline.version>3.12.1</jline.version>
<junit.jupiter.version>5.6.0</junit.jupiter.version>
<logbackVersion>1.2.3</logbackVersion>
<mavenVersion>3.6.3</mavenVersion>
<logback.version>1.2.3</logback.version>
<maven.version>3.6.3</maven.version>
<mockito.version>3.3.3</mockito.version>
<pluginTestingVersion>2.9.2</pluginTestingVersion>
<slf4jVersion>1.7.25</slf4jVersion>
<takariLifecycleVersion>1.13.9</takariLifecycleVersion>
<takariProvisioVersion>0.1.56</takariProvisioVersion>
<takariLocalRepositoryVersion>0.11.2</takariLocalRepositoryVersion>
<mavenCompilerPluginVersion>3.8.1</mavenCompilerPluginVersion>
<slf4j.version>1.7.25</slf4j.version>
<takari-local-repository.version>0.11.2</takari-local-repository.version>
<!-- plugin versions a..z -->
<compiler.version>3.8.1</compiler.version>
<mrm.version>1.2.0</mrm.version>
<surefire.version>3.0.0-M4</surefire.version>
<takari-lifecycle.version>1.13.9</takari-lifecycle.version>
<takari-provisio.version>0.1.56</takari-provisio.version>
</properties>
<modules>
<module>client</module>
<module>daemon</module>
<module>integration-tests</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
@@ -50,45 +65,107 @@
<type>pom</type>
</dependency>
<dependency>
<groupId>io.takari.aether</groupId>
<artifactId>takari-local-repository</artifactId>
<version>${takari-local-repository.version}</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta.inject.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>apache-maven</artifactId>
<type>tar.gz</type>
<classifier>bin</classifier>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>
<artifactId>mvnd-client</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>
<artifactId>mvnd-daemon</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>
<artifactId>mvnd-junit5</artifactId>
<version>0.1-SNAPSHOT</version>
<groupId>org.jline</groupId>
<artifactId>jline-terminal</artifactId>
<version>${jline.version}</version>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline-terminal-jansi</artifactId>
<version>${jline.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>io.takari.maven.plugins</groupId>
<artifactId>provisio-maven-plugin</artifactId>
<version>${takari-provisio.version}</version>
</plugin>
<plugin>
<groupId>io.takari.maven.plugins</groupId>
<artifactId>takari-lifecycle-plugin</artifactId>
<version>${takari-lifecycle.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>mrm-maven-plugin</artifactId>