Use a prefix for maven artifacts build in the project.

geonetwork · Apr 20, 2020 · 973c3e1 · 973c3e1
1 parent e06076a
commit 973c3e1
Show file tree

Hide file tree

Showing 39 changed files with 133 additions and 133 deletions.
diff --git a/add-schema.sh b/add-schema.sh
@@ -62,7 +62,7 @@ line=$(grep -n "schema-${schema}" web/pom.xml | cut -d: -f1)
 
 if [ ! $line ]
 then
-  line=$(grep -n 'schema-iso19139</artifactId>' web/pom.xml | cut -d: -f1)
+  line=$(grep -n 'gn-schema-iso19139</artifactId>' web/pom.xml | cut -d: -f1)
   insertLine=$(($line + 2))
 
   projectGroupId='${project.groupId}'

diff --git a/cachingxslt/pom.xml b/cachingxslt/pom.xml
@@ -39,7 +39,7 @@
   <!-- Module Description -->
   <!-- =========================================================== -->
   <groupId>org.geonetwork-opensource</groupId>
-  <artifactId>cachingxslt</artifactId>
+  <artifactId>gn-cachingxslt</artifactId>
   <packaging>jar</packaging>
   <name>Caching xslt module</name>
   <description>
@@ -65,7 +65,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>gn-common</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

diff --git a/common/pom.xml b/common/pom.xml
@@ -38,9 +38,9 @@
   <!-- =========================================================== -->
   <!-- Module Description -->
   <!-- =========================================================== -->
-  <artifactId>common</artifactId>
+  <artifactId>gn-common</artifactId>
   <packaging>jar</packaging>
-  <name>common utils</name>
+  <name>GeoNetwork common utils</name>
   <description>
     Utility classes used by many or all geonetwork modules.
   </description>

diff --git a/core/pom.xml b/core/pom.xml
@@ -31,7 +31,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>core</artifactId>
+  <artifactId>gn-core</artifactId>
   <name>GeoNetwork core</name>
 
   <dependencies>
@@ -303,14 +303,14 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>domain</artifactId>
+      <artifactId>gn-domain</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>events</artifactId>
+      <artifactId>gn-events</artifactId>
       <version>${project.version}</version>
     </dependency>
 
@@ -380,27 +380,27 @@
     <!-- Generated dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>oaipmh</artifactId>
+      <artifactId>gn-oaipmh</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>domain</artifactId>
+      <artifactId>gn-domain</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>cachingxslt</artifactId>
+      <artifactId>gn-cachingxslt</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>schema-iso19139</artifactId>
+      <artifactId>gn-schema-iso19139</artifactId>
       <version>${gn.schemas.version}</version>
     </dependency>
     <dependency> <!-- dummy API for ARC SDE stuff -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>dummy-api</artifactId>
+      <artifactId>gn-dummy-api</artifactId>
       <version>${project.version}</version>
     </dependency>
 
@@ -475,8 +475,8 @@
       <artifactId>jackson-datatype-hibernate4</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.geonetwork-opensource</groupId>
-      <artifactId>index</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>gn-index</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/csw-server/pom.xml b/csw-server/pom.xml
@@ -31,26 +31,26 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>csw-server</artifactId>
+  <artifactId>gn-csw-server</artifactId>
   <name>GeoNetwork CSW server</name>
 
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>core</artifactId>
+      <artifactId>gn-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>domain</artifactId>
+      <artifactId>gn-domain</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>core</artifactId>
+      <artifactId>gn-core</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -30,7 +30,7 @@
     <version>3.11.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>docs</artifactId>
+  <artifactId>gn-docs</artifactId>
   <name>Documentation module</name>
   <packaging>pom</packaging>
   <licenses>

diff --git a/doi/pom.xml b/doi/pom.xml
@@ -32,18 +32,18 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>doi</artifactId>
+  <artifactId>gn-doi</artifactId>
   <name>GeoNetwork Digital Object Identifier (DOI) client</name>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>core</artifactId>
+      <artifactId>gn-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>gn-common</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

diff --git a/domain/pom.xml b/domain/pom.xml
@@ -31,13 +31,13 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>domain</artifactId>
+  <artifactId>gn-domain</artifactId>
   <name>GeoNetwork domain</name>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>gn-common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/es/es-dashboards/pom.xml b/es/es-dashboards/pom.xml
