From 7135270f0386d23f7857e7630d66d6c1e9d480b3 Mon Sep 17 00:00:00 2001
From: mbaudier <mbaudier@mostar>
Date: Fri, 3 Nov 2017 07:49:15 +0100
Subject: [PATCH] Improve RPM build

---
 dep/org.argeo.dep.cms.client/pom.xml   | 38 +++++++++++++++-----------
 dep/org.argeo.dep.cms.node/pom.xml     | 38 +++++++++++++++-----------
 dep/org.argeo.dep.cms.platform/pom.xml | 38 +++++++++++++++-----------
 3 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 42f3d093e..5adff7d46 100644
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -245,22 +245,6 @@
 									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
-							<execution>
-								<id>copy-tp</id>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-dependencies</goal>
-								</goals>
-								<configuration>
-									<includeTypes>jar</includeTypes>
-									<outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
-									<excludeGroupIds>org.argeo.commons</excludeGroupIds>
-									<excludeTransitive>true</excludeTransitive>
-									<includeTypes>jar</includeTypes>
-									<includeScope>runtime</includeScope>
-									<useRepositoryLayout>true</useRepositoryLayout>
-								</configuration>
-							</execution>
 						</executions>
 					</plugin>
 					<plugin>
@@ -314,6 +298,28 @@
 			<id>rpmbuild-tp</id>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
+									<excludeGroupIds>org.argeo.commons</excludeGroupIds>
+									<excludeTransitive>true</excludeTransitive>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 887d6ac0f..813633e2c 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -303,22 +303,6 @@
 									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
-							<execution>
-								<id>copy-tp</id>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-dependencies</goal>
-								</goals>
-								<configuration>
-									<includeTypes>jar</includeTypes>
-									<outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
-									<excludeGroupIds>org.argeo.commons</excludeGroupIds>
-									<excludeTransitive>true</excludeTransitive>
-									<includeTypes>jar</includeTypes>
-									<includeScope>runtime</includeScope>
-									<useRepositoryLayout>true</useRepositoryLayout>
-								</configuration>
-							</execution>
 						</executions>
 					</plugin>
 					<plugin>
@@ -372,6 +356,28 @@
 			<id>rpmbuild-tp</id>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
+									<excludeGroupIds>org.argeo.commons</excludeGroupIds>
+									<excludeTransitive>true</excludeTransitive>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index d94f372df..9ec3f3cec 100644
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -186,22 +186,6 @@
 									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
-							<execution>
-								<id>copy-tp</id>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-dependencies</goal>
-								</goals>
-								<configuration>
-									<includeTypes>jar</includeTypes>
-									<outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
-									<excludeGroupIds>org.argeo.commons</excludeGroupIds>
-									<excludeTransitive>true</excludeTransitive>
-									<includeTypes>jar</includeTypes>
-									<includeScope>runtime</includeScope>
-									<useRepositoryLayout>true</useRepositoryLayout>
-								</configuration>
-							</execution>
 						</executions>
 					</plugin>
 					<plugin>
@@ -255,6 +239,28 @@
 			<id>rpmbuild-tp</id>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
+									<excludeGroupIds>org.argeo.commons</excludeGroupIds>
+									<excludeTransitive>true</excludeTransitive>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
-- 
2.30.2