X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Forg.argeo.slc.sdk%2Fpom.xml;h=a32588f47d6437cb2a5eeed2c88813bd423d0959;hb=19d5d5e8af1f41d067fc6f606e9f0bb3404c8f4b;hp=e3b2e55afea45bf8d2b86e96cec53c5b49c24059;hpb=0ebe6753b6569ff52b4ba86cd61c6e08a19e0c5f;p=gpl%2Fargeo-slc.git

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index e3b2e55af..a32588f47 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -110,39 +110,70 @@
 					</execution>
 				</executions>
 			</plugin>
+			<!--
+				<plugin> <groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId> <version>1.1</version>
+				<executions> <execution> <id>create-repository</id>
+				<phase>deploy</phase> <goals> <goal>exec</goal> </goals>
+				</execution> </executions> <configuration>
+				<executable>${argeo.p2.cmd}</executable> optional
+				<workingDirectory>/tmp</workingDirectory> <arguments>
+				<argument>-noSplash</argument> <argument>-application</argument>
+				<argument>org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher</argument>
+				<argument>-metadataRepository</argument>
+				<argument>file:${argeo.p2.repository}</argument>
+				<argument>-artifactRepository</argument>
+				<argument>file:${argeo.p2.repository}</argument>
+				<argument>-bundles</argument>
+				<argument>${project.build.directory}</argument>
+				<argument>-features</argument>
+				<argument>${project.build.directory}</argument>
+				<argument>-compress</argument>
+				<argument>-publishArtifacts</argument> </arguments> </configuration>
+				</plugin>
+			-->
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.1</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>create-repository</id>
+						<id>p2-copyToRepo</id>
 						<phase>deploy</phase>
 						<goals>
-							<goal>exec</goal>
+							<goal>run</goal>
 						</goals>
+						<configuration>
+							<tasks>
+								<mkdir dir="${project.build.directory}/repobase" />
+								<copy todir="${project.build.directory}/repobase">
+									<fileset dir="${project.build.directory}/lib">
+										<include name="*.jar" />
+									</fileset>
+									<fileset dir="${project.build.directory}/libsrc">
+										<include name="*.jar" />
+									</fileset>
+								</copy>
+								<exec executable="${argeo.p2.cmd}">
+									<arg value="-noSplash" />
+									<arg value="-application" />
+									<arg
+										value="org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
+									<arg value="-metadataRepository" />
+									<arg value="file:${argeo.p2.repository}" />
+									<arg value="-artifactRepository" />
+									<arg value="file:${argeo.p2.repository}" />
+									<arg value="-bundles" />
+									<arg value="${project.build.directory}/repobase" />
+									<arg value="-features" />
+									<arg value="${project.build.directory}/repobase" />
+									<arg value="-compress" />
+									<arg value="-publishArtifacts" />
+								</exec>
+
+							</tasks>
+						</configuration>
 					</execution>
 				</executions>
-				<configuration>
-					<executable>${argeo.p2.cmd}</executable>
-					<!-- optional -->
-					<workingDirectory>/tmp</workingDirectory>
-					<arguments>
-						<argument>-noSplash</argument>
-						<argument>-application</argument>
-						<argument>org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher</argument>
-						<argument>-metadataRepository</argument>
-						<argument>file:${argeo.p2.repository}</argument>
-						<argument>-artifactRepository</argument>
-						<argument>file:${argeo.p2.repository}</argument>
-						<argument>-bundles</argument>
-						<argument>${project.build.directory}</argument>
-						<argument>-features</argument>
-						<argument>${project.build.directory}</argument>
-						<argument>-compress</argument>
-						<argument>-publishArtifacts</argument>
-					</arguments>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>
@@ -152,6 +183,11 @@
 			<artifactId>org.argeo.slc.dep.sdk</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.sdk.sources</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
@@ -189,7 +225,7 @@
 						<executions>
 							<execution>
 								<id>rpm-sdk</id>
-								<phase>package</phase>
+								<phase>deploy</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
@@ -286,7 +322,7 @@
 							</execution>
 							<execution>
 								<id>rpm-devel</id>
-								<phase>package</phase>
+								<phase>deploy</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
@@ -316,7 +352,7 @@
 							</execution>
 							<execution>
 								<id>rpm-demo</id>
-								<phase>package</phase>
+								<phase>deploy</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
@@ -358,7 +394,7 @@
 						<executions>
 							<execution>
 								<id>rpm-copyToRepo</id>
-								<phase>install</phase>
+								<phase>deploy</phase>
 								<goals>
 									<goal>run</goal>
 								</goals>