Merge branch 'master' into dev/update-bom

CJSCommonPlatform · May 3, 2019 · 3a4c3fc · 3a4c3fc
2 parents b43f006 + 8e1fd6e
commit 3a4c3fc
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 182 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,11 +5,16 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## Unreleased
 
-## [1.6.6] - 2019-05-03
+## [1.6.7] - 2019-05-03
 
 ### Changed
 - Updated common-bom version to 2.0.2
 
+## [1.6.6] - 2019-02-12
+
+### Removed
+- Removed raml-maven-test-utils module
+
 ## [1.6.5] - 2019-02-01
 
 ### Changed

diff --git a/io-utils/pom.xml b/io-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>raml-maven</artifactId>
         <groupId>uk.gov.justice.maven</groupId>
-        <version>1.6.6-SNAPSHOT</version>
+        <version>1.6.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lint-checker-core/pom.xml b/lint-checker-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>raml-maven</artifactId>
         <groupId>uk.gov.justice.maven</groupId>
-        <version>1.6.6-SNAPSHOT</version>
+        <version>1.6.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>uk.gov.justice.maven</groupId>
     <artifactId>raml-maven</artifactId>
-    <version>1.6.6-SNAPSHOT</version>
+    <version>1.6.7-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -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-for-testing-io/pom.xml b/raml-for-testing-io/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>raml-maven</artifactId>
         <groupId>uk.gov.justice.maven</groupId>
-        <version>1.6.6-SNAPSHOT</version>
+        <version>1.6.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/raml-generator-core/pom.xml b/raml-generator-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>raml-maven</artifactId>
         <groupId>uk.gov.justice.maven</groupId>
-        <version>1.6.6-SNAPSHOT</version>
+        <version>1.6.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/raml-generator-for-testing/pom.xml b/raml-generator-for-testing/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>raml-maven</artifactId>
         <groupId>uk.gov.justice.maven</groupId>
-        <version>1.6.6-SNAPSHOT</version>
+        <version>1.6.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/raml-maven-plugin-it/pom.xml b/raml-maven-plugin-it/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>uk.gov.justice.maven</groupId>
         <artifactId>raml-maven</artifactId>
-        <version>1.6.6-SNAPSHOT</version>
+        <version>1.6.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/raml-maven-plugin/pom.xml b/raml-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>uk.gov.justice.maven</groupId>
         <artifactId>raml-maven</artifactId>
-        <version>1.6.6-SNAPSHOT</version>
+        <version>1.6.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>raml-maven-plugin</artifactId>
@@ -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
diff --git a/raml-parser/pom.xml b/raml-parser/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>raml-maven</artifactId>
         <groupId>uk.gov.justice.maven</groupId>
-        <version>1.6.6-SNAPSHOT</version>
+        <version>1.6.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>raml-parser</artifactId>