X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=dep%2Forg.argeo.slc.dep.rap%2Fpom.xml;h=4ce787d4b0d213991aac0768f0d7891844ecb8e9;hb=b08118912e5cbff26c59e6cf4a8c468c34998a9c;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..4ce787d4b 100644
--- a/dep/org.argeo.slc.dep.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.rap/pom.xml
@@ -1,31 +1,28 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dep</artifactId>
-		<version>0.13.1-SNAPSHOT</version>
+		<version>1.1.5-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-	<groupId>org.argeo.slc.dep</groupId>
 	<artifactId>org.argeo.slc.dep.rap</artifactId>
 	<name>SLC Eclipse RAP Dependencies</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,33 +30,20 @@
 						</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>1.1.5-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>1.1.5-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Secure Application -->
@@ -68,8 +52,45 @@
 			<artifactId>org.argeo.security.dep.node.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
+
+		<!-- For target platform generation -->
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.unit</artifactId>
+			<version>1.1.5-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.support.maven</artifactId>
+			<version>1.1.5-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 +107,6 @@
 								</goals>
 								<configuration>
 									<name>slc-rap</name>
-									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi/rap</directory>
@@ -96,7 +116,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>
@@ -120,8 +140,7 @@
 								<configuration>
 									<target>
 										<copy todir="${rpm.stagingRepository}" verbose="true">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
+											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>
@@ -132,5 +151,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