Use uk.gov.justice.maven groupId

This serves two purposes: 1. Correctly groups artifacts instead of leaving them as top level. 2. Works around this bug: mojohaus/versions#5
CJSCommonPlatform · Mar 15, 2016 · 2c4e59f · 2c4e59f
1 parent cf63f09
commit 2c4e59f
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 11 deletions.
diff --git a/io-utils/pom.xml b/io-utils/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>raml-maven</artifactId>
-        <groupId>uk.gov.justice</groupId>
+        <groupId>uk.gov.justice.maven</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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>
@@ -7,6 +8,7 @@
         <version>1.6.4</version>
     </parent>
 
+    <groupId>uk.gov.justice.maven</groupId>
     <artifactId>raml-maven</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>

diff --git a/raml-generator-core/pom.xml b/raml-generator-core/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>raml-maven</artifactId>
-        <groupId>uk.gov.justice</groupId>
+        <groupId>uk.gov.justice.maven</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/raml-maven-plugin/pom.xml b/raml-maven-plugin/pom.xml
@@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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>
+        <groupId>uk.gov.justice.maven</groupId>
         <artifactId>raml-maven</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
@@ -30,17 +31,17 @@
 
     <dependencies>
         <dependency>
-            <groupId>uk.gov.justice</groupId>
+            <groupId>uk.gov.justice.maven</groupId>
             <artifactId>raml-generator-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice</groupId>
+            <groupId>uk.gov.justice.maven</groupId>
             <artifactId>io-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice</groupId>
+            <groupId>uk.gov.justice.maven</groupId>
             <artifactId>raml-parser</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/raml-maven-plugin/src/test/resources/generate/pom.xml b/raml-maven-plugin/src/test/resources/generate/pom.xml
@@ -11,7 +11,7 @@
         <plugins>
             <plugin>
                 <artifactId>raml-maven-plugin</artifactId>
-                <groupId>uk.gov.justice</groupId>
+                <groupId>uk.gov.justice.maven</groupId>
                 <configuration>
                     <generatorName>uk.gov.justice.raml.jaxrs.maven.DummyGenerator</generatorName>
                     <basePackageName>uk.gov.justice.api</basePackageName>

diff --git a/raml-maven-plugin/src/test/resources/includes-excludes/pom.xml b/raml-maven-plugin/src/test/resources/includes-excludes/pom.xml
@@ -11,7 +11,7 @@
         <plugins>
             <plugin>
                 <artifactId>raml-maven-plugin</artifactId>
-                <groupId>uk.gov.justice</groupId>
+                <groupId>uk.gov.justice.maven</groupId>
                 <configuration>
                     <generatorName>uk.gov.justice.raml.jaxrs.maven.DummyGenerator</generatorName>
                     <basePackageName>uk.gov.justice.api</basePackageName>

diff --git a/raml-maven-plugin/src/test/resources/invalid-raml/pom.xml b/raml-maven-plugin/src/test/resources/invalid-raml/pom.xml
@@ -11,7 +11,7 @@
         <plugins>
             <plugin>
                 <artifactId>raml-maven-plugin</artifactId>
-                <groupId>uk.gov.justice</groupId>
+                <groupId>uk.gov.justice.maven</groupId>
                 <configuration>
                     <generatorName>uk.gov.justice.raml.jaxrs.maven.DummyGenerator</generatorName>
                     <basePackageName>uk.gov.justice.api</basePackageName>

diff --git a/raml-maven-plugin/src/test/resources/non-raml/pom.xml b/raml-maven-plugin/src/test/resources/non-raml/pom.xml
@@ -11,7 +11,7 @@
         <plugins>
             <plugin>
                 <artifactId>raml-maven-plugin</artifactId>
-                <groupId>uk.gov.justice</groupId>
+                <groupId>uk.gov.justice.maven</groupId>
                 <configuration>
                     <generatorName>uk.gov.justice.raml.jaxrs.maven.DummyGenerator</generatorName>
                     <basePackageName>uk.gov.justice.api</basePackageName>

diff --git a/raml-parser/pom.xml b/raml-parser/pom.xml
@@ -6,7 +6,7 @@
 
     <parent>
         <artifactId>raml-maven</artifactId>
-        <groupId>uk.gov.justice</groupId>
+        <groupId>uk.gov.justice.maven</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>