From bc1ce20c0e437a7bb0b318e76bbf721bf948bbfd Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 5 Jan 2022 07:58:54 +0100
Subject: [PATCH] Move rap specific to a sub groupId

---
 dep/org.argeo.dep.cms.e4.rap/pom.xml   |  4 +++-
 dep/org.argeo.dep.cms.ui.rap/pom.xml   | 24 +++++++++++-------------
 org.argeo.cms.e4/pom.xml               |  2 +-
 org.argeo.cms.swt/pom.xml              |  2 +-
 org.argeo.cms.ui/pom.xml               |  3 ++-
 rap/org.argeo.cms.e4.rap/pom.xml       | 11 +++++++----
 rap/org.argeo.cms.ui.rap/pom.xml       |  5 +++--
 rap/org.argeo.swt.specific.rap/pom.xml |  2 +-
 rap/pom.xml                            |  5 ++++-
 9 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/dep/org.argeo.dep.cms.e4.rap/pom.xml b/dep/org.argeo.dep.cms.e4.rap/pom.xml
index 7cdd09255..8e39bd4a9 100644
--- a/dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml
@@ -25,8 +25,10 @@
 			<artifactId>org.argeo.cms.e4</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+		
+		<!-- RAP specific -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.cms.e4.rap</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
diff --git a/dep/org.argeo.dep.cms.ui.rap/pom.xml b/dep/org.argeo.dep.cms.ui.rap/pom.xml
index 02bf9317c..567602211 100644
--- a/dep/org.argeo.dep.cms.ui.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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">
+<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>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
@@ -19,34 +21,30 @@
 			<type>pom</type>
 		</dependency>
 
-		<!-- Argeo Commons UI -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.commons</groupId> -->
-<!-- 			<artifactId>org.argeo.eclipse.ui</artifactId> -->
-<!-- 			<version>2.3-SNAPSHOT</version> -->
-<!-- 		</dependency> -->
+		<!-- SWT -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.swt.specific.rap</artifactId>
+			<artifactId>org.argeo.cms.swt</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.cms.swt</artifactId>
+			<artifactId>org.argeo.cms.ui</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+
+		<!-- Eclipse RAP -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.cms.ui</artifactId>
+			<groupId>org.argeo.commons.rap</groupId>
+			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.cms.ui.rap</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
-
 		<!-- RWT -->
 		<dependency>
 			<groupId>org.argeo.tp.rap.e4</groupId>
diff --git a/org.argeo.cms.e4/pom.xml b/org.argeo.cms.e4/pom.xml
index d1c9c50d9..dda9b4f27 100644
--- a/org.argeo.cms.e4/pom.xml
+++ b/org.argeo.cms.e4/pom.xml
@@ -19,7 +19,7 @@
 
 		<!-- UI -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>2.3-SNAPSHOT</version>
 			<scope>provided</scope>
diff --git a/org.argeo.cms.swt/pom.xml b/org.argeo.cms.swt/pom.xml
index b969259e7..f31cfa004 100644
--- a/org.argeo.cms.swt/pom.xml
+++ b/org.argeo.cms.swt/pom.xml
@@ -28,7 +28,7 @@
 
 		<!-- Specific -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>2.3-SNAPSHOT</version>
 			<scope>provided</scope>
diff --git a/org.argeo.cms.ui/pom.xml b/org.argeo.cms.ui/pom.xml
index 84ff17e94..b68cb9acc 100644
--- a/org.argeo.cms.ui/pom.xml
+++ b/org.argeo.cms.ui/pom.xml
@@ -26,9 +26,10 @@
 			<artifactId>org.argeo.cms.jcr</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+		
 		<!-- Specific -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>2.3-SNAPSHOT</version>
 			<scope>provided</scope>
diff --git a/rap/org.argeo.cms.e4.rap/pom.xml b/rap/org.argeo.cms.e4.rap/pom.xml
index 49b40c4d0..bfce2abf5 100644
--- a/rap/org.argeo.cms.e4.rap/pom.xml
+++ b/rap/org.argeo.cms.e4.rap/pom.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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">
+<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>
 	<parent>
-		<groupId>org.argeo.commons</groupId>
+		<groupId>org.argeo.commons.rap</groupId>
 		<artifactId>rap</artifactId>
 		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -12,7 +14,7 @@
 	<packaging>jar</packaging>
 	<dependencies>
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.cms.ui.rap</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
@@ -21,9 +23,10 @@
 			<artifactId>org.argeo.cms.e4</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+		
 		<!-- Specific -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>2.3-SNAPSHOT</version>
 			<scope>provided</scope>
diff --git a/rap/org.argeo.cms.ui.rap/pom.xml b/rap/org.argeo.cms.ui.rap/pom.xml
index 093c20852..23f6cacae 100644
--- a/rap/org.argeo.cms.ui.rap/pom.xml
+++ b/rap/org.argeo.cms.ui.rap/pom.xml
@@ -2,7 +2,7 @@
 <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>
 	<parent>
-		<groupId>org.argeo.commons</groupId>
+		<groupId>org.argeo.commons.rap</groupId>
 		<artifactId>rap</artifactId>
 		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
@@ -16,9 +16,10 @@
 			<artifactId>org.argeo.cms.ui</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+		
 		<!-- Specific -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>2.3-SNAPSHOT</version>
 			<scope>provided</scope>
diff --git a/rap/org.argeo.swt.specific.rap/pom.xml b/rap/org.argeo.swt.specific.rap/pom.xml
index b889b95d3..0f31ab24c 100644
--- a/rap/org.argeo.swt.specific.rap/pom.xml
+++ b/rap/org.argeo.swt.specific.rap/pom.xml
@@ -2,7 +2,7 @@
 <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>
 	<parent>
-		<groupId>org.argeo.commons</groupId>
+		<groupId>org.argeo.commons.rap</groupId>
 		<version>2.3-SNAPSHOT</version>
 		<artifactId>rap</artifactId>
 		<relativePath>..</relativePath>
diff --git a/rap/pom.xml b/rap/pom.xml
index 60373a270..709740b53 100644
--- a/rap/pom.xml
+++ b/rap/pom.xml
@@ -1,5 +1,7 @@
 <?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/maven-v4_0_0.xsd">
+<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>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
@@ -7,6 +9,7 @@
 		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
+	<groupId>org.argeo.commons.rap</groupId>
 	<artifactId>rap</artifactId>
 	<name>Eclipse RAP Specific</name>
 	<packaging>pom</packaging>
-- 
2.30.2