Improve RPM build

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 42f3d093e7f0732fa35b7bb02827d98d3e79d7c3..5adff7d46eea87821b4bde3bfcb420b9dab1e6c1 100644 (file)
--- 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 887d6ac0ff5c0fbde102d1d121cd4cf8a9171409..813633e2ca069c3925cefcc7c0d7ff0212435a4d 100644 (file)
--- 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 d94f372dfb9ecc7b6a81dc38b699bf86b3f48dd5..9ec3f3cec649b23fa6dc1f9ee35e6c696a54024d 100644 (file)
--- 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>