Merge remote-tracking branch 'origin/v2.x'

[gpl/argeo-suite.git] / dist / argeo-office / pom.xml

diff --git a/dist/argeo-office/pom.xml b/dist/argeo-office/pom.xml
index 0cf70b9a2239ad67937f5ddcf0dbae3ee56dc5aa..dc4c578342dd7de45cc195f3cb347fb210ea40ca 100644 (file)
--- a/dist/argeo-office/pom.xml
+++ b/dist/argeo-office/pom.xml
@@ -1,16 +1,26 @@
-<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.suite</groupId>
                <artifactId>dist</artifactId>
-               <version>0.1.13-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>argeo-office</artifactId>
        <packaging>pom</packaging>
        <name>Argeo Office</name>
+       <dependencies>
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.suite</groupId> -->
+<!--                   <artifactId>org.argeo.suite.standard</artifactId> -->
+<!--                   <version>2.1.16-SNAPSHOT</version> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.suite</groupId> -->
+<!--                   <artifactId>org.argeo.suite.tracker</artifactId> -->
+<!--                   <version>2.1.16-SNAPSHOT</version> -->
+<!--           </dependency> -->
+       </dependencies>
        <profiles>
                <profile>
                        <id>dist</id>
@@ -18,7 +28,7 @@
                                <dependency>
                                        <groupId>org.argeo.suite</groupId>
                                        <artifactId>org.argeo.suite.dep.e4.rap</artifactId>
-                                       <version>0.1.13-SNAPSHOT</version>
+                                       <version>2.3.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
@@ -58,50 +68,5 @@
                                </plugins>
                        </build>
                </profile>
-               <profile>
-                       <id>rpmbuild</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.codehaus.mojo</groupId>
-                                               <artifactId>rpm-maven-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>rpm-node</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>argeo-office</name>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/etc/node/conf.d</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>node</groupname>
-                                                                                       <filemode>640</filemode>
-                                                                                       <configuration>noreplace</configuration>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>base/etc/node/conf.d</location>
-                                                                                                       <includes>
-                                                                                                               <include>*.ini</include>
-                                                                                                               <include>*.txt</include>
-                                                                                                       </includes>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                                       <requires>
-                                                                               <require>argeo-suite-e4-rap</require>
-                                                                       </requires>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
        </profiles>
 </project>