Update SDK

git-svn-id: https://svn.argeo.org/slc/trunk@3258 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/buildSite.sh b/buildSite.sh
index ebe8b9dda6b538df6d0f6375696b3f83407e8793..b83896c54de98b1e9655f8ae8ac20f1760d57038 100755 (executable)
--- a/buildSite.sh
+++ b/buildSite.sh
@@ -26,9 +26,9 @@ else
 fi
 
 # SDK
-cd dist/org.argeo.slc.sdk
-/usr/local/bin/mvn deploy
-cd ../..
+#cd dist/org.argeo.slc.sdk
+#/usr/local/bin/mvn deploy
+#cd ../..
 
 # SITE
 /usr/local/bin/mvn -up --fail-at-end site-deploy $PROFILES 2>&1 | tee siteGeneration.log

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 6099b57b8abcbde8b9bc50dbf86b0b964bffe46d..98113caf5d08fb86f9a783a075e093e19a615dfc 100644 (file)
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -33,6 +33,22 @@
                                        </execution>
                                </executions>
                        </plugin>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                               <extensions>true</extensions>
+                               <executions>
+                                       <execution>
+                                               <id>pde-source</id>
+                                               <phase>process-resources</phase>
+                                               <goals>
+                                                       <goal>pde-sources</goal>
+                                               </goals>
+                                               <configuration>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <plugin>
                                <artifactId>maven-resources-plugin</artifactId>
                                <executions>

diff --git a/dist/org.argeo.slc.sdk/src/assembly/dist.xml b/dist/org.argeo.slc.sdk/src/assembly/dist.xml
index f2053a474fbd835ad042219cc05c934395bb169f..8dd5df7797c88155471763f8bddd041fa0f0d261 100644 (file)
--- a/dist/org.argeo.slc.sdk/src/assembly/dist.xml
+++ b/dist/org.argeo.slc.sdk/src/assembly/dist.xml
@@ -1,16 +1,28 @@
-<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+<assembly
+       xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
        <id>dist</id>
        <baseDirectory>slc</baseDirectory>
        <formats>
                <format>zip</format>
        </formats>
-       <filesets>
+       <fileSets>
                <fileSet>
                        <directory>target/base</directory>
                        <outputDirectory></outputDirectory>
+                       <includes>
+                               <include>**</include>
+                       </includes>
+               </fileSet>
+               <fileSet>
+                       <directory>target/libsrc</directory>
+                       <outputDirectory>libsrc</outputDirectory>
+                       <includes>
+                               <include>*</include>
+                       </includes>
                </fileSet>
-       </filesets>
+       </fileSets>
        <dependencySets>
                <dependencySet>
                        <unpack>false</unpack>

diff --git a/dist/pom.xml b/dist/pom.xml
index d8a782e995b74fd8d5f7c8b9e0239d26a45f31c7..21c424cb89295527b1898c858b3ae095abdf6add 100644 (file)
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -1,4 +1,5 @@
-<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>
@@ -11,5 +12,6 @@
        <packaging>pom</packaging>
        <name>SLC Distribution</name>
        <modules>
+               <module>org.argeo.slc.sdk</module>
        </modules>
 </project>
\ No newline at end of file