* Determines whether or not the server blocks when started. The default
@@ -444,10 +436,10 @@ public abstract class AbstractJettyMojo extends AbstractMojo
{
// check that its port was set
- if (httpConnector.getPort() < 0)
+ if (httpConnector.getPort() <= 0)
{
//use any jetty.http.port settings provided
- String tmp = System.getProperty(MavenServerConnector.PORT_SYSPROPERTY,
+ String tmp = System.getProperty(MavenServerConnector.PORT_SYSPROPERTY, //
System.getProperty("jetty.port", MavenServerConnector.DEFAULT_PORT_STR));
httpConnector.setPort(Integer.parseInt(tmp.trim()));
}
@@ -474,25 +466,7 @@ public abstract class AbstractJettyMojo extends AbstractMojo
// start Jetty
this.server.start();
- if (httpConnector != null)
- {
- int port = httpConnector.getLocalPort();
- getLog().info( "Started Jetty Server on port: " + port );
- if (propertiesPortFilePath != null)
- {
- Path propertiesPath = Paths.get( propertiesPortFilePath);
- Files.deleteIfExists(propertiesPath);
- try(OutputStream outputStream = Files.newOutputStream( propertiesPath ))
- {
- Properties properties = new Properties( );
- properties.put( "port", Integer.toString( port ) );
- properties.store( outputStream, "Eclipse Jetty Maven Plugin port used" );
- }
- }
- } else
- {
- getLog().info( "Started Jetty Server" );
- }
+ getLog().info( "Started Jetty Server" );
if ( dumpOnStart )
{
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
index c4d03008abf..6e6b35b46a3 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
@@ -44,6 +44,7 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.project.MavenProject;
import org.eclipse.jetty.annotations.AnnotationConfiguration;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.IO;
@@ -169,10 +170,18 @@ public class JettyRunForkedMojo extends JettyRunMojo
}
}
}
-
-
-
+
+ @Override
+ /**
+ * we o
+ */
+ protected MavenProject getProjectReferences( Artifact artifact, MavenProject project )
+ {
+
+ return null;
+ }
+
/**
* ConsoleStreamer
*
@@ -349,7 +358,7 @@ public class JettyRunForkedMojo extends JettyRunMojo
builder.directory(project.getBasedir());
if (PluginLog.getLog().isDebugEnabled())
- PluginLog.getLog().debug(Arrays.toString(cmd.toArray()));
+ PluginLog.getLog().debug("Forked cli:"+Arrays.toString(cmd.toArray()));
PluginLog.getLog().info("Forked process starting");
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java
index cdedd33c921..00a6b9f3ec8 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java
@@ -626,7 +626,7 @@ public class JettyRunMojo extends AbstractJettyMojo
}
- private MavenProject getProjectReferences( Artifact artifact, MavenProject project )
+ protected MavenProject getProjectReferences( Artifact artifact, MavenProject project )
{
if ( project.getProjectReferences() == null || project.getProjectReferences().isEmpty() )
{
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Starter.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Starter.java
index 040a58202cf..37a155f6b89 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Starter.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Starter.java
@@ -246,7 +246,7 @@ public class Starter
Set