Improve JCR

[gpl/argeo-slc.git] / dist / org.argeo.slc.sdk / pom.xml

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 3145829b4dded343489d43bbe817a6d83e508065..e3b2e55afea45bf8d2b86e96cec53c5b49c24059 100644 (file)
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -147,11 +147,6 @@
                </plugins>
        </build>
        <dependencies>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.server</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.sdk</artifactId>
@@ -160,7 +155,8 @@
        </dependencies>
        <profiles>
                <profile>
-                       <id>rpmbuild</id><!--
+                       <id>rpmbuild</id>
+
                        <activation>
                                <os>
                                        <name>Linux</name>
@@ -169,10 +165,11 @@
                                        <exists>/usr/bin/rpmbuild</exists>
                                </file>
                        </activation>
-                       --><properties>
+
+                       <properties>
                                <package.version>${project.version}</package.version>
                                <distribution.label>argeo</distribution.label>
-                               <distribution.root>/net/cash/srv/yumrepos/argeo-el/5/argeo-testing/</distribution.root>
+                               <distribution.root>/var/argeo/linux/argeo-el/5/argeo-testing</distribution.root>
                        </properties>
                        <build>
                                <plugins>
@@ -312,6 +309,9 @@
                                                                                        </sources>
                                                                                </mapping>
                                                                        </mappings>
+                                                                       <requires>
+                                                                               <require>org.argeo.slc.sdk</require>
+                                                                       </requires>
                                                                </configuration>
                                                        </execution>
                                                        <execution>
@@ -329,15 +329,15 @@
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
                                                                                        <directoryIncluded>false</directoryIncluded>
-                                                                                       <configuration>true</configuration>
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>../../demo/site</location>
                                                                                                        <includes>
-                                                                                                               <include>**</include>
+                                                                                                               <include>org.argeo.*/**</include>
                                                                                                        </includes>
                                                                                                        <excludes>
-                                                                                                               <exclude>*.pom.xml</exclude>
+                                                                                                               <exclude>pom.xml</exclude>
+                                                                                                               <exclude>target</exclude>
                                                                                                                <exclude>.svn</exclude>
                                                                                                                <exclude>**/.svn/**</exclude>
                                                                                                        </excludes>
@@ -345,6 +345,9 @@
                                                                                        </sources>
                                                                                </mapping>
                                                                        </mappings>
+                                                                       <requires>
+                                                                               <require>org.argeo.slc.sdk</require>
+                                                                       </requires>
                                                                </configuration>
                                                        </execution>
                                                </executions>
@@ -361,6 +364,8 @@
                                                                </goals>
                                                                <configuration>
                                                                        <tasks>
+                                                                               <mkdir dir="${distribution.root}/i386" />
+                                                                               <mkdir dir="${distribution.root}/x86_64" />
                                                                                <delete verbose="true">
                                                                                        <fileset dir="${distribution.root}" includes="*/org.argeo.slc.sdk-*.rpm" />
                                                                                </delete>