Merge 711d916 into 08e51c4

CJSCommonPlatform · Feb 12, 2019 · 5963e4f · 5963e4f
2 parents 08e51c4 + 711d916
commit 5963e4f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 172 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,6 @@
         <module>raml-maven-plugin-it</module>
         <module>raml-generator-for-testing</module>
         <module>lint-checker-core</module>
-        <module>raml-maven-test-utils</module>
     </modules>
 
     <properties>

diff --git a/raml-maven-plugin/pom.xml b/raml-maven-plugin/pom.xml
@@ -20,6 +20,7 @@
 
     <properties>
         <org.apache.maven.plugin-tools.version>3.5</org.apache.maven.plugin-tools.version>
+        <maven-test-utils.version>1.0.0</maven-test-utils.version>
     </properties>
 
     <build>
@@ -160,8 +161,8 @@
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.maven</groupId>
-            <artifactId>raml-maven-test-utils</artifactId>
-            <version>${project.version}</version>
+            <artifactId>maven-test-utils</artifactId>
+            <version>${maven-test-utils.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/raml-maven-plugin/src/test/java/uk/gov/justice/raml/maven/generator/GenerateMojoTest.java b/raml-maven-plugin/src/test/java/uk/gov/justice/raml/maven/generator/GenerateMojoTest.java
@@ -8,8 +8,8 @@
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.core.IsEqual.equalTo;
 
+import uk.gov.justice.maven.test.utils.BetterAbstractMojoTestCase;
 import uk.gov.justice.raml.core.GeneratorConfig;
-import uk.gov.justice.raml.maven.test.utils.BetterAbstractMojoTestCase;
 
 import java.io.File;
 import java.nio.file.Files;

diff --git a/...n-plugin/src/test/java/uk/gov/justice/raml/maven/lintchecker/rules/LintCheckMojoTest.java b/...n-plugin/src/test/java/uk/gov/justice/raml/maven/lintchecker/rules/LintCheckMojoTest.java
@@ -4,11 +4,8 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
+import uk.gov.justice.maven.test.utils.BetterAbstractMojoTestCase;
 import uk.gov.justice.raml.maven.lintchecker.LintCheckerException;
-import uk.gov.justice.raml.maven.lintchecker.rules.FailingLintCheckRule;
-import uk.gov.justice.raml.maven.lintchecker.rules.LintCheckMojo;
-import uk.gov.justice.raml.maven.lintchecker.rules.SucceedingLintCheckRule;
-import uk.gov.justice.raml.maven.test.utils.BetterAbstractMojoTestCase;
 
 import java.io.File;
 

diff --git a/...ven-plugin/src/test/java/uk/gov/justice/raml/maven/validator/RamlSyntaxCheckMojoTest.java b/...ven-plugin/src/test/java/uk/gov/justice/raml/maven/validator/RamlSyntaxCheckMojoTest.java
@@ -9,8 +9,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import uk.gov.justice.maven.test.utils.BetterAbstractMojoTestCase;
 import uk.gov.justice.raml.maven.common.BasicGoalConfig;
-import uk.gov.justice.raml.maven.test.utils.BetterAbstractMojoTestCase;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/raml-maven-test-utils/pom.xml b/raml-maven-test-utils/pom.xml
diff --git a/...-utils/src/main/java/uk/gov/justice/raml/maven/test/utils/BetterAbstractMojoTestCase.java b/...-utils/src/main/java/uk/gov/justice/raml/maven/test/utils/BetterAbstractMojoTestCase.java