[maven-release-plugin] prepare for next development iteration

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index b0b78e93a3622322294a2c5662f2c25cb2dc1fba..138b66a0e1031c9cbea4bd9fe84c0ecd5978d17d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.75-SNAPSHOT</version>
+       <version>2.1.78-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
        <properties>
-               <version.argeo-commons>2.1.75-SNAPSHOT</version.argeo-commons>
-               <!-- <developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons> -->
-               <!-- <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate> -->
-               <version.argeo-tp>2.1.20</version.argeo-tp>
+               <version.argeo-commons>2.1.77</version.argeo-commons>
+               <version.argeo-tp>2.1.24</version.argeo-tp>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
@@ -27,6 +23,7 @@
                <module>org.argeo.enterprise</module>
                <module>org.argeo.jcr</module>
                <module>org.argeo.osgi.boot</module>
+               <module>org.argeo.core</module>
                <!-- Eclipse -->
                <module>org.argeo.eclipse.ui</module>
                <module>org.argeo.eclipse.ui.rap</module>
@@ -44,6 +41,7 @@
                <module>org.argeo.cms.ui.workbench.rap</module>
                <!-- Third Parties Extensions -->
                <module>org.argeo.ext.jackrabbit</module>
+               <module>org.argeo.ext.equinox.jetty</module>
                <module>org.argeo.ext.rap.ui.workbench</module>
                <!-- Distribution -->
                <module>maven</module>
@@ -342,6 +340,12 @@ limitations under the License.
                        <artifactId>argeo-tp</artifactId>
                        <version>${version.argeo-tp}</version>
                        <scope>provided</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.apache</groupId>
+                                       <artifactId>org.apache.xerces</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
        </dependencies>
        <dependencyManagement>
@@ -459,7 +463,7 @@ limitations under the License.
                </repository>
                <site>
                        <id>staging</id>
-                       <url>dav:https://forge.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url>
+                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
                </site>
        </distributionManagement>
        <profiles>
@@ -477,10 +481,8 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
-                                                                                       failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm"
-                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>
@@ -505,10 +507,8 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
-                                                                                       failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm"
-                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>
@@ -538,10 +538,6 @@ limitations under the License.
                                        <url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
                                        <uniqueVersion>false</uniqueVersion>
                                </repository>
-                               <site>
-                                       <id>staging</id>
-                                       <url>dav:http://localhost:7080/data/docs/argeo-2.1/site/argeo-commons/</url>
-                               </site>
                        </distributionManagement>
                </profile>
        </profiles>