Fix rpm build

diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index f72236391a1717378bcdebdb927b01efe06c545a..fc849d2203c201b2c24445ee0f8f17f5d19da37f 100644 (file)
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -1,4 +1,6 @@
-<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>
@@ -99,29 +101,29 @@
                                                        </execution>
                                                </executions>
                                        </plugin>
-<!--                                   <plugin> -->
-<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
-<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
-<!--                                           <executions> -->
-<!--                                                   <execution> -->
-<!--                                                           <id>copy-argeo</id> -->
-<!--                                                           <phase>package</phase> -->
-<!--                                                           <goals> -->
-<!--                                                                   <goal>copy-dependencies</goal> -->
-<!--                                                           </goals> -->
-<!--                                                           <configuration> -->
-<!--                                                                   <includeTypes>jar</includeTypes> -->
-<!--                                                                   <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-<!--                                                                   <includeGroupIds>org.argeo.slc</includeGroupIds> -->
-<!--                                                                   <excludeTransitive>true</excludeTransitive> -->
-<!--                                                                   <excludeArtifactIds>org.argeo.slc.dep.minimal</excludeArtifactIds> -->
-<!--                                                                   <includeTypes>jar</includeTypes> -->
-<!--                                                                   <includeScope>runtime</includeScope> -->
-<!--                                                                   <useRepositoryLayout>true</useRepositoryLayout> -->
-<!--                                                           </configuration> -->
-<!--                                                   </execution> -->
-<!--                                           </executions> -->
-<!--                                   </plugin> -->
+                                       <!-- <plugin> -->
+                                       <!-- <groupId>org.apache.maven.plugins</groupId> -->
+                                       <!-- <artifactId>maven-dependency-plugin</artifactId> -->
+                                       <!-- <executions> -->
+                                       <!-- <execution> -->
+                                       <!-- <id>copy-argeo</id> -->
+                                       <!-- <phase>package</phase> -->
+                                       <!-- <goals> -->
+                                       <!-- <goal>copy-dependencies</goal> -->
+                                       <!-- </goals> -->
+                                       <!-- <configuration> -->
+                                       <!-- <includeTypes>jar</includeTypes> -->
+                                       <!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
+                                       <!-- <includeGroupIds>org.argeo.slc</includeGroupIds> -->
+                                       <!-- <excludeTransitive>true</excludeTransitive> -->
+                                       <!-- <excludeArtifactIds>org.argeo.slc.dep.minimal</excludeArtifactIds> -->
+                                       <!-- <includeTypes>jar</includeTypes> -->
+                                       <!-- <includeScope>runtime</includeScope> -->
+                                       <!-- <useRepositoryLayout>true</useRepositoryLayout> -->
+                                       <!-- </configuration> -->
+                                       <!-- </execution> -->
+                                       <!-- </executions> -->
+                                       <!-- </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -150,13 +152,13 @@
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/osgi/org/argeo/slc/${project.artifactId}/${project.version}</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <artifact />
-                                                                               </mapping>
+                                                                               <!-- <mapping> -->
+                                                                               <!-- <directory>/usr/share/osgi/org/argeo/slc/${project.artifactId}/${project.version}</directory> -->
+                                                                               <!-- <username>root</username> -->
+                                                                               <!-- <groupname>root</groupname> -->
+                                                                               <!-- <directoryIncluded>false</directoryIncluded> -->
+                                                                               <!-- <artifact /> -->
+                                                                               <!-- </mapping> -->
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-e4-rap</require>

diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index dfe7575d9932830a26614e04e2861906533a6515..0947c103fe6ed001e1257a546c1d01ff88e889f0 100644 (file)
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -1,4 +1,6 @@
-<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>
@@ -32,19 +34,19 @@
                                        </execution>
                                </executions>
                        </plugin>
-<!--                   <plugin> -->
-<!--                           <groupId>org.apache.maven.plugins</groupId> -->
-<!--                           <artifactId>maven-dependency-plugin</artifactId> -->
-<!--                           <executions> -->
-<!--                                   <execution> -->
-<!--                                           <id>copy-dependencies</id> -->
-<!--                                           <phase>package</phase> -->
-<!--                                           <goals> -->
-<!--                                                   <goal>copy-dependencies</goal> -->
-<!--                                           </goals> -->
-<!--                                   </execution> -->
-<!--                           </executions> -->
-<!--                   </plugin> -->
+                       <!-- <plugin> -->
+                       <!-- <groupId>org.apache.maven.plugins</groupId> -->
+                       <!-- <artifactId>maven-dependency-plugin</artifactId> -->
+                       <!-- <executions> -->
+                       <!-- <execution> -->
+                       <!-- <id>copy-dependencies</id> -->
+                       <!-- <phase>package</phase> -->
+                       <!-- <goals> -->
+                       <!-- <goal>copy-dependencies</goal> -->
+                       <!-- </goals> -->
+                       <!-- </execution> -->
+                       <!-- </executions> -->
+                       <!-- </plugin> -->
                </plugins>
        </build>
        <dependencies>
