Improve RPM build

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

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index b87293dc32825e091c70f3158731ef3c1bcbaf7d..179f7ba63ddbae3a71b40515054397e10454a117 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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.commons</groupId>
@@ -269,7 +270,7 @@
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <directoryIncluded>true</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>${project.build.directory}/lib-argeo</location>
@@ -279,6 +280,14 @@
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <artifact />
+                                                                               </mapping>
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-client-tp</require>

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 3a7566afd95a24db01b20edad029152a1ec01c56..3945b230db1f8708d9c61cbefa0bc7ec03c0c9b1 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -313,7 +313,7 @@
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <directoryIncluded>true</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>${project.build.directory}/lib-argeo</location>
@@ -323,6 +323,14 @@
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <artifact />
+                                                                               </mapping>
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-client</require>

diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index e32aca29a0f156e31afb433746f65817faa251ec..89b0877702685263feb1bf6ad06807174c8c120c 100644 (file)
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -226,7 +226,7 @@
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <directoryIncluded>true</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>${project.build.directory}/lib-argeo</location>
@@ -236,6 +236,14 @@
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <artifact />
+                                                                               </mapping>
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-node</require>

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index e89182037def1c4aca22e308bbafa26cc2548959..67298eacad3788fa12bf884c1804568b3ffb7c94 100644 (file)
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -31,38 +31,6 @@
                        <id>rpmbuild</id>
                        <build>
                                <plugins>
-                                       <!-- <plugin> -->
-                                       <!-- <groupId>org.apache.maven.plugins</groupId> -->
-                                       <!-- <artifactId>maven-dependency-plugin</artifactId> -->
-                                       <!-- <executions> -->
-                                       <!-- <execution> -->
-                                       <!-- <id>copy-dependencies</id> -->
-                                       <!-- <phase>package</phase> -->
-                                       <!-- <goals> -->
-                                       <!-- <goal>copy</goal> -->
-                                       <!-- </goals> -->
-                                       <!-- <configuration> -->
-                                       <!-- <includeTypes>jar</includeTypes> -->
-                                       <!-- <stripVersion>true</stripVersion> -->
-                                       <!-- <outputDirectory>${project.build.directory}/lib</outputDirectory> -->
-                                       <!-- <artifactItems> -->
-                                       <!-- <artifactItem> -->
-                                       <!-- <groupId>org.argeo.commons</groupId> -->
-                                       <!-- <artifactId>org.argeo.osgi.boot</artifactId> -->
-                                       <!-- <version>${version.argeo-commons}</version> -->
-                                       <!-- <type>jar</type> -->
-                                       <!-- </artifactItem> -->
-                                       <!-- <artifactItem> -->
-                                       <!-- <groupId>org.argeo.tp.equinox</groupId> -->
-                                       <!-- <artifactId>org.eclipse.osgi</artifactId> -->
-                                       <!-- <version>${version.equinox}</version> -->
-                                       <!-- <type>jar</type> -->
-                                       <!-- </artifactItem> -->
-                                       <!-- </artifactItems> -->
-                                       <!-- </configuration> -->
-                                       <!-- </execution> -->
-                                       <!-- </executions> -->
-                                       <!-- </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>