diff --git a/pom.xml b/pom.xml
index 1fd29e9..125c16f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
uk.gov.justice.plugin
server-maven-plugin
- 0.1-SNAPSHOT
+ 1.0
maven-plugin
server-maven-plugin
http://maven.apache.org
diff --git a/src/main/java/uk/gov/justice/plugin/StartServerMojo.java b/src/main/java/uk/gov/justice/plugin/StartServerMojo.java
index 2c5b475..4d0ae04 100644
--- a/src/main/java/uk/gov/justice/plugin/StartServerMojo.java
+++ b/src/main/java/uk/gov/justice/plugin/StartServerMojo.java
@@ -106,9 +106,9 @@ public void execute() throws MojoExecutionException {
args.add(getServerClass());
final Process process = new ProcessBuilder(args).start();
+ addShutdownHook(process);
dumpStream(process.getInputStream(), System.out);
dumpStream(process.getErrorStream(), System.err);
- addShutdownHook(process);
waitOnStopCommand(process);
} catch (Exception e) {
diff --git a/src/main/java/uk/gov/justice/plugin/StopServerMojo.java b/src/main/java/uk/gov/justice/plugin/StopServerMojo.java
index 4b669b3..6fb61a7 100644
--- a/src/main/java/uk/gov/justice/plugin/StopServerMojo.java
+++ b/src/main/java/uk/gov/justice/plugin/StopServerMojo.java
@@ -8,7 +8,6 @@
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
@Mojo(name = "stop", defaultPhase = LifecyclePhase.VERIFY, requiresOnline = false,
requiresProject = true, threadSafe = false)
@@ -17,18 +16,6 @@ public class StopServerMojo extends AbstractMojo {
@Parameter(property = "port", required = true)
protected int port;
- @Parameter(defaultValue = "${project}", readonly = true)
- protected MavenProject project;
-
-
- public MavenProject getProject() {
- return project;
- }
-
- public void setProject(MavenProject project) {
- this.project = project;
- }
-
public int getPort() {
return port;
}
diff --git a/src/test/java/uk/gov/justice/plugin/StopServerMojoTest.java b/src/test/java/uk/gov/justice/plugin/StopServerMojoTest.java
index 6cdcdc8..fadd54a 100644
--- a/src/test/java/uk/gov/justice/plugin/StopServerMojoTest.java
+++ b/src/test/java/uk/gov/justice/plugin/StopServerMojoTest.java
@@ -2,15 +2,11 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import java.io.DataInputStream;
import java.io.IOException;
import java.net.ServerSocket;
-import java.net.Socket;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
@@ -22,20 +18,6 @@ public class StopServerMojoTest {
@InjectMocks
StopServerMojo stopServerMojo;
- @Test
- public void shouldGetProject() {
- MavenProject mp = mock(MavenProject.class);
- stopServerMojo.setProject(mp);
- assertEquals(mp, stopServerMojo.getProject());
- }
-
- @Test
- public void shouldSetProject() {
- MavenProject mp = mock(MavenProject.class);
- stopServerMojo.setProject(mp);
- assertEquals(mp, stopServerMojo.getProject());
- }
-
@Test
public void shouldGetPort() {
stopServerMojo.setPort(8000);