@@ -22,11 +22,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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>es-dashboards</artifactId>
+  <artifactId>gn-es-dashboards</artifactId>
   <name>GeoNetwork dashboard app based on Kibana</name>
 
   <parent>
-    <artifactId>es</artifactId>
+    <artifactId>gn-es</artifactId>
     <groupId>org.geonetwork-opensource</groupId>
     <version>3.11.0-SNAPSHOT</version>
   </parent>

diff --git a/es/pom.xml b/es/pom.xml
@@ -8,7 +8,7 @@
     <version>3.11.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>es</artifactId>
+  <artifactId>gn-es</artifactId>
   <name>GeoNetwork index using Elasticsearch</name>
   <packaging>pom</packaging>
 

diff --git a/estest/pom.xml b/estest/pom.xml
@@ -9,12 +9,12 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>es-test</artifactId>
+  <artifactId>gn-es-test</artifactId>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>core</artifactId>
+      <artifactId>gn-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/events/pom.xml b/events/pom.xml
@@ -33,7 +33,7 @@
 
   <name>GeoNetwork Events</name>
   <packaging>jar</packaging>
-  <artifactId>events</artifactId>
+  <artifactId>gn-events</artifactId>
   <description>Contains all types of events geoNetwork specific you can listen to.</description>
   <url>http://geonetwork-opensource.org</url>
   <dependencies>
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>domain</artifactId>
+      <artifactId>gn-domain</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

diff --git a/harvesters/pom.xml b/harvesters/pom.xml
@@ -31,18 +31,18 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>harvesters</artifactId>
+  <artifactId>gn-harvesters</artifactId>
   <name>GeoNetwork harvesters</name>
 
   <dependencies>
     <dependency>
-      <groupId>org.geonetwork-opensource</groupId>
-      <artifactId>core</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>gn-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.geonetwork-opensource</groupId>
-      <artifactId>csw-server</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>gn-csw-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -64,14 +64,14 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>domain</artifactId>
+      <artifactId>gn-domain</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>core</artifactId>
+      <artifactId>gn-core</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>

diff --git a/healthmonitor/pom.xml b/healthmonitor/pom.xml
@@ -31,25 +31,25 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>health-monitor</artifactId>
+  <artifactId>gn-health-monitor</artifactId>
   <name>GeoNetwork health monitor</name>
 
   <dependencies>
 
     <dependency>
-      <groupId>org.geonetwork-opensource</groupId>
-      <artifactId>core</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>gn-core</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>csw-server</artifactId>
+      <artifactId>gn-csw-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>harvesters</artifactId>
+      <artifactId>gn-harvesters</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/index/pom.xml b/index/pom.xml
@@ -8,7 +8,7 @@
     <version>3.11.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>index</artifactId>
+  <artifactId>gn-index</artifactId>
   <name>Index module</name>
   <dependencies>
     <dependency>
@@ -21,7 +21,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>gn-common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!--<dependency>

diff --git a/inspire-atom/pom.xml b/inspire-atom/pom.xml
@@ -32,25 +32,25 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>inspire-atom</artifactId>
+  <artifactId>gn-inspire-atom</artifactId>
   <name>GeoNetwork INSPIRE Atom</name>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>core</artifactId>
+      <artifactId>gn-core</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>gn-common</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>services</artifactId>
+      <artifactId>gn-services</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/integration-test/pom.xml b/integration-test/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>geonetwork-integration-test</groupId>
-  <artifactId>geonetwork-integration-test</artifactId>
+  <artifactId>gn-integration-test</artifactId>
   <version>3..0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>geonetwork-integration-test</name>

diff --git a/jmeter/pom.xml b/jmeter/pom.xml
@@ -34,7 +34,7 @@
   <!-- =========================================================== -->
   <!--     Module Description                                      -->
   <!-- =========================================================== -->
-  <artifactId>performance</artifactId>
+  <artifactId>gn-performance</artifactId>
   <packaging>pom</packaging>
   <name>Performance testing module</name>
   <description>
@@ -150,7 +150,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
-                  <artifactId>geonetwork-main</artifactId>
+                  <artifactId>gn-geonetwork-main</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
                 </artifactItem>