Resolve sources before generating target platforms

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

diff --git a/dep/pom.xml b/dep/pom.xml
index 954ad8ffeac1293869c8df592938940366c7d065..92183d7c8a3080aa2b796e1955a0cdd4b59ce074 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -4,7 +4,7 @@
        <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>
@@ -12,16 +12,21 @@
        <packaging>pom</packaging>
        <name>SLC Dependencies</name>
        <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.eclipse</module>
+               <module>org.argeo.slc.dep.sdk</module>
+               <module>org.argeo.slc.dep.sdk.sources</module>
        </modules>
        <build>
                <resources>
                        <resource>
                                <directory>.</directory>
                                <includes>
-                                       <include>META-INF/MANIFEST.MF</include>
+                                       <include>*.inf</include>
                                </includes>
                        </resource>
                </resources>
@@ -37,7 +42,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 +51,49 @@
                                <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>
+                                               <id>bundle-manifest</id>
+                                               <phase>process-resources</phase>
                                                <goals>
-                                                       <goal>descriptors</goal>
+                                                       <goal>manifest</goal>
                                                </goals>
-                                               <phase>generate-resources</phase>
                                        </execution>
                                </executions>
                        </plugin>
                        <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>build-helper-maven-plugin</artifactId>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
                                <executions>
                                        <execution>
-                                               <id>attach-artifacts</id>
-                                               <phase>package</phase>
+                                               <id>resolve-pde-sources</id>
                                                <goals>
-                                                       <goal>attach-artifact</goal>
+                                                       <goal>pde-sources</goal>
                                                </goals>
+                                               <phase>generate-resources</phase>
                                                <configuration>
-                                                       <artifacts>
-                                                               <artifact>
-                                                                       <file>target/classes/modularDistribution.csv</file>
-                                                                       <type>csv</type>
-                                                                       <classifier>modularDistribution</classifier>
-                                                               </artifact>
-                                                       </artifacts>
+                                                       <copyArtifacts>true</copyArtifacts>
                                                </configuration>
                                        </execution>
+                                       <execution>
+                                               <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> </plugin> -->
                </plugins>
        </build>
 </project>
\ No newline at end of file