X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Fpom.xml;h=8ed99e2ef6d7ca1a955839edbec304f58a7c5f7c;hb=85b0dba06831dfca60d634b4591aec21d5d9f1af;hp=8dd6c13d750149e21181ee0c2ca6cd5c29c60288;hpb=8fe8a185d7b0c64fe9a790e7242f174f4bdd8aa1;p=gpl%2Fargeo-slc.git

diff --git a/dep/pom.xml b/dep/pom.xml
index 8dd6c13d7..8ed99e2ef 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -3,102 +3,106 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.12.2</version>
+		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-	<groupId>org.argeo.slc</groupId>
 	<artifactId>dep</artifactId>
-	<packaging>pom</packaging>
 	<name>SLC Dependencies</name>
+	<packaging>pom</packaging>
 	<modules>
-		<module>org.argeo.slc.dep.agent</module>
-		<module>org.argeo.slc.dep.agent.extras</module>
-		<module>org.argeo.slc.dep.server</module>
-		<module>org.argeo.slc.dep.detached</module>
-		<module>org.argeo.slc.dep.gis</module>
-		<module>org.argeo.slc.dep.sdk</module>
-		<module>org.argeo.slc.dep.sdk.sources</module>
+		<module>org.argeo.slc.dep.minimal</module>
+		<module>org.argeo.slc.dep.e4.rap</module>
 	</modules>
 	<build>
-		<resources>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>*.inf</include>
-				</includes>
-			</resource>
-		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<configuration>
-					<useLastCommittedRevision>false</useLastCommittedRevision>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
-					<manifestLocation>META-INF</manifestLocation>
 					<instructions>
-						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-						<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+						<SLC-ModularDistribution>default</SLC-ModularDistribution>
 					</instructions>
 				</configuration>
-				<executions>
-					<execution>
-						<id>bundle-manifest</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>manifest</goal>
-						</goals>
-					</execution>
-				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>properties-maven-plugin</artifactId>
+				<configuration>
+					<quiet>true</quiet>
+					<files>
+						<file>../../cnf/${version.context}.bnd</file>
+					</files>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<artifactId>argeo-osgi-plugin</artifactId>
 				<executions>
 					<execution>
+						<id>generate-descriptors</id>
 						<goals>
 							<goal>descriptors</goal>
 						</goals>
 						<phase>generate-resources</phase>
 					</execution>
 				</executions>
-			</plugin><!--
+			</plugin>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-artifacts</id>
-						<phase>package</phase>
-						<goals>
-							<goal>attach-artifact</goal>
-						</goals>
-						<configuration>
-							<artifacts>
-								<artifact>
-									<file>target/classes/modularDistribution.csv</file>
-									<type>csv</type>
-									<classifier>modularDistribution</classifier>
-								</artifact>
-							</artifacts>
-						</configuration>
-					</execution>
-				</executions>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<attach>false</attach>
+				</configuration>
 			</plugin>
-		--></plugins>
+		</plugins>
 	</build>
+	<dependencies>
+		<dependency>
+			<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.tp.sdk</groupId>
+			<artifactId>org.hamcrest</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>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>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.init</artifactId>
+					<version>${version.argeo-commons}</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file