introduction of new architecture for target platforms with sdk.rap and sdk.rcp distin...

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

diff --git a/dep/pom.xml b/dep/pom.xml
index 954ad8ffeac1293869c8df592938940366c7d065..1028867794c58964c60bb241eb78005408f32f4d 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -4,24 +4,28 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>0.11.5-SNAPSHOT</version>
+               <version>0.13.1-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.server</module>
                <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.backend</module>
+               <module>org.argeo.slc.dep.sdk.rcp</module>
+               <module>org.argeo.slc.dep.sdk.rap</module>
        </modules>
        <build>
                <resources>
                        <resource>
                                <directory>.</directory>
                                <includes>
-                                       <include>META-INF/MANIFEST.MF</include>
+                                       <include>*.inf</include>
                                </includes>
                        </resource>
                </resources>
@@ -37,7 +41,7 @@
                                <artifactId>maven-jar-plugin</artifactId>
                                <configuration>
                                        <archive>
-                                               <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
                                        </archive>
                                </configuration>
                        </plugin>
@@ -46,46 +50,75 @@
                                <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>
                                        </instructions>
                                </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>descriptors</goal>
-                                               </goals>
-                                               <phase>generate-resources</phase>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>build-helper-maven-plugin</artifactId>
                                <executions>
                                        <execution>
-                                               <id>attach-artifacts</id>
-                                               <phase>package</phase>
+                                               <id>bundle-manifest</id>
+                                               <phase>process-resources</phase>
                                                <goals>
-                                                       <goal>attach-artifact</goal>
+                                                       <goal>manifest</goal>
                                                </goals>
-                                               <configuration>
-                                                       <artifacts>
-                                                               <artifact>
-                                                                       <file>target/classes/modularDistribution.csv</file>
-                                                                       <type>csv</type>
-                                                                       <classifier>modularDistribution</classifier>
-                                                               </artifact>
-                                                       </artifacts>
-                                               </configuration>
                                        </execution>
                                </executions>
                        </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>
+               <!-- TO BE DELETED <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>true</copyArtifacts> </configuration> </execution> 
+                       <execution> <goals> <goal>descriptors</goal> </goals> <phase>generate-resources</phase> 
+                       </execution> </executions> </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> </plugin> -->
+               <!-- </plugins> -->
        </build>
 </project>
\ No newline at end of file