Improve RPM build

git-svn-id: https://svn.argeo.org/commons/trunk@5067 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/security/dep/org.argeo.security.dep.node.rap/pom.xml b/security/dep/org.argeo.security.dep.node.rap/pom.xml
index 6c5ec689083a5bd2b785ef0c80395fa3ad8bc3e0..e0c72cc6f11c69da2145b855b614575352ec0f48 100644 (file)
--- a/security/dep/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/dep/org.argeo.security.dep.node.rap/pom.xml
@@ -22,13 +22,6 @@
                                                </goals>
                                                <phase>generate-resources</phase>
                                        </execution>
-                                       <execution>
-                                               <id>resolve-pde-sources</id>
-                                               <goals>
-                                                       <goal>pde-sources</goal>
-                                               </goals>
-                                               <phase>generate-resources</phase>
-                                       </execution>
                                        <execution>
                                                <id>check-osgi</id>
                                                <phase>test</phase>
@@ -124,23 +117,23 @@
                                                        </execution>
                                                </executions>
                                        </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+               <profile>
+                       <id>pdeSources</id>
+                       <build>
+                               <plugins>
                                        <plugin>
-                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
                                                <executions>
                                                        <execution>
-                                                               <phase>install</phase>
+                                                               <id>resolve-pde-sources</id>
                                                                <goals>
-                                                                       <goal>run</goal>
+                                                                       <goal>pde-sources</goal>
                                                                </goals>
-                                                               <configuration>
-                                                                       <target>
-                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
-                                                                                       <fileset dir="${project.build.directory}/rpm"
-                                                                                               includes="*/RPMS/**/*.rpm" />
-                                                                                       <flattenmapper />
-                                                                               </copy>
-                                                                       </target>
-                                                               </configuration>
+                                                               <phase>generate-resources</phase>
                                                        </execution>
                                                </executions>
                                        </plugin>

diff --git a/security/dep/org.argeo.security.dep.node.rcp/pom.xml b/security/dep/org.argeo.security.dep.node.rcp/pom.xml
index cbd2f233205830ba2f44162bfdf5f8c34dd5d273..554005e3dd1e70b8d3728a88adca6a4cd717acbd 100644 (file)
--- a/security/dep/org.argeo.security.dep.node.rcp/pom.xml
+++ b/security/dep/org.argeo.security.dep.node.rcp/pom.xml
@@ -95,5 +95,25 @@
                                </plugins>
                        </build>
                </profile>
+               <profile>
+                       <id>pdeSources</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>resolve-pde-sources</id>
+                                                               <goals>
+                                                                       <goal>pde-sources</goal>
+                                                               </goals>
+                                                               <phase>generate-resources</phase>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
        </profiles>
 </project>

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index a8073c02e6e1ede9fe8c09512dce7c560b10eacd..02f839f37d78cb46f2bdce64aaca7dd834b19f67 100644 (file)
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -355,26 +355,6 @@
                                                        </execution>
                                                </executions>
                                        </plugin>
-                                       <plugin>
-                                               <artifactId>maven-antrun-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <phase>install</phase>
-                                                               <goals>
-                                                                       <goal>run</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <target>
-                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
-                                                                                       <fileset dir="${project.build.directory}/rpm"
-                                                                                               includes="*/RPMS/**/*.rpm" />
-                                                                                       <flattenmapper />
-                                                                               </copy>
-                                                                       </target>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
                                </plugins>
                        </build>
                </profile>