From ddc243a040c6ffa6816591241caacdb2c145799d Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 13 Feb 2012 13:14:27 +0000
Subject: [PATCH] Improve RPM build

git-svn-id: https://svn.argeo.org/commons/trunk@5067 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.security.dep.node.rap/pom.xml   | 31 +++++++------------
 .../org.argeo.security.dep.node.rcp/pom.xml   | 20 ++++++++++++
 .../dep/org.argeo.security.dep.node/pom.xml   | 20 ------------
 3 files changed, 32 insertions(+), 39 deletions(-)

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 6c5ec6890..e0c72cc6f 100644
--- 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 cbd2f2332..554005e3d 100644
--- 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 a8073c02e..02f839f37 100644
--- 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>
-- 
2.30.2