Improve RPM build.

git-svn-id: https://svn.argeo.org/commons/trunk@9195 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 179f7ba63ddbae3a71b40515054397e10454a117..2cf24264dea434e537ff6d5b808198c04a4f6f4e 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -270,7 +270,7 @@
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
-                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <directoryIncluded>false</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>${project.build.directory}/lib-argeo</location>
@@ -284,8 +284,7 @@
                                                                                        <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory>
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <directoryIncluded>false</directoryIncluded>
                                                                                        <artifact />
                                                                                </mapping>
                                                                        </mappings>

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 3945b230db1f8708d9c61cbefa0bc7ec03c0c9b1..ffc635ebdad5842e2b7f792fa7372391cf4e868d 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -16,6 +16,7 @@
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.client</artifactId>
                        <version>2.1.46-SNAPSHOT</version>
+                       <type>pom</type>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
@@ -313,7 +314,7 @@
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
-                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <directoryIncluded>false</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>${project.build.directory}/lib-argeo</location>
@@ -327,8 +328,7 @@
                                                                                        <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory>
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <directoryIncluded>false</directoryIncluded>
                                                                                        <artifact />
                                                                                </mapping>
                                                                        </mappings>

diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index 89b0877702685263feb1bf6ad06807174c8c120c..a596ccb02169d8d47214d9cdf9ca747e4a9bc93a 100644 (file)
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -16,6 +16,7 @@
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.node</artifactId>
                        <version>2.1.46-SNAPSHOT</version>
+                       <type>pom</type>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
@@ -226,7 +227,7 @@
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
-                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <directoryIncluded>false</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>${project.build.directory}/lib-argeo</location>
@@ -240,8 +241,7 @@
                                                                                        <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory>
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <directoryIncluded>false</directoryIncluded>
                                                                                        <artifact />
                                                                                </mapping>
                                                                        </mappings>

diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index cc8b791eae82fd99539dcdf6ac2b39e975c2fa48..fd6b69924f05fa31d36f86d2c4b81010ffe92c81 100644 (file)
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -14,6 +14,7 @@
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.platform</artifactId>
                        <version>2.1.46-SNAPSHOT</version>
+                       <type>pom</type>
                </dependency>
 
                <!-- ALM Third Parties -->

diff --git a/pom.xml b/pom.xml
index 0730f6de871b2cd246f5839be66adc99f3b3293e..572796381501fe3d18bb6fcde945070511ab920a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -257,6 +257,9 @@ limitations under the License.
                                                <distribution>argeo${argeo.rpm.release}</distribution>
                                                <group>Applications/System</group>
                                                <prefix>/usr</prefix>
+                                               <!-- <copyTo>${argeo.rpm.stagingRepository}</copyTo> -->
+                                               <defaultDirMode>755</defaultDirMode>
+                                               <defaultFileMode>644</defaultFileMode>
                                        </configuration>
                                </plugin>
                                <plugin>
@@ -513,30 +516,6 @@ limitations under the License.
                                                        </execution>
                                                </executions>
                                        </plugin>
-<!--                                   <plugin> -->
-<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
-<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
-<!--                                           <executions> -->
-<!--                                                   <execution> -->
-<!--                                                           <id>copy</id> -->
-<!--                                                           <phase>package</phase> -->
-<!--                                                           <goals> -->
-<!--                                                                   <goal>copy</goal> -->
-<!--                                                           </goals> -->
-<!--                                                           <configuration> -->
-<!--                                                                   <artifactItems> -->
-<!--                                                                           <artifactItem> -->
-<!--                                                                                   <groupId>${project.groupId}</groupId> -->
-<!--                                                                                   <artifactId>${project.artifactId}</artifactId> -->
-<!--                                                                                   <version>${project.version}</version> -->
-<!--                                                                                   <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-<!--                                                                           </artifactItem> -->
-<!--                                                                   </artifactItems> -->
-<!--                                                                   other configurations here -->
-<!--                                                           </configuration> -->
-<!--                                                   </execution> -->
-<!--                                           </executions> -->
-<!--                                   </plugin> -->
                                </plugins>
                        </build>
                </profile>