Add SCM section

CJSCommonPlatform · Oct 3, 2016 · 47ee151 · 47ee151
1 parent 594ad0b
commit 47ee151
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
+	<parent>
+		<groupId>uk.gov.justice</groupId>
+		<artifactId>parent-pom</artifactId>
+		<version>1.6.11</version>
+	</parent>
 	<groupId>uk.gov.justice.plugin</groupId>
 	<artifactId>server-maven-plugin</artifactId>
 	<version>0.1-SNAPSHOT</version>
@@ -21,6 +25,24 @@
 		<maven-plugin-plugin.version>3.2</maven-plugin-plugin.version>
 	</properties>
 
+	<scm>
+		<connection>scm:git:git@github.com:CJSCommonPlatform/server-maven-plugin.git</connection>
+		<developerConnection>scm:git:git@github.com:CJSCommonPlatform/server-maven-plugin.git
+        </developerConnection>
+	</scm>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>uk.gov.justice</groupId>
+				<artifactId>common-bom</artifactId>
+				<version>1.6.10</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
@@ -45,6 +67,16 @@
 			<artifactId>maven-core</artifactId>
 			<version>${maven.version}</version>
 			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-classworlds</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.maven</groupId>
+					<artifactId>maven-plugin-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
@@ -81,6 +113,14 @@
 					<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.eluder.coveralls</groupId>
+				<artifactId>coveralls-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/src/main/java/uk/gov/justice/plugin/StartServerMojo.java b/src/main/java/uk/gov/justice/plugin/StartServerMojo.java
@@ -148,7 +148,6 @@ public void waitOnStopCommand(final Process process) throws IOException {
         // !!! cannot write lambdas in plugins it fails
         // java.lang.ArrayIndexOutOfBoundsException: 5377
         waitThread = new Thread(new Runnable() {
-
             public void run() {
                 try (final ServerSocket ssocket = new ServerSocket(getPort())) {
                     boolean flag = false;
@@ -173,9 +172,7 @@ public void run() {
                 try {
                     destroyIfAlive(process);
                 } catch (Exception e) {
-                    if (!Objects.isNull(process) && process.isAlive()) {
-                        process.destroyForcibly();
-                    }
+                    destroyForciblyIfAlive(process);
                 }
             }
         }));