X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=983baa148361fcccbab740a51d1cabddf08d305e;hb=dc61e15280d5430c637effd689d45322a08cc4d8;hp=a1e57458402cc262db34c530524a90d532c38105;hpb=5975640ef4992c6346ce2cff053d426291242a52;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index a1e574584..983baa148 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?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>
 	<parent>
 		<groupId>org.argeo</groupId>
@@ -13,16 +14,27 @@
 	<packaging>pom</packaging>
 	<properties>
 		<developmentCycle>0.3</developmentCycle>
-		<version.argeo-distribution>1.1.3</version.argeo-distribution>
+		<version.argeo-distribution>1.1.4-SNAPSHOT</version.argeo-distribution>
 		<version.argeo-commons>0.3.2-SNAPSHOT</version.argeo-commons>
 		<version.argeo-ria>0.12.5</version.argeo-ria>
 		<version.equinox>3.6.2</version.equinox>
-		<version.maven-argeo-osgi>0.1.31</version.maven-argeo-osgi>
+		<!-- Maven -->
+		<!-- Using version 2.3.4 causes package use conflict. To be investigated. -->
 		<version.maven-bundle-plugin>2.2.0</version.maven-bundle-plugin>
+		<version.maven-argeo-osgi>1.0.33</version.maven-argeo-osgi>
 		<version.maven-argeo-qooxdoo>1.1.1</version.maven-argeo-qooxdoo>
 		<site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
 		<site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
 	</properties>
+	<modules>
+		<module>basic</module>
+		<module>osgi</module>
+		<module>server</module>
+		<module>eclipse</module>
+		<module>security</module>
+		<module>gis</module>
+		<module>sandbox</module>
+	</modules>
 	<url>${site.urlBase}/${developmentCycle}</url>
 	<scm>
 		<connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
@@ -68,15 +80,6 @@ limitations under the License.
 			</roles>
 		</developer>
 	</developers>
-	<modules>
-		<module>basic</module>
-		<module>osgi</module>
-		<module>server</module>
-		<module>eclipse</module>
-		<module>security</module>
-		<module>gis</module>
-		<module>sandbox</module>
-	</modules>
 	<build>
 		<pluginManagement>
 			<plugins>