X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Fpom.xml;h=e89b4b200339242269f31786bc5491ef87b96ac4;hb=1e9566f95fc5d791b31333d8ab8188a4bf713aa2;hp=9b9ad8d2024fa8321102d8d3e6cacf48bd8b5f5d;hpb=430acfd04dbf6145d625ff610f4a3eb5dce5e429;p=gpl%2Fargeo-slc.git

diff --git a/dep/pom.xml b/dep/pom.xml
index 9b9ad8d20..e89b4b200 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -3,76 +3,107 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>1.1.3</version>
+		<version>2.1.17-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dep</artifactId>
 	<name>SLC Dependencies</name>
 	<packaging>pom</packaging>
 	<modules>
-		<module>org.argeo.slc.dep.detached</module>
+		<module>org.argeo.slc.dep.minimal</module>
+		<module>org.argeo.slc.dep.spring</module>
+		<module>org.argeo.slc.dep.e4.rap</module>
+		<module>org.argeo.slc.dep.spring.e4.rap</module>
+		<!--  Legacy -->
 		<module>org.argeo.slc.dep.backend</module>
-		<module>org.argeo.slc.dep.eclipse</module>
-		<module>org.argeo.slc.dep.rcp</module>
-		<module>org.argeo.slc.dep.rap</module>
 	</modules>
 	<build>
-		<resources>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>*.inf</include>
-				</includes>
-			</resource>
-		</resources>
 		<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>argeo-osgi-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<dependencies>
+					<dependency>
+						<groupId>org.argeo.commons</groupId>
+						<artifactId>assembly-descriptors</artifactId>
+						<version>${version.argeo-commons}</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+					<attach>false</attach>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- For target platform generation -->
 		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.unit</artifactId>
-			<version>1.1.3</version>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.junit</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.support.maven</artifactId>
-			<version>1.1.3</version>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
-			<id>rpmbuild</id>
+			<id>check-osgi</id>
 			<build>
 				<plugins>
 					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>argeo-osgi-plugin</artifactId>
 						<executions>
 							<execution>
-								<phase>install</phase>
+								<id>check-osgi</id>
+								<phase>test</phase>
 								<goals>
-									<goal>run</goal>
+									<goal>equinox</goal>
 								</goals>
 								<configuration>
-									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true" failonerror="false">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
+									<onlyCheck>true</onlyCheck>
 								</configuration>
 							</execution>
 						</executions>
 					</plugin>
 				</plugins>
 			</build>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>${version.argeo-commons}</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
 		</profile>
 	</profiles>
 </project>
\ No newline at end of file