Adapt to changes in Argeo Commons.

[gpl/argeo-slc.git] / dep / pom.xml

diff --git a/dep/pom.xml b/dep/pom.xml
index be5f94f714bc73be44af2fe5e1f1b769c42b9230..c463f27cdfe7e1ed4ea1e047324461938acab394 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,82 +1,108 @@
-<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>argeo-slc</artifactId>
-               <version>0.13.1-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>
        <name>SLC Dependencies</name>
        <packaging>pom</packaging>
        <modules>
-               <module>org.argeo.slc.dep.agent</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.provided</module>
-               <module>org.argeo.slc.dep.backend</module>
-               <module>org.argeo.slc.dep.sdk.rcp</module>
-               <module>org.argeo.slc.dep.sdk.rap</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.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <SLC-ModularDistribution>default</SLC-ModularDistribution>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>buildnumber-maven-plugin</artifactId>
+                               <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>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>
                                <configuration>
-                                       <useLastCommittedRevision>false</useLastCommittedRevision>
+                                       <attach>false</attach>
                                </configuration>
                        </plugin>
                </plugins>
-               <pluginManagement>
-                       <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>
-                                                       <configuration>
-                                                               <copyArtifacts>false</copyArtifacts>
-                                                       </configuration>
-                                               </execution>
-                                               <execution>
-                                                       <id>generate-descriptors</id>
-                                                       <goals>
-                                                               <goal>descriptors</goal>
-                                                       </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>
-               </pluginManagement>
        </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.osgi.boot</artifactId>
+                                       <version>${version.argeo-commons}</version>
+                                       <scope>test</scope>
+                               </dependency>
+                       </dependencies>
+               </profile>
+       </profiles>
 </project>
\ No newline at end of file