From 733ac3e03258b21ba3b630151ee75734c82890fd Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 20 Feb 2018 15:31:38 +0100
Subject: [PATCH] Fix RPM deployment

---
 dep/org.argeo.dep.cms.node/pom.xml     |  5 +-
 dep/org.argeo.dep.cms.platform/pom.xml |  5 +-
 dep/org.argeo.dep.cms.sdk/pom.xml      | 87 +++++++++++++-------------
 3 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 87ed53f22..3dcf69e2b 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -11,12 +11,14 @@
 	<name>CMS Node</name>
 	<dependencies>
 
-		<!-- Argeo Commons -->
+		<!-- Parent dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.client</artifactId>
 			<version>2.1.72-SNAPSHOT</version>
 		</dependency>
+
+		<!-- Argeo Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.node.api</artifactId>
@@ -304,6 +306,7 @@
 									<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
 									<includeGroupIds>org.argeo.commons</includeGroupIds>
 									<excludeTransitive>true</excludeTransitive>
+									<excludeArtifactIds>org.argeo.dep.cms.client</excludeArtifactIds>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
 									<useRepositoryLayout>true</useRepositoryLayout>
diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index 8bcf2ec44..047eff135 100644
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -11,12 +11,14 @@
 	<name>CMS Platform</name>
 	<dependencies>
 
-		<!-- Argeo Commons -->
+		<!-- Parent dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.node</artifactId>
 			<version>2.1.72-SNAPSHOT</version>
 		</dependency>
+
+		<!-- Argeo Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.cms.ui.workbench</artifactId>
@@ -280,6 +282,7 @@
 									<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
 									<includeGroupIds>org.argeo.commons</includeGroupIds>
 									<excludeTransitive>true</excludeTransitive>
+									<excludeArtifactIds>org.argeo.dep.cms.node</excludeArtifactIds>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
 									<useRepositoryLayout>true</useRepositoryLayout>
diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index b6f7329cc..7f5f956e4 100644
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -1,5 +1,6 @@
 <?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>
@@ -10,6 +11,7 @@
 	<artifactId>org.argeo.dep.cms.sdk</artifactId>
 	<name>CMS SDK</name>
 	<dependencies>
+		<!-- Parent dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.platform</artifactId>
@@ -39,42 +41,42 @@
 			<groupId>org.argeo.tp.sdk</groupId>
 			<artifactId>org.dbunit</artifactId>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.api</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.spi</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.util</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.impl</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.connector.basic</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.transport.classpath</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.transport.file</artifactId> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.api</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.spi</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.util</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.impl</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.connector.basic</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.transport.classpath</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.transport.file</artifactId> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.sdk</groupId>
 			<artifactId>org.redline-rpm</artifactId>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
-<!-- 			<artifactId>org.tmatesoft.svnkit</artifactId> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.sdk</groupId> -->
+		<!-- <artifactId>org.tmatesoft.svnkit</artifactId> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
@@ -83,15 +85,15 @@
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>org.eclipse.jgit</artifactId>
 		</dependency>
-		
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>org.postgresql.postgresql</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>org.h2</artifactId> -->
-<!-- 		</dependency> -->
+
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.postgresql.postgresql</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.h2</artifactId> -->
+		<!-- </dependency> -->
 	</dependencies>
 
 	<profiles>
@@ -114,6 +116,7 @@
 									<outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
 									<excludeGroupIds>org.argeo.commons</excludeGroupIds>
 									<excludeTransitive>true</excludeTransitive>
+									<excludeArtifactIds>org.argeo.dep.cms.platform</excludeArtifactIds>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
 									<useRepositoryLayout>true</useRepositoryLayout>
-- 
2.30.2