Fix maven issue with included properties files

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

diff --git a/pom.xml b/pom.xml
index c6f488ccdb3803a5995023b56ce18e6cd7cc013d..38033c312f55714f714305a7475c058e7fe86897 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>1.1.3</version>
+       <version>1.1.5-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <description>Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring</description>
        <packaging>pom</packaging>
@@ -11,7 +11,7 @@
                <developmentCycle>1.1</developmentCycle>
                <developmentCycle.startDate>2012-06-19</developmentCycle.startDate>
                <version.argeo-distribution>1.3.1</version.argeo-distribution>
-               <version.argeo-commons>1.1.3</version.argeo-commons>
+               <version.argeo-commons>1.1.5-SNAPSHOT</version.argeo-commons>
                <!-- distribution -->
                <site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
                <site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
@@ -21,10 +21,8 @@
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
        <modules>
-               <module>basic</module>
-               <module>osgi</module>
+               <module>base</module>
                <module>server</module>
-               <module>eclipse</module>
                <module>security</module>
        </modules>
        <organization>
@@ -33,10 +31,10 @@
        </organization>
        <url>${site.urlBase}/${developmentCycle}</url>
        <scm>
-               <connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-1.1.3</connection>
-               <developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-1.1.3
+               <connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
+               <developerConnection>scm:svn:https://svn.argeo.org/commons/trunk
                </developerConnection>
-               <url>https://svn.argeo.org/commons/tags/argeo-commons-1.1.3</url>
+               <url>https://svn.argeo.org/commons/trunk</url>
        </scm>
        <inceptionYear>2007</inceptionYear>
        <licenses>
@@ -359,7 +357,7 @@ limitations under the License.
                                <artifactId>maven-release-plugin</artifactId>
                                <configuration>
                                        <goals>deploy</goals>
-                                       <releaseProfiles>rpmbuild,rpmbuild-tp,el5</releaseProfiles>
+                                       <releaseProfiles>rpmbuild,rpmbuild-tp</releaseProfiles>
                                </configuration>
                        </plugin>
                        <plugin>
@@ -400,7 +398,7 @@ limitations under the License.
        <repositories>
                <repository>
                        <id>argeo-tp</id>
-                       <url>http://dev.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.tp-1.3.1</url>
+                       <url>http://repo.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.tp-1.3.1</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
@@ -431,7 +429,7 @@ limitations under the License.
        <distributionManagement>
                <repository>
                        <id>staging</id>
-                       <url>dav:http://localhost:7080/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
+                       <url>dav:https://repo.argeo.org/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
                <site>