X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.rap%2Fpom.xml;h=a532ea6a47f9287117d610af7f34ba8feeecca90;hb=44ee48577d1004811ca171f4ad7842dcf0f4fa4b;hp=6a43fdbd5f11ece1fdace5b5d3af166b68012876;hpb=166532a9db4e21987d3732c576efb74872eec210;p=gpl%2Fargeo-slc.git

diff --git a/dep/org.argeo.slc.dep.rap/pom.xml b/dep/org.argeo.slc.dep.rap/pom.xml
index 6a43fdbd5..a532ea6a4 100644
--- a/dep/org.argeo.slc.dep.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.rap/pom.xml
@@ -4,28 +4,26 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dep</artifactId>
-		<version>0.13.1-SNAPSHOT</version>
+		<version>2.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-	<groupId>org.argeo.slc.dep</groupId>
 	<artifactId>org.argeo.slc.dep.rap</artifactId>
-	<name>SLC Eclipse RAP Dependencies</name>
+	<name>SLC Eclipse RAP</name>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<SLC-ModularDistribution>default</SLC-ModularDistribution>
+					</instructions>
+				</configuration>
+			</plugin>
 			<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>
-						<configuration>
-							<copyArtifacts>false</copyArtifacts>
-						</configuration>
-					</execution>
 					<execution>
 						<id>generate-descriptors</id>
 						<goals>
@@ -33,43 +31,60 @@
 						</goals>
 						<phase>generate-resources</phase>
 					</execution>
-					<execution>
-						<id>check-osgi</id>
-						<phase>test</phase>
-						<goals>
-							<goal>equinox</goal>
-						</goals>
-						<configuration>
-							<onlyCheck>true</onlyCheck>
-							<argsToAppend>
-								<arg>-clean</arg>
-							</argsToAppend>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.dep.eclipse</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.eclipse</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.rap</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Secure Application -->
+		<!-- For target platform generation -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.node.rap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.unit</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc</groupId> -->
+		<!-- <artifactId>org.argeo.slc.support.maven</artifactId> -->
+		<!-- <version>2.1.1-SNAPSHOT</version> -->
+		<!-- <scope>test</scope> -->
+		<!-- </dependency> -->
 	</dependencies>
 	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>rpmbuild</id>
 			<build>
@@ -86,7 +101,6 @@
 								</goals>
 								<configuration>
 									<name>slc-rap</name>
-									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi/rap</directory>
@@ -96,7 +110,7 @@
 											<directoryIncluded>false</directoryIncluded>
 											<dependency>
 												<includes>
-													<include>org.argeo.slc.eclipse:org.argeo.slc.client.rap</include>
+													<include>org.argeo.slc:org.argeo.slc.client.rap</include>
 												</includes>
 											</dependency>
 										</mapping>
@@ -132,5 +146,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>
\ No newline at end of file