@@ -54,7 +56,7 @@
                        <artifactId>org.argeo.dep.cms.node</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
-               
+
                <!-- Absolutely minimal SLC Agent -->
                <dependency>
                        <groupId>org.argeo.slc</groupId>
@@ -90,11 +92,11 @@
                        <artifactId>org.argeo.slc.agent.jcr</artifactId>
                        <version>2.1.14-SNAPSHOT</version>
                </dependency>
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.slc</groupId> -->
-<!--                   <artifactId>org.argeo.slc.node.jackrabbit</artifactId> -->
-<!--                   <version>2.1.5-SNAPSHOT</version> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.slc</groupId> -->
+               <!-- <artifactId>org.argeo.slc.node.jackrabbit</artifactId> -->
+               <!-- <version>2.1.5-SNAPSHOT</version> -->
+               <!-- </dependency> -->
 
        </dependencies>
        <profiles>
@@ -119,29 +121,29 @@
                                                        </execution>
                                                </executions>
                                        </plugin>
-<!--                                   <plugin> -->
-<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
-<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
-<!--                                           <executions> -->
-<!--                                                   <execution> -->
-<!--                                                           <id>copy-argeo</id> -->
-<!--                                                           <phase>package</phase> -->
-<!--                                                           <goals> -->
-<!--                                                                   <goal>copy-dependencies</goal> -->
-<!--                                                           </goals> -->
-<!--                                                           <configuration> -->
-<!--                                                                   <includeTypes>jar</includeTypes> -->
-<!--                                                                   <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-<!--                                                                   <includeGroupIds>org.argeo.slc</includeGroupIds> -->
-<!--                                                                   <excludeTransitive>true</excludeTransitive> -->
-<!--                                                                   <excludeArtifactIds>org.argeo.dep.cms.node</excludeArtifactIds> -->
-<!--                                                                   <includeTypes>jar</includeTypes> -->
-<!--                                                                   <includeScope>runtime</includeScope> -->
-<!--                                                                   <useRepositoryLayout>true</useRepositoryLayout> -->
-<!--                                                           </configuration> -->
-<!--                                                   </execution> -->
-<!--                                           </executions> -->
-<!--                                   </plugin> -->
+                                       <!-- <plugin> -->
+                                       <!-- <groupId>org.apache.maven.plugins</groupId> -->
+                                       <!-- <artifactId>maven-dependency-plugin</artifactId> -->
+                                       <!-- <executions> -->
+                                       <!-- <execution> -->
+                                       <!-- <id>copy-argeo</id> -->
+                                       <!-- <phase>package</phase> -->
+                                       <!-- <goals> -->
+                                       <!-- <goal>copy-dependencies</goal> -->
+                                       <!-- </goals> -->
+                                       <!-- <configuration> -->
+                                       <!-- <includeTypes>jar</includeTypes> -->
+                                       <!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
+                                       <!-- <includeGroupIds>org.argeo.slc</includeGroupIds> -->
+                                       <!-- <excludeTransitive>true</excludeTransitive> -->
+                                       <!-- <excludeArtifactIds>org.argeo.dep.cms.node</excludeArtifactIds> -->
+                                       <!-- <includeTypes>jar</includeTypes> -->
+                                       <!-- <includeScope>runtime</includeScope> -->
+                                       <!-- <useRepositoryLayout>true</useRepositoryLayout> -->
+                                       <!-- </configuration> -->
+                                       <!-- </execution> -->
+                                       <!-- </executions> -->
+                                       <!-- </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -170,13 +172,13 @@
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/osgi/org/argeo/slc/${project.artifactId}/${project.version}</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <artifact />
-                                                                               </mapping>
+                                                                               <!-- <mapping> -->
+                                                                               <!-- <directory>/usr/share/osgi/org/argeo/slc/${project.artifactId}/${project.version}</directory> -->
+                                                                               <!-- <username>root</username> -->
+                                                                               <!-- <groupname>root</groupname> -->
+                                                                               <!-- <directoryIncluded>false</directoryIncluded> -->
+                                                                               <!-- <artifact /> -->
+                                                                               <!-- </mapping> -->
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-node</